diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-08-08 17:15:56 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-08-08 17:15:56 +0000 |
| commit | 668e389b83a04f89b9c84fa20bfc1ca94cefadf7 (patch) | |
| tree | 16508b4f33dd757d25d14a9a4843570fe6176295 /media-gfx/pornview | |
| parent | Restrict 2.4 and 2.5 Python ABIs. Update HOMEPAGE. Patch by Arfrever. (diff) | |
| download | gentoo-2-668e389b83a04f89b9c84fa20bfc1ca94cefadf7.tar.gz gentoo-2-668e389b83a04f89b9c84fa20bfc1ca94cefadf7.tar.bz2 gentoo-2-668e389b83a04f89b9c84fa20bfc1ca94cefadf7.zip | |
Fix building with libpng15 wrt #378173 by Diego Elio Pettenò. Make compatible with the gold linker.
(Portage version: 2.2.0_alpha50/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/pornview')
| -rw-r--r-- | media-gfx/pornview/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/pornview/files/pornview-0.2.0_pre1-libpng15.patch | 11 | ||||
| -rw-r--r-- | media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild | 16 |
3 files changed, 28 insertions, 6 deletions
diff --git a/media-gfx/pornview/ChangeLog b/media-gfx/pornview/ChangeLog index 632deafb9f42..b5bb435c5783 100644 --- a/media-gfx/pornview/ChangeLog +++ b/media-gfx/pornview/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/pornview # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/ChangeLog,v 1.40 2011/03/28 16:49:16 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/ChangeLog,v 1.41 2011/08/08 17:15:56 ssuominen Exp $ + + 08 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> + pornview-0.2.0_pre1-r2.ebuild, +files/pornview-0.2.0_pre1-libpng15.patch: + Fix building with libpng15 wrt #378173 by Diego Elio Pettenò. Make + compatible with the gold linker. 28 Mar 2011; Christoph Mende <angelos@gentoo.org> pornview-0.2.0_pre1-r1.ebuild, pornview-0.2.0_pre1-r2.ebuild: diff --git a/media-gfx/pornview/files/pornview-0.2.0_pre1-libpng15.patch b/media-gfx/pornview/files/pornview-0.2.0_pre1-libpng15.patch new file mode 100644 index 000000000000..8830a03edee9 --- /dev/null +++ b/media-gfx/pornview/files/pornview-0.2.0_pre1-libpng15.patch @@ -0,0 +1,11 @@ +--- src/support/pixbuf_utils.c ++++ src/support/pixbuf_utils.c +@@ -60,7 +60,7 @@ + return FALSE; + } + +- if (setjmp (png_ptr->jmpbuf)) ++ if (setjmp (png_jmpbuf(png_ptr))) + { + png_destroy_write_struct (&png_ptr, &info_ptr); + fclose (handle); diff --git a/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild b/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild index 4445f629271c..096702133a8d 100644 --- a/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild +++ b/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild,v 1.2 2011/03/28 16:49:16 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild,v 1.3 2011/08/08 17:15:56 ssuominen Exp $ EAPI=3 inherit eutils toolchain-funcs @@ -25,14 +25,20 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${P/_/} src_prepare() { - epatch "${FILESDIR}"/${P}-4.diff \ + epatch \ + "${FILESDIR}"/${P}-4.diff \ "${FILESDIR}"/traypatch.diff \ "${FILESDIR}"/${P}-desktop-entry.patch \ "${FILESDIR}"/${P}-new-gtk-object-system.diff \ "${FILESDIR}"/${P}-fix-array-boundaries.patch \ - "${FILESDIR}"/${P}-fix-segfault-comment.patch - #Bug 325879 - sed -i -e '1i #pragma GCC optimize ("O0")' src/comment.c || die + "${FILESDIR}"/${P}-fix-segfault-comment.patch \ + "${FILESDIR}"/${P}-libpng15.patch + + # $X_LIBS fails to bring in -lX11 and the build fails with undefined + # references with strict linker + sed -i -e 's:view_LDADD =:view_LDADD = -lX11:' src/Makefile.{am,in} || die + #Bug 325879 + sed -i -e '1i #pragma GCC optimize ("O0")' src/comment.c || die } src_configure() { |