diff options
13 files changed, 421 insertions, 51 deletions
diff --git a/dev-libs/libdbusmenu/ChangeLog b/dev-libs/libdbusmenu/ChangeLog index 054b0b58b82d..e3df590b3496 100644 --- a/dev-libs/libdbusmenu/ChangeLog +++ b/dev-libs/libdbusmenu/ChangeLog @@ -1,6 +1,21 @@ # ChangeLog for dev-libs/libdbusmenu # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/ChangeLog,v 1.5 2011/01/29 15:58:13 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/ChangeLog,v 1.6 2011/02/07 09:56:46 tampakrap Exp $ + +*libdbusmenu-0.3.16-r2 (07 Feb 2011) + + 07 Feb 2011; Theo Chatzimichos <tampakrap@gentoo.org> + files/libdbusmenu-0.3.14-optional-dumper.patch, + +libdbusmenu-0.3.16-r2.ebuild, + +files/libdbusmenu-0.3.16-fix-introspection.patch, + files/libdbusmenu-0.3.16-optional-gtk.patch, + files/libdbusmenu-0.3.16-optional-tests.patch, + +files/libdbusmenu-0.3.16-optional-vala.patch, + +files/libdbusmenu-0.3.94-decouple-testapp.patch, + +files/libdbusmenu-0.3.94-fix-introspection.patch, + +files/libdbusmenu-0.3.94-optional-gtk.patch: + Revision bump, improved patches, fix tests, bug 315217, ebuild and patches by + Dennis Schridde *libdbusmenu-0.3.16 (29 Jan 2011) diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest index 52eea99bbb19..67b2be65a6da 100644 --- a/dev-libs/libdbusmenu/Manifest +++ b/dev-libs/libdbusmenu/Manifest @@ -1,25 +1,21 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX libdbusmenu-0.2.8-1-optional-gtk.patch 1075 RMD160 4c32361e3f067fd7f3bf2ce79b56c596249ca9bb SHA1 83509f4e77f045b844fb9c472cd32b98bad0bdbd SHA256 9ee4597a6113eb3868a8f69ce6ecdd02ef5cb926febf45879a4202ea346179f8 AUX libdbusmenu-0.2.8-2-optional-tests.patch 1073 RMD160 1f2ac693cc10cbcb1635c4357ef0d0e57ae699f2 SHA1 095c326b0de91aba441ed20425dcc9ffe968819d SHA256 7edd3e056ed470d999c2346c408ccdfc0218c30e7b7d10f413e9b45811d4628c AUX libdbusmenu-0.2.8-no-gobject-introspection.patch 297 RMD160 467e14be23f3891540f67022f8d602287434d936 SHA1 66819750f37812c3f2950d7d4c46fb84cc57b5cc SHA256 fa6411ae8f311d4e2b8ac2c40314d28996905b2aaf2a8361c743d17845dcff1f AUX libdbusmenu-0.3.14-fix-aclocal.patch 201 RMD160 318e6abd0d997bcf2aee6fe869f87ef1571f521c SHA1 6dcf3e5a1b2ac26fec0e8655de965577b114dbc7 SHA256 9a872801a0d3c319abea5e789ebf47f7f302da8a864265623d20bd468c8326e5 -AUX libdbusmenu-0.3.14-optional-dumper.patch 930 RMD160 71eca829ce52cdcef4444bbb05de35fa576c08a2 SHA1 1224c84de413b7855f8a86ab4de8b7566b8c5ccb SHA256 0edcc9960eb76439e72a72e0b70742b847a7ad58efd1916caf8493b4ea509df7 +AUX libdbusmenu-0.3.14-optional-dumper.patch 1784 RMD160 3d6d322d58889e4419b2a07aa98b498cd8300d7c SHA1 5a57afbbabe2567e31a3872badb900fe24fd0dec SHA256 d182f8670d986ffdf1d0ade3c9b47d1fb8fdb41632755dfcfe0d1d696f584a96 AUX libdbusmenu-0.3.16-decouple-testapp.patch 349 RMD160 44eca28765906a5d344e6e641721821dc762812c SHA1 a54728d048dd368fe074195d0ea6032c202c4955 SHA256 3cd97bb99354088deae159565304187c10b4ad10573e92d14bd130d98a90c4a6 -AUX libdbusmenu-0.3.16-optional-gtk.patch 2154 RMD160 636acf8e09c4bd5981f0c657c3456817380ad968 SHA1 6e727a2b125fbaee18e61d7ecfa609e9ae3f1b42 SHA256 072122462b044e18f19f28e57aef7267273b1d94d678a212dd0d87c7dc3eacba -AUX libdbusmenu-0.3.16-optional-tests.patch 1252 RMD160 afdd144622b322d9d6fe668d09ebd7a80f6d3966 SHA1 62aae2d1ea2a55519b989f34ab07c4ccdea3c256 SHA256 43b77be0784fd254bd651f65834b8ca13017266c1aeb73bcb655ff8e96f5e1f0 +AUX libdbusmenu-0.3.16-fix-introspection.patch 424 RMD160 2e8f958a104d932289447419f3e20546fd85ed40 SHA1 aab1cd4ec40eb87e741cadfbb81e6ca79c5bbc8e SHA256 d7f2f92cbdc4f20d6f1ac51ad7954f4849d5054886c0528d6f65934275e03209 +AUX libdbusmenu-0.3.16-optional-gtk.patch 2384 RMD160 da63f65b37e27b2d2fa15aeaff4dc0b744384f4a SHA1 b9816b0efd0887a97eb71e24b4856f4a4cbc5bf0 SHA256 aeb5c768c05e2b6c2256b7c0475795124637c2c4efa78ac2f6594372622f068d +AUX libdbusmenu-0.3.16-optional-tests.patch 1530 RMD160 c19af1685c486d9899a8e6acc5f603264e9c1ae5 SHA1 4000509efe00902464e6dde83de312c89f8d5371 SHA256 24dd5aa18a1760b5df403c027b17b1896cb6b98748f4f459538e489297ede6ac +AUX libdbusmenu-0.3.16-optional-vala.patch 1500 RMD160 3f180c443d3c734a2a0126385cdb03b90ce5f3fd SHA1 e84dadeea86767b5d9dc4b479465cc605afd1a49 SHA256 6fe47c788a6ba8496e52e5eb0410ae990a82a152cf94559b609f5037ad9a3225 AUX libdbusmenu-0.3.16-parallel-make.patch 297 RMD160 c700649cb5a08ec0f911d24e59777fa941e73803 SHA1 880150e7e53f3ef22dc6c0cb037c0d339ecb6689 SHA256 9d41ae601b527b9696cefb5b069fd742987125c3d4bf8eea5aec241393f7352f +AUX libdbusmenu-0.3.94-decouple-testapp.patch 452 RMD160 d1b40ffc8d7cfbd181c8d1ce572a1f355902e0d3 SHA1 70a59fba59195835278f1946f4ecf398bead49de SHA256 1bc6ec38ae035466cf7db56efac359d19ebeabb90f6571c95d4e94af85f9574d +AUX libdbusmenu-0.3.94-fix-introspection.patch 440 RMD160 c3f88647e841352a8458d225c69128b8f74fdcca SHA1 45ee137cc519dce56bbd59d0ce9ba3975c6719ad SHA256 1bf6efc1150e42bfda680678e7ef926f6aa50bd3d4e9854c877cdcf8a61762ee +AUX libdbusmenu-0.3.94-optional-gtk.patch 3490 RMD160 4946bbd0d3d8dd5d2ff48708db30a6016763ca02 SHA1 31247718c60e227070de822c9c02bc17a3343261 SHA256 93b222e233ab1b31de1f670d69c39530b45e0fdb04845fce1ea29a4e4f26ade2 DIST libdbusmenu-0.2.8.tar.gz 431813 RMD160 50a946497e9f47a5a92d4dfcaa0ad211689e3da3 SHA1 8c0cc228393754a57907ff7eb1417ff9ea3dd98e SHA256 5464906135c5658a67bb9fd2bbb8bd9c8fd859ae35099a885db993ee7c75d6ba DIST libdbusmenu-0.3.16.tar.gz 534381 RMD160 fcacb2fa11a2a51bd053eac81680bc50e643d21d SHA1 b10bce4f7049980e05fe96d5483c880b065fe105 SHA256 3b5dc86a7a298641586a306a837efd5817a65df1947601f696189b8afedb9683 EBUILD libdbusmenu-0.2.8.ebuild 1519 RMD160 d56b4d9c20d49f8814e9bf072f6f6387bd87f07e SHA1 2a6928fe9a039d79211af66cf3348f5fc330858e SHA256 13d99a2cfd57dc399a9ccd18c313db13788f991ff1bee608cb611104421d261d -EBUILD libdbusmenu-0.3.16.ebuild 2022 RMD160 8418f56784af135ea2e1e4bf7827fee8bf7f98ef SHA1 1c6618b4ab473368355d815d62528ec36f6f7d0f SHA256 2cd62f1872dde56c7bd2453aa2af53a91ba73d79876b5ad8d1808c731105b69e -MISC ChangeLog 1487 RMD160 72b7028d438b6eae4741b5b0ea8fe984eae6304b SHA1 1a1ce652012e78e42a7b63926c8720f86ef49339 SHA256 143ffef0b8efbd267250c3895914dcb37b684b1eb71f6068e1d07a0c31b7dc28 -MISC metadata.xml 158 RMD160 f15477b4ffb8ae0849cbae52329d1bdf99a407f4 SHA1 18cd6cdb98f781c3975c49f300d3f8b1e07333b8 SHA256 b5a2d16139d03b8af578bc87503b14b589dd7e3544d879297ccdb735d35a02e2 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iEYEARECAAYFAk1Ez0IACgkQ/ejvha5XGaP6cQCeJsI8fWoJomE7IhdMyyHNCmKJ -+pQAn3zIksijncckHz4x8grQicCnyxRN -=Z1kN ------END PGP SIGNATURE----- +EBUILD libdbusmenu-0.3.16-r2.ebuild 2555 RMD160 90f6c09f8ea00ff99283d625209f670de2e04467 SHA1 171a089f40f75f83312280ae8e7f95441adf34e6 SHA256 81800ae79db151250961abc2c8ff8abb8053b86f963cc6103ff9492404aa5836 +EBUILD libdbusmenu-0.3.16.ebuild 2019 RMD160 b44a25cfff866cb2319dc881574ff9530d909cdc SHA1 fc76505f9e021630ab570e32edc3f95ddca27382 SHA256 4728c3b22bb6d59752c38e9b7a9d523ea658836d29d63d6157a949b454fce1b4 +MISC ChangeLog 2114 RMD160 6203063dd123b75e9706689993e423cd675e94ff SHA1 0a5f45d8934c58140dc9533790f716f86f387fc1 SHA256 d098ccd72513b1e29f993be8bb8736b36a5c28a5035c349b4b60368a4689a689 +MISC metadata.xml 329 RMD160 ca3029bd8fece0ce6888b9689d554bf0ad4ed1dc SHA1 c8739c065cdaba2b7259fd44e8e6fc890efa1f37 SHA256 244b7f61aed94c089d2b5421c017ed225943c76eec8b1b20b536fd83fe58cd94 diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch index 3edc237a748b..644c799edade 100644 --- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch +++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch @@ -1,21 +1,31 @@ --- configure.ac.orig 2010-09-20 21:51:50.289828895 +0200 +++ configure.ac 2010-09-20 22:05:38.292979567 +0200 -@@ -63,8 +63,15 @@ +@@ -63,8 +63,17 @@ X11_REQUIRED_VERSION=1.3 +AC_ARG_ENABLE([dumper], + AC_HELP_STRING([--disable-dumper], [Disable dbusmenudumper tool]), -+ [enable_dumper=$enableval], enable_dumper=auto) ++ [enable_dumper=$enableval], [enable_dumper=auto]) +AM_CONDITIONAL([WANT_DBUSMENUDUMPER], [test "x$enable_dumper" != "xno"]) + -+if test "x$enable_dumper" != "xno" ; then ++AS_IF([test "x$enable_dumper" != "xno"],[ PKG_CHECK_MODULES(DBUSMENUDUMPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION - x11 >= $X11_REQUIRED_VERSION) -+fi +- x11 >= $X11_REQUIRED_VERSION) ++ x11 >= $X11_REQUIRED_VERSION, ++ [have_dumper=yes] ++) ++]) AC_SUBST(DBUSMENUDUMPER_CFLAGS) AC_SUBST(DBUSMENUDUMPER_LIBS) +@@ -193,1 +193,6 @@ + ++AS_IF([test "x$have_dumper" = "xyes"], ++ AC_MSG_NOTICE([ Dumper: yes]), ++ AC_MSG_NOTICE([ Dumper: no]) ++) ++ --- tools/Makefile.am.orig 2010-09-20 22:02:07.280175897 +0200 +++ tools/Makefile.am 2010-09-20 22:05:15.621664358 +0200 @@ -3,5 +3,9 @@ @@ -29,3 +39,30 @@ libexec_SCRIPTS = dbusmenu-bench +--- tests/Makefile.am.orig 2011-02-07 00:01:11.066461559 +0100 ++++ tests/Makefile.am 2011-02-07 00:02:33.487751202 +0100 +@@ -10,6 +10,10 @@ + test-glib-properties \ + test-glib-proxy \ + test-glib-simple-items \ +- test-glib-submenu \ ++ test-glib-submenu ++ ++if WANT_DBUSMENUDUMPER ++TESTS += \ + test-json ++endif + +@@ -36,7 +40,11 @@ + test-glib-proxy-proxy \ + test-glib-submenu-client \ + test-glib-submenu-server \ +- test-glib-simple-items \ ++ test-glib-simple-items ++ ++if WANT_DBUSMENUDUMPER ++check_PROGRAMS += \ + test-json-client \ + test-json-server ++endif + diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-fix-introspection.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-fix-introspection.patch new file mode 100644 index 000000000000..59777950e810 --- /dev/null +++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-fix-introspection.patch @@ -0,0 +1,11 @@ +--- ./libdbusmenu-glib/Makefile.am.orig 2011-02-05 16:38:38.713641727 +0100 ++++ ./libdbusmenu-glib/Makefile.am 2011-02-05 16:38:44.917448353 +0100 +@@ -123,7 +123,7 @@ + + introspection_sources = $(libdbusmenu_glibinclude_HEADERS) + +-Dbusmenu_Glib-0.2.gir: libdbusmenu-glib.la ++Dbusmenu-Glib-0.2.gir: libdbusmenu-glib.la + Dbusmenu_Glib_0_2_gir_INCLUDES = \ + GObject-2.0 + Dbusmenu_Glib_0_2_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch index 7fdc051c765b..844fa14360ac 100644 --- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch +++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch @@ -1,40 +1,46 @@ --- configure.ac.orig 2010-09-20 21:51:50.289828895 +0200 +++ configure.ac 2010-09-20 21:58:03.536293089 +0200 -@@ -49,10 +49,17 @@ +@@ -49,10 +49,19 @@ GTK_REQUIRED_VERSION=2.16 +AC_ARG_ENABLE([gtk], + AC_HELP_STRING([--disable-gtk], [Disable libdbusmenu-gtk library]), -+ [enable_gtk=$enableval], enable_gtk=auto) ++ [enable_gtk=$enableval], [enable_gtk=auto]) +AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"]) + -+if test "x$enable_gtk" != "xno"; then ++AS_IF([test "x$enable_gtk" != "xno"],[ PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_REQUIRED_VERSION - libxml-2.0 >= $XML_REQUIRED_VERSION) -+fi +- libxml-2.0 >= $XML_REQUIRED_VERSION) ++ libxml-2.0 >= $XML_REQUIRED_VERSION, ++ [have_gtk=yes] ++) ++]) AC_SUBST(DBUSMENUGTK_CFLAGS) AC_SUBST(DBUSMENUGTK_LIBS) +@@ -193,1 +192,6 @@ + ++AS_IF([test "x$have_gtk" = "xyes"], ++ AC_MSG_NOTICE([ Gtk: yes]), ++ AC_MSG_NOTICE([ Gtk: no]) ++) ++ --- Makefile.am.orig 2010-09-20 21:58:41.616751481 +0200 +++ Makefile.am 2010-09-20 21:59:23.492035983 +0200 -@@ -5,10 +5,13 @@ +@@ -5,5 +5,9 @@ ++if WANT_LIBDBUSMENUGTK ++LIBDBUSMENUGTK_SUBDIR = libdbusmenu-gtk ++endif ++ SUBDIRS = \ libdbusmenu-glib \ - libdbusmenu-gtk \ ++ $(LIBDBUSMENUGTK_SUBDIR) \ tools \ - tests \ - docs \ - po - -+if WANT_LIBDBUSMENUGTK -+SUBDIRS += libdbusmenu-gtk -+endif -+ - DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc --- tests/Makefile.am.orig 2011-01-29 14:37:11.863805482 +0100 +++ tests/Makefile.am 2011-01-29 14:38:48.910883303 +0100 @@ -11,12 +11,16 @@ @@ -83,3 +89,4 @@ XVFB_RUN=". $(srcdir)/run-xvfb.sh" + diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch index b0518717c1e8..e047cd83bfc4 100644 --- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch +++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch @@ -1,34 +1,45 @@ --- configure.ac.orig 2010-09-20 21:51:50.289828895 +0200 +++ configure.ac 2010-09-20 22:01:21.623107607 +0200 -@@ -76,8 +76,15 @@ +@@ -76,8 +76,17 @@ JSON_GLIB_REQUIRED_VERSION=0.6.0 GIO_UNIX_REQUIRED_VERSION=2.24 +AC_ARG_ENABLE([tests], + AC_HELP_STRING([--disable-tests], [Disable tests]), -+ [enable_tests=$enableval], enable_tests=auto) ++ [enable_tests=$enableval], [enable_tests=auto]) +AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"]) + -+if test "x$enable_tests" != "xno" ; then ++AS_IF([test "x$enable_tests" != "xno"],[ PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) -+fi +- gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) ++ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION, ++ [have_tests=yes] ++) ++]) AC_SUBST(DBUSMENUTESTS_CFLAGS) AC_SUBST(DBUSMENUTESTS_LIBS) +@@ -193,1 +193,6 @@ + ++AS_IF([test "x$have_tests" = "xyes"], ++ AC_MSG_NOTICE([ Tests: yes]), ++ AC_MSG_NOTICE([ Tests: no]) ++) ++ --- Makefile.am.orig 2010-09-20 21:58:41.616751481 +0200 +++ Makefile.am 2010-09-20 22:01:55.525674385 +0200 -@@ -9,6 +9,9 @@ - tools \ -- tests \ - docs \ - po +@@ -5,2 +5,6 @@ +if WANT_TESTS -+SUBDIRS += tests ++TESTS_SUBDIR = tests +endif + - DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc + SUBDIRS = \ +@@ -9,3 +9,3 @@ + tools \ +- tests \ ++ $(TESTS_SUBDIR) \ + docs \ --- tools/testapp/Makefile.am.orig 2011-01-29 13:42:00.984605528 +0100 +++ tools/testapp/Makefile.am 2011-01-29 13:44:45.523514281 +0100 @@ -1,5 +1,9 @@ diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch new file mode 100644 index 000000000000..72fcd57d194e --- /dev/null +++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch @@ -0,0 +1,59 @@ +--- configure.ac.orig 2011-02-05 15:01:31.212827464 +0100 ++++ configure.ac 2011-02-05 15:13:08.310031260 +0100 +@@ -143,7 +143,17 @@ + # Vala API Generation + ########################### + ++AC_ARG_ENABLE([vala], ++ AC_HELP_STRING([--disable-vala], [Disable vala]), ++ [enable_vala=$enableval], [enable_vala=auto]) ++ ++AS_IF([test "x$enable_vala" != "xno"],[ ++ AM_COND_IF([HAVE_INTROSPECTION],,[ ++ AC_MSG_ERROR([Vala bindings require introspection support, please --enable-introspection]) ++ ]) + AC_PATH_PROG([VALA_API_GEN], [vapigen]) ++]) ++AM_CONDITIONAL([HAVE_VALA], [test -n "$VALA_API_GEN"]) + + ########################### + # XSLT Processor +@@ -193,1 +193,6 @@ + ++AM_COND_IF([HAVE_VALA], ++ AC_MSG_NOTICE([ Vala bindings: yes]), ++ AC_MSG_NOTICE([ Vala bindings no]) ++) ++ +--- libdbusmenu-gtk/Makefile.am.orig 2011-02-05 15:09:06.429965757 +0100 ++++ libdbusmenu-gtk/Makefile.am 2011-02-05 15:08:14.742722310 +0100 +@@ -131,6 +131,7 @@ + # VAPI Files + ######################### + ++if HAVE_VALA + if HAVE_INTROSPECTION + + vapidir = $(datadir)/vala/vapi +@@ -154,4 +155,5 @@ + CLEANFILES += $(vapi_DATA) DbusmenuGtk$(VER)-0.4.tmp.gir + + endif ++endif + +--- libdbusmenu-glib/Makefile.am.orig 2011-02-05 15:08:49.613538681 +0100 ++++ libdbusmenu-glib/Makefile.am 2011-02-05 15:06:23.826443241 +0100 +@@ -165,6 +165,7 @@ + # VAPI Files + ######################### + ++if HAVE_VALA + if HAVE_INTROSPECTION + + vapidir = $(datadir)/vala/vapi +@@ -176,4 +177,5 @@ + CLEANFILES += $(vapi_DATA) + + endif ++endif + diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-decouple-testapp.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-decouple-testapp.patch new file mode 100644 index 000000000000..64812a40010a --- /dev/null +++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-decouple-testapp.patch @@ -0,0 +1,20 @@ +--- tools/testapp/Makefile.am.orig 2011-01-29 20:50:54.266939219 +0100 ++++ tools/testapp/Makefile.am 2011-01-29 20:51:16.185268917 +0100 +@@ -1,10 +1,4 @@ + +-if USE_GTK3 +-VER=3 +-else +-VER= +-endif +- + libexec_PROGRAMS = + + if WANT_TESTS +@@ -22,6 +16,4 @@ + + dbusmenu_testapp_LDADD = \ + $(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \ +- $(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \ +- $(DBUSMENUGTK_LIBS) \ + $(DBUSMENUTESTS_LIBS) diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.patch new file mode 100644 index 000000000000..a25994253650 --- /dev/null +++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.patch @@ -0,0 +1,11 @@ +--- ./libdbusmenu-glib/Makefile.am.orig 2011-02-05 16:16:34.481082458 +0100 ++++ ./libdbusmenu-glib/Makefile.am 2011-02-05 16:20:31.703396315 +0100 +@@ -138,7 +138,7 @@ + + introspection_sources = $(libdbusmenu_glibinclude_HEADERS) + +-Dbusmenu_Glib-0.4.gir: libdbusmenu-glib.la ++Dbusmenu-Glib-0.4.gir: libdbusmenu-glib.la + Dbusmenu_Glib_0_4_gir_INCLUDES = \ + GObject-2.0 + Dbusmenu_Glib_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir) diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch new file mode 100644 index 000000000000..e178447f7ae3 --- /dev/null +++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch @@ -0,0 +1,119 @@ +--- configure.ac.orig 2011-01-29 20:37:03.892284177 +0100 ++++ configure.ac 2011-01-29 20:42:10.969923186 +0100 +@@ -58,29 +58,39 @@ + GTK_REQUIRED_VERSION=2.16 + GTK3_REQUIRED_VERSION=2.91 + ++AC_ARG_ENABLE([gtk], ++ AC_HELP_STRING([--disable-gtk], [Disable libdbusmenu-gtk library]), ++ [enable_gtk=$enableval], [enable_gtk=auto]) ++AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"]) ++ + AC_ARG_WITH([gtk], + [AS_HELP_STRING([--with-gtk], + [Which version of gtk to use @<:@default=2@:>@])], + [], + [with_gtk=2]) ++AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" = "x3"]) ++ ++AS_IF([test "x$enable_gtk" != "xno"],[ + AS_IF([test "x$with_gtk" = x3], + [PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-3.0 >= $GTK3_REQUIRED_VERSION + glib-2.0 >= $GLIB_REQUIRED_VERSION +- libxml-2.0 >= $XML_REQUIRED_VERSION) ++ libxml-2.0 >= $XML_REQUIRED_VERSION, ++ [have_gtk=yes] ++) +- AC_SUBST(DBUSMENUGTK_CFLAGS) +- AC_SUBST(DBUSMENUGTK_LIBS) + AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available]) + ], + [test "x$with_gtk" = x2], + [PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION + glib-2.0 >= $GLIB_REQUIRED_VERSION +- libxml-2.0 >= $XML_REQUIRED_VERSION) ++ libxml-2.0 >= $XML_REQUIRED_VERSION, ++ [have_gtk=yes] ++) +- AC_SUBST(DBUSMENUGTK_CFLAGS) +- AC_SUBST(DBUSMENUGTK_LIBS) + ], + [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] + ) +-AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) ++]) ++AC_SUBST(DBUSMENUGTK_CFLAGS) ++AC_SUBST(DBUSMENUGTK_LIBS) + + ########################### + # Dependencies - dumper +@@ -193,1 +193,6 @@ + ++AS_IF([test "x$enable_gtk" = "xyes"], ++ AC_MSG_NOTICE([ Gtk: yes (gtk$with_gtk)]), ++ AC_MSG_NOTICE([ Gtk: no]) ++) ++ +--- Makefile.am.orig 2010-09-20 21:58:41.616751481 +0200 ++++ Makefile.am 2010-09-20 21:59:23.492035983 +0200 +@@ -5,5 +5,9 @@ + ++if WANT_LIBDBUSMENUGTK ++LIBDBUSMENUGTK_SUBDIR = libdbusmenu-gtk ++endif ++ + SUBDIRS = \ + libdbusmenu-glib \ +- libdbusmenu-gtk \ ++ $(LIBDBUSMENUGTK_SUBDIR) \ + tools \ +--- tests/Makefile.am.orig 2011-01-29 20:47:16.721588701 +0100 ++++ tests/Makefile.am 2011-01-29 20:45:10.116455527 +0100 +@@ -11,13 +11,17 @@ + test-glib-proxy \ + test-glib-simple-items \ + test-glib-submenu \ +- test-json \ ++ test-json ++ ++if WANT_LIBDBUSMENUGTK ++TESTS += \ + test-gtk-objects-test \ + test-gtk-label \ + test-gtk-shortcut \ + test-gtk-reorder \ + test-gtk-submenu \ + test-gtk-parser-test ++endif + + check_PROGRAMS = \ + glib-server-nomenu \ +@@ -31,20 +35,24 @@ + test-glib-proxy-client \ + test-glib-proxy-server \ + test-glib-proxy-proxy \ +- test-gtk-objects \ + test-glib-submenu-client \ + test-glib-submenu-server \ ++ test-glib-simple-items \ ++ test-json-client \ ++ test-json-server ++ ++if WANT_LIBDBUSMENUGTK ++check_PROGRAMS += \ ++ test-gtk-objects \ + test-gtk-label-client \ + test-gtk-label-server \ + test-gtk-shortcut-client \ + test-gtk-shortcut-server \ +- test-glib-simple-items \ + test-gtk-reorder-server \ +- test-json-client \ +- test-json-server \ + test-gtk-submenu-server \ + test-gtk-submenu-client \ + test-gtk-parser ++endif + + XVFB_RUN=". $(srcdir)/run-xvfb.sh" + diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild new file mode 100644 index 000000000000..a8d95df976e7 --- /dev/null +++ b/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild,v 1.1 2011/02/07 09:56:46 tampakrap Exp $ + +EAPI=3 + +inherit autotools eutils versionator virtualx + +MY_MAJOR_VERSION="$(get_version_component_range 1-2)" +if version_is_at_least "${MY_MAJOR_VERSION}.50" ; then + MY_MAJOR_VERSION="$(get_major_version).$(($(get_version_component_range 2)+1))" +fi + +DESCRIPTION="Library to pass menu structure across DBus" +HOMEPAGE="https://launchpad.net/dbusmenu" +SRC_URI="http://launchpad.net/dbusmenu/${MY_MAJOR_VERSION}/${PV}/+download/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gtk +introspection test vala" + +RDEPEND="dev-libs/glib:2 + dev-libs/dbus-glib + dev-libs/libxml2:2 + gtk? ( x11-libs/gtk+:2 )" +DEPEND="${RDEPEND} + introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) + test? ( + dev-libs/json-glib[introspection=] + dev-util/dbus-test-runner + ) + vala? ( dev-lang/vala:0 ) + dev-util/intltool + dev-util/pkgconfig" + +pkg_setup() { + if use vala && use !introspection ; then + eerror "Vala bindings (USE=vala) require introspection support (USE=introspection)" + die "Vala bindings (USE=vala) require introspection support (USE=introspection)" + fi +} + +src_prepare() { + # Make Vala bindings optional, launchpad-bug #713685 + epatch "${FILESDIR}/${P}-optional-vala.patch" + # Make tests optional, launchpad-bug #552526 + epatch "${FILESDIR}/${P}-optional-tests.patch" + # Make libdbusmenu-gtk library optional, launchpad-bug #552530 + epatch "${FILESDIR}/${P}-optional-gtk.patch" + # Decouple testapp from libdbusmenu-gtk, launchpad-bug #709761 + epatch "${FILESDIR}/${P}-decouple-testapp.patch" + # Make dbusmenudumper optional, launchpad-bug #643871 + epatch "${FILESDIR}/${PN}-0.3.14-optional-dumper.patch" + # Fixup undeclared HAVE_INTROSPECTION, launchpad-bug #552538 + epatch "${FILESDIR}/${PN}-0.3.14-fix-aclocal.patch" + # Fix introspection generation, launchpad-bug #713690 + epatch "${FILESDIR}/${P}-fix-introspection.patch" + # Drop -Werror in a release + sed -e 's:-Werror::g' -i libdbusmenu-glib/Makefile.am libdbusmenu-gtk/Makefile.am || die "sed failed" + eautoreconf +} + +src_configure() { + econf \ + $(use_enable gtk) \ + $(use_enable gtk dumper) \ + $(use_enable introspection) \ + $(use_enable test tests) \ + $(use_enable vala) +} + +src_test() { + Xemake check || die "testsuite failed" +} + +src_install() { + emake DESTDIR="${ED}" install || die "make install failed" + dodoc AUTHORS || die "dodoc failed" +} diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild index d82186a66109..4a786a5afe98 100644 --- a/dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild +++ b/dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild,v 1.1 2011/01/29 15:58:13 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild,v 1.2 2011/02/07 09:56:46 tampakrap Exp $ EAPI=3 @@ -23,7 +23,7 @@ RDEPEND="dev-libs/glib:2 dev-libs/libxml2:2 gtk? ( x11-libs/gtk+:2 )" DEPEND="${RDEPEND} - introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) + introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) test? ( dev-libs/json-glib[introspection=] ) dev-util/intltool dev-util/pkgconfig" diff --git a/dev-libs/libdbusmenu/metadata.xml b/dev-libs/libdbusmenu/metadata.xml index 8d36d5b01cd2..f72a4b5e1709 100644 --- a/dev-libs/libdbusmenu/metadata.xml +++ b/dev-libs/libdbusmenu/metadata.xml @@ -2,4 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>kde</herd> + <use> + <flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag> + <flag name="vala">Enable bindings for dev-lang/vala</flag> + </use> </pkgmetadata> |