diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-02-05 13:31:15 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-02-05 13:31:15 +0000 |
| commit | 74a550fddf5f1fac46b1e2f6c43cef72e47050a8 (patch) | |
| tree | 4f2f8fb118316763fd39276795774bb4d76dfa88 /gnome-extra/gnome-color-manager | |
| parent | Properly fix bug 350850 in making akonadi optional (diff) | |
| download | historical-74a550fddf5f1fac46b1e2f6c43cef72e47050a8.tar.gz historical-74a550fddf5f1fac46b1e2f6c43cef72e47050a8.tar.bz2 historical-74a550fddf5f1fac46b1e2f6c43cef72e47050a8.zip | |
Fix building with x11-libs/libnotify >= 0.7.
Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64
Diffstat (limited to 'gnome-extra/gnome-color-manager')
4 files changed, 47 insertions, 17 deletions
diff --git a/gnome-extra/gnome-color-manager/ChangeLog b/gnome-extra/gnome-color-manager/ChangeLog index 002832d4299d..afc6cdae0fa9 100644 --- a/gnome-extra/gnome-color-manager/ChangeLog +++ b/gnome-extra/gnome-color-manager/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-extra/gnome-color-manager # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/ChangeLog,v 1.2 2011/01/03 21:55:11 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/ChangeLog,v 1.3 2011/02/05 13:31:15 ssuominen Exp $ + + 05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> + gnome-color-manager-2.32.0.ebuild, + +files/gnome-color-manager-2.32.0-libnotify-0.7.patch: + Fix building with x11-libs/libnotify >= 0.7. 03 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org> gnome-color-manager-2.32.0.ebuild: diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest index e61fe657d14b..419218396118 100644 --- a/gnome-extra/gnome-color-manager/Manifest +++ b/gnome-extra/gnome-color-manager/Manifest @@ -1,14 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX gnome-color-manager-2.32.0-libnotify-0.7.patch 732 RMD160 9cfd74dc9f784429d674578c4a02a0bc61f47562 SHA1 1635dfa32b90575da915da896618f0fb90718c15 SHA256 a4ac10d8bda2fb8e9d7580524d086b87cede2b8188f2cace17032f735b7773dd DIST gnome-color-manager-2.32.0.tar.bz2 2491525 RMD160 6ad3b2d3a4cd84ba78988411d7402abca46aebcf SHA1 18cdc922188c2872c5e0c32b215e6cbea878e289 SHA256 fa287ef12d329643d1f01b8f35c2b104dd293cd30e91a012f04929c203da54cf -EBUILD gnome-color-manager-2.32.0.ebuild 1143 RMD160 e1cacc14779000cd6f4216b0d93106af64c6f9d2 SHA1 e2f288c6366cdf98d7077546e492d19da8b4b077 SHA256 b5bc7ae2bbd4d29586f24f81f7edd1dd84b8976432048005bf67c92b62400ac1 -MISC ChangeLog 636 RMD160 072365f727ae80652a5d676e8693a55cd55795ff SHA1 7a46fda2a5bf8997f776f93e70f1c94343a2eba5 SHA256 0ac04021b4bb227c6442832b10a2dca294603c57c3cc6870bf6b1e1cabd0e770 +EBUILD gnome-color-manager-2.32.0.ebuild 1260 RMD160 10c10837cec6fc68235f5a0f78c9d1d127a8a743 SHA1 f600491ceb84575012cd3618710daad6c44e7b5e SHA256 466321d7e8b209a31eb785d1912bdba1988965e2b042c21310442061f9782b5c +MISC ChangeLog 838 RMD160 682320fbf5cbae5f5a2bda1829f6e4204da6c640 SHA1 2ffd55a34875fbdac6cb99cb850022c09a033f1f SHA256 109ff1a1307c2bab61b8062013fb48bce00732e115110e0a8b0f47d5933d3ffc MISC metadata.xml 268 RMD160 f5013dae2ef1a2751baf01bce26c233f5d5a83c7 SHA1 fb5b48775f0d846f0a3555970e6961e511008e19 SHA256 4d59f5f31e9d7c08685c252c1e65136392d54bdcd408a9729a5bd1123e04f3e6 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iEUEARECAAYFAk0iU9QACgkQ1fmVwcYIWAYhbwCYjS9136HKfNqcTPmacJDHEtV4 -PwCg277iS/CW3e2Mm+aj+NyP4IHVFyg= -=0oe5 ------END PGP SIGNATURE----- diff --git a/gnome-extra/gnome-color-manager/files/gnome-color-manager-2.32.0-libnotify-0.7.patch b/gnome-extra/gnome-color-manager/files/gnome-color-manager-2.32.0-libnotify-0.7.patch new file mode 100644 index 000000000000..7b3fe5b4273d --- /dev/null +++ b/gnome-extra/gnome-color-manager/files/gnome-color-manager-2.32.0-libnotify-0.7.patch @@ -0,0 +1,27 @@ +--- src/gcm-session.c ++++ src/gcm-session.c +@@ -28,6 +28,10 @@ + #include <gconf/gconf-client.h> + #include <libnotify/notify.h> + ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif ++ + #include "egg-debug.h" + #include "gcm-dbus.h" + #include "gcm-client.h" +@@ -145,7 +149,12 @@ + NotifyNotification *notification; + + /* show a bubble */ +- notification = notify_notification_new (title, message, GCM_STOCK_ICON, NULL); ++ notification = notify_notification_new (title, message, GCM_STOCK_ICON ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ ); ++#else ++ , NULL); ++#endif + notify_notification_set_timeout (notification, GCM_SESSION_NOTIFY_TIMEOUT); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-2.32.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-2.32.0.ebuild index 99ba610c8d0a..a6b387bb4c07 100644 --- a/gnome-extra/gnome-color-manager/gnome-color-manager-2.32.0.ebuild +++ b/gnome-extra/gnome-color-manager/gnome-color-manager-2.32.0.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-2.32.0.ebuild,v 1.2 2011/01/03 21:55:11 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-2.32.0.ebuild,v 1.3 2011/02/05 13:31:15 ssuominen Exp $ EAPI="3" GCONF_DEBUG="no" -inherit gnome2 +inherit eutils gnome2 DESCRIPTION="Color profile manager for the GNOME desktop" HOMEPAGE="http://projects.gnome.org/gnome-color-manager/" @@ -42,5 +42,12 @@ DEPEND="${RDEPEND} # FIXME: run test-suite with files on live file-system RESTRICT="test" -# Always enable tests since they are check_PROGRAMS anyway -G2CONF="${G2CONF} --enable-tests --disable-packagekit" +pkg_setup() { + # Always enable tests since they are check_PROGRAMS anyway + G2CONF="${G2CONF} --enable-tests --disable-packagekit" +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-libnotify-0.7.patch + gnome2_src_prepare +} |