[arch-commits] Commit in chromium/trunk (PKGBUILD createSource libpng-1.4.patch)

[Pierre Schmitz]

    Date: Thursday, March 25, 2010 @ 16:11:40
  Author: pierre
Revision: 73429

upstream update; disable system ssl for now

SSL seems to hang if you access archlinux.de for example; so no binary pacakges for now

Modified:
  chromium/trunk/PKGBUILD
  chromium/trunk/createSource
  chromium/trunk/libpng-1.4.patch

------------------+
 PKGBUILD         |   12 ++++++++----
 createSource     |    3 ++-
 libpng-1.4.patch |   43 -------------------------------------------
 3 files changed, 10 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-25 13:56:23 UTC (rev 73428)
+++ PKGBUILD	2010-03-25 20:11:40 UTC (rev 73429)
@@ -3,7 +3,7 @@
 # Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=chromium
-pkgver=5.0.307.11
+pkgver=5.0.342.7
 pkgrel=1
 pkgdesc='The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser.'
 arch=('i686' 'x86_64')
@@ -19,18 +19,21 @@
 source=("ftp://ftp.archlinux.org/other/chromium/chromium-${pkgver}.tar.xz"
         'chromium.desktop' 'chromium.sh'
         'drop_sse2.patch' 'ffmpeg_branding_mime.patch' 'libpng-1.4.patch')
-md5sums=('74fb683dcb999086d8cf2e59da968319'
+md5sums=('3f06dfaaaba42a48fc765b358a618ca2'
          '897de25e9c25a01f8b1b67abe554a6b7'
          '93cd6f5f53b15546dc9d3de49118534c'
          'dfbc18bb26dffa2dc6d4d3a857730902'
          'ae9e26e6c2d164e6af0e513dae2273a3'
-         'e3b482665b179e06ff852c58463706a8')
+         'bb75bfdfe85db26639abbea9054b85f9')
 
 build() {
 	cd ${srcdir}/chromium-${pkgver}
 
 	export GYP_GENERATORS='make'
 	export BUILDTYPE='Release'
+	# we need to disable system_ssl until "next protocol negotiation" support
+	# is available in our nss package
+	# see https://bugzilla.mozilla.org/show_bug.cgi?id=547312
 	export GYP_DEFINES="gcc_version=44 \
 		no_strict_aliasing=1 \
 		linux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
@@ -40,11 +43,12 @@
 		use_system_libjpeg=1 \
 		use_system_libxslt=1 \
 		use_system_bzip2=1 \
+		use_system_zlib=1 \
 		use_system_libpng=1 \
 		use_system_ffmpeg=1 \
 		use_system_yasm=1 \
 		use_system_libevent=1 \
-		use_system_ssl=1"
+		use_system_ssl=0"
 
 	patch -p0 -i ${srcdir}/ffmpeg_branding_mime.patch || return 1
 	# i686 does not include SSE2

Modified: createSource
===================================================================
--- createSource	2010-03-25 13:56:23 UTC (rev 73428)
+++ createSource	2010-03-25 20:11:40 UTC (rev 73429)
@@ -22,9 +22,10 @@
 cd $tmp/chromium-$pkgver
 
 # this should be updated to a more recent revision on major updates
-svn co -r38382 -q http://src.chromium.org/svn/trunk/tools/depot_tools/ depot_tools
+svn co -r42572 -q http://src.chromium.org/svn/trunk/tools/depot_tools/ depot_tools
 
 export PATH=./depot_tools/:$PATH
+chmod +x ./depot_tools/gclient.py
 gclient.py config http://src.chromium.org/svn/releases/$pkgver
 sed -e '15i\      "src/third_party/WebKit/LayoutTests": None,' \
     -e '15i\      "src/chrome/tools/test/reference_build": None,' \

Modified: libpng-1.4.patch
===================================================================
--- libpng-1.4.patch	2010-03-25 13:56:23 UTC (rev 73428)
+++ libpng-1.4.patch	2010-03-25 20:11:40 UTC (rev 73429)
@@ -1,46 +1,3 @@
---- src/app/gfx/codec/png_codec.cc
-+++ src/app/gfx/codec/png_codec.cc
-@@ -190,7 +190,7 @@ void DecodeInfoCallback(png_struct* png_ptr, png_info* info_ptr) {
-   unsigned long long total_size =
-       static_cast<unsigned long long>(w) * static_cast<unsigned long long>(h);
-   if (total_size > ((1 << 29) - 1))
--    longjmp(png_ptr->jmpbuf, 1);
-+    longjmp(png_jmpbuf(png_ptr), 1);
-   state->width = static_cast<int>(w);
-   state->height = static_cast<int>(h);
- 
-@@ -279,7 +279,7 @@ void DecodeInfoCallback(png_struct* png_ptr, png_info* info_ptr) {
-     }
-   } else {
-     NOTREACHED() << "Unknown input channels";
--    longjmp(png_ptr->jmpbuf, 1);
-+    longjmp(png_jmpbuf(png_ptr), 1);
-   }
- 
-   if (state->bitmap) {
-@@ -349,10 +349,7 @@ bool BuildPNGStruct(const unsigned char* input, size_t input_size,
-   if (png_sig_cmp(const_cast<unsigned char*>(input), 0, 8) != 0)
-     return false;
- 
--  *png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
--                                    png_voidp_NULL,
--                                    png_error_ptr_NULL,
--                                    png_error_ptr_NULL);
-+  *png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-   if (!*png_ptr)
-     return false;
- 
-@@ -574,9 +571,7 @@ bool PNGCodec::Encode(const unsigned char* input, ColorFormat format,
-   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);
-+                                                NULL, NULL, NULL);
-   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 @@