diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2013-09-06 17:40:43 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2013-09-06 17:40:43 +0000 |
| commit | 0ec928a46c46619777290fa20f4794fdd60fc6b2 (patch) | |
| tree | ad825cc512755c2c9a61d4f9bd397de64d59744a /media-gfx/gqview | |
| parent | Force automake 1.12, bug #484002 (diff) | |
| download | gentoo-2-0ec928a46c46619777290fa20f4794fdd60fc6b2.tar.gz gentoo-2-0ec928a46c46619777290fa20f4794fdd60fc6b2.tar.bz2 gentoo-2-0ec928a46c46619777290fa20f4794fdd60fc6b2.zip | |
add patch to build against newer glibc from Dennis 'dlan' Lan (bug #403051)
(Portage version: 2.1.12.2/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'media-gfx/gqview')
| -rw-r--r-- | media-gfx/gqview/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/gqview/files/gqview-2.1.5-glibc.patch | 39 | ||||
| -rw-r--r-- | media-gfx/gqview/gqview-2.1.5.ebuild | 11 |
3 files changed, 52 insertions, 6 deletions
diff --git a/media-gfx/gqview/ChangeLog b/media-gfx/gqview/ChangeLog index c560b3041794..bd99fb48d457 100644 --- a/media-gfx/gqview/ChangeLog +++ b/media-gfx/gqview/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/gqview -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gqview/ChangeLog,v 1.100 2012/07/26 18:41:29 blueness Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gqview/ChangeLog,v 1.101 2013/09/06 17:40:43 mr_bones_ Exp $ + + 06 Sep 2013; Michael Sterrett <mr_bones_@gentoo.org> + +files/gqview-2.1.5-glibc.patch, gqview-2.1.5.ebuild: + add patch to build against newer glibc from Dennis 'dlan' Lan (bug #403051) 26 Jul 2012; Anthony G. Basile <blueness@gentoo.org> gqview-2.1.5.ebuild: Keyword ~arm diff --git a/media-gfx/gqview/files/gqview-2.1.5-glibc.patch b/media-gfx/gqview/files/gqview-2.1.5-glibc.patch new file mode 100644 index 000000000000..957080737040 --- /dev/null +++ b/media-gfx/gqview/files/gqview-2.1.5-glibc.patch @@ -0,0 +1,39 @@ +diff --git a/Makefile.in b/Makefile.in +index 38f6b25..4d7ad2c 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -123,6 +123,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + LCMS_LIBS = @LCMS_LIBS@ ++LIBM = @LIBM@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +diff --git a/configure.in b/configure.in +index 9335493..2299b4a 100644 +--- a/configure.in ++++ b/configure.in +@@ -52,6 +52,9 @@ fi + AC_SUBST(LCMS_LIBS) + AM_CONDITIONAL(HAVE_LCMS, test "$have_lcms" = "yes") + ++AC_CHECK_LIB(m, ceil, LIBM="-lm") ++AC_SUBST(LIBM) ++ + ALL_LINGUAS="ar be bg ca cs da de eo es et eu fi fr hu id it ja ko nl no pl pt_BR ro ru sk sl sv th tr uk vi zh_CN.GB2312 zh_TW" + GETTEXT_PACKAGE=$PACKAGE + AC_SUBST(GETTEXT_PACKAGE) +diff --git a/src/Makefile.am b/src/Makefile.am +index 7ce4702..5005877 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -166,7 +166,7 @@ gqview_SOURCES = \ + view_file_icon.c \ + view_file_icon.h + +-gqview_LDADD = $(GTK_LIBS) $(INTLLIBS) $(LCMS_LIBS) ++gqview_LDADD = $(GTK_LIBS) $(INTLLIBS) $(LCMS_LIBS) $(LIBM) + + EXTRA_DIST = \ + $(extra_SLIK) diff --git a/media-gfx/gqview/gqview-2.1.5.ebuild b/media-gfx/gqview/gqview-2.1.5.ebuild index 7c214c7a3f10..fec04a6b6cce 100644 --- a/media-gfx/gqview/gqview-2.1.5.ebuild +++ b/media-gfx/gqview/gqview-2.1.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gqview/gqview-2.1.5.ebuild,v 1.16 2012/07/26 18:41:29 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gqview/gqview-2.1.5.ebuild,v 1.17 2013/09/06 17:40:43 mr_bones_ Exp $ EAPI=2 -inherit eutils +inherit eutils autotools DESCRIPTION="A GTK-based image browser" HOMEPAGE="http://gqview.sourceforge.net/" @@ -22,13 +22,16 @@ DEPEND="${RDEPEND} sys-devel/gettext" src_prepare() { - epatch "${FILESDIR}/${P}-windows.patch" + epatch \ + "${FILESDIR}/${P}-windows.patch" \ + "${FILESDIR}/${P}-glibc.patch" sed -i \ -e '/^Encoding/d' \ -e '/^Icon/s/\.png//' \ -e '/^Categories/s/Application;//' \ gqview.desktop \ || die + eautoreconf } src_configure() { |