[arch-commits] Commit in firefox/trunk (PKGBUILD mozconfig python2.7.patch)

[Ionut Biru]

    Date: Tuesday, October 19, 2010 @ 14:27:02
  Author: ibiru
Revision: 96278

upgpkg: firefox 3.6.11-1
update to 3.6.11

Added:
  firefox/trunk/python2.7.patch
Modified:
  firefox/trunk/PKGBUILD
  firefox/trunk/mozconfig

-----------------+
 PKGBUILD        |   17 ++++++++++-------
 mozconfig       |    2 +-
 python2.7.patch |   11 +++++++++++
 3 files changed, 22 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-19 18:22:05 UTC (rev 96277)
+++ PKGBUILD	2010-10-19 18:27:02 UTC (rev 96278)
@@ -2,14 +2,14 @@
 # Contributor: Jakub Schmidtke <sjakub at gmail.com>
 
 pkgname=firefox
-pkgver=3.6.10
+pkgver=3.6.11
 pkgrel=1
-_xulver=1.9.2.10
+_xulver=1.9.2.11
 pkgdesc="Standalone web browser from mozilla.org"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
 depends=("xulrunner=${_xulver}" 'desktop-file-utils')
-makedepends=('zip' 'pkg-config' 'diffutils' 'libgnomeui>=2.24.1' 'python' 'wireless_tools')
+makedepends=('zip' 'pkg-config' 'diffutils' 'libgnomeui>=2.24.1' 'python2' 'wireless_tools' 'autoconf2.13')
 install=firefox.install
 url="http://www.mozilla.org/projects/firefox"
 source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}/source/firefox-${pkgver}.source.tar.bz2
@@ -19,15 +19,17 @@
         mozilla-firefox-1.0-lang.patch
         browser-defaulturls.patch
         firefox-version.patch
-	firefox-agent.patch)
-md5sums=('59ee60ddfd8b33e99a24788d3b12adb3'
-         '1e4283a24953f8d0c6a5c00a36ae0981'
+	firefox-agent.patch
+        python2.7.patch)
+md5sums=('f698dd0f8f145d84933a50f69662c8db'
+         'ca385167401b98ef7adc6529e4b53205'
          'ba96924ece1d77453e462429037a2ce5'
          '6f38a5899034b7786cb1f75ad42032b8'
          'bd5db57c23c72a02a489592644f18995'
          '1807651225b021e043154f8bba715a19'
          '92c11c66dd69b03f214002fededd1fc8'
-         'f437e94acff8f810991271ef4677d859')
+         'f437e94acff8f810991271ef4677d859'
+         'ab3dc9aecae7f08b9492fb3c00a5fd28')
 
 build() {
   cd "${srcdir}/mozilla-1.9.2"
@@ -35,6 +37,7 @@
   patch -Np1 -i "${srcdir}/browser-defaulturls.patch"
   patch -Np1 -i "${srcdir}/firefox-version.patch"
   patch -Np1 -i "${srcdir}/firefox-agent.patch"
+  patch -Np0 -i "${srcdir}/python2.7.patch"
 
   cp "${srcdir}/mozconfig" .mozconfig
   unset CFLAGS

Modified: mozconfig
===================================================================
--- mozconfig	2010-10-19 18:22:05 UTC (rev 96277)
+++ mozconfig	2010-10-19 18:27:02 UTC (rev 96278)
@@ -17,7 +17,7 @@
 ac_add_options --disable-xprint
 ac_add_options --enable-strip
 ac_add_options --enable-pango
-ac_add_options --enable-system-cairo
+#ac_add_options --enable-system-cairo
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
 ac_add_options --enable-startup-notification

Added: python2.7.patch
===================================================================
--- python2.7.patch	                        (rev 0)
+++ python2.7.patch	2010-10-19 18:27:02 UTC (rev 96278)
@@ -0,0 +1,11 @@
+--- configure.in	2010-10-12 10:44:37.000000000 -0700
++++ configure.in~	2010-10-19 09:51:49.660019364 -0700
+@@ -811,7 +811,7 @@
+     AC_MSG_RESULT([yes])    
+ fi
+ 
+-MOZ_PATH_PROGS(PYTHON, $PYTHON python2.5 python2.4 python)
++MOZ_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.5 python2.4 python)
+ if test -z "$PYTHON"; then
+     AC_MSG_ERROR([python was not found in \$PATH])
+ fi