From ad1d34add08caaf8d68c79e40f0a61c733fd68b8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 1 Jan 2023 14:22:04 +0000 Subject: gentoo auto-resync : 01:01:2023 - 14:22:03 --- dev-libs/libindicate/Manifest | 5 +- .../files/libindicate-0.6.1-no-mono.patch | 78 ----------- .../files/libindicate-12.10.1-autotools.patch | 151 +++++++++++++++++++++ .../files/libindicate-12.10.1-werror.patch | 13 -- dev-libs/libindicate/libindicate-12.10.1-r3.ebuild | 77 ----------- dev-libs/libindicate/libindicate-12.10.1-r4.ebuild | 62 +++++++++ 6 files changed, 215 insertions(+), 171 deletions(-) delete mode 100644 dev-libs/libindicate/files/libindicate-0.6.1-no-mono.patch create mode 100644 dev-libs/libindicate/files/libindicate-12.10.1-autotools.patch delete mode 100644 dev-libs/libindicate/files/libindicate-12.10.1-werror.patch delete mode 100644 dev-libs/libindicate/libindicate-12.10.1-r3.ebuild create mode 100644 dev-libs/libindicate/libindicate-12.10.1-r4.ebuild (limited to 'dev-libs/libindicate') diff --git a/dev-libs/libindicate/Manifest b/dev-libs/libindicate/Manifest index e490a8039432..bbb5f8f58101 100644 --- a/dev-libs/libindicate/Manifest +++ b/dev-libs/libindicate/Manifest @@ -1,5 +1,4 @@ -AUX libindicate-0.6.1-no-mono.patch 1888 BLAKE2B 60cb0434e3974cf474fca729be08defcaa01d713e4039001f4994bcaae0a657fd04b0c2eafa447c25c2e56d92bddd39f2b17915fdb7d26b916eae3e3315588d7 SHA512 b2623349c139321403e285ce384191f2741b6216dd87ce5e05a439bd175a2846bca111ade729e87322a413bfc518fdfc2546274114fe5726de171b51d3be7cb1 -AUX libindicate-12.10.1-werror.patch 343 BLAKE2B d7c64d707ef1d5dc47e865458ac6617c49842cf26001a1f74c69b226cf13b281c08cc854ae4df2de6cb36a5031eac107c88592a0134075e7b91f5b67a7c7c683 SHA512 8a385ed6cd0a9a216c675eb003497e15415a25666a2a475be2bbe7fd077ebf4fb8566a4252e53123f372adcf49fac48cfa8ffaef7c6ee6fabef98edf06f3d00f +AUX libindicate-12.10.1-autotools.patch 3814 BLAKE2B 13f881fcc06a139e5a7be2fb4575d743de12e9928d19b726a1eec9aae00da10a25c24006d6c20b1ea38b753cc61216660e4ef9cc46d52ef5ca729b35bb8da182 SHA512 2aadbe0388d9dbfdbee6255b0a127769effbc546b55fcd2d4d81704df85884f38f4aad086679a402b1ee377aba0b00f6e4f774a8279250f3b4eb8d382aa6e554 DIST libindicate-12.10.1.tar.gz 550378 BLAKE2B 9966c645c2538bf9246221e138771ce38e7f74629ae2365cd803a5e26372922cd5194ca1449f79a35f2bcd391e3ee2056183ab53b11fa8d92a8b2c258ead9c6d SHA512 4dcb5f292153210bc15a05f117101429da77a60b8b05b569baddf0e9043d852c2dccb0d5a6adbdf4d4a1b6f06b33c61e242bb4bcb376e3d96563bda591685c06 -EBUILD libindicate-12.10.1-r3.ebuild 1706 BLAKE2B dcd85d0a5a1cd71f649535531197190a7ab362c94892d4e48217b32367d5010b4b009d74c995ffe8b5bfb27fc45c076629d4b9e3967dd783aa876c55585e8c1e SHA512 39f249ffd1264e86f6de697f408201875fedec2665c680e06e8fa7288ccfe962892e037f9d639ab0300e4e009b4242509bed6380ead28606f0d8c856597924ad +EBUILD libindicate-12.10.1-r4.ebuild 1270 BLAKE2B cf1a9877c2702f06097224d01779b30bd7d7d460adc4d1395af291eca42d0d082f473752015b42c3a39768c88221dec00b561f7e767f1d1d3748db401dec84fe SHA512 954b4a466c3568e33e890ab6f22c543c0d266ac08e9597eb65291654f92f4fa54a4163808b1a92fa444514e59f5e1992f25517a467db0cec7948754bb36aff52 MISC metadata.xml 247 BLAKE2B eec2dcbcd33f264a92a826ef6e2817dc76b1fa8612c04d9b6404e24b0d210071908466c77f9dffa1349f49b14920c37c017b65f7f184166ca816840ada88edf3 SHA512 e9bb0332e8873e5fc733d47280c49cbeef950d32999ee14bea561e2af2911d7b467da253ec8bba84aac703b9ae6090d690bbede71a4e58ed45a4b1ef513bdf55 diff --git a/dev-libs/libindicate/files/libindicate-0.6.1-no-mono.patch b/dev-libs/libindicate/files/libindicate-0.6.1-no-mono.patch deleted file mode 100644 index 1743f861f4ba..000000000000 --- a/dev-libs/libindicate/files/libindicate-0.6.1-no-mono.patch +++ /dev/null @@ -1,78 +0,0 @@ -Temporary patch to disable mono until new gtk-sharp is in tree wrt bug #382491 - ---- a/bindings/Makefile.am -+++ b/bindings/Makefile.am -@@ -1,9 +1,5 @@ - SUBDIRS = - --if HAS_MONO --SUBDIRS += mono --endif -- - if HAS_PYTHON - SUBDIRS += python - endif ---- a/configure.ac -+++ b/configure.ac -@@ -124,61 +124,6 @@ - AC_PATH_PROG([VALA_API_GEN], [vapigen]) - - ########################### --# Check for Mono support --########################### -- --MONO_REQUIRED_VERSION=1.0 --PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false) -- --AC_PATH_PROG(AL, al, no) --if test "x$AL" = "xno" ; then -- AC_MSG_NOTICE([No al tool found. You need to install Mono.]) --fi -- --if test "x$has_mono" = "xtrue" ; then -- GENERATED_SOURCES=generated/*.cs -- AC_PATH_PROG(RUNTIME, mono, no) -- -- if test "x$RUNTIME" != "no" ; then -- RUNTIME=mono -- fi -- -- AC_PATH_PROG(CSC, gmcs, no) -- LIB_PREFIX=.so -- LIB_SUFFIX= --fi -- --if test "x$CSC" = "xno" ; then -- AC_MSG_NOTICE([No Mono compiler found.]) --fi -- --AC_PATH_PROG(GACUTIL, gacutil, no) --if test "x$GACUTIL" = "xno" ; then -- AC_MSG_NOTICE([No gacutil tool found]) --fi -- --AC_SUBST(RUNTIME) --AC_SUBST(CSC) --AC_SUBST(GACUTIL) --AC_SUBST(LIB_PREFIX) --AC_SUBST(LIB_SUFFIX) --AC_SUBST(GENERATED_SOURCES) -- --GLIB_SHARP_REQ_VERSION=2.12.1 --GTK_SHARP_REQ_VERSION=2.12 --PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP_REQ_VERSION, has_gtksharp=true, has_gtksharp=false) --AC_SUBST(GTK_SHARP_LIBS) --AC_SUBST(GTK_SHARP_CFLAGS) -- --PKG_CHECK_MODULES(GAPI, gapi-2.0 >= $GLIB_SHARP_REQ_VERSION, has_gapi=true, has_gapi=false) --AC_PATH_PROG(GAPI_PARSER, gapi2-parser, no) --AC_SUBST(GAPI_PARSER) --AC_PATH_PROG(GAPI_CODEGEN, gapi2-codegen, no) --AC_SUBST(GAPI_CODEGEN) --AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no) --AC_SUBST(GAPI_FIXUP) -- --########################### - # Check for Python support - ########################### - diff --git a/dev-libs/libindicate/files/libindicate-12.10.1-autotools.patch b/dev-libs/libindicate/files/libindicate-12.10.1-autotools.patch new file mode 100644 index 000000000000..ef84aab8cd94 --- /dev/null +++ b/dev-libs/libindicate/files/libindicate-12.10.1-autotools.patch @@ -0,0 +1,151 @@ +- Temporary patch to disable mono until new gtk-sharp is in tree wrt bug #382491 +- fix parallel install issue #469032 +- remove -Werror +- use VAPIGEN from vala.eclass + +--- a/bindings/Makefile.am ++++ b/bindings/Makefile.am +@@ -1,9 +1,5 @@ + SUBDIRS = + +-if HAS_MONO +-SUBDIRS += mono +-endif +- + if HAS_PYTHON + SUBDIRS += python + endif +--- a/configure.ac ++++ b/configure.ac +@@ -3,7 +3,7 @@ + + AC_PREREQ(2.53) + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AM_INIT_AUTOMAKE(libindicate, 12.10.1) + + AM_MAINTAINER_MODE +@@ -134,62 +134,7 @@ + # Vala API Generation + ########################### + +-AC_PATH_PROG([VALA_API_GEN], [vapigen]) +- +-########################### +-# Check for Mono support +-########################### +- +-MONO_REQUIRED_VERSION=1.0 +-PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false) +- +-AC_PATH_PROG(AL, al, no) +-if test "x$AL" = "xno" ; then +- AC_MSG_NOTICE([No al tool found. You need to install Mono.]) +-fi +- +-if test "x$has_mono" = "xtrue" ; then +- GENERATED_SOURCES=generated/*.cs +- AC_PATH_PROG(RUNTIME, mono, no) +- +- if test "x$RUNTIME" != "no" ; then +- RUNTIME=mono +- fi +- +- AC_PATH_PROG(CSC, gmcs, no) +- LIB_PREFIX=.so +- LIB_SUFFIX= +-fi +- +-if test "x$CSC" = "xno" ; then +- AC_MSG_NOTICE([No Mono compiler found.]) +-fi +- +-AC_PATH_PROG(GACUTIL, gacutil, no) +-if test "x$GACUTIL" = "xno" ; then +- AC_MSG_NOTICE([No gacutil tool found]) +-fi +- +-AC_SUBST(RUNTIME) +-AC_SUBST(CSC) +-AC_SUBST(GACUTIL) +-AC_SUBST(LIB_PREFIX) +-AC_SUBST(LIB_SUFFIX) +-AC_SUBST(GENERATED_SOURCES) +- +-GLIB_SHARP_REQ_VERSION=2.12.1 +-GTK_SHARP_REQ_VERSION=2.12 +-PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP_REQ_VERSION, has_gtksharp=true, has_gtksharp=false) +-AC_SUBST(GTK_SHARP_LIBS) +-AC_SUBST(GTK_SHARP_CFLAGS) +- +-PKG_CHECK_MODULES(GAPI, gapi-2.0 >= $GLIB_SHARP_REQ_VERSION, has_gapi=true, has_gapi=false) +-AC_PATH_PROG(GAPI_PARSER, gapi2-parser, no) +-AC_SUBST(GAPI_PARSER) +-AC_PATH_PROG(GAPI_CODEGEN, gapi2-codegen, no) +-AC_SUBST(GAPI_CODEGEN) +-AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no) +-AC_SUBST(GAPI_FIXUP) ++AC_PATH_PROG([VAPIGEN], [vapigen]) + + ########################### + # Check for Python support +--- a/libindicate/Makefile.am ++++ b/libindicate/Makefile.am +@@ -74,7 +74,7 @@ + libindicate_la_CFLAGS = \ + $(LIBINDICATE_CFLAGS) \ + $(COVERAGE_CFLAGS) \ +- -Wall -Werror ++ -Wall + + libindicate_la_LIBADD = \ + $(LIBINDICATE_LIBS) +@@ -173,7 +173,7 @@ + vapi_DATA = Indicate-0.7.vapi + + Indicate-0.7.vapi: Indicate-0.7.gir +- $(VALA_API_GEN) --library=Indicate-0.7 \ ++ $(VAPIGEN) --library=Indicate-0.7 \ + --pkg Dbusmenu-0.4 \ + $< + +--- a/libindicate-gtk/Makefile.am ++++ b/libindicate-gtk/Makefile.am +@@ -26,8 +26,7 @@ + indicator.h \ + listener.h + +-libindicate_gtkinclude_HEADERS = \ +- $(indicate_gtk_headers) ++libindicate_gtkinclude_HEADERS = + + libindicate_gtk_la_SOURCES = \ + $(indicate_gtk_headers) \ +@@ -43,7 +42,7 @@ + libindicate_gtk_la_CFLAGS = \ + $(COVERAGE_CFLAGS) \ + -I $(top_srcdir) \ +- -Wall -Werror \ ++ -Wall \ + $(LIBINDICATEGTK_CFLAGS) + + libindicate_gtk_la_LIBADD = \ +@@ -58,7 +57,7 @@ + libindicate_gtk3_la_CFLAGS = $(libindicate_gtk_la_CFLAGS) + libindicate_gtk3_la_LDFLAGS = $(libindicate_gtk_la_LDFLAGS) + libindicate_gtk3_la_SOURCES = $(libindicate_gtk_la_SOURCES) +-libindicate_gtk3include_HEADERS = $(libindicate_gtkinclude_HEADERS) ++libindicate_gtk3include_HEADERS = $(indicate_gtk_headers) + libindicate_gtk3includedir = $(libindicate_gtkincludedir) + + pkgconfig_DATA = indicate-gtk$(VER)-0.7.pc +@@ -139,7 +138,7 @@ + vapi_DATA = IndicateGtk$(VER)-0.7.vapi + + IndicateGtk$(VER)-0.7.vapi: IndicateGtk$(VER)-0.7.tmp.gir Makefile.am +- $(VALA_API_GEN) --library=IndicateGtk$(VER)-0.7 \ ++ $(VAPIGEN) --library=IndicateGtk$(VER)-0.7 \ + --pkg $(GTKVALA) \ + --pkg Dbusmenu-0.4 \ + --pkg Indicate-0.7 \ diff --git a/dev-libs/libindicate/files/libindicate-12.10.1-werror.patch b/dev-libs/libindicate/files/libindicate-12.10.1-werror.patch deleted file mode 100644 index 9a330caac03c..000000000000 --- a/dev-libs/libindicate/files/libindicate-12.10.1-werror.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/libindicate-gtk/Makefile.am -+++ b/libindicate-gtk/Makefile.am -@@ -45,3 +45,3 @@ libindicate_gtk_la_CFLAGS = \ - -I $(top_srcdir) \ -- -Wall -Werror \ -+ -Wall \ - $(LIBINDICATEGTK_CFLAGS) ---- a/libindicate/Makefile.am -+++ b/libindicate/Makefile.am -@@ -76,3 +76,3 @@ libindicate_la_CFLAGS = \ - $(COVERAGE_CFLAGS) \ -- -Wall -Werror -+ -Wall diff --git a/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild b/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild deleted file mode 100644 index e1cb38a5bbb4..000000000000 --- a/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -VALA_MIN_API_VERSION="0.16" -VALA_USE_DEPEND="vapigen" -inherit autotools flag-o-matic vala xdg-utils - -DESCRIPTION="Library to raise flags on DBus for other components of the desktop" -HOMEPAGE="https://launchpad.net/libindicate" -SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz" - -LICENSE="LGPL-2.1 LGPL-3" -SLOT="3" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86" -IUSE="gtk +introspection" - -RESTRICT="test" # consequence of the -no-mono.patch - -RDEPEND=" - dev-libs/dbus-glib - dev-libs/glib:2 - dev-libs/libdbusmenu[introspection?] - dev-libs/libxml2 - gtk? ( - dev-libs/libdbusmenu[gtk3] - x11-libs/gtk+:3 - ) - introspection? ( >=dev-libs/gobject-introspection-1 ) -" -DEPEND="${RDEPEND} - $(vala_depend) - app-text/gnome-doc-utils - dev-util/gtk-doc-am - gnome-base/gnome-common - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.6.1-no-mono.patch - "${FILESDIR}"/${PN}-12.10.1-werror.patch -) - -src_prepare() { - default - xdg_environment_reset - vala_src_prepare - - sed -i \ - -e "s:vapigen:vapigen-$(vala_best_api_version):" \ - -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \ - configure.ac || die - - eautoreconf -} - -src_configure() { - append-flags -Wno-error - - # python bindings are only for GTK+-2.x - econf \ - --disable-static \ - $(use_enable gtk) \ - $(use_enable introspection) \ - --disable-python \ - --disable-scrollkeeper \ - --with-gtk=3 -} - -src_install() { - # work around failing parallel installation (-j1) - # until a better fix is available. (bug #469032) - emake -j1 DESTDIR="${D}" install - einstalldocs - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/libindicate/libindicate-12.10.1-r4.ebuild b/dev-libs/libindicate/libindicate-12.10.1-r4.ebuild new file mode 100644 index 000000000000..2124b53457b2 --- /dev/null +++ b/dev-libs/libindicate/libindicate-12.10.1-r4.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VALA_USE_DEPEND="vapigen" + +inherit autotools vala + +DESCRIPTION="Library to raise flags on DBus for other components of the desktop" +HOMEPAGE="https://launchpad.net/libindicate" +SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz" + +LICENSE="LGPL-2.1 LGPL-3" +SLOT="3" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86" +IUSE="gtk +introspection" +RESTRICT="test" # consequence of the -no-mono.patch + +RDEPEND=" + dev-libs/dbus-glib + dev-libs/glib:2 + dev-libs/libdbusmenu[introspection?] + dev-libs/libxml2 + gtk? ( + dev-libs/libdbusmenu[gtk3] + x11-libs/gtk+:3 + ) + introspection? ( >=dev-libs/gobject-introspection-1 ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-text/gnome-doc-utils + dev-util/gtk-doc-am + gnome-base/gnome-common + virtual/pkgconfig + $(vala_depend) +" + +PATCHES=( "${FILESDIR}"/${P}-autotools.patch ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + vala_setup + + # python bindings are only for GTK+-2.x + econf \ + $(use_enable gtk) \ + $(use_enable introspection) \ + --disable-python \ + --disable-scrollkeeper \ + --with-gtk=3 +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} -- cgit v1.2.3