From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- media-gfx/gtkimageview/Manifest | 3 +- ...eview-1.6.4-slibtool-undefined-references.patch | 35 ++++++++++++++++++++++ media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild | 16 ++++++---- 3 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 media-gfx/gtkimageview/files/gtkimageview-1.6.4-slibtool-undefined-references.patch (limited to 'media-gfx/gtkimageview') diff --git a/media-gfx/gtkimageview/Manifest b/media-gfx/gtkimageview/Manifest index c92f8612d5e7..3f2302c2e774 100644 --- a/media-gfx/gtkimageview/Manifest +++ b/media-gfx/gtkimageview/Manifest @@ -1,3 +1,4 @@ +AUX gtkimageview-1.6.4-slibtool-undefined-references.patch 1038 BLAKE2B 6026cf188eb0d230f139667eadd8926eedc14bddacdcc338798ccf59422e06b48727c0a5faf172acefe03a710965a56dbf515a9ec4ffb48ceff99d9dcce33059 SHA512 0d4b3baa96c4cf7ac79623a963c2d95226858a5e06ba5eab6658f7737d9e3501fe9dd44f2716691b2a67176907010de5faf5363a6aa1d9e0981eca83412c03f4 DIST gtkimageview-1.6.4.tar.gz 1158138 BLAKE2B b59abcbac71d4bd039bf9f3fc2f25f6590f91c4cc320cea90243a4889e020f1a54a3ca5d8a843f7482551ce8da6fafe6e3ce4fbc5a5e32fd6ceb4367b5abb9db SHA512 6378c640006e73aa1ffbf92eb9d4e42570707bc159f0a657b11f027d328088f5e89fc334de170de5ab1a39bed588b0b76f4633688a894cb7def16f1dea9f8e39 -EBUILD gtkimageview-1.6.4.ebuild 1214 BLAKE2B 3670654ed740e99716ef8fd930b70de468d5868770ad04ac8d5674640978b5013ff9e26d3db652512746646cd73669417cd2c6d2efea4af2146edbaf32279cb4 SHA512 cf47f073e3ce16b5d2b2d0689c69a2929c96b172b423ebf8dcc63e2f92ffbfe42fdc82abc21e24f2bcd6f3c26930a402b2a7e8242d6c26da9b5c6cd70c722800 +EBUILD gtkimageview-1.6.4.ebuild 1315 BLAKE2B d9353501d43fee619926ae26e176c49d04160053cf838ccee5ed1cf4bef0c8409895b8127f7efa22227b1bb7dde5136e652c6853e926743936cfd351a2bfb1f3 SHA512 228bf366b5a4031782487a26f11c0d4160ce2a6196430be184c0555b01b5798c029f58ce8c35ea96d2e697b68ea0e7240ec58d993b8380fb19a342e048e8f318 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 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 new file mode 100644 index 000000000000..b323d74c2573 --- /dev/null +++ b/media-gfx/gtkimageview/files/gtkimageview-1.6.4-slibtool-undefined-references.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/779127 + +commit 7f1fc516fbfb185e77b0acaab84a25b666a55e21 +Author: orbea +Date: Mon Mar 29 11:50:45 2021 -0700 + + build: Fix undefined libm reference. + +diff --git a/configure.in b/configure.in +index bd01480..63eb587 100644 +--- a/configure.in ++++ b/configure.in +@@ -23,6 +23,9 @@ GNOME_COMPILE_WARNINGS(error) + DEPRECATED_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" + AC_SUBST(DEPRECATED_FLAGS) + ++AC_CHECK_LIBM ++AC_SUBST([LIBM]) ++ + PKG_CHECK_MODULES(DEP, + gtk+-2.0 >= 2.6.0) + AC_SUBST(DEP_CFLAGS) +diff --git a/src/Makefile.am b/src/Makefile.am +index 57c9f42..375dc44 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -41,7 +41,7 @@ libgtkimageview_la_SOURCES = \ + $(BUILT_SOURCES) \ + $(libgtkimageview_headers) + +-libgtkimageview_la_LIBADD = $(DEP_LIBS) ++libgtkimageview_la_LIBADD = $(DEP_LIBS) $(LIBM) + libgtkimageview_la_LDFLAGS = -no-undefined + + libgtkimageview_includedir = $(includedir)/gtkimageview diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild index 707ce5975732..a5f5c5e507ff 100644 --- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild +++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -GNOME2_LA_PUNT="yes" +EAPI=7 +GNOME2_LA_PUNT="yes" inherit autotools gnome2 DESCRIPTION="A simple image viewer widget for GTK" @@ -19,11 +19,16 @@ IUSE="examples static-libs" RESTRICT="test" RDEPEND="x11-libs/gtk+:2" -DEPEND="${RDEPEND} - gnome-base/gnome-common +DEPEND="gnome-base/gnome-common" +BDEPEND=" dev-util/gtk-doc-am + gnome-base/gnome-common " +PATCHES=( + "${FILESDIR}"/${PN}-1.6.4-slibtool-undefined-references.patch +) + src_prepare() { gnome2_src_prepare @@ -47,6 +52,7 @@ src_configure() { src_install() { gnome2_src_install + if use examples ; then docinto examples dodoc tests/ex-*.c -- cgit v1.2.3