From 438e6750e6d1bf3349d6b30ed211bbad90d49948 Mon Sep 17 00:00:00 2001 From: Sergey Popov Date: Thu, 29 Mar 2012 20:41:32 +0400 Subject: [PATCH] add patch to properly compile with/without libnotify. Thanks to Tomasz Golinski(reported - https://bugs.gentoo.org/show_bug.cgi?id=363321) --- x11-plugins/compiz-plugins-extra/Manifest | 3 ++- .../compiz-plugins-extra-0.8.8-r9999.ebuild | 3 +-- .../files/compiz-plugins-extra-0.8.8-libnotify.patch | 11 +++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.8-libnotify.patch diff --git a/x11-plugins/compiz-plugins-extra/Manifest b/x11-plugins/compiz-plugins-extra/Manifest index b533e6d..c7e8ae6 100644 --- a/x11-plugins/compiz-plugins-extra/Manifest +++ b/x11-plugins/compiz-plugins-extra/Manifest @@ -1,6 +1,7 @@ AUX compiz-plugins-extra-0.8.6-libnotify.patch 1412 RMD160 a4e1a09e293c5e1a16bf3b0fd7710d7440c12bcc SHA1 c9201df9851f3ef325fe6b2f612097bc10723b1b SHA256 864971c7f1ad664d64c4cfcca527c2a9788f95a2b030b2cc94f1d2ad9332c106 +AUX compiz-plugins-extra-0.8.8-libnotify.patch 701 RMD160 be292728a4da1e3647919feb8c377fd3b079d001 SHA1 f4a1db4145840d4ef61be6d08f35c44726b66798 SHA256 8ebc9f57ed80476387a8142facd60e231dd1aa70ff5df508421cd7ca27616bcc AUX compiz-plugins-extra-no-gconf.patch 585 RMD160 bb3b291eab783be7f9754d724d3a96618fe2e614 SHA1 564d6614cc157397ae24347a731a9f4d65bf30f8 SHA256 0567850b07c3973f1b4bfd5c36a1e240a57e45a1714b63637ecec577febfc13f DIST compiz-plugins-extra-0.8.6.tar.bz2 2699385 RMD160 cd8d26902d38ee7fb42fe2077e483f92fc458929 SHA1 66c571c64910aa21808aedaee8c8ceb4c4a82c78 SHA256 e111beecd9e563065448aae81002fd6cb644b3cd0e11a8406d6a2d3146747de1 DIST compiz-plugins-extra-0.8.8.tar.bz2 2689953 RMD160 948fc491075f202759a31a3395fcd31deb6fa101 SHA1 ce592993696c0b5d4e0bb13171897b4c25b3844e SHA256 bdce203098c62370b01b87741b04d3d9bc37e918789acce07120c4f081d5bbe3 EBUILD compiz-plugins-extra-0.8.6-r9999.ebuild 1564 RMD160 28cf176862dd4bb9cfee9b434ab691090e9490f0 SHA1 ffedde3e900095a8b784856285f07937006da03a SHA256 59504a217dcdbbe674c9f21932d9a1a1e3b7981b5c1f0ebce02240196f89256a -EBUILD compiz-plugins-extra-0.8.8-r9999.ebuild 1614 RMD160 9e1f235af93ba19013d02cb5c7e9b82ea4b37585 SHA1 dcbdb7c1dd7176215dd78e2e8927982ec19c4925 SHA256 73415cab9299d73fc82b48b0468ecd350b4a850e964a2610483f29fb30972826 +EBUILD compiz-plugins-extra-0.8.8-r9999.ebuild 1564 RMD160 28cf176862dd4bb9cfee9b434ab691090e9490f0 SHA1 ffedde3e900095a8b784856285f07937006da03a SHA256 59504a217dcdbbe674c9f21932d9a1a1e3b7981b5c1f0ebce02240196f89256a diff --git a/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.8-r9999.ebuild b/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.8-r9999.ebuild index 64d4961..4876927 100644 --- a/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.8-r9999.ebuild +++ b/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.8-r9999.ebuild @@ -39,8 +39,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-no-gconf.patch fi -# Pinkbyte: !STUB! Need to adapt patch for 0.8.8 -# epatch "${FILESDIR}/${P}-libnotify.patch" + epatch "${FILESDIR}/${P}-libnotify.patch" # required to apply the above patch intltoolize --copy --force || die "intltoolize failed" diff --git a/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.8-libnotify.patch b/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.8-libnotify.patch new file mode 100644 index 0000000..cb04c01 --- /dev/null +++ b/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.8-libnotify.patch @@ -0,0 +1,11 @@ +--- configure.ac.org 2011-06-03 19:44:45.848405096 +0200 ++++ configure.ac 2011-06-03 19:50:54.353341075 +0200 +@@ -136,7 +136,7 @@ + PKG_CHECK_MODULES(COMPIZMOUSEPOLL, compiz-mousepoll, [have_compiz_mousepoll=yes], [have_compiz_mousepoll=no]) + AM_CONDITIONAL(SHOWMOUSE_PLUGIN, test "x$have_compiz_mousepoll" = "xyes") + +-PKG_CHECK_MODULES(LIBNOTIFY, libnotify gtk+-2.0, [have_libnotify=yes], [have_libnotify=no]) ++AC_ARG_WITH([libnotify], [AS_HELP_STRING([--with-libnotify], [Build with libnotify support @<:@default=auto@:>@])]) + AM_CONDITIONAL(NOTIFICATION_PLUGIN, test "x$have_libnotify" = "xyes") + if test "$have_libnotify" = yes; then + AC_DEFINE(USE_NOTIFICATION, 1, [Build notification plugin])