Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gtkimageview/files/, media-gfx/gtkimageview/
Date: Thu, 01 Apr 2021 23:04:18
Message-Id: 1617318239.02b5cfb32642a1fdcf64effcc2898a5bf4ebed8a.sam@gentoo
1 commit: 02b5cfb32642a1fdcf64effcc2898a5bf4ebed8a
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 1 22:54:48 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 1 23:03:59 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02b5cfb3
7
8 media-gfx/gtkimageview: fix build with slibtool
9
10 Thakns-to: orbea <orbea <AT> riseup.net>
11 Closes: https://bugs.gentoo.org/779127
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 ...eview-1.6.4-slibtool-undefined-references.patch | 35 ++++++++++++++++++++++
15 media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild | 4 +++
16 2 files changed, 39 insertions(+)
17
18 diff --git a/media-gfx/gtkimageview/files/gtkimageview-1.6.4-slibtool-undefined-references.patch b/media-gfx/gtkimageview/files/gtkimageview-1.6.4-slibtool-undefined-references.patch
19 new file mode 100644
20 index 00000000000..b323d74c257
21 --- /dev/null
22 +++ b/media-gfx/gtkimageview/files/gtkimageview-1.6.4-slibtool-undefined-references.patch
23 @@ -0,0 +1,35 @@
24 +https://bugs.gentoo.org/779127
25 +
26 +commit 7f1fc516fbfb185e77b0acaab84a25b666a55e21
27 +Author: orbea <orbea@××××××.net>
28 +Date: Mon Mar 29 11:50:45 2021 -0700
29 +
30 + build: Fix undefined libm reference.
31 +
32 +diff --git a/configure.in b/configure.in
33 +index bd01480..63eb587 100644
34 +--- a/configure.in
35 ++++ b/configure.in
36 +@@ -23,6 +23,9 @@ GNOME_COMPILE_WARNINGS(error)
37 + DEPRECATED_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
38 + AC_SUBST(DEPRECATED_FLAGS)
39 +
40 ++AC_CHECK_LIBM
41 ++AC_SUBST([LIBM])
42 ++
43 + PKG_CHECK_MODULES(DEP,
44 + gtk+-2.0 >= 2.6.0)
45 + AC_SUBST(DEP_CFLAGS)
46 +diff --git a/src/Makefile.am b/src/Makefile.am
47 +index 57c9f42..375dc44 100644
48 +--- a/src/Makefile.am
49 ++++ b/src/Makefile.am
50 +@@ -41,7 +41,7 @@ libgtkimageview_la_SOURCES = \
51 + $(BUILT_SOURCES) \
52 + $(libgtkimageview_headers)
53 +
54 +-libgtkimageview_la_LIBADD = $(DEP_LIBS)
55 ++libgtkimageview_la_LIBADD = $(DEP_LIBS) $(LIBM)
56 + libgtkimageview_la_LDFLAGS = -no-undefined
57 +
58 + libgtkimageview_includedir = $(includedir)/gtkimageview
59
60 diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
61 index 2e38da6bfd9..a5f5c5e507f 100644
62 --- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
63 +++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
64 @@ -25,6 +25,10 @@ BDEPEND="
65 gnome-base/gnome-common
66 "
67
68 +PATCHES=(
69 + "${FILESDIR}"/${PN}-1.6.4-slibtool-undefined-references.patch
70 +)
71 +
72 src_prepare() {
73 gnome2_src_prepare