diff options
9 files changed, 243 insertions, 38 deletions
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest index 009c6365ea4..b535f0eaba6 100644 --- a/dev-libs/libdbusmenu/Manifest +++ b/dev-libs/libdbusmenu/Manifest @@ -1,9 +1,22 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + 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.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-parallel-make.patch 297 RMD160 c700649cb5a08ec0f911d24e59777fa941e73803 SHA1 880150e7e53f3ef22dc6c0cb037c0d339ecb6689 SHA256 9d41ae601b527b9696cefb5b069fd742987125c3d4bf8eea5aec241393f7352f +AUX libdbusmenu-0.3.16-optional-gtk.patch 2099 RMD160 a77bdfc887f3805271a7a7189595dea8bbc22980 SHA1 731cba8db4448e95514f392da67e6ca442af548a SHA256 5e22c89eee491ef31448e980772953d73e401c10eff3ac339c1f6ce0a0ef27f9 +AUX libdbusmenu-0.3.16-optional-tests.patch 1231 RMD160 a074e3f9e9b9322a14a183725af96f3e09dfeeff SHA1 847e17fd09c284f88aa39471b163871e65ec5b2b SHA256 f07acd7b39d299e0c425bdafd90a300e748d46857eff06f8b55ea1440ee3dabb +AUX libdbusmenu-0.3.94-decouple-testapp.patch 452 RMD160 d1b40ffc8d7cfbd181c8d1ce572a1f355902e0d3 SHA1 70a59fba59195835278f1946f4ecf398bead49de SHA256 1bc6ec38ae035466cf7db56efac359d19ebeabb90f6571c95d4e94af85f9574d +AUX libdbusmenu-0.3.94-optional-gtk.patch 3029 RMD160 013bf4c7fa5385bf69f87a5fc438a1426c5dc894 SHA1 d29f51cb6155a05b8c5a5f336223fdea6a501d69 SHA256 efe1fe1d5e6861e614c9741495395399ece1872d1f3ce2a7acdc8e825c5034f9 DIST libdbusmenu-0.3.16.tar.gz 534381 RMD160 fcacb2fa11a2a51bd053eac81680bc50e643d21d SHA1 b10bce4f7049980e05fe96d5483c880b065fe105 SHA256 3b5dc86a7a298641586a306a837efd5817a65df1947601f696189b8afedb9683 -EBUILD libdbusmenu-0.3.16.ebuild 2020 RMD160 f40c3940df9619705926ee3a608e4a43d672772d SHA1 d6816b1dd175eace6ce2fedc9103e1338560a928 SHA256 6ffff514a6341d149b4ee78736c43a6d8935980451d4b9cf6280642872e5b0c6 -MISC metadata.xml 158 RMD160 f15477b4ffb8ae0849cbae52329d1bdf99a407f4 SHA1 18cd6cdb98f781c3975c49f300d3f8b1e07333b8 SHA256 b5a2d16139d03b8af578bc87503b14b589dd7e3544d879297ccdb735d35a02e2 +DIST libdbusmenu-0.3.94.tar.gz 614544 RMD160 5ede1948800fd2cf1721ff70f950c52865a78bd4 SHA1 9b06ac06c5d4248ce9e33d0c797c5b9c5b5d1ba7 SHA256 8cc600632ed894ba26d624cc9ad375da63bfed01f665ab6e2e2299567c6d95e5 +EBUILD libdbusmenu-0.3.16.ebuild 1913 RMD160 00bdd5ac5930d5c7cc706e3030cb61c2fa6db1ff SHA1 fcf2fa77b4cc250eb4fe9aa9bd5c9034791a9b1e SHA256 fef352a4bceeb87f7bc4fe5127d421fbf782259b4ac3bbac48fe982e6668748a +EBUILD libdbusmenu-0.3.94.ebuild 2253 RMD160 0043b5098cdeb2c9d330912a580340d7c21a234e SHA1 142428e201298d88ab10dd903c14a4acc8b01ead SHA256 7e4f383b1b4aa06f3a2b330b1c20ede4f7ec59fb3edb5941dde336913da1bb25 +MISC metadata.xml 349 RMD160 443a29e0117c63734151e49b36fcd9828a809eff SHA1 3f5030351df63351e33aeb2cf003cfce9929c85a SHA256 763b46eab82cb42368815f31d25dff2c135a7af66454abb2e021574f55450378 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk1EqAgACgkQjqfyF1DtJW7HXACgjBMkMSLn5Lu5Kzqr5GcVlC5b +LXwAn05HA9O98KCNeLMACAUeXC+zFzIC +=bz3y +-----END PGP SIGNATURE----- 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 7fdc051c765..dd33d4a1f36 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 @@ -20,21 +20,17 @@ AC_SUBST(DBUSMENUGTK_LIBS) --- 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 @@ 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 b0518717c1e..a6d05369f15 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 @@ -18,17 +18,18 @@ AC_SUBST(DBUSMENUTESTS_LIBS) --- 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-parallel-make.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-parallel-make.patch deleted file mode 100644 index ed605df58c5..00000000000 --- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-parallel-make.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.am.orig 2011-01-29 13:49:42.828302898 +0100 -+++ Makefile.am 2011-01-29 13:50:45.096371768 +0100 -@@ -21,4 +21,8 @@ - -+libdbusmenu-gtk: libdbusmenu-glib -+tests: libdbusmenu-gtk -+tools: libdbusmenu-gtk -+ - DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc - - dist-hook: 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 00000000000..64812a40010 --- /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-optional-gtk.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch new file mode 100644 index 00000000000..c19ee998026 --- /dev/null +++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch @@ -0,0 +1,106 @@ +--- configure.ac.orig 2011-01-29 20:37:03.892284177 +0100 ++++ configure.ac 2011-01-29 20:42:10.969923186 +0100 +@@ -58,29 +58,35 @@ + 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]) ++ ++if test "x$enable_gtk" != "xno" ; then + 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) +- 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) +- 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]) ++fi ++AC_SUBST(DBUSMENUGTK_CFLAGS) ++AC_SUBST(DBUSMENUGTK_LIBS) + + ########################### + # Dependencies - dumper +--- 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.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild index 877b458aed9..e3e418fee4d 100644 --- a/dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild +++ b/dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild @@ -23,18 +23,16 @@ 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" src_prepare() { - # Make libdbusmenu-gtk library optional, launchpad-bug #552530 - epatch "${FILESDIR}/${P}-optional-gtk.patch" # Make tests optional, launchpad-bug #552526 epatch "${FILESDIR}/${P}-optional-tests.patch" - # Try to make parallel-make safe, launchpad-bug #709762 - epatch "${FILESDIR}/${P}-parallel-make.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 diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.94.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.94.ebuild new file mode 100644 index 00000000000..7317cc548d8 --- /dev/null +++ b/dev-libs/libdbusmenu/libdbusmenu-0.3.94.ebuild @@ -0,0 +1,78 @@ +# 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.2.8.ebuild,v 1.2 2010/09/14 07:41:41 reavertm Exp $ + +EAPI=3 + +inherit autotools eutils versionator + +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 gtk3 +introspection test" + +# Needs dev-util/dbus-test-runner (not yet in tree) +RESTRICT="test" + +RDEPEND="dev-libs/glib:2 + dev-libs/dbus-glib + dev-libs/libxml2:2 + gtk? ( + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + )" +DEPEND="${RDEPEND} + introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) + test? ( dev-libs/json-glib[introspection=] ) + dev-util/intltool + dev-util/pkgconfig" + +src_prepare() { + # Make tests optional, launchpad-bug #552526 + epatch "${FILESDIR}/${PN}-0.3.16-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" + # 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() { + local conf + if use gtk3 ; then + conf="${conf} --with-gtk=3" + else + conf="${conf} --with-gtk=2" + fi + + econf \ + $(use_enable gtk) \ + $(use_enable gtk dumper) \ + $(use_enable introspection) \ + $(use_enable test tests) \ + ${conf} +} + +src_test() { + emake check || die "testsuite failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + dodoc AUTHORS || die "dodoc failed" +} diff --git a/dev-libs/libdbusmenu/metadata.xml b/dev-libs/libdbusmenu/metadata.xml index 8d36d5b01cd..fb2117aa2f6 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="gtk3">Build experimental gtk3 version instead of using gtk2</flag> + <flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag> + </use> </pkgmetadata> |