summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2011-10-04 18:55:49 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2011-10-04 18:55:49 +0200
commit05222ffb2ec1987563da1b6c869fe374b20a2ee8 (patch)
tree522badb8d8d635e00822435ba66ef40902ca80b2 /libre
parent1a501389f91e9316c04f2d47c2d19a4f6f63c43c (diff)
downloadabslibre-05222ffb2ec1987563da1b6c869fe374b20a2ee8.tar.gz
abslibre-05222ffb2ec1987563da1b6c869fe374b20a2ee8.tar.bz2
abslibre-05222ffb2ec1987563da1b6c869fe374b20a2ee8.zip
Update icecat to 7.0, remove unneeded changes. Tab restore still broken.
Diffstat (limited to 'libre')
-rw-r--r--libre/icecat/PKGBUILD6
-rw-r--r--libre/icecat/firefox-version.patch2
-rw-r--r--libre/icecat/python2.7.patch11
3 files changed, 4 insertions, 15 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index af3a0250c..180be0485 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -21,7 +21,7 @@
# * Disabled ContentHandlers and other Google/Yahoo! related services
pkgname=icecat
-pkgver=6.0
+pkgver=7.0
pkgrel=1
pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!"
arch=('i686' 'x86_64' 'mips64el')
@@ -52,7 +52,7 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
# Default options
firefox.js
region.properties)
-md5sums=('9b752e408717ccb50d50f0bafe18a552'
+md5sums=('f486a11f638e208b45b04c29d41de19b'
'e7fe1de533599f4ae645ea1661e4006a'
'e81ad01dbc16ba28bf92ba4b7c309ca7'
'd93fe402b87cd000a869e1fd6badc6c9'
@@ -88,7 +88,7 @@ build() {
sed -i 's/@PRE_RELEASE_SUFFIX@//g' \
browser/base/content/browser.xul
- export LDFLAGS="-Wl,-rpath,/usr/lib/icecat-$pkgver -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed"
+ export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/icecat-$pkgver"
export PYTHON="/usr/bin/python2"
# PGO
diff --git a/libre/icecat/firefox-version.patch b/libre/icecat/firefox-version.patch
index 85a8fb18d..a72eab698 100644
--- a/libre/icecat/firefox-version.patch
+++ b/libre/icecat/firefox-version.patch
@@ -5,7 +5,7 @@ diff -Nur mozilla-2.0.orig//browser/installer/Makefile.in mozilla-2.0/browser/in
include $(DEPTH)/config/autoconf.mk
-+MOZ_APP_VERSION="4.0"
++MOZ_APP_VERSION="7.0"
+
include $(topsrcdir)/config/rules.mk
diff --git a/libre/icecat/python2.7.patch b/libre/icecat/python2.7.patch
deleted file mode 100644
index 05a3e91a0..000000000
--- a/libre/icecat/python2.7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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