summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsibel <lesibel@free.fr>2011-01-02 08:04:04 +0100
committersibel <lesibel@free.fr>2011-01-02 08:04:04 +0100
commitbd0052227c4415ee3597d9f590f836ab9c217938 (patch)
treeb017e179044ed2ec913d15196e2604b257b2a948
parent4ebb5857b380581a9927556628734670467e1a18 (diff)
downloadnutyx-extra-bd0052227c4415ee3597d9f590f836ab9c217938.tar.gz
nutyx-extra-bd0052227c4415ee3597d9f590f836ab9c217938.tar.bz2
nutyx-extra-bd0052227c4415ee3597d9f590f836ab9c217938.tar.xz
nutyx-extra-bd0052227c4415ee3597d9f590f836ab9c217938.zip
firefox#3.6.13-1, correction python
-rw-r--r--extra/firefox/Pkgfile6
-rw-r--r--extra/firefox/python2.7.patch11
2 files changed, 14 insertions, 3 deletions
diff --git a/extra/firefox/Pkgfile b/extra/firefox/Pkgfile
index 686120fa2..eb09c231c 100644
--- a/extra/firefox/Pkgfile
+++ b/extra/firefox/Pkgfile
@@ -1,8 +1,8 @@
-# Description: Navigateur internet de Mozilla
+# Decription: Navigateur internet de Mozilla
# URL: http://www.mozilla.com/firefox/
# Maintainer: NuTyX core team
# Packager: thierryn1 at hispeed dot ch
-# Depends on: desktop-file-utils, alsa-lib, gtk, libidl, pango, python, curl, nss, libnotify, sqlite3, dbus-glib, libgnomeui
+# Depends on: desktop-file-utils, alsa-lib, gtk, libidl, pango, python2, curl, nss, libnotify, sqlite3, dbus-glib, libgnomeui
name=firefox
version=3.6.13
@@ -20,7 +20,7 @@ build() {
cd mozilla-1.9.2
sed -e "s/#CFLAGS#/$CFLAGS/" $SRC/mozconfig > .mozconfig
- ./configure
+ PYTHON=python2 ./configure
make
diff --git a/extra/firefox/python2.7.patch b/extra/firefox/python2.7.patch
new file mode 100644
index 000000000..05a3e91a0
--- /dev/null
+++ b/extra/firefox/python2.7.patch
@@ -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