summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-10-04 16:46:51 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-10-04 16:46:51 -0300
commit9823361973d7087bca6e7acaf3064168b8571c10 (patch)
tree082291c046f51d633f26bde9d0a734e40a7c3cc8
parent2e39dc019e1eb8077c86a6866f562bff9f4f4035 (diff)
parent05222ffb2ec1987563da1b6c869fe374b20a2ee8 (diff)
Merge branch 'master' of ssh://gparabola/abslibre
Conflicts: libre/icecat/PKGBUILD
-rw-r--r--libre/icecat/PKGBUILD32
-rw-r--r--libre/icecat/firefox-version.patch2
-rw-r--r--libre/icecat/python2.7.patch11
3 files changed, 17 insertions, 28 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index a40959f7c..47cc99f42 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -52,6 +52,21 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
# Default options
firefox.js
region.properties)
+md5sums=('f486a11f638e208b45b04c29d41de19b'
+ 'e7fe1de533599f4ae645ea1661e4006a'
+ 'e81ad01dbc16ba28bf92ba4b7c309ca7'
+ 'd93fe402b87cd000a869e1fd6badc6c9'
+ 'bd5db57c23c72a02a489592644f18995'
+ '462c68585461f8cdc23c93c46f6ee4cf'
+ '2d492295c4308f9bba9ece28d8b3af2d'
+ '937ac0e5392b060d93bd33e761fbfa51'
+ 'cf97082e77e3ef5f1bd74b1db9329965'
+ '24528ca3f7f1e1a0ba735231aa3ac1de'
+ 'c5f00b6b24222aacd5a749d1f59c4d24'
+ 'e1bda0854de7d764f7401c81bb82b5ef'
+ 'ff83f1796ee13d3aec494649491d93cc'
+ '9952048383966926eea6d67384102425'
+ 'f1c76e7e244257856a386ca2de69bdf0')
build() {
ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR
@@ -73,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
@@ -118,18 +133,3 @@ package() {
install -m755 -d ${pkgdir}${ICECATDIR}/searchplugins/
install -m644 ${srcdir}/*.xml ${pkgdir}${ICECATDIR}/searchplugins/
}
-md5sums=('f486a11f638e208b45b04c29d41de19b'
- 'e7fe1de533599f4ae645ea1661e4006a'
- 'e81ad01dbc16ba28bf92ba4b7c309ca7'
- 'd93fe402b87cd000a869e1fd6badc6c9'
- 'bd5db57c23c72a02a489592644f18995'
- '462c68585461f8cdc23c93c46f6ee4cf'
- '2d492295c4308f9bba9ece28d8b3af2d'
- '937ac0e5392b060d93bd33e761fbfa51'
- 'cf97082e77e3ef5f1bd74b1db9329965'
- '24528ca3f7f1e1a0ba735231aa3ac1de'
- 'c5f00b6b24222aacd5a749d1f59c4d24'
- 'e1bda0854de7d764f7401c81bb82b5ef'
- 'ff83f1796ee13d3aec494649491d93cc'
- '9952048383966926eea6d67384102425'
- 'f1c76e7e244257856a386ca2de69bdf0')
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