[gentoo-commits] repo/gentoo:master commit in: media-gfx/gtkimageview/files/, media-gfx/gtkimageview/
commit: 02b5cfb32642a1fdcf64effcc2898a5bf4ebed8a
Author: Sam James gentoo org>
AuthorDate: Thu Apr 1 22:54:48 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Apr 1 23:03:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02b5cfb3
media-gfx/gtkimageview: fix build with slibtool
Thakns-to: orbea riseup.net>
Closes: https://bugs.gentoo.org/779127
Signed-off-by: Sam James gentoo.org>
...eview-1.6.4-slibtool-undefined-references.patch | 35 ++
media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild | 4 +++
2 files changed, 39 insertions(+)
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 000..b323d74c257
--- /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 2e38da6bfd9..a5f5c5e507f 100644
--- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
+++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
@@ -25,6 +25,10 @@ BDEPEND="
gnome-base/gnome-common
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.4-slibtool-undefined-references.patch
+)
+
src_prepare() {
gnome2_src_prepare
[gentoo-commits] repo/gentoo:master commit in: media-gfx/gtkimageview/
commit: e202861b974e5e3b5870a02f99e2b7337dac219f
Author: Sam James gentoo org>
AuthorDate: Thu Apr 1 22:52:44 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Apr 1 23:03:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e202861b
media-gfx/gtkimageview: port to EAPI 7, BDEPEND
Signed-off-by: Sam James gentoo.org>
media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
index 707ce597573..2e38da6bfd9 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,9 +19,10 @@ 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
"
src_prepare() {
@@ -47,6 +48,7 @@ src_configure() {
src_install() {
gnome2_src_install
+
if use examples ; then
docinto examples
dodoc tests/ex-*.c
[gentoo-commits] repo/gentoo:master commit in: media-gfx/gtkimageview/
commit: e7e10e4e0123ce1e96c05e466a7a28693c341a78
Author: Mart Raudsepp gentoo org>
AuthorDate: Sun Feb 9 11:10:45 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sun Feb 9 12:23:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7e10e4e
media-gfx/gtkimageview: drop to ~hppa
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp gentoo.org>
media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
index 4a33fe1c6f3..e7f1da0489b 100644
--- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
+++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86
~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sh sparc x86
~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="examples static-libs"
# tests are severely broken, bug #483952
[gentoo-commits] repo/gentoo:master commit in: media-gfx/gtkimageview/
commit: 3acaaf6bf75ae30a82e8b0ee5020be09d66ec567
Author: Matt Turner gentoo org>
AuthorDate: Mon Apr 2 06:23:00 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Apr 2 06:23:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3acaaf6b
media-gfx/gtkimageview-1.6.4: added ~mips
media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
index f3789f949bf..75cf22ae35f 100644
--- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
+++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd
~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="examples static-libs"
# tests are severely broken, bug #483952
[gentoo-commits] repo/gentoo:master commit in: media-gfx/gtkimageview/
commit: 5bfe8f1692d353fbecb3269f14ea05e0f2021500
Author: Alexis Ballier gentoo org>
AuthorDate: Fri Jun 30 06:00:54 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Fri Jun 30 06:02:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bfe8f16
media-gfx/gtkimageview: keyword ~arm64
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
index 8d759ca0aef..f3789f949bf 100644
--- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
+++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd
~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd
~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="examples static-libs"
# tests are severely broken, bug #483952
[gentoo-commits] repo/gentoo:master commit in: media-gfx/gtkimageview/
commit: 63c2feb7f522e0615263d2a6d7ffe1b497bf7698
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Oct 9 11:45:00 2016 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Oct 9 11:45:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63c2feb7
media-gfx/gtkimageview: tests are severely broken and not meant to be run
(#483952), stop relying on userpriv (#516580), update eapi, don't rebuild
gtk-doc.
Package-Manager: portage-2.3.1
media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild | 51 +++-
1 file changed, 14 insertions(+), 37 deletions(-)
diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
index 19d3b30..77eebb3 100644
--- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
+++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
-
+EAPI=6
GNOME2_LA_PUNT="yes"
-VIRTUALX_REQUIRED=test
-inherit autotools gnome2 virtualx
+inherit autotools gnome2
DESCRIPTION="A simple image viewer widget for GTK"
HOMEPAGE="https://projects.gnome.org/gtkimageview/;
@@ -16,57 +14,36 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd
~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="doc examples static-libs"
+IUSE="examples static-libs"
-# tests do not work with userpriv
-RESTRICT="test? ( userpriv )"
+# tests are severely broken, bug #483952
+RESTRICT="test"
RDEPEND="x11-libs/gtk+:2"
DEPEND="${RDEPEND}
gnome-base/gnome-common
dev-util/gtk-doc-am
- doc? ( >=dev-util/gtk-doc-1.8 )"
-
-pkg_setup() {
- DOCS="README"
- G2CONF="$(use_enable static-libs static)"
-}
+"
src_prepare() {
gnome2_src_prepare
# Prevent excessive build failures due to gcc changes
- sed -e '/CFLAGS/s/-Werror //g' -i configure.in || die "sed 1 failed"
-
- # Prevent excessive build failures due to glib/gtk changes
- sed '/DEPRECATED_FLAGS/d' -i configure.in || die "sed 2 failed"
+ sed -e '/CFLAGS/s/-Werror //g' -i configure.in || die
# Gold linker fix
sed -e '/libtest.la/s:$: -lm:g' -i tests/Makefile.am || die
- if use doc; then
- sed "/^TARGET_DIR/i
\GTKDOC_REBASE=${EPREFIX}/usr/bin/gtkdoc-rebase" \
- -i gtk-doc.make || die "sed 3 failed"
- else
- sed "/^TARGET_DIR/i \GTKDOC_REBASE=true" \
- -i gtk-doc.make || die "sed 4 failed"
- fi
+ # Don't rebuild gtk-doc
+ sed "/^TARGET_DIR/i \GTKDOC_REBASE=true" -i gtk-doc.make || die
+ mv configure.in configure.ac || die
AT_NOELIBTOOLIZE=yes eautoreconf
}
-src_test() {
- # the tests are only built, but not run by default
- local failed="0"
- Xemake check
- cd "${S}"/tests
- for test in ./test-* ; do
- if [[ -x ${test} ]] ; then
- VIRTUALX_COMMAND="${test}"
- virtualmake || failed=$((${failed}+1))
- fi
- done
- [[ ${failed} -gt 0 ]] && die "${failed} tests failed"
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable static-libs static)
}
src_install() {
