diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2006-07-03 16:57:44 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2006-07-03 16:57:44 +0000 |
| commit | 1d9cc1a60cd5bf936d4b7b1b65a0353c16bdc125 (patch) | |
| tree | e0c88c7ca4858f22a9959f09cb290fa75f431650 /net-print | |
| parent | Some cleanups suggested by FlameEyes in bug #90707 (diff) | |
| download | gentoo-2-1d9cc1a60cd5bf936d4b7b1b65a0353c16bdc125.tar.gz gentoo-2-1d9cc1a60cd5bf936d4b7b1b65a0353c16bdc125.tar.bz2 gentoo-2-1d9cc1a60cd5bf936d4b7b1b65a0353c16bdc125.zip | |
libpng >=1.2.10 compat thanks to kojiro in bug 136346
(Portage version: 2.1.1_pre2-r2)
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/ChangeLog | 6 | ||||
| -rw-r--r-- | net-print/cups/cups-1.1.23-r7.ebuild | 9 | ||||
| -rw-r--r-- | net-print/cups/files/cups-1.1.23-image-png.patch | 12 |
3 files changed, 24 insertions, 3 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index 6e959602d68c..175c3f3db2f6 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/cups # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.188 2006/07/02 22:19:37 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.189 2006/07/03 16:57:44 genstef Exp $ + + 03 Jul 2006; Stefan Schweizer <genstef@gentoo.org> + +files/cups-1.1.23-image-png.patch, cups-1.1.23-r7.ebuild: + libpng >=1.2.10 compat thanks to kojiro in bug 136346 02 Jul 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.1-r2.ebuild: Add ppds useflag to drag in the linuxprinting.org ppds as suggested by diff --git a/net-print/cups/cups-1.1.23-r7.ebuild b/net-print/cups/cups-1.1.23-r7.ebuild index 625d7678edfd..33c08065d57e 100644 --- a/net-print/cups/cups-1.1.23-r7.ebuild +++ b/net-print/cups/cups-1.1.23-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r7.ebuild,v 1.18 2006/06/22 07:04:36 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r7.ebuild,v 1.19 2006/07/03 16:57:44 genstef Exp $ inherit eutils flag-o-matic pam autotools @@ -23,7 +23,7 @@ DEP="pam? ( virtual/pam ) gnutls? ( net-libs/gnutls ) ) slp? ( >=net-libs/openslp-1.0.4 ) - <media-libs/libpng-1.2.10 + media-libs/libpng >=media-libs/tiff-3.5.5 >=media-libs/jpeg-6b" DEPEND="${DEP} @@ -53,6 +53,11 @@ src_unpack() { epatch ${FILESDIR}/${P}-respectldflags.patch eautoconf + # 1.2.10 compat thanks to kojiro in bug 136346 + if has_version '>=media-libs/libpng-1.2.10'; then + epatch ${FILESDIR}/${P}-image-png.patch + fi + # disable builtin xpdf sed -i -e "s:pdftops::" Makefile } diff --git a/net-print/cups/files/cups-1.1.23-image-png.patch b/net-print/cups/files/cups-1.1.23-image-png.patch new file mode 100644 index 000000000000..726317ac9017 --- /dev/null +++ b/net-print/cups/files/cups-1.1.23-image-png.patch @@ -0,0 +1,12 @@ +--- filter/image-png.c.orig 2005-01-03 14:29:57.000000000 -0500 ++++ filter/image-png.c 2006-07-03 11:40:25.000000000 -0400 +@@ -252,7 +252,8 @@ + } + + png_read_end(pp, info); +- png_read_destroy(pp, info, NULL); ++ png_destroy_read_struct(&pp, &info, NULL); ++ //png_read_destroy(pp, info, NULL); + + fclose(fp); + free(in); |