summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-misc/notify-osd/ChangeLog6
-rw-r--r--x11-misc/notify-osd/Manifest19
-rw-r--r--x11-misc/notify-osd/files/notify-osd-0.9.30-libnotify-0.7.patch257
-rw-r--r--x11-misc/notify-osd/notify-osd-0.9.30.ebuild51
4 files changed, 13 insertions, 320 deletions
diff --git a/x11-misc/notify-osd/ChangeLog b/x11-misc/notify-osd/ChangeLog
index c9f17dc0bdc1..e4b08b023941 100644
--- a/x11-misc/notify-osd/ChangeLog
+++ b/x11-misc/notify-osd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/notify-osd
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/notify-osd/ChangeLog,v 1.6 2011/10/21 19:24:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/notify-osd/ChangeLog,v 1.7 2011/11/20 03:53:13 ssuominen Exp $
+
+ 20 Nov 2011; Samuli Suominen <ssuominen@gentoo.org>
+ -notify-osd-0.9.30.ebuild, -files/notify-osd-0.9.30-libnotify-0.7.patch:
+ old
*notify-osd-0.9.32 (21 Oct 2011)
diff --git a/x11-misc/notify-osd/Manifest b/x11-misc/notify-osd/Manifest
index db3968cf24c4..cf4d695cbbb0 100644
--- a/x11-misc/notify-osd/Manifest
+++ b/x11-misc/notify-osd/Manifest
@@ -1,21 +1,18 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX notify-osd-0.9.30-libnotify-0.7.patch 7912 RMD160 267681859436762380c18cf75bd6c8973ca8f785 SHA1 94c2b76d7419e477727a0db0e0eb6a6412fb50a6 SHA256 9e6751f33cd5c0738308a791bd3ff7b0f7b2e630d408ce3794153b383e695e8b
-DIST notify-osd-0.9.30.tar.gz 608796 RMD160 e8c1810385a31c5b0fd7ad2b741e901b99c6c390 SHA1 10f47457971d41e0f412672d86f19a0878136493 SHA256 5dbe49d46b6d7be703cd1f015b78bdfe8346dd409d020aa8b10fe023e25eb078
DIST notify-osd-0.9.32.tar.gz 629967 RMD160 fb8e11e92caa464a97fa79f20dec545b819fe7a5 SHA1 bb402d8f7dabf1b981a2bbde17886ce9813b3c13 SHA256 bb6cfaabce7efda886c84a7eb9c23a7aed9a555e01513b90569dd12fa23f8d6a
-EBUILD notify-osd-0.9.30.ebuild 1490 RMD160 e66d7d089be42bb806ecdb1e0603d7c7fede4064 SHA1 a1fe83c894f0121375b4367a8aec4ed60d2526fc SHA256 db650b073ad7f814f93b6bd716932483fb1caae0b2bd2fa3c140c0323e89c7c3
EBUILD notify-osd-0.9.32.ebuild 1424 RMD160 e5d76c2ee6ea9e2931c36938b960ac5a98c667e5 SHA1 fc8c69079360cd1837ead7655dc7535b8045e4e4 SHA256 249630fe28e601e5d0dec7e6ec3800f5acb7d22c28e4d013d1dbd7aaed68e815
-MISC ChangeLog 1196 RMD160 5461fded4eee3c38d928e08f340838087269d362 SHA1 37ba350a594fccaa5f5a4927d1bdff3f33fe8b22 SHA256 19238fdc8a52971882a2b7d377de4c211d52b43fe90f031ac63550b79f1aeeb4
+MISC ChangeLog 1332 RMD160 adb0d3621629b3fb16c3e94f0d54f7fd92c259ed SHA1 e3ee71744d51c765802a06784973f68785f1162b SHA256 a8359345942af8080ac6169a75e7fd48d1feddca46b3a81a56de6e8bc1247aea
MISC metadata.xml 271 RMD160 f5550f51d7c9f7bb15177eeb66d3de3f6511f45a SHA1 13cd5d11fbd7f0dfd5967b8757efd71d4d273e23 SHA256 b0ab8f8a76df2649ab818da3d391589e88d0befc9607eb6c3be7f1746b2d4392
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBAgAGBQJOocbJAAoJEEdUh39IaPFNgHwH/1AVyygBd0z2NZuzIJpA6kia
-Um9oyQ6uFDxCuIC41lk3AwfZxDP4l6bOB6iSIUcNDOfWbTLMPmw5RTxoMX1GmGsq
-M3CmbTtVKOA+VmPZm10dKQxnlXrCaCgXUo0CEUUReGwWkSOcbTU25m1ETMPL4I8x
-z7r7JbaathqE/i1ryJ2E+Y3KG7I38ikJGvcTmGChlE6Yt/7PJxv8iGMpheHAUj2x
-vA+d1B2+Zgm2k6mY3rewxLLdfDmcE2jNobxAw3QGfS0DcBbhMLI7GhUBopNUiKdA
-DMgF6NsXsR8xEc1J4eJbXskYWDuHRZ4VJ/dscOubS8Vch0iyi/PI6gHfOpYV+o0=
-=1sEv
+iQEcBAEBAgAGBQJOyHlEAAoJEEdUh39IaPFNfNUIAJ2HAmMk66nhpemFeLQZ0aie
+2DxhOB/F5qE0dPds1zuae5ApWFpj32eltn/ejl/upCA6otPqglDQ22x4hx3heJc6
+dJldb9CA5YQWzUUh6kfTOOsofkEwFP0Hltjsi1TxhsxEOKrxhlrm4kdLKqdkX8D4
+QkcpSrsho2koebkB3PdYFVFDuUt/jQ9FKkIvqRVnHNw64lJiNRPZDMyemZdKcQTh
+qC3i1CgBfcY3x0TLsPmQlMBdUzjH+H4wigmkdQHZSxCNW6GUx3Sz6cav5Q9c/uVr
+eo1Qhzo/GQX0Osmt07inR1TLsB+Zx48UbocvTIik+yJz2gSNM5lFlTr2qKEDtko=
+=86G1
-----END PGP SIGNATURE-----
diff --git a/x11-misc/notify-osd/files/notify-osd-0.9.30-libnotify-0.7.patch b/x11-misc/notify-osd/files/notify-osd-0.9.30-libnotify-0.7.patch
deleted file mode 100644
index 7f70d99f9e9e..000000000000
--- a/x11-misc/notify-osd/files/notify-osd-0.9.30-libnotify-0.7.patch
+++ /dev/null
@@ -1,257 +0,0 @@
---- examples/append-hint-example.c
-+++ examples/append-hint-example.c
-@@ -41,7 +41,7 @@
- GError* error = NULL;
-
- /* initial notification */
-- notification = notify_notification_new (title, body, icon, NULL);
-+ notification = notify_notification_new (title, body, icon);
- notify_notification_set_hint_string (notification,
- "x-canonical-append",
- "");
---- examples/icon-only.c
-+++ examples/icon-only.c
-@@ -54,8 +54,7 @@
- notification = notify_notification_new (
- "Eject", /* for a11y-reasons put something meaningfull here */
- NULL,
-- "notification-device-eject",
-- NULL);
-+ "notification-device-eject");
- notify_notification_set_hint_string (notification,
- "x-canonical-private-icon-only",
- "");
---- examples/icon-summary-body.c
-+++ examples/icon-summary-body.c
-@@ -54,8 +54,7 @@
- "Hey pal, what's up with the party "
- "next weekend? Will you join me "
- "and Anna?",
-- "notification-message-im",
-- NULL);
-+ "notification-message-im");
- error = NULL;
- success = notify_notification_show (notification, &error);
- if (!success)
---- examples/icon-summary.c
-+++ examples/icon-summary.c
-@@ -52,8 +52,7 @@
- notification = notify_notification_new (
- "WiFi connection lost",
- NULL,
-- "notification-network-wireless-disconnected",
-- NULL);
-+ "notification-network-wireless-disconnected");
- error = NULL;
- success = notify_notification_show (notification, &error);
- if (!success)
---- examples/icon-updating.c
-+++ examples/icon-updating.c
-@@ -53,7 +53,6 @@
- notification = notify_notification_new (
- "Test 1/3",
- "Set icon via hint \"image_path\" to logo-icon.",
-- NULL,
- NULL);
- notify_notification_set_hint_string (
- notification,
---- examples/icon-value.c
-+++ examples/icon-value.c
-@@ -42,8 +42,7 @@
- notification = notify_notification_new (
- "Brightness", /* for a11y-reasons put something meaningfull here */
- NULL,
-- icon,
-- NULL);
-+ icon);
- notify_notification_set_hint_int32 (notification,
- "value",
- value);
---- examples/summary-body.c
-+++ examples/summary-body.c
-@@ -52,7 +52,6 @@
- notification = notify_notification_new (
- "Totem",
- "This is a superfluous notification",
-- NULL,
- NULL);
- error = NULL;
- success = notify_notification_show (notification, &error);
---- examples/summary-only.c
-+++ examples/summary-only.c
-@@ -52,7 +52,6 @@
- notification = notify_notification_new (
- "Summary-only",
- NULL,
-- NULL,
- NULL);
- error = NULL;
- success = notify_notification_show (notification, &error);
---- examples/sync-icon-only.c
-+++ examples/sync-icon-only.c
-@@ -55,8 +55,7 @@
- notification = notify_notification_new (
- "Eject", /* for a11y-reasons put something meaningfull here */
- NULL,
-- "notification-device-eject",
-- NULL);
-+ "notification-device-eject");
- notify_notification_set_hint_string (notification,
- "x-canonical-private-icon-only",
- "");
---- examples/update-notifications.c
-+++ examples/update-notifications.c
-@@ -53,8 +53,7 @@
- "Inital notification",
- "This is the original content of "
- "this notification-bubble.",
-- "notification-message-im",
-- NULL);
-+ "notification-message-im");
- error = NULL;
- success = notify_notification_show (notification, &error);
- if (!success)
-@@ -97,8 +96,7 @@
- "Initial layout",
- "This bubble uses the icon-title-body "
- "layout.",
-- "notification-message-im",
-- NULL);
-+ "notification-message-im");
- error = NULL;
- success = notify_notification_show (notification, &error);
- if (!success)
---- tests/test-synchronous.c
-+++ tests/test-synchronous.c
-@@ -38,7 +38,7 @@
- NotifyNotification *n;
- n = notify_notification_new ("Test notification",
- g_strdup (message),
-- "", NULL);
-+ "");
- notify_notification_show (n, NULL);
- g_object_unref(G_OBJECT(n));
- }
-@@ -53,8 +53,7 @@
- if (n == NULL)
- n = notify_notification_new (" ",
- "",
-- g_strdup (icon),
-- NULL);
-+ g_strdup (icon));
- else
- notify_notification_update (n,
- " ",
---- tests/test-withlib.c
-+++ tests/test-withlib.c
-@@ -94,7 +94,7 @@
-
- n = notify_notification_new ("Test",
- "You should see a normal notification",
-- "", NULL);
-+ "");
- notify_notification_show (n, NULL);
- sleep (3);
-
-@@ -109,7 +109,7 @@
-
- n = notify_notification_new ("Test",
- "New notification",
-- "", NULL);
-+ "");
- res = notify_notification_show (n, NULL);
- g_assert (res);
- sleep (1);
-@@ -135,7 +135,7 @@
-
- n = notify_notification_new ("Image Test",
- "You should see an image",
-- "", NULL);
-+ "");
- 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 +157,22 @@
-
- n1 = notify_notification_new ("Dummy Notification",
- "This is a test notification",
-- "", NULL);
-+ "");
- notify_notification_show (n1, NULL);
- n2 = notify_notification_new ("Normal Notification",
- "You should see this *after* the urgent notification.",
-- "", NULL);
-+ "");
- 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);
-+ "");
- 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);
-+ "");
- notify_notification_set_urgency (n4, NOTIFY_URGENCY_CRITICAL);
- notify_notification_show (n4, NULL);
-
-@@ -207,7 +207,7 @@
-
- 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);
-+ "");
- notify_notification_add_action (n1,
- "action",
- "Action",
-@@ -231,7 +231,7 @@
-
- n = notify_notification_new ("Test Title",
- "This notification will be closed prematurely...",
-- "", NULL);
-+ "");
- notify_notification_show (n, NULL);
-
- loop = g_main_loop_new(NULL, FALSE);
-@@ -256,8 +256,7 @@
- /* 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");
- res = notify_notification_show (n, NULL);
- g_assert (res);
- sleep (1);
-@@ -296,8 +295,7 @@
- /* 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");
- notify_notification_set_hint_string (n, "icon-only", "allowed");
- res = notify_notification_show (n, NULL);
- g_assert (res);
-@@ -314,8 +312,7 @@
-
- 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 &gt; b &lt; c = 0",
-- SRCDIR"/icons/avatar.png",
-- NULL);
-+ SRCDIR"/icons/avatar.png");
- res = notify_notification_show (n, NULL);
- g_assert (res);
- sleep (2);
-@@ -341,7 +338,7 @@
-
- // create dummy notification
- snprintf (buf, 19, "Test #%.2d", i);
-- n = notify_notification_new (buf, buf, "", NULL);
-+ n = notify_notification_new (buf, buf, "");
-
- // inject it into the queue
- res = notify_notification_show (n, &error);
diff --git a/x11-misc/notify-osd/notify-osd-0.9.30.ebuild b/x11-misc/notify-osd/notify-osd-0.9.30.ebuild
deleted file mode 100644
index 3f44ce283ff1..000000000000
--- a/x11-misc/notify-osd/notify-osd-0.9.30.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/notify-osd/notify-osd-0.9.30.ebuild,v 1.5 2011/05/01 09:31:34 ssuominen Exp $
-
-EAPI=2
-inherit autotools eutils gnome2-utils savedconfig
-
-DESCRIPTION="Canonical's on-screen-display notification agent"
-HOMEPAGE="http://launchpad.net/notify-osd"
-SRC_URI="http://launchpad.net/${PN}/natty/natty-alpha3/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.88
- >=dev-libs/glib-2.16:2
- gnome-base/gconf:2
- >=x11-libs/gtk+-2.22:2
- >=x11-libs/libnotify-0.7
- x11-libs/libwnck:1
- x11-libs/libX11
- x11-libs/pixman
- !<xfce-extra/xfce4-notifyd-0.2.1_p20110101
- !x11-misc/notification-daemon"
-RDEPEND="${COMMON_DEPEND}
- !minimal? ( x11-themes/notify-osd-icons )"
-DEPEND="${COMMON_DEPEND}
- dev-util/pkgconfig
- gnome-base/gnome-common
- x11-proto/xproto"
-
-RESTRICT="test" # virtualx.eclass: 1 of 1: FAIL: test-modules
-
-src_prepare() {
- sed -i -e 's:noinst_PROG:check_PROG:' tests/Makefile.am || die
- epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
- use savedconfig && restore_config src/{bubble,defaults}.c
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS README TODO
- save_config src/{bubble,defaults}.c
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }