diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-09 14:13:49 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-09 14:13:49 +0000 |
| commit | 45dcb5fa8e2b27f74cd0a764f6f9223da2b9896e (patch) | |
| tree | 907bf42559297336cddeb07b05988b7c9cc67017 | |
| parent | Automated update of use.local.desc (diff) | |
| download | gentoo-2-45dcb5fa8e2b27f74cd0a764f6f9223da2b9896e.tar.gz gentoo-2-45dcb5fa8e2b27f74cd0a764f6f9223da2b9896e.tar.bz2 gentoo-2-45dcb5fa8e2b27f74cd0a764f6f9223da2b9896e.zip | |
Fix building with libpng14.
(Portage version: 2.2_rc66/cvs/Linux x86_64)
| -rw-r--r-- | x11-wm/pekwm/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-wm/pekwm/files/pekwm-0.1.11-libpng14.patch | 22 | ||||
| -rw-r--r-- | x11-wm/pekwm/pekwm-0.1.11.ebuild | 17 |
3 files changed, 37 insertions, 8 deletions
diff --git a/x11-wm/pekwm/ChangeLog b/x11-wm/pekwm/ChangeLog index 6ee46d750279..df7c2432cbd0 100644 --- a/x11-wm/pekwm/ChangeLog +++ b/x11-wm/pekwm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/pekwm # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/ChangeLog,v 1.49 2010/01/22 16:51:47 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/ChangeLog,v 1.50 2010/03/09 14:13:48 ssuominen Exp $ + + 09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> pekwm-0.1.11.ebuild, + +files/pekwm-0.1.11-libpng14.patch: + Fix building with libpng14. 22 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> pekwm-0.1.11.ebuild: Require SLOT="0" of media-libs/jpeg for headers. diff --git a/x11-wm/pekwm/files/pekwm-0.1.11-libpng14.patch b/x11-wm/pekwm/files/pekwm-0.1.11-libpng14.patch new file mode 100644 index 000000000000..98d394f825eb --- /dev/null +++ b/x11-wm/pekwm/files/pekwm-0.1.11-libpng14.patch @@ -0,0 +1,22 @@ +http://repos.archlinux.org/wsvn/packages/pekwm/trunk/libpng-1.4.patch + +--- src/PImageLoaderPng.cc ++++ src/PImageLoaderPng.cc +@@ -108,7 +108,7 @@ + + // gray -> 8 bit gray + if (color_type == PNG_COLOR_TYPE_GRAY && (bpp < 8)) { +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + } + + if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { +@@ -179,7 +179,7 @@ + + status = fread(sig, 1, PImageLoaderPng::PNG_SIG_BYTES, fp); + if (status == PImageLoaderPng::PNG_SIG_BYTES) { +- return (png_check_sig(sig, PImageLoaderPng::PNG_SIG_BYTES) != 0); ++ return (png_sig_cmp(sig, 0, PImageLoaderPng::PNG_SIG_BYTES) == 0); + } + return false; + } diff --git a/x11-wm/pekwm/pekwm-0.1.11.ebuild b/x11-wm/pekwm/pekwm-0.1.11.ebuild index 67e3c5300590..274b9bd95770 100644 --- a/x11-wm/pekwm/pekwm-0.1.11.ebuild +++ b/x11-wm/pekwm/pekwm-0.1.11.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/pekwm-0.1.11.ebuild,v 1.2 2010/01/22 16:51:47 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/pekwm-0.1.11.ebuild,v 1.3 2010/03/09 14:13:48 ssuominen Exp $ -EAPI=1 +EAPI=2 +inherit eutils DESCRIPTION="A small window mananger based on aewm++" HOMEPAGE="http://pekwm.org/" @@ -24,7 +25,11 @@ DEPEND="media-libs/jpeg:0 RDEPEND="${DEPEND} x11-apps/xprop" -src_compile() { +src_prepare() { + epatch "${FILESDIR}"/${P}-libpng14.patch +} + +src_configure() { econf \ $(use_enable debug) \ $(use_enable truetype xft) \ @@ -35,13 +40,11 @@ src_compile() { --enable-image-xpm \ --enable-menus \ --enable-shape \ - --enable-xrandr || die "econf failed" - - emake || die "emake failed" + --enable-xrandr } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install || die dodoc AUTHORS ChangeLog NEWS README rm "${WORKDIR}/themes/Ace/.theme.swp" |