diff options
Diffstat (limited to 'dev-libs/libdbusmenu')
-rw-r--r-- | dev-libs/libdbusmenu/Manifest | 7 | ||||
-rw-r--r-- | dev-libs/libdbusmenu/files/libdbusmenu-12.10.2-gtk2-signal-fix.patch | 36 | ||||
-rw-r--r-- | dev-libs/libdbusmenu/files/libdbusmenu-16.04.0-configure-fix.patch | 35 | ||||
-rw-r--r-- | dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild | 131 | ||||
-rw-r--r-- | dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild | 151 | ||||
-rw-r--r-- | dev-libs/libdbusmenu/metadata.xml | 15 |
6 files changed, 375 insertions, 0 deletions
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest new file mode 100644 index 000000000000..013c82618a6b --- /dev/null +++ b/dev-libs/libdbusmenu/Manifest @@ -0,0 +1,7 @@ +AUX libdbusmenu-12.10.2-gtk2-signal-fix.patch 1379 BLAKE2B d625c02fe3e43f01c9ad0f5cefffe748a7ef59e7a5326fe65b5fefd0e060ff85a93affbf2594417f8a5dbac9325180be9cebf1e0f758ade1753304da7e6560ae SHA512 a96488c1522a202248fdaa9e3ca6a4a8c50d548e4e347894a3f30708b883a46c291cc5c5d611e58cafa5ca020451d3c358c8011a227af7f19129f897db8ddc78 +AUX libdbusmenu-16.04.0-configure-fix.patch 1268 BLAKE2B 9b7c045b46b9b8ad6af069d4d95c0e867e4cdd7c5edba1412483a7b11424d24d757bd04c7f64fdd0ae36107befe26b54e589d658739438f331bf82277a79e391 SHA512 e872017556eb7e6b23a9c80e478b9e25be604bd2500be94879bad6634150265bb7b2979fc3cbe05a06dc9f3ca115ab57457853b37c6db622b5ec4bb23abff2bd +DIST libdbusmenu-12.10.2.tar.gz 735730 BLAKE2B 0c0ee66a1044ded26dcfdebdbf8d4501592b4a57dccec80fd196707588eeccdbd162528d3c60e895b38180e893106332b2ea4273f1408d86872bc678bea1aefc SHA512 cf2e50dc3adbf35d0a4ccdd62a3efd9fae2d079b8d06e6522b70f077f89ac2cf72188e380f476e38d184b69549e90b801bf1e32174fa94bbe612dd52aec94496 +DIST libdbusmenu-16.04.0.tar.gz 760376 BLAKE2B 6996ce09bc2b81a8f415a46490ecb3189a064a64f1716919bb1495dccefa220ab058af06f4b3391c954ec76ec38e62db9c092b620cb69cacffb064e590ec1297 SHA512 ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241 +EBUILD libdbusmenu-12.10.2-r2.ebuild 3455 BLAKE2B cc11d393df54088a8b4fccad722f2b4a496272d8894ea54ff5df4d897e5c8289d1375948989ae2f83f9d17104f7fc9715c0facaad606775659a4edf50cea4c68 SHA512 a2a38070422f02554b039213ee071f49d8b62578273e9adc87edc643c3550ebdbd67f161544785edec94ae48439f7ee720d11c537cc34aec6a56731c493f925f +EBUILD libdbusmenu-16.04.0.ebuild 3996 BLAKE2B a803f22de43483042d82a1d9f6a3909fd3d32fcdb9c514a85af57fb153f5df923f09419cbc5affa43afcdd6b33a55109bbfc5ae4574f7687bb0d3a831f8e3369 SHA512 c58923554236b1fdbe71ad64474863961747967afbc42163b804baa23fbddf24a1533ba308911756139f57a9317f86d96f99bf699dc8b85eb34ec5ffd22a03a9 +MISC metadata.xml 491 BLAKE2B 2cf408454b7544b7db725159845410fc104e6b73f3629a7e81b42154ee9700fe94587408cbb95e91f28a9233972c0c0c06dbbbbb9d11d171b809d33ad7cd8e01 SHA512 9183ab899735954d60ecb8b7ca394a72bc519b291fb2032cf5888711ab0f748bed9bc1cfb657ea6c34224b657df5634ab4d54a5bf89fbb0762d5a23d90425d12 diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-12.10.2-gtk2-signal-fix.patch b/dev-libs/libdbusmenu/files/libdbusmenu-12.10.2-gtk2-signal-fix.patch new file mode 100644 index 000000000000..6d270f1370bf --- /dev/null +++ b/dev-libs/libdbusmenu/files/libdbusmenu-12.10.2-gtk2-signal-fix.patch @@ -0,0 +1,36 @@ +=== modified file 'libdbusmenu-gtk/parser.c' +--- libdbusmenu-gtk/parser.c 2013-06-18 19:59:44 +0000 ++++ libdbusmenu-gtk/parser.c 2013-11-03 02:46:23 +0000 +@@ -97,9 +97,7 @@ + gpointer data); + static void item_inserted_cb (GtkContainer * menu, + GtkWidget * widget, +-#ifdef HAVE_GTK3 + gint position, +-#endif + gpointer data); + static void item_removed_cb (GtkContainer * menu, + GtkWidget * widget, +@@ -431,11 +429,7 @@ + + pdata->shell = menu; + pdata->item_inserted_handler_id = g_signal_connect (G_OBJECT (menu), +-#ifdef HAVE_GTK3 + "insert", +-#else +- "child-added", +-#endif + G_CALLBACK (item_inserted_cb), + mi); + pdata->item_removed_handler_id = g_signal_connect (G_OBJECT (menu), +@@ -1394,9 +1388,7 @@ + static void + item_inserted_cb (GtkContainer *menu, + GtkWidget *widget, +-#ifdef HAVE_GTK3 + gint position, +-#endif + gpointer data) + { + DbusmenuMenuitem *menuitem = (DbusmenuMenuitem *)data; + diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-16.04.0-configure-fix.patch b/dev-libs/libdbusmenu/files/libdbusmenu-16.04.0-configure-fix.patch new file mode 100644 index 000000000000..a57877810904 --- /dev/null +++ b/dev-libs/libdbusmenu/files/libdbusmenu-16.04.0-configure-fix.patch @@ -0,0 +1,35 @@ +From 4b79b41a25cc1e2c4355738b4bed6c73b919ffee Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Sun, 6 Aug 2017 17:55:45 +0200 +Subject: [PATCH] configure: Fix HAVE_VALGRIND not being defined when tests are + disabled + +If --disable-tests is used, configure fails with the following error: + + configure: error: conditional "HAVE_VALGRIND" was never defined. + Usually this means the macro was only invoked conditionally. + +This is because AM_CONDITIONAL for it is called inside the 'if' for +tests being enabled. Move it just below that block to ensure that it's +defined unconditionally. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ace54d1..cbd38a6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -120,8 +120,8 @@ PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION + [have_tests=yes] + ) + PKG_CHECK_MODULES(DBUSMENUTESTSVALGRIND, valgrind, have_valgrind=yes, have_valgrind=no) +-AM_CONDITIONAL([HAVE_VALGRIND], [test "x$have_valgrind" = "xyes"]) + ]) ++AM_CONDITIONAL([HAVE_VALGRIND], [test "x$have_valgrind" = "xyes"]) + + AC_SUBST(DBUSMENUTESTS_CFLAGS) + AC_SUBST(DBUSMENUTESTS_LIBS) +-- +2.14.0 + diff --git a/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild b/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild new file mode 100644 index 000000000000..1689f6f879ba --- /dev/null +++ b/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +VALA_MIN_API_VERSION=0.16 +VALA_USE_DEPEND=vapigen +PYTHON_COMPAT=( python2_7 ) + +inherit eutils flag-o-matic multilib-minimal python-single-r1 vala xdg-utils + +DESCRIPTION="Library to pass menu structure across DBus" +HOMEPAGE="https://launchpad.net/dbusmenu" +SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz" + +LICENSE="LGPL-2.1 LGPL-3" +SLOT="0" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86" +IUSE="debug gtk gtk3 +introspection" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] + >=dev-libs/json-glib-0.13.4[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.32[${MULTILIB_USEDEP}] + dev-libs/libxml2[${MULTILIB_USEDEP}] + ${PYTHON_DEPS} + gtk? ( x11-libs/gtk+:2[introspection?,${MULTILIB_USEDEP}] ) + gtk3? ( >=x11-libs/gtk+-3.2:3[introspection?,${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1 ) + !<${CATEGORY}/${PN}-0.5.1-r200" +DEPEND="${RDEPEND} + app-text/gnome-doc-utils + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig[${MULTILIB_USEDEP}] + introspection? ( $(vala_depend) )" + +pkg_setup() { + xdg_environment_reset + python-single-r1_pkg_setup +} + +src_prepare() { + if use introspection; then + vala_src_prepare + export VALA_API_GEN="${VAPIGEN}" + fi + python_fix_shebang tools + + # remove reliance on custom Ubuntu hacks in old GTK+2 + epatch "${FILESDIR}/${P}-gtk2-signal-fix.patch" + epatch_user +} + +multilib_src_configure() { + append-flags -Wno-error #414323 + + local myconf=( + --disable-gtk + --disable-static + --disable-silent-rules + --disable-scrollkeeper + # dumper extra tool is only for GTK+-2.x, tests use valgrind which is stupid + --disable-dumper + $(multilib_native_use_enable introspection) + $(multilib_native_use_enable introspection vala) + $(use_enable debug massivedebugging) + ) + local ECONF_SOURCE=${S} + econf "${myconf[@]}" + + GTK_VARIANTS=( $(usex gtk 2 '') $(usex gtk3 3 '') ) + local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" ) + local top_builddir=${BUILD_DIR} + + gtk_configure() { + local gtkconf=( + "${myconf[@]}" + --enable-gtk + --with-gtk="${MULTIBUILD_VARIANT}" + ) + mkdir -p "${BUILD_DIR}" || die + cd "${BUILD_DIR}" || die + econf "${gtkconf[@]}" + + rm -r libdbusmenu-glib || die + ln -s "${top_builddir}"/libdbusmenu-glib libdbusmenu-glib || die + } + [[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant gtk_configure +} + +gtk_emake() { + emake -C "${BUILD_DIR}"/libdbusmenu-gtk "${@}" + multilib_is_native_abi && \ + emake -C "${BUILD_DIR}"/docs/libdbusmenu-gtk "${@}" +} + +multilib_src_compile() { + emake + + local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" ) + [[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant \ + gtk_emake +} + +src_test() { :; } #440192 + +multilib_src_install() { + emake -j1 DESTDIR="${D}" install + + local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" ) + [[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant \ + gtk_emake -j1 install DESTDIR="${D}" +} + +multilib_src_install_all() { + einstalldocs + prune_libtool_files +} + +pkg_preinst() { + # kill old symlinks that Portage will preserve and break install + if [[ -L ${EROOT}/usr/share/gtk-doc/html/libdbusmenu-glib ]]; then + rm -v "${EROOT}/usr/share/gtk-doc/html/libdbusmenu-glib" || die + fi + if [[ -L ${EROOT}/usr/share/gtk-doc/html/libdbusmenu-gtk ]]; then + rm -v "${EROOT}/usr/share/gtk-doc/html/libdbusmenu-gtk" || die + fi +} diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild new file mode 100644 index 000000000000..1abf95c7910c --- /dev/null +++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +VALA_MIN_API_VERSION=0.16 +VALA_USE_DEPEND=vapigen +PYTHON_COMPAT=( python2_7 ) +VIRTUALX_REQUIRED=manual + +inherit autotools flag-o-matic multilib-minimal python-single-r1 vala \ + virtualx xdg-utils + +DESCRIPTION="Library to pass menu structure across DBus" +HOMEPAGE="https://launchpad.net/dbusmenu" +SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz" + +LICENSE="LGPL-2.1 LGPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug gtk gtk3 +introspection test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.35.4[${MULTILIB_USEDEP}] + dev-libs/libxml2[${MULTILIB_USEDEP}] + ${PYTHON_DEPS} + gtk? ( x11-libs/gtk+:2[introspection?,${MULTILIB_USEDEP}] ) + gtk3? ( >=x11-libs/gtk+-3.2:3[introspection?,${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1 ) + !<${CATEGORY}/${PN}-0.5.1-r200" +# tests also have optional dep on valgrind which we do not enforce +DEPEND="${RDEPEND} + app-text/gnome-doc-utils + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig[${MULTILIB_USEDEP}] + introspection? ( $(vala_depend) ) + test? ( + >=dev-libs/json-glib-0.13.4[${MULTILIB_USEDEP}] + >=dev-util/dbus-test-runner-15.04.0_p100 + gtk? ( ${VIRTUALX_DEPEND} ) + gtk3? ( ${VIRTUALX_DEPEND} ) + )" + +pkg_setup() { + xdg_environment_reset + python-single-r1_pkg_setup +} + +src_prepare() { + if use introspection; then + vala_src_prepare + export VALA_API_GEN="${VAPIGEN}" + fi + python_fix_shebang tools + + eapply "${FILESDIR}/${P}-configure-fix.patch" + eapply_user + eautoreconf +} + +multilib_src_configure() { + append-flags -Wno-error #414323 + + local myconf=( + --cache-file="${BUILD_DIR}"/config.cache + --disable-gtk + --disable-static + # dumper extra tool is only for GTK+-2.x + --disable-dumper + $(multilib_native_use_enable introspection) + $(multilib_native_use_enable introspection vala) + $(use_enable debug massivedebugging) + $(use_enable test tests) + ) + local ECONF_SOURCE=${S} + econf "${myconf[@]}" + + GTK_VARIANTS=( $(usex gtk 2 '') $(usex gtk3 3 '') ) + local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" ) + local top_builddir=${BUILD_DIR} + + gtk_configure() { + local gtkconf=( + "${myconf[@]}" + --enable-gtk + --with-gtk="${MULTIBUILD_VARIANT}" + ) + mkdir -p "${BUILD_DIR}" || die + cd "${BUILD_DIR}" || die + econf "${gtkconf[@]}" + + rm -r libdbusmenu-glib || die + ln -s "${top_builddir}"/libdbusmenu-glib libdbusmenu-glib || die + } + [[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant gtk_configure +} + +gtk_emake() { + emake -C "${BUILD_DIR}"/libdbusmenu-gtk "${@}" + multilib_is_native_abi && \ + emake -C "${BUILD_DIR}"/docs/libdbusmenu-gtk "${@}" +} + +multilib_src_compile() { + emake + + local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" ) + [[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant \ + gtk_emake +} + +multilib_src_test() { + emake check + + gtk_test() { + # please keep the list of GTK+ tests up-to-date + emake -C "${BUILD_DIR}"/tests check \ + TESTS="test-gtk-objects-test test-gtk-label + test-gtk-shortcut test-gtk-reorder test-gtk-remove" + } + local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" ) + [[ ${GTK_VARIANTS[@]} ]] && virtx multibuild_foreach_variant \ + gtk_test +} + +multilib_src_install() { + emake -j1 DESTDIR="${D}" install + + local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" ) + [[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant \ + gtk_emake -j1 install DESTDIR="${D}" +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die +} + +pkg_preinst() { + # kill old symlinks that Portage will preserve and break install + if [[ -L ${EROOT}/usr/share/gtk-doc/html/libdbusmenu-glib ]]; then + rm -v "${EROOT}/usr/share/gtk-doc/html/libdbusmenu-glib" || die + fi + if [[ -L ${EROOT}/usr/share/gtk-doc/html/libdbusmenu-gtk ]]; then + rm -v "${EROOT}/usr/share/gtk-doc/html/libdbusmenu-gtk" || die + fi +} diff --git a/dev-libs/libdbusmenu/metadata.xml b/dev-libs/libdbusmenu/metadata.xml new file mode 100644 index 000000000000..f6c24ef12fe8 --- /dev/null +++ b/dev-libs/libdbusmenu/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <use> + <flag name="gtk" restrict=">=dev-libs/libdbusmenu-12.10.2-r2">Enable support for GTK+2</flag> + <flag name="gtk3">Enable support for GTK+3</flag> + </use> + <upstream> + <remote-id type="launchpad">dbusmenu</remote-id> + </upstream> +</pkgmetadata> |