| 1 |
ssuominen 11/01/30 09:29:46 |
| 2 |
|
| 3 |
Modified: 0.12-FLAGS.patch |
| 4 |
Added: 0.12-libnotify-0.7.patch |
| 5 |
Removed: makefile-standalone-0.10.patch |
| 6 |
Log: |
| 7 |
Fix building with x11-libs/libnotify >= 0.7. Fix missing -I and -l flags for dbus-glib-1 in -FLAGS.patch. punt old |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.2 sys-kernel/kerneloops/files/0.12-FLAGS.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/kerneloops/files/0.12-FLAGS.patch?rev=1.2&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/kerneloops/files/0.12-FLAGS.patch?rev=1.2&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/kerneloops/files/0.12-FLAGS.patch?r1=1.1&r2=1.2 |
| 17 |
|
| 18 |
Index: 0.12-FLAGS.patch |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/files/0.12-FLAGS.patch,v |
| 21 |
retrieving revision 1.1 |
| 22 |
retrieving revision 1.2 |
| 23 |
diff -u -r1.1 -r1.2 |
| 24 |
--- 0.12-FLAGS.patch 7 Feb 2010 19:31:53 -0000 1.1 |
| 25 |
+++ 0.12-FLAGS.patch 30 Jan 2011 09:29:46 -0000 1.2 |
| 26 |
@@ -1,28 +1,28 @@ |
| 27 |
-diff --git a/Makefile b/Makefile |
| 28 |
-index 86acdf2..c2b8567 100644 |
| 29 |
---- a/Makefile |
| 30 |
-+++ b/Makefile |
| 31 |
-@@ -10,7 +10,7 @@ LOCALESDIR=/usr/share/locale |
| 32 |
+diff -ur kerneloops-0.12.orig/Makefile kerneloops-0.12/Makefile |
| 33 |
+--- kerneloops-0.12.orig/Makefile 2008-04-10 01:02:24.000000000 +0300 |
| 34 |
++++ kerneloops-0.12/Makefile 2011-01-30 11:23:39.000000000 +0200 |
| 35 |
+@@ -10,16 +10,16 @@ |
| 36 |
MANDIR=/usr/share/man/man8 |
| 37 |
CC?=gcc |
| 38 |
|
| 39 |
-CFLAGS := -O2 -g -fstack-protector -D_FORTIFY_SOURCE=2 -Wall -W -Wstrict-prototypes -Wundef -fno-common -Werror-implicit-function-declaration -Wdeclaration-after-statement |
| 40 |
+CFLAGS ?= -O2 -g -fstack-protector -D_FORTIFY_SOURCE=2 -Wall -W -Wstrict-prototypes -Wundef -fno-common -Werror-implicit-function-declaration -Wdeclaration-after-statement |
| 41 |
|
| 42 |
- MY_CFLAGS := `pkg-config --cflags libnotify gtk+-2.0` |
| 43 |
+-MY_CFLAGS := `pkg-config --cflags libnotify gtk+-2.0` |
| 44 |
++MY_CFLAGS := `pkg-config --cflags dbus-glib-1 libnotify gtk+-2.0` |
| 45 |
# |
| 46 |
-@@ -18,8 +18,8 @@ MY_CFLAGS := `pkg-config --cflags libnotify gtk+-2.0` |
| 47 |
+ # pkg-config tends to make programs pull in a ton of libraries, not all |
| 48 |
# are needed. -Wl,--as-needed tells the linker to just drop unused ones, |
| 49 |
# and that makes the applet load faster and use less memory. |
| 50 |
# |
| 51 |
-LDF_A := -Wl,--as-needed `pkg-config --libs libnotify gtk+-2.0` |
| 52 |
-LDF_D := -Wl,--as-needed `pkg-config --libs glib-2.0 dbus-glib-1` `curl-config --libs` -Wl,"-z relro" -Wl,"-z now" |
| 53 |
-+LIBSA := `pkg-config --libs libnotify gtk+-2.0` |
| 54 |
++LIBSA := `pkg-config --libs dbus-glib-1 libnotify gtk+-2.0` |
| 55 |
+LIBSD := `pkg-config --libs glib-2.0 dbus-glib-1` `curl-config --libs` |
| 56 |
|
| 57 |
all: kerneloops kerneloops-applet kerneloops.8.gz |
| 58 |
|
| 59 |
-@@ -30,11 +30,11 @@ noui: kerneloops kerneloops.8.gz |
| 60 |
+@@ -30,11 +30,11 @@ |
| 61 |
|
| 62 |
|
| 63 |
kerneloops: kerneloops.o submit.o dmesg.o configfile.o kerneloops.h |
| 64 |
|
| 65 |
|
| 66 |
|
| 67 |
1.1 sys-kernel/kerneloops/files/0.12-libnotify-0.7.patch |
| 68 |
|
| 69 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/kerneloops/files/0.12-libnotify-0.7.patch?rev=1.1&view=markup |
| 70 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/kerneloops/files/0.12-libnotify-0.7.patch?rev=1.1&content-type=text/plain |
| 71 |
|
| 72 |
Index: 0.12-libnotify-0.7.patch |
| 73 |
=================================================================== |
| 74 |
diff -ur kerneloops-0.12.orig/kerneloops-applet.c kerneloops-0.12/kerneloops-applet.c |
| 75 |
--- kerneloops-0.12.orig/kerneloops-applet.c 2008-09-13 18:27:50.000000000 +0300 |
| 76 |
+++ kerneloops-0.12/kerneloops-applet.c 2011-01-30 11:26:13.000000000 +0200 |
| 77 |
@@ -240,8 +240,15 @@ |
| 78 |
/* if there's a notification active already, close it first */ |
| 79 |
close_notification(); |
| 80 |
|
| 81 |
- notify = notify_notification_new(summary, message, |
| 82 |
- "/usr/share/kerneloops/icon.png", NULL); |
| 83 |
+#ifdef NOTIFY_CHECK_VERSION |
| 84 |
+#if NOTIFY_CHECK_VERSION (0, 7, 0) |
| 85 |
+ notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png"); |
| 86 |
+#else |
| 87 |
+ notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png", NULL); |
| 88 |
+#endif |
| 89 |
+#else |
| 90 |
+ notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png", NULL); |
| 91 |
+#endif |
| 92 |
|
| 93 |
notify_notification_set_timeout(notify, 0); |
| 94 |
notify_notification_set_urgency(notify, NOTIFY_URGENCY_CRITICAL); |
| 95 |
@@ -306,8 +313,15 @@ |
| 96 |
|
| 97 |
url_to_oops[0] = 0; |
| 98 |
|
| 99 |
- notify = notify_notification_new(summary, message, |
| 100 |
- "/usr/share/kerneloops/icon.png", NULL); |
| 101 |
+#ifdef NOTIFY_CHECK_VERSION |
| 102 |
+#if NOTIFY_CHECK_VERSION (0, 7, 0) |
| 103 |
+ notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png"); |
| 104 |
+#else |
| 105 |
+ notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png", NULL); |
| 106 |
+#endif |
| 107 |
+#else |
| 108 |
+ notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png", NULL); |
| 109 |
+#endif |
| 110 |
|
| 111 |
notify_notification_set_timeout(notify, 5000); |
| 112 |
notify_notification_set_urgency(notify, NOTIFY_URGENCY_LOW); |
Archives