Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-themes/gtk-engines-candido/, x11-themes/gtk-engines-candido/files/
Date: Fri, 30 Apr 2021 16:16:54
Message-Id: 1619799402.f22efd7a1c09380d7312ac954a0f0cc470817d45.polynomial-c@gentoo
1 commit: f22efd7a1c09380d7312ac954a0f0cc470817d45
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 30 14:29:49 2021 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 30 16:16:42 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f22efd7a
7
8 x11-themes/gtk-engines-candidio: Fix for slibtool
9
10 Thanks-to: orbea <orbea <AT> riseup.net>
11 Closes: https://bugs.gentoo.org/779478
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 .../files/gtk-engines-candido-0.9.1-libm.patch | 31 ++++++++++++++++++++++
15 .../gtk-engines-candido-0.9.1.ebuild | 5 +++-
16 2 files changed, 35 insertions(+), 1 deletion(-)
17
18 diff --git a/x11-themes/gtk-engines-candido/files/gtk-engines-candido-0.9.1-libm.patch b/x11-themes/gtk-engines-candido/files/gtk-engines-candido-0.9.1-libm.patch
19 new file mode 100644
20 index 00000000000..a2d87d35d96
21 --- /dev/null
22 +++ b/x11-themes/gtk-engines-candido/files/gtk-engines-candido-0.9.1-libm.patch
23 @@ -0,0 +1,31 @@
24 +commit 11de11a1cfa840545dd8fd9b41937445c6107f86
25 +Author: orbea <orbea@××××××.net>
26 +Date: Wed Mar 31 05:11:07 2021 -0700
27 +
28 + build: Fix undefined reference for libm.
29 +
30 +diff --git a/Makefile.am b/Makefile.am
31 +index 62fd2e3..78ccc65 100644
32 +--- a/Makefile.am
33 ++++ b/Makefile.am
34 +@@ -22,5 +22,4 @@ libcandido_la_SOURCES = \
35 + ./src/config.h
36 +
37 + libcandido_la_LDFLAGS = -module -avoid-version -no-undefined
38 +-libcandido_la_LIBADD = $(GTK_LIBS)
39 +-
40 ++libcandido_la_LIBADD = $(GTK_LIBS) $(LIBM)
41 +diff --git a/configure.ac b/configure.ac
42 +index 8e261af..8570101 100644
43 +--- a/configure.ac
44 ++++ b/configure.ac
45 +@@ -27,6 +27,9 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8.0,,
46 + AC_SUBST(GTK_CFLAGS)
47 + AC_SUBST(GTK_LIBS)
48 +
49 ++AC_CHECK_LIBM
50 ++AC_SUBST([LIBM])
51 ++
52 + GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
53 + AC_SUBST(GTK_VERSION)
54 +
55
56 diff --git a/x11-themes/gtk-engines-candido/gtk-engines-candido-0.9.1.ebuild b/x11-themes/gtk-engines-candido/gtk-engines-candido-0.9.1.ebuild
57 index 90d89b19f4f..af36e75970f 100644
58 --- a/x11-themes/gtk-engines-candido/gtk-engines-candido-0.9.1.ebuild
59 +++ b/x11-themes/gtk-engines-candido/gtk-engines-candido-0.9.1.ebuild
60 @@ -21,7 +21,10 @@ BDEPEND="virtual/pkgconfig"
61
62 S="${WORKDIR}/${MY_P}"
63
64 -PATCHES=( "${FILESDIR}"/${P}-glib-2.31.patch )
65 +PATCHES=(
66 + "${FILESDIR}"/${P}-glib-2.31.patch
67 + "${FILESDIR}"/${P}-libm.patch
68 +)
69
70 src_prepare() {
71 default