[arch-commits] Commit in chromium/trunk (PKGBUILD libpng-1.4.patch)
Pierre Schmitz
pierre at archlinux.org
Mon Jan 18 10:51:48 UTC 2010
Date: Monday, January 18, 2010 @ 05:51:48
Author: pierre
Revision: 63708
jpng rebuild
Added:
chromium/trunk/libpng-1.4.patch
Modified:
chromium/trunk/PKGBUILD
------------------+
PKGBUILD | 12 ++++++++----
libpng-1.4.patch | 43 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-01-18 10:48:28 UTC (rev 63707)
+++ PKGBUILD 2010-01-18 10:51:48 UTC (rev 63708)
@@ -3,7 +3,7 @@
pkgname=chromium
pkgver=4.0.249.64
-pkgrel=1
+pkgrel=2
pkgdesc='An open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web'
arch=('i686' 'x86_64')
url='http://www.chromium.org/'
@@ -17,12 +17,13 @@
options=('force')
source=("ftp://ftp.archlinux.org/other/chromium/chromium-${pkgver}.tar.xz"
'chromium.desktop' 'chromium.sh'
- 'drop_sse2.patch' 'ffmpeg_branding_mime.patch')
+ 'drop_sse2.patch' 'ffmpeg_branding_mime.patch' 'libpng-1.4.patch')
md5sums=('04c397ba565e64c592bc5d3034576c6c'
'897de25e9c25a01f8b1b67abe554a6b7'
'93cd6f5f53b15546dc9d3de49118534c'
'ddc1d741d50e8d46765a6b76e8faad32'
- '95567a364197237dcefa3fabb5631822')
+ '95567a364197237dcefa3fabb5631822'
+ 'ac1da2e538ed1e16235b206ff9ba9407')
build() {
cd ${srcdir}/chromium-${pkgver}
@@ -39,7 +40,8 @@
use_system_libxml=1 \
use_system_libxslt=1 \
use_system_bzip2=1 \
- use_system_libpng=1"
+ use_system_libpng=1 \
+ werror="
patch -p0 -i ${srcdir}/ffmpeg_branding_mime.patch || return 1
@@ -47,6 +49,8 @@
# see http://code.google.com/p/chromium/issues/detail?id=9007
patch -p0 -i ${srcdir}/drop_sse2.patch || return 1
+ patch -p0 -i ${srcdir}/libpng-1.4.patch || return 1
+
export PATH=./depot_tools/:$PATH
gclient.py runhooks --force || return 1
Added: libpng-1.4.patch
===================================================================
--- libpng-1.4.patch (rev 0)
+++ libpng-1.4.patch 2010-01-18 10:51:48 UTC (rev 63708)
@@ -0,0 +1,43 @@
+--- src/app/gfx/codec/orig/png_codec.cc 2009-11-19 12:14:46.000000000 -0800
++++ src/app/gfx/codec/png_codec.cc 2009-11-19 12:15:56.000000000 -0800
+@@ -350,9 +350,9 @@
+ return false;
+
+ *png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+- png_voidp_NULL,
+- png_error_ptr_NULL,
+- png_error_ptr_NULL);
++ 0,
++ 0,
++ 0);
+ if (!*png_ptr)
+ return false;
+
+@@ -574,9 +574,9 @@
+ DCHECK(input_color_components * w <= row_byte_width);
+
+ png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+- png_voidp_NULL,
+- png_error_ptr_NULL,
+- png_error_ptr_NULL);
++ 0,
++ 0,
++ 0);
+ if (!png_ptr)
+ return false;
+ png_info* info_ptr = png_create_info_struct(png_ptr);
+--- src/third_party/WebKit/WebCore/platform/image-encoders/skia/orig/PNGImageEncoder.cpp 2009-11-19 13:39:07.000000000 -0800
++++ src/third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp 2009-11-19 13:39:25.000000000 -0800
+@@ -130,9 +130,9 @@
+ }
+
+ png_struct* pngPtr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+- png_voidp_NULL,
+- png_error_ptr_NULL,
+- png_error_ptr_NULL);
++ 0,
++ 0,
++ 0);
+ if (!pngPtr)
+ return false;
+
More information about the arch-commits
mailing list