[arch-commits] Commit in chromium/trunk (PKGBUILD gyp-make.patch)

[Pierre Schmitz]

    Date: Thursday, October 28, 2010 @ 06:45:24
  Author: pierre
Revision: 97291

Prepare Chromium 7 to use python2

Modified:
  chromium/trunk/PKGBUILD
Deleted:
  chromium/trunk/gyp-make.patch

----------------+
 PKGBUILD       |   20 ++++++++++++--------
 gyp-make.patch |   33 ---------------------------------
 2 files changed, 12 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-28 10:02:57 UTC (rev 97290)
+++ PKGBUILD	2010-10-28 10:45:24 UTC (rev 97291)
@@ -4,24 +4,22 @@
 # Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=chromium
-pkgver=6.0.472.62
+pkgver=7.0.517.43
 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=('nss' 'gconf' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'bzip2' 'libevent' 'libxss')
-makedepends=('python' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring')
+makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring')
 provides=('chromium-browser')
 conflicts=('chromium-browser')
 install=chromium.install
 source=("http://build.chromium.org/buildbot/official/chromium-${pkgver}.tar.bz2"
-        'chromium.desktop' 'chromium.sh'
-        'gyp-make.patch')
-md5sums=('0618d3f2f5460aa2a68f6b28f2d63a9a'
+        'chromium.desktop' 'chromium.sh')
+md5sums=('48bad976fb375e117ace6b1c7cf69044'
          'c5e849fcb1101149977355c99d8ff78f'
-         '096a46ef386817988250d2d7bddd1b34'
-         '6ac578c512c6a75357d7532211213a92')
+         '096a46ef386817988250d2d7bddd1b34')
 
 build() {
   cd ${srcdir}/chromium-${pkgver}
@@ -33,7 +31,13 @@
 
 ### Configure
 
-  patch -p0 -i ${srcdir}/gyp-make.patch
+  echo 'Use python2 instead of python...'
+  find . -type f -exec \
+	sed -E 's#(/usr/bin/python)$#\12#g;s#(/usr/bin/python2)\.4$#\1#g' -i {} \;
+  # There are still a lot of relative calls which need a workaround
+  mkdir ${srcdir}/python2-path
+  ln -s /usr/bin/python2 ${srcdir}/python2-path/python
+  export PATH="${srcdir}/python2-path/:${PATH}"
 
   # we need to disable system_ssl until "next protocol negotiation" support
   # is available in our nss package

Deleted: gyp-make.patch
===================================================================
--- gyp-make.patch	2010-10-28 10:02:57 UTC (rev 97290)
+++ gyp-make.patch	2010-10-28 10:45:24 UTC (rev 97291)
@@ -1,33 +0,0 @@
---- tools/gyp/pylib/gyp/generator/make.py	(revision 839)
-+++ tools/gyp/pylib/gyp/generator/make.py	(working copy)
-@@ -497,6 +497,12 @@
-   return string
- 
- 
-+def StringToMakefileVariable(string):
-+  """Convert a string to a value that is acceptable as a make variable name."""
-+  # TODO: replace other metacharacters that we encounter.
-+  return string.replace(' ', '_')
-+
-+
- srcdir_prefix = ''
- def Sourceify(path):
-   """Convert a path to its source directory form."""
-@@ -656,7 +662,7 @@
-     part_of_all: flag indicating this target is part of 'all'
-     """
-     for action in actions:
--      name = self.target + '_' + action['action_name']
-+      name = self.target + '_' + StringToMakefileVariable(action['action_name'])
-       self.WriteLn('### Rules for action "%s":' % action['action_name'])
-       inputs = action['inputs']
-       outputs = action['outputs']
-@@ -725,7 +731,7 @@
-     part_of_all: flag indicating this target is part of 'all'
-     """
-     for rule in rules:
--      name = self.target + '_' + rule['rule_name']
-+      name = self.target + '_' + StringToMakefileVariable(rule['rule_name'])
-       count = 0
-       self.WriteLn('### Generated for rule %s:' % name)
-