summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-libs/libdbusmenu/Manifest20
-rw-r--r--dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch20
-rw-r--r--dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch21
-rw-r--r--dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch20
-rw-r--r--dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch25
-rw-r--r--dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch27
-rw-r--r--dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild (renamed from dev-libs/libdbusmenu/libdbusmenu-0.3.16-r1.ebuild)0
-rw-r--r--dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild (renamed from dev-libs/libdbusmenu/libdbusmenu-0.3.94-r1.ebuild)0
8 files changed, 92 insertions, 41 deletions
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index a3af0bf9d38..0a2036e73a0 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -2,24 +2,24 @@
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.14-optional-dumper.patch 1220 RMD160 4e26d75b34f38008c04f27a0765caf28641a559e SHA1 5cdf3ae5d0d93b80e6a49feff16c084f2661de3a SHA256 74980cdb1c55a389d367c9cefd6f2ad66ac050a46e848c4c08b174de8207db06
AUX libdbusmenu-0.3.16-decouple-testapp.patch 349 RMD160 44eca28765906a5d344e6e641721821dc762812c SHA1 a54728d048dd368fe074195d0ea6032c202c4955 SHA256 3cd97bb99354088deae159565304187c10b4ad10573e92d14bd130d98a90c4a6
AUX libdbusmenu-0.3.16-fix-introspection.patch 424 RMD160 2e8f958a104d932289447419f3e20546fd85ed40 SHA1 aab1cd4ec40eb87e741cadfbb81e6ca79c5bbc8e SHA256 d7f2f92cbdc4f20d6f1ac51ad7954f4849d5054886c0528d6f65934275e03209
-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.16-optional-vala.patch 1366 RMD160 897310993e5138a4ddbb020cfe5883ff2b849991 SHA1 ec27559b6192e0fc2bf83e7d39733c17ceee3333 SHA256 06ab99b2b7bafbbb259f8f66bd316b29071e9d8bb589ec969ddbd918405c15ec
+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.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 3029 RMD160 013bf4c7fa5385bf69f87a5fc438a1426c5dc894 SHA1 d29f51cb6155a05b8c5a5f336223fdea6a501d69 SHA256 efe1fe1d5e6861e614c9741495395399ece1872d1f3ce2a7acdc8e825c5034f9
+AUX libdbusmenu-0.3.94-optional-gtk.patch 3490 RMD160 4946bbd0d3d8dd5d2ff48708db30a6016763ca02 SHA1 31247718c60e227070de822c9c02bc17a3343261 SHA256 93b222e233ab1b31de1f670d69c39530b45e0fdb04845fce1ea29a4e4f26ade2
DIST libdbusmenu-0.3.16.tar.gz 534381 RMD160 fcacb2fa11a2a51bd053eac81680bc50e643d21d SHA1 b10bce4f7049980e05fe96d5483c880b065fe105 SHA256 3b5dc86a7a298641586a306a837efd5817a65df1947601f696189b8afedb9683
DIST libdbusmenu-0.3.94.tar.gz 614544 RMD160 5ede1948800fd2cf1721ff70f950c52865a78bd4 SHA1 9b06ac06c5d4248ce9e33d0c797c5b9c5b5d1ba7 SHA256 8cc600632ed894ba26d624cc9ad375da63bfed01f665ab6e2e2299567c6d95e5
-EBUILD libdbusmenu-0.3.16-r1.ebuild 2549 RMD160 af646bb94e9f454f6b38da6caaf5766b6df23320 SHA1 e24186b0a2b8b14a8dc65dbadd417cace48d23f3 SHA256 6215d357eed272649941afe19af03f836a9341bcb8ba37b8252308f32fcbbdf9
-EBUILD libdbusmenu-0.3.94-r1.ebuild 2719 RMD160 bd32d0c52aab3c1deb547d91f7a2172f3f233d37 SHA1 9d88216474a94a650baf152a54fe60955b61149e SHA256 b7f912d683f18ee6725f1ba17407c2fb10e1cc1bbef24be58e398677bba1a1b9
+EBUILD libdbusmenu-0.3.16-r2.ebuild 2549 RMD160 af646bb94e9f454f6b38da6caaf5766b6df23320 SHA1 e24186b0a2b8b14a8dc65dbadd417cace48d23f3 SHA256 6215d357eed272649941afe19af03f836a9341bcb8ba37b8252308f32fcbbdf9
+EBUILD libdbusmenu-0.3.94-r2.ebuild 2719 RMD160 bd32d0c52aab3c1deb547d91f7a2172f3f233d37 SHA1 9d88216474a94a650baf152a54fe60955b61149e SHA256 b7f912d683f18ee6725f1ba17407c2fb10e1cc1bbef24be58e398677bba1a1b9
MISC metadata.xml 409 RMD160 2ee443faa26b15e8e12281faee55e2b160768745 SHA1 220966ab3109ae2969566a0c3ac8d1e1cda4fe18 SHA256 75ac27fadab34b1d697a2d610678d4f990077f3b50f76a23b37e2a776ec9bc18
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk1NqvwACgkQjqfyF1DtJW7iWgCfdxhfTd+WXjdS5igR6fL8AO8j
-wjAAnj85uZbuxaJzzURiIniq8ceVnlcE
-=grRU
+iEYEARECAAYFAk1Nr+wACgkQjqfyF1DtJW6mDQCgjxhc5JTSr3U/L8rQWrasKNvo
+pjAAoMQf56mysVrHsOsz7F5ZRx9Lj1nR
+=bGHv
-----END PGP SIGNATURE-----
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 3edc237a748..3a062626d26 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 @@
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 dd33d4a1f36..844fa14360a 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,23 +1,33 @@
--- 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,5 +5,9 @@
@@ -79,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 a6d05369f15..e047cd83bfc 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,21 +1,31 @@
--- 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
@@ -5,2 +5,6 @@
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
index 9aceb8896e4..72fcd57d194 100644
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch
@@ -6,25 +6,32 @@
+AC_ARG_ENABLE([vala],
+ AC_HELP_STRING([--disable-vala], [Disable vala]),
-+ [enable_vala=$enableval], enable_vala=auto)
-+AM_CONDITIONAL([WANT_VALA], [test "x$enable_vala" != "xno"])
++ [enable_vala=$enableval], [enable_vala=auto])
+
-+if test "x$enable_vala" != "xno" ; then
-+if test "x$enable_introspection" = "xno" ; then
-+ AC_MSG_ERROR([Vala bindings require introspection support, please --enable-introspection])
-+fi
++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])
-+fi
++])
++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 WANT_VALA
++if HAVE_VALA
if HAVE_INTROSPECTION
vapidir = $(datadir)/vala/vapi
@@ -40,7 +47,7 @@
# VAPI Files
#########################
-+if WANT_VALA
++if HAVE_VALA
if HAVE_INTROSPECTION
vapidir = $(datadir)/vala/vapi
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
index c19ee998026..e178447f7ae 100644
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch
@@ -1,12 +1,12 @@
--- 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 @@
+@@ -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)
++ [enable_gtk=$enableval], [enable_gtk=auto])
+AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"])
+
AC_ARG_WITH([gtk],
@@ -14,13 +14,16 @@
[Which version of gtk to use @<:@default=2@:>@])],
[],
[with_gtk=2])
-+AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
++AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" = "x3"])
+
-+if test "x$enable_gtk" != "xno" ; then
++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)
++ 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])
@@ -28,19 +31,29 @@
[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)
++ 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])
-+fi
++])
+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 @@
diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r1.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild
index 7cc9790b2e4..7cc9790b2e4 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r1.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild
diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r1.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild
index 277e40fb7de..277e40fb7de 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r1.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild