diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-01-29 14:17:33 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-01-29 14:17:33 +0000 |
| commit | 0aac730678fbbc751203bd5bfe532a4e43ea865e (patch) | |
| tree | d6b668e2b55a474665e7c195335030594a2f8952 /x11-plugins | |
| parent | Fix building with x11-libs/libnotify >= 0.7 wrt #352128 by Priit Laes. (diff) | |
| download | historical-0aac730678fbbc751203bd5bfe532a4e43ea865e.tar.gz historical-0aac730678fbbc751203bd5bfe532a4e43ea865e.tar.bz2 historical-0aac730678fbbc751203bd5bfe532a4e43ea865e.zip | |
Fix building with x11-libs/libnotify >= 0.7.
Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64
Diffstat (limited to 'x11-plugins')
| -rw-r--r-- | x11-plugins/wmudmount/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-plugins/wmudmount/Manifest | 5 | ||||
| -rw-r--r-- | x11-plugins/wmudmount/files/wmudmount-1.8-libnotify-0.7.patch | 16 | ||||
| -rw-r--r-- | x11-plugins/wmudmount/wmudmount-1.8.ebuild | 12 |
4 files changed, 34 insertions, 7 deletions
diff --git a/x11-plugins/wmudmount/ChangeLog b/x11-plugins/wmudmount/ChangeLog index a99989acfa6b..437d4fa66f49 100644 --- a/x11-plugins/wmudmount/ChangeLog +++ b/x11-plugins/wmudmount/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-plugins/wmudmount -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmudmount/ChangeLog,v 1.4 2010/12/26 13:01:52 ssuominen Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmudmount/ChangeLog,v 1.5 2011/01/29 14:17:33 ssuominen Exp $ + + 29 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> wmudmount-1.8.ebuild, + +files/wmudmount-1.8-libnotify-0.7.patch: + Fix building with x11-libs/libnotify >= 0.7. *wmudmount-1.8 (26 Dec 2010) diff --git a/x11-plugins/wmudmount/Manifest b/x11-plugins/wmudmount/Manifest index 985c7ad49bb9..192840f1c727 100644 --- a/x11-plugins/wmudmount/Manifest +++ b/x11-plugins/wmudmount/Manifest @@ -1,6 +1,7 @@ +AUX wmudmount-1.8-libnotify-0.7.patch 560 RMD160 e157cb3fef3099d4224808a71b0e543c1b019661 SHA1 a3d42b99134ecdb23f68d25b110595721d0347c6 SHA256 3955ea4a2b3031222fac7f9aef20801d917de8ac74338881829328fecae6ec72 DIST wmudmount-1.6.tar.gz 170834 RMD160 71fba0eadf5c8c1e0c8855b5761f2b9dfdcc1d7b SHA1 ac0b1853f2817d3fd395eddfd10cc4632daf7fb6 SHA256 1610d655966054139cd083fc81b3c19d94dac712ce07d00660a6443009b93fb8 DIST wmudmount-1.8.tar.gz 171467 RMD160 aa557be28b596aa7c4a12d61c0203335ac845e98 SHA1 066acd39f7a8d09567ef596b6b57552647b57eeb SHA256 d7617ef0738b1a7e041c2cdbe982984148eef56bba61db5133434e741394f74f EBUILD wmudmount-1.6.ebuild 1038 RMD160 d65ad14da0b106c78de5b7d7168c07593bd781fa SHA1 c3e882dfc754de095a4207531592f573ea4f4501 SHA256 c38c68fc44cb160eabedb00b6e56883b48b14f3eee2f9c05fa9ae181582ce7ba -EBUILD wmudmount-1.8.ebuild 1042 RMD160 54e41954257219d24166a928b82468f14b9bd3a3 SHA1 d0759ef1700b9de777e539375e95f270531ade6b SHA256 311bd908d6f19750b95d727937d2c7f026fa342d933727471d56f765f019056d -MISC ChangeLog 776 RMD160 28d75ccdc180bf8ee498eba42ef769763b1e7ef6 SHA1 1a0c758b454adb5e6ba8976a07d712d99440d6a5 SHA256 8f3bf4dd9f82a81cc778b67c3dc09042934d81121426030be7ff2937a9e11770 +EBUILD wmudmount-1.8.ebuild 1201 RMD160 a299e6a57ca217b938339ab7206fa25ef799d16d SHA1 c1a9540a155fe8010f46b724003204ab28253336 SHA256 8c5fe4c7c22a15b137a2cf294881bf6d19c70726557356ba57d35e846ce97bed +MISC ChangeLog 944 RMD160 6c75b06a75152046557ec1f37f6f98e24fb389f1 SHA1 ecd29a05769cf2944794c3ebe70bd45aa3044f26 SHA256 d6bf6d4830c1de4a4090690859fb90cb6399a98700734e162594f0bea70219ae MISC metadata.xml 167 RMD160 407c7d2b252afa7f63c4743fedf94da43b716623 SHA1 f42c260c0a7ce58db5124a80e8f65e9d570294b2 SHA256 0b161d83e9e7cad5a69cc5c2a23a5ba0fcac0d20751516b605dc232d9a2e7284 diff --git a/x11-plugins/wmudmount/files/wmudmount-1.8-libnotify-0.7.patch b/x11-plugins/wmudmount/files/wmudmount-1.8-libnotify-0.7.patch new file mode 100644 index 000000000000..eaae8604d7ce --- /dev/null +++ b/x11-plugins/wmudmount/files/wmudmount-1.8-libnotify-0.7.patch @@ -0,0 +1,16 @@ +--- notify.c ++++ notify.c +@@ -58,7 +58,12 @@ + } else if(G_IS_FILE_ICON(icon)){ + icon_name = g_icon_to_string(icon); + } +- NotifyNotification *n = notify_notification_new(summary, body, icon_name, NULL); ++ NotifyNotification *n = notify_notification_new(summary, body, icon_name ++#ifdef HAVE_LIBNOTIFY_07 ++ ); ++#else ++ , NULL); ++#endif + GError *err = NULL; + if(!notify_notification_show(n, &err)){ + warn(DEBUG_ERROR, "Failed to show notification \"%s\" \"%s\": %s", summary, body, err?err->message:"<unknown error>"); diff --git a/x11-plugins/wmudmount/wmudmount-1.8.ebuild b/x11-plugins/wmudmount/wmudmount-1.8.ebuild index 4848cbd97e56..ce5d373bd8bb 100644 --- a/x11-plugins/wmudmount/wmudmount-1.8.ebuild +++ b/x11-plugins/wmudmount/wmudmount-1.8.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmudmount/wmudmount-1.8.ebuild,v 1.1 2010/12/26 13:01:52 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmudmount/wmudmount-1.8.ebuild,v 1.2 2011/01/29 14:17:33 ssuominen Exp $ EAPI=2 -inherit gnome2-utils +inherit flag-o-matic gnome2-utils DESCRIPTION="A filesystem mounter that uses udisks to handle notification and mounting" HOMEPAGE="http://sourceforge.net/projects/wmudmount/" @@ -22,7 +22,13 @@ RDEPEND=">=x11-libs/gtk+-2.18:2 DEPEND="${RDEPEND} dev-util/pkgconfig" +src_prepare() { + epatch "${FILESDIR}"/${P}-libnotify-0.7.patch +} + src_configure() { + has_version ">=x11-libs/libnotify-0.7" && append-cppflags -DHAVE_LIBNOTIFY_07 + econf \ --disable-dependency-tracking \ $(use_with libnotify) \ |