diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2021-04-29 06:45:06 -0700 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2021-04-29 19:59:18 +0200 |
| commit | ef6816134f08119f99016210a1069353320046ee (patch) | |
| tree | 13352940cf0b9ef480caa498619f66b82e0b9719 | |
| parent | profiles/package.mask: dev-java/minlog last-rite (diff) | |
| download | gentoo-ef6816134f08119f99016210a1069353320046ee.tar.gz gentoo-ef6816134f08119f99016210a1069353320046ee.tar.bz2 gentoo-ef6816134f08119f99016210a1069353320046ee.zip | |
x11-themes/gtk-engines-nodoka: Fix the build with slibtool
Thanks-to: orbea <orbea@riseup.net>
Closes: https://bugs.gentoo.org/778884
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
3 files changed, 75 insertions, 1 deletions
diff --git a/x11-themes/gtk-engines-nodoka/files/gtk-engines-nodoka-0.7.5-autoreconf.patch b/x11-themes/gtk-engines-nodoka/files/gtk-engines-nodoka-0.7.5-autoreconf.patch new file mode 100644 index 000000000000..3ca6da26df2d --- /dev/null +++ b/x11-themes/gtk-engines-nodoka/files/gtk-engines-nodoka-0.7.5-autoreconf.patch @@ -0,0 +1,23 @@ +From 92bbdc36493d07c803ca86ffc90a188afd60bfa4 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Mar 28 2021 17:40:15 +0000 +Subject: gtk-nodoka-engine: Fix autoreconf. + + +Signed-off-by: orbea <orbea@riseup.net> + +--- + +diff --git a/configure.ac b/configure.ac +index e086fd9..46b8df8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -6,6 +6,7 @@ AM_INIT_AUTOMAKE([-Wall -Werror tar-pax]) + dnl Initialize maintainer mode + AM_MAINTAINER_MODE + ++AM_PROG_AR + AC_PROG_CC + AC_PROG_CC_STDC + AC_PROG_INSTALL + diff --git a/x11-themes/gtk-engines-nodoka/files/gtk-engines-nodoka-0.7.5-libm.patch b/x11-themes/gtk-engines-nodoka/files/gtk-engines-nodoka-0.7.5-libm.patch new file mode 100644 index 000000000000..271c0a75c16e --- /dev/null +++ b/x11-themes/gtk-engines-nodoka/files/gtk-engines-nodoka-0.7.5-libm.patch @@ -0,0 +1,40 @@ +From 6568ca0e84d19f4c7f67e9c5ac3f85931cffa61a Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Sun, 28 Mar 2021 10:46:58 -0700 +Subject: [PATCH] gtk-nodoka-engine: Fix undefined libm references with + slibtool. + +Signed-off-by: orbea <orbea@riseup.net> +--- + Makefile.am | 2 +- + configure.ac | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index d7b2a8b..c426a45 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -34,5 +34,5 @@ libnodoka_la_SOURCES = \ + ./src/GTKEngine/config.h + + libnodoka_la_LDFLAGS = -module -avoid-version -no-undefined +-libnodoka_la_LIBADD = $(GTK_LIBS) ++libnodoka_la_LIBADD = $(GTK_LIBS) $(LIBM) + +diff --git a/configure.ac b/configure.ac +index d771891..4ddbc87 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,6 +17,9 @@ AM_DISABLE_STATIC + AC_LIBTOOL_WIN32_DLL + AM_PROG_LIBTOOL + ++AC_CHECK_LIBM ++AC_SUBST([LIBM]) ++ + AC_ARG_ENABLE(animation, [ --enable-animation compile nodoka with animation support], [animation=$enableval], [animation="no"], ) + AC_ARG_ENABLE(animationtoleft, [ --enable-animationtoleft compile nodoka with progressbar animation from right to left], [animationtoleft=$enableval], [animationtoleft="no"], ) + +-- +2.29.2 + diff --git a/x11-themes/gtk-engines-nodoka/gtk-engines-nodoka-0.7.5.ebuild b/x11-themes/gtk-engines-nodoka/gtk-engines-nodoka-0.7.5.ebuild index 2c9744b94635..ecb67cfd24b7 100644 --- a/x11-themes/gtk-engines-nodoka/gtk-engines-nodoka-0.7.5.ebuild +++ b/x11-themes/gtk-engines-nodoka/gtk-engines-nodoka-0.7.5.ebuild @@ -3,6 +3,8 @@ EAPI=7 +inherit autotools + MY_P="gtk-nodoka-engine-${PV}" DESCRIPTION="GTK+ engine and themes developed by the Fedora Project" @@ -20,7 +22,16 @@ BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${MY_P}" -PATCHES=( "${FILESDIR}"/${P}-glib2.32.patch ) +PATCHES=( + "${FILESDIR}"/${P}-glib2.32.patch + "${FILESDIR}"/${P}-autoreconf.patch + "${FILESDIR}"/${P}-libm.patch +) + +src_prepare() { + default + eautoreconf +} src_configure() { econf \ |