Thu Mar 1 03:21:19 UTC 2012

5 files changed, 62 insertions, 46 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 0c2159889..6628c2f9b 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -38,6 +38,7 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
         icecat-safe.desktop
         mozilla-firefox-1.0-lang.patch
         firefox-version.patch
+        firefox-install-dir.patch
 	libvpx.patch
 # Search engines
 		internet-archive.xml
@@ -52,12 +53,13 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
         firefox.js
         region.properties)
 md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7'
-         '927c3ac9ad0ba682e0ec9b66ed8cc4d3'
+         'da4ed59ea64fe92fe326981a8efb3b75'
          'e81ad01dbc16ba28bf92ba4b7c309ca7'
          'd93fe402b87cd000a869e1fd6badc6c9'
          'bd5db57c23c72a02a489592644f18995'
-         'ff4654144499faf630271cddc2261b7c'
-         'e5d6c83b98d2d2ac69ff4d277702ff55'
+         '8f555198a7885f7d33d7525a101a6550'
+         '1e4bcac59e93d21fffa6a1d1ad235247'
+         '5d418ecdbdb9f40597df6b978b0b5ee5'
          '462c68585461f8cdc23c93c46f6ee4cf'
          '2d492295c4308f9bba9ece28d8b3af2d'
          '937ac0e5392b060d93bd33e761fbfa51'
