diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /dev-libs/libdbusmenu |
reinit the tree, so we can have metadata
Diffstat (limited to 'dev-libs/libdbusmenu')
-rw-r--r-- | dev-libs/libdbusmenu/Manifest | 9 | ||||
-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, 377 insertions, 0 deletions
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest new file mode 100644 index 000000000000..f4cbb341284c --- /dev/null +++ b/dev-libs/libdbusmenu/Manifest @@ -0,0 +1,9 @@ +AUX libdbusmenu-12.10.2-gtk2-signal-fix.patch 1379 SHA256 7e02be3d1a0de22b48aa6c6aeffcaee9a150cd5b0888b14d7548cdefad1e835a SHA512 a96488c1522a202248fdaa9e3ca6a4a8c50d548e4e347894a3f30708b883a46c291cc5c5d611e58cafa5ca020451d3c358c8011a227af7f19129f897db8ddc78 WHIRLPOOL 0ccd4fd7b1e5447e0f45e85f2ca010133042fc4103b0c29764c5bd70054eb1a1dce1c38d0e7a29aeda7ed13c2e2288d3258f17946ea9b70b02c101cdcff19aa5 +AUX libdbusmenu-16.04.0-configure-fix.patch 1268 SHA256 e6e1dd702dbd97e2cc4c9015995441556f85d58c7fcafbaacf9d96bc3dce709d SHA512 e872017556eb7e6b23a9c80e478b9e25be604bd2500be94879bad6634150265bb7b2979fc3cbe05a06dc9f3ca115ab57457853b37c6db622b5ec4bb23abff2bd WHIRLPOOL 040d896b1906079c673f08d095bcb26b2afb0b20f299d6127c2476dc6157ad447b1e647702aab47f8a4acfd0c19590cb4891b7ffb40b8913e93f0aa5c0730886 +DIST libdbusmenu-12.10.2.tar.gz 735730 SHA256 9d6ad4a0b918b342ad2ee9230cce8a095eb601cb0cee6ddc1122d0481f9d04c9 SHA512 cf2e50dc3adbf35d0a4ccdd62a3efd9fae2d079b8d06e6522b70f077f89ac2cf72188e380f476e38d184b69549e90b801bf1e32174fa94bbe612dd52aec94496 WHIRLPOOL 3e75fd0bcbadcff8f4e4cd3a2be33a3aa7cf715413b1a67c5430b9420a965d64db2d988fa5c21fc42c6458ad4ed479c400b28b8a94074cb7223ab0a03ad985eb +DIST libdbusmenu-16.04.0.tar.gz 760376 SHA256 b9cc4a2acd74509435892823607d966d424bd9ad5d0b00938f27240a1bfa878a SHA512 ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241 WHIRLPOOL 0242614bf02ad9028e0a9c697dd7bf5ad35665b6fd73eaad9669345f8800e841cacb7912ffeb9ee38b7b3568b6d8141a42e4aee2f292e5df2b9a9cab77d869e4 +EBUILD libdbusmenu-12.10.2-r2.ebuild 3455 SHA256 73400e32c2fff281a21df9927e3c354481304b1ddee6c4898a01e260428c86b7 SHA512 a2a38070422f02554b039213ee071f49d8b62578273e9adc87edc643c3550ebdbd67f161544785edec94ae48439f7ee720d11c537cc34aec6a56731c493f925f WHIRLPOOL 324c227978b2b69675737516c298221498436ab72464a22d8705c526c0419be1404bf705119adea8f168cd9ecaa50a2c1c2ce4a86afa32c144cfc2312490c227 +EBUILD libdbusmenu-16.04.0.ebuild 3977 SHA256 2689a6fa4c2df18def77c4664bc187e78ff96f95761968da1cad23b737e8aa00 SHA512 ee207f9dc1deac80441ee2195bb232447ec233a43066383eb00642c4075ef8236663e48eb9f13dbe8c5d22b396e3fef20acfeb6a6df4e0d48d4479e413f9525c WHIRLPOOL 5778823cb2f74301d11ac199e09c1c05be4fa88885eb68075d4663e5350893c1c7be82e8b30a8c4e4aaa64039b3de8c11da6feed12465abfe39603b1b35863ff +MISC ChangeLog 5285 SHA256 c943c1f41dd4741550f65c4aa98d5785aa2101ee43a4f07e0e8d3155b1866102 SHA512 f1403a75ef4124fb11696608d9d3b5f5e92b67106353e9fb9709e602ab588b63b7eb71d45d75d076f828195d1456ff014144efd841d297f5e96420531957ef2a WHIRLPOOL 50c3e610284a32fef40493d1d85e8114783e3b2d487c534508ac533a9090b15de1f931504c6928412fc035cd04f9e98da66618465b56f05167d996215085668d +MISC ChangeLog-2015 7840 SHA256 6892b6ef59be8951515d951d7fd0eb9212ba193f844309736f874d927b6f176c SHA512 fb2ef2a3f3045be746616baf23a15237453288c9b818a5a304ed9d7d3a8a1c44c12cb6681eb1cec0b827069c673106327fb433c061090466e32677907dbaef7a WHIRLPOOL d94dad486232602b48c92c58cba56e41eefb56701a9424a50803ff96dd0a8ca98d81617d53b2d47105371141b53dae4114bd5b7389f1ed378c8389219f851a33 +MISC metadata.xml 491 SHA256 f41253a8dae06c7302ff9cc3e3bf61d7cadaba48d36be37bf695f9c4cd878559 SHA512 9183ab899735954d60ecb8b7ca394a72bc519b291fb2032cf5888711ab0f748bed9bc1cfb657ea6c34224b657df5634ab4d54a5bf89fbb0762d5a23d90425d12 WHIRLPOOL 4979f3ea8ba1dde00287a0a3d0fa6cd500d0e80e1323e7aba2cc091026d6820acea96511c12c35edf8703a623cdbc349cf27200360444a669f60443e8bf30079 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..93b4219e284b --- /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="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64" +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> |