[gentoo-commits] repo/gentoo:master commit in: x11-themes/gtk-engines-aurora/files/, x11-themes/gtk-engines-aurora/

[Sam James]

commit:     6f82aa02a5e0afdb2fdf7f65e2a72c55a17c5913
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 30 20:49:51 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 30 21:08:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f82aa02

x11-themes/gtk-engines-aurora: fix build with slibtool

Thanks-to: orbea <orbea <AT> riseup.net>
Closes: https://bugs.gentoo.org/779406
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...urora-1.5.1-slibtool-undefined-references.patch | 32 ++++++++++++++++++++++
 .../gtk-engines-aurora-1.5.1.ebuild                | 11 ++++----
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/x11-themes/gtk-engines-aurora/files/gtk-engines-aurora-1.5.1-slibtool-undefined-references.patch b/x11-themes/gtk-engines-aurora/files/gtk-engines-aurora-1.5.1-slibtool-undefined-references.patch
new file mode 100644
index 00000000000..b88f21cac82
--- /dev/null
+++ b/x11-themes/gtk-engines-aurora/files/gtk-engines-aurora-1.5.1-slibtool-undefined-references.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/779406
+
+commit e55f6880d6bb649b2f1bd55c31bd4ba6265ccae0
+Author: orbea <orbea@××××××.net>
+Date:   Tue Mar 30 11:54:33 2021 -0700
+
+    build: Fix undefined references for libm.
+
+diff --git a/Makefile.am b/Makefile.am
+index 16d29ea..09a51bb 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -22,4 +22,4 @@ libaurora_la_SOURCES =		\
+ 	./src/config.h
+ 
+ libaurora_la_LDFLAGS = -module -avoid-version -no-undefined
+-libaurora_la_LIBADD =  $(GTK_LIBS)
++libaurora_la_LIBADD = $(GTK_LIBS) $(LIBM)
+diff --git a/configure.ac b/configure.ac
+index b1c35e9..9b446c3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,6 +20,9 @@ AC_ARG_ENABLE(animation, 	[  --enable-animation      compile aurora with animati
+ 
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10.0,,AC_MSG_ERROR([GTK+-2.10 is required to compile aurora]))
+ 
++AC_CHECK_LIBM
++AC_SUBST([LIBM])
++
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+ 

diff --git a/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild b/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild
index 2a8bfa1c6b8..68deb890414 100644
--- a/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild
+++ b/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild
@@ -4,10 +4,10 @@
 EAPI=7
 
 MY_MAJ=$(ver_cut 1-2)
-
 DESCRIPTION="Aurora GTK+ 2.x Theme Engine"
 HOMEPAGE="https://www.gnome-look.org/content/show.php?content=56438"
 SRC_URI="https://gnome-look.org/CONTENT/content-files/56438-aurora-${PV}.tar.bz2"
+S="${WORKDIR}/aurora-${MY_MAJ}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,9 +19,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/aurora-${MY_MAJ}"
-
-PATCHES=( "${FILESDIR}"/${P}-glib-2.31.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-glib-2.31.patch
+	"${FILESDIR}"/${P}-slibtool-undefined-references.patch
+)
 
 src_unpack() {
 	unpack ${A}
@@ -40,5 +41,5 @@ src_install() {
 	doins -r ../Aurora/.
 
 	# no static archives
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }