Author: lisu Date: Sat May 21 14:31:07 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- fixed build with libnotify 0.7
---- Files affected:
packages/notify-osd:
notify-osd-libnotify.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/notify-osd/notify-osd-libnotify.patch
diff -u /dev/null packages/notify-osd/notify-osd-libnotify.patch:1.1
--- /dev/null Sat May 21 16:31:07 2011
+++ packages/notify-osd/notify-osd-libnotify.patch Sat May 21 16:31:02 2011
@@ -0,0 +1,165 @@
+--- notify-osd-0.9.30/tests/test-withlib.c~ 2011-02-25 09:10:24.000000000
+0100
++++ notify-osd-0.9.30/tests/test-withlib.c 2011-05-21 16:27:58.986752462
+0200
+@@ -94,7 +94,11 @@
+
+ n = notify_notification_new ("Test",
+ "You should see a normal notification",
+- "", NULL);
++ ""
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 &&
NOTIFY_VERSION_MINOR < 7)
++ , NULL
++#endif
++ );
+ notify_notification_show (n, NULL);
+ sleep (3);
+
+@@ -109,7 +113,11 @@
+
+ n = notify_notification_new ("Test",
+ "New notification",
+- "", NULL);
++ ""
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 &&
NOTIFY_VERSION_MINOR < 7)
++ , NULL
++#endif
++ );
+ res = notify_notification_show (n, NULL);
+ g_assert (res);
+ sleep (1);
+@@ -135,7 +143,11 @@
+
+ n = notify_notification_new ("Image Test",
+ "You should see an image",
+- "", NULL);
++ ""
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 &&
NOTIFY_VERSION_MINOR < 7)
++ , NULL
++#endif
++ );
+ g_print ("iconpath: %s\n", SRCDIR"/icons/avatar.png");
+ pixbuf = gdk_pixbuf_new_from_file_at_scale (SRCDIR"/icons/avatar.png",
+ 64, 64, TRUE, NULL);
+@@ -157,22 +169,38 @@
+
+ n1 = notify_notification_new ("Dummy Notification",
+ "This is a test notification",
+- "", NULL);
++ ""
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 &&
NOTIFY_VERSION_MINOR < 7)
++ , NULL
++#endif
++ );
+ notify_notification_show (n1, NULL);
+ n2 = notify_notification_new ("Normal Notification",
+ "You should see this *after* the urgent
notification.",
+- "", NULL);
++ ""
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 &&
NOTIFY_VERSION_MINOR < 7)
++ , NULL
++#endif
++ );
+ notify_notification_set_urgency (n2, NOTIFY_URGENCY_LOW);
+ notify_notification_show (n2, NULL);
+ n3 = notify_notification_new ("Synchronous Notification",
+ "You should immediately see this
notification.",
+- "", NULL);
++ ""
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 &&
NOTIFY_VERSION_MINOR < 7)
++ , NULL
++#endif
++ );
+ notify_notification_set_hint_string (n3, "synchronous", "test");
+ notify_notification_set_urgency (n3, NOTIFY_URGENCY_NORMAL);
+ notify_notification_show (n3, NULL);
+ n4 = notify_notification_new ("Urgent Notification",
+ "You should see a dialog box, and after,
a normal notification.",
+- "", NULL);
++ ""
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 &&
NOTIFY_VERSION_MINOR < 7)
++ , NULL
++#endif
++ );
+ notify_notification_set_urgency (n4, NOTIFY_URGENCY_CRITICAL);
+ notify_notification_show (n4, NULL);
+
+@@ -207,7 +235,11 @@
+
+ n1 = notify_notification_new ("Notification with an action",
+ "You should see that in a dialog box.
Click the 'Action' button for the test to succeed.",
+- "", NULL);
++ ""
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 &&
NOTIFY_VERSION_MINOR < 7)
++ , NULL
++#endif
++ );
+ notify_notification_add_action (n1,
+ "action",
+ "Action",
+@@ -231,7 +263,11 @@
+
+ n = notify_notification_new ("Test Title",
+ "This notification will be closed
prematurely...",
+- "", NULL);
++ ""
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 &&
NOTIFY_VERSION_MINOR < 7)
++ , NULL
++#endif
++ );
+ notify_notification_show (n, NULL);
+
+ loop = g_main_loop_new(NULL, FALSE);
+@@ -256,8 +292,11 @@
+ /* init notification, supply first line of body-text */
+ n = notify_notification_new ("Test (append-hint)",
+ "The quick brown fox jumps over the lazy
dog.",
+- SRCDIR"/icons/avatar.png",
+- NULL);
++ SRCDIR"/icons/avatar.png"
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 &&
NOTIFY_VERSION_MINOR < 7)
++ , NULL
++#endif
++ );
+ res = notify_notification_show (n, NULL);
+ g_assert (res);
+ sleep (1);
+@@ -296,8 +335,11 @@
+ /* init notification, supply first line of body-text */
+ n = notify_notification_new (" ", /* needs this to be non-NULL */
+ NULL,
+- "notification-audio-play",
+- NULL);
++ "notification-audio-play"
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 &&
NOTIFY_VERSION_MINOR < 7)
++ , NULL
++ );
++#endif
+ notify_notification_set_hint_string (n, "icon-only", "allowed");
+ res = notify_notification_show (n, NULL);
+ g_assert (res);
+@@ -314,8 +356,11 @@
+
+ n = notify_notification_new ("Swallow markup test",
+ "This text is hopefully neither
<b>bold</b>, <i>italic</i> nor <u>underlined</u>.\n\nA little
math-notation:\n\n\ta > b < c = 0",
+- SRCDIR"/icons/avatar.png",
+- NULL);
++ SRCDIR"/icons/avatar.png"
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 &&
NOTIFY_VERSION_MINOR < 7)
++ , NULL
++#endif
++ );
+ res = notify_notification_show (n, NULL);
+ g_assert (res);
+ sleep (2);
+@@ -341,7 +386,11 @@
+
+ // create dummy notification
+ snprintf (buf, 19, "Test #%.2d", i);
+- n = notify_notification_new (buf, buf, "", NULL);
++ n = notify_notification_new (buf, buf, ""
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 &&
NOTIFY_VERSION_MINOR < 7)
++ , NULL
++#endif
++ );
+
+ // inject it into the queue
+ res = notify_notification_show (n, &error);
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
