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

[Evangelos Foutras]

    Date: Friday, February 22, 2013 @ 05:41:26
  Author: foutrelis
Revision: 178432

upgpkg: chromium 25.0.1364.97-1

New upstream release.

Added:
  chromium/trunk/chromium-system-libpng-r0.patch
Modified:
  chromium/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   16 ++++++++++++----
 chromium-system-libpng-r0.patch |   11 +++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-22 00:33:32 UTC (rev 178431)
+++ PKGBUILD	2013-02-22 04:41:26 UTC (rev 178432)
@@ -5,14 +5,14 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=chromium
-pkgver=24.0.1312.70
+pkgver=25.0.1364.97
 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')
 url="http://www.chromium.org/"
 license=('BSD')
 depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss'
-         'libgcrypt' 'ttf-font' 'udev' 'dbus' 'desktop-file-utils'
+         'libgcrypt' 'ttf-font' 'udev' 'dbus' 'harfbuzz' 'desktop-file-utils'
          'hicolor-icon-theme')
 makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring'
              'elfutils' 'subversion' 'nacl-toolchain-newlib')
@@ -24,13 +24,15 @@
         chromium.default
         chromium.sh
         chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch
+        chromium-system-libpng-r0.patch
         chromium-ppapi-r0.patch
         chromium-no-pnacl-r0.patch)
-sha256sums=('d87dce37293f619bb0c5898ffef214b0d1d6e06963da98a0f551709a5debe207'
+sha256sums=('15be31be9614c68b0bc3efc594eea65942a7bb433819736279a60ac4228313e5'
             '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
             '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
             '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9'
             'c1baf14121502efbc2a31b64029dcafa0e28ca5b71ad0e28a3c6342d18198615'
+            'd0a8b8f5b3d25be4bd2f060422c467dc827997a0b69dfc34a6d18dc9d2f36868'
             '1f4b57670d317959bc2dc60e5d2a44aa8fc6028f7ed540cdb502fa0aa99c81bd'
             '44061e1648ac4674ad0b9990c265c96c33de435679f6854e4b54a421d81cbe6c')
 
@@ -48,6 +50,11 @@
   # Fix build with glibc 2.16
   patch -Np1 -i "$srcdir/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch"
 
+  # Fix compilation against system libpng (patch from Gentoo)
+  patch -Np0 -i "$srcdir/chromium-system-libpng-r0.patch"
+  # It somehow still manages to build against bundled libpng
+  find third_party/libpng -type f -not -iname '*.gyp*' -delete
+
   # Fix build without NaCl glibc toolchain (patch from Gentoo)
   patch -Np0 -i "$srcdir/chromium-ppapi-r0.patch"
 
@@ -90,6 +97,7 @@
     -Dproprietary_codecs=1 \
     -Duse_system_bzip2=1 \
     -Duse_system_ffmpeg=0 \
+    -Duse_system_harfbuzz=1 \
     -Duse_system_libevent=1 \
     -Duse_system_libjpeg=1 \
     -Duse_system_libpng=1 \
@@ -118,7 +126,7 @@
     "$pkgdir/usr/lib/chromium/"
 
   if [[ $CARCH == i686 ]]; then
-    rm "$pkgdir/usr/lib/chromium/nacl_irt_x86_64.nexe"
+    rm "$pkgdir"/usr/lib/chromium/nacl_irt{,_srpc}_x86_64.nexe
   fi
 
   # Allow users to override command-line options

Added: chromium-system-libpng-r0.patch
===================================================================
--- chromium-system-libpng-r0.patch	                        (rev 0)
+++ chromium-system-libpng-r0.patch	2013-02-22 04:41:26 UTC (rev 178432)
@@ -0,0 +1,11 @@
+--- build/shim_headers.gypi.orig	2012-12-20 02:51:12.000000000 +0100
++++ build/shim_headers.gypi	2012-12-20 02:51:40.000000000 +0100
+@@ -10,7 +10,7 @@
+ 
+ {
+   'variables': {
+-    'shim_headers_path': '<(INTERMEDIATE_DIR)/shim_headers',
++    'shim_headers_path': '<(SHARED_INTERMEDIATE_DIR)/shim_headers/<(_target_name)',
+   },
+   'direct_dependent_settings': {
+     'include_dirs+': [