@@ -73,6 +75,7 @@ build() {
   ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR
 
   cd "${srcdir}/${pkgname}-${pkgver}/"
+  patch -Np1 -i "$srcdir/firefox-install-dir.patch"
   patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch"
   patch -Np1 -i "${srcdir}/libvpx.patch"
 
@@ -83,15 +86,15 @@ build() {
   cp --remove-destination ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/
   cp --remove-destination ${srcdir}/firefox.js ./browser/app/profile/
 
-  cp "$srcdir/mozconfig" .mozconfig
-  patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.patch"
-  patch -Np1 -i "$srcdir/firefox-version.patch"
+  cp "${srcdir}/mozconfig" .mozconfig
+  patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch"
+  patch -Np1 -i "${srcdir}/firefox-version.patch"
 
   # Fix PRE_RELEASE_SUFFIX
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
       browser/base/Makefile.in
 
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/icecat-7.0"
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/icecat-${pkgver}"
   export PYTHON="/usr/bin/python2"
 
   LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
@@ -103,7 +106,7 @@ package() {
   ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR
 
   cd "${srcdir}/${pkgname}-${pkgver}/"
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
+  make -j1 -f client.mk DESTDIR="${pkgdir}" install
 
   msg2 "Finishing..."
   install -m755 -d ${pkgdir}/usr/share/applications
@@ -115,16 +118,16 @@ package() {
   cd ${pkgdir}/usr/lib
   ln -s ${ICECATDIR} icecat
 
-  rm -rf "$pkgdir"/usr/lib/icecat-7.0/{dictionaries,hyphenation}
-  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/icecat-7.0/dictionaries"
-  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/icecat-7.0/hyphenation"
+  rm -rf "${pkgdir}"/usr/lib/icecat-${pkgver}/{dictionaries,hyphenation}
+  ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/icecat-${pkgver}/dictionaries"
+  ln -sf /usr/share/hyphen "${pkgdir}/usr/lib/icecat-${pkgver}/hyphenation"
 
   # We don't want the development stuff
-  rm -r "$pkgdir"/usr/{include,lib/icecat-devel-$pkgver,share/idl}
+  rm -r "${pkgdir}"/usr/{include,lib/icecat-devel-$pkgver,share/idl}
 
   #workaround for now
   #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf /usr/lib/icecat-7.0/icecat-bin "$pkgdir/usr/lib/icecat-7.0/icecat"
+  ln -sf /usr/lib/icecat-${pkgver}/icecat-bin "${pkgdir}/usr/lib/icecat-${pkgver}/icecat"
 
   msg2 "Removing proprietary and anti-privacy search engines"
   rm -f ${pkgdir}${ICECATDIR}/searchplugins/{google,answers,amazondotcom,eBay,yahoo,bing}.xml
diff --git a/libre/icecat/firefox-install-dir.patch b/libre/icecat/firefox-install-dir.patch
new file mode 100644
index 000000000..b6f9700b3
--- /dev/null
+++ b/libre/icecat/firefox-install-dir.patch
@@ -0,0 +1,28 @@
+diff -Nur mozilla-release.orig/config/autoconf.mk.in mozilla-release/config/autoconf.mk.in
+--- mozilla-release.orig/config/autoconf.mk.in	2011-11-06 14:06:44.462920048 +0000
++++ mozilla-release/config/autoconf.mk.in	2011-11-06 14:20:45.124169469 +0000
+@@ -68,8 +68,8 @@
+ mandir		= @mandir@
+ idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+
+ DIST		= $(DEPTH)/dist
+ LIBXUL_SDK      = @LIBXUL_SDK@
+diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in mozilla-release/js/src/config/autoconf.mk.in
+--- mozilla-release.orig/js/src/config/autoconf.mk.in	2011-11-06 14:06:45.586263727 +0000
++++ mozilla-release/js/src/config/autoconf.mk.in	2011-11-06 14:21:01.770993669 +0000
+@@ -61,8 +61,8 @@
+ datadir		= @datadir@
+ mandir		= @mandir@
+
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+
+ TOP_DIST	= @TOP_DIST@
+ ifneq (,$(filter /%,$(TOP_DIST)))
diff --git a/libre/icecat/firefox-version.patch b/libre/icecat/firefox-version.patch
index ab5dda540..8b2d74896 100644
--- a/libre/icecat/firefox-version.patch
+++ b/libre/icecat/firefox-version.patch
@@ -5,7 +5,7 @@ diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/bro
  
  include $(DEPTH)/config/autoconf.mk
  
-+MOZ_APP_VERSION="7.0"
++MOZ_APP_VERSION="10.0"
 +
  include $(topsrcdir)/config/rules.mk
  
diff --git a/libre/icecat/libvpx.patch b/libre/icecat/libvpx.patch
index 48b71c077..f883b8e08 100644
--- a/libre/icecat/libvpx.patch
+++ b/libre/icecat/libvpx.patch
@@ -1,5 +1,6 @@
---- icecat-10.0/configure.in.orig       2012-02-28 13:42:56.601961717 -0200
-+++ icecat-10.0/configure.in    2012-02-28 13:45:39.311963210 -0200
+diff -Nur mozilla-release.orig/configure.in mozilla-release/configure.in
+--- mozilla-release.orig/configure.in	2012-02-05 16:01:35.722024142 +0000
++++ mozilla-release/configure.in	2012-02-05 16:03:34.871064547 +0000
 @@ -5629,7 +5629,7 @@
              dnl v0.9.6 one to check for.
              AC_TRY_COMPILE([
diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
index a5810e33a..da11f9faa 100644
--- a/libre/icecat/mozconfig
+++ b/libre/icecat/mozconfig
@@ -1,8 +1,9 @@
 . $topsrcdir/browser/config/mozconfig
 
-ac_add_options --disable-official-branding
 ac_add_options --prefix=/usr
 ac_add_options --libdir=/usr/lib
+
+# System libraries
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
@@ -13,53 +14,36 @@ ac_add_options --with-system-libevent
 ac_add_options --with-system-libvpx
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
 ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
 ac_add_options --with-pthreads
 
-ac_add_options --enable-default-toolkit=cairo-gtk2
+# Features
+ac_add_options --disable-official-branding
 ac_add_options --disable-safe-browsing
-ac_add_options --enable-extensions=default
 ac_add_options --enable-startup-notification
-ac_add_options --enable-pango
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --enable-smil
-ac_add_options --enable-canvas3d
-ac_add_options --enable-places
-ac_add_options --enable-url-classifier
-
-ac_add_options --enable-optimize
-ac_add_options --enable-strip
-ac_add_options --enable-install-strip
-ac_add_options --enable-jemalloc
-ac_add_options --enable-xterm-updates
-ac_add_options --enable-printing
-ac_add_options --enable-xinerama
+ac_add_options --enable-gio
+ac_add_options --enable-extensions=default
 ac_add_options --with-distribution-id=org.gnu.gnuzilla
 ac_add_options --with-user-appdir=.gnuzilla
 ac_add_options --with-branding=browser/branding/unofficial
 
-ac_add_options --disable-javaxpcom
+ac_add_options --disable-gnomevfs
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --disable-tests
 ac_add_options --disable-mochitest
-ac_add_options --disable-debug
 ac_add_options --disable-installer
-ac_add_options --disable-pedantic
-ac_add_options --disable-static
 
-ac_add_options --enable-gio
-ac_add_options --disable-gnomevfs
-ac_add_options --enable-libnotify
-
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
+# Optimization
+ac_add_options --enable-optimize
 
 # PGO
 ac_add_options --enable-profile-guided-optimization
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
 mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1