[arch-commits] Commit in kdelibs/trunk (PKGBUILD libpng-1.4.patch)
Pierre Schmitz
pierre at archlinux.org
Sun Jan 17 18:44:18 UTC 2010
Date: Sunday, January 17, 2010 @ 13:44:18
Author: pierre
Revision: 63523
fix build with libpng-1.4; hopefully
Added:
kdelibs/trunk/libpng-1.4.patch
Modified:
kdelibs/trunk/PKGBUILD
------------------+
PKGBUILD | 8 ++++++--
libpng-1.4.patch | 14 ++++++++++++++
2 files changed, 20 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-01-17 18:42:46 UTC (rev 63522)
+++ PKGBUILD 2010-01-17 18:44:18 UTC (rev 63523)
@@ -15,11 +15,13 @@
replaces=('arts')
install='kdelibs.install'
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2
- 'kde-applications-menu.patch' 'archlinux-menu.patch' 'abs-syntax-highlight.patch')
+ 'kde-applications-menu.patch' 'archlinux-menu.patch' 'abs-syntax-highlight.patch'
+ 'libpng-1.4.patch')
md5sums=('bc781838ad8cafa479e99139f7f403f3'
'280f34ee159845f8902c31bd499254fc'
'0f214b222bfb0327e7a2b6fb13756895'
- '18ea42696a7f41332a092d6ead7efc6a')
+ '18ea42696a7f41332a092d6ead7efc6a'
+ '8226f4e6033d20612acf2800b3f8ccec')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -30,6 +32,8 @@
patch -p1 -i $srcdir/archlinux-menu.patch
# add syntax highlightning for PKGBUILD and .install files
patch -p1 -i $srcdir/abs-syntax-highlight.patch
+ # fix build with libpng 1.4 (will be fixed in 4.4)
+ patch -p0 -i $srcdir/libpng-1.4.patch || return 1
cd ${srcdir}
mkdir build
Added: libpng-1.4.patch
===================================================================
--- libpng-1.4.patch (rev 0)
+++ libpng-1.4.patch 2010-01-17 18:44:18 UTC (rev 63523)
@@ -0,0 +1,14 @@
+--- khtml/imload/decoders/pngloader.cpp (Revision 1076191)
++++ khtml/imload/decoders/pngloader.cpp (Revision 1076191)
+@@ -93,7 +93,11 @@
+
+ //Ask libPNG to change bit depths we don't support
+ if (bitDepth < 8)
++#if PNG_LIBPNG_VER < 10400
+ png_set_gray_1_2_4_to_8(pngReadStruct);
++#else
++ png_set_expand_gray_1_2_4_to_8(pngReadStruct);
++#endif
+
+ if (bitDepth > 8)
+ png_set_strip_16 (pngReadStruct);
More information about the arch-commits
mailing list