diff options
Diffstat (limited to 'libre/icecat')
| -rw-r--r-- | libre/icecat/PKGBUILD | 53 | ||||
| -rw-r--r-- | libre/icecat/firefox-version.patch | 6 | ||||
| -rw-r--r-- | libre/icecat/mozconfig | 2 |
3 files changed, 27 insertions, 34 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 47cc99f42..9ab8d6c71 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -21,17 +21,13 @@ # * Disabled ContentHandlers and other Google/Yahoo! related services pkgname=icecat -pkgver=7.0 +pkgver=7.0.1 pkgrel=1 pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!" arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') -depends=('gtk2' 'gcc-libs' 'mozilla-common' 'nss>=3.12.10' 'libxt' 'libxrender' - 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' - 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'desktop-file-utils' 'libvpx' - 'lcms' 'nspr>=4.8.8' 'libevent' 'libpng' 'cairo') -makedepends=('unzip' 'zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' - 'mesa' 'autoconf2.13' 'gconf' 'xorg-server-xvfb') +depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'sqlite3' 'libnotify' 'desktop-file-utils' 'libvpx' 'libevent' 'hicolor-icon-theme') +makedepends=('p7zip-libre' 'zip' 'pkg-config' 'diffutils' 'python2-libre' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'libidl2' 'xorg-server-xvfb') options=(!buildflags !distcc) url="http://www.gnu.org/software/gnuzilla/" install=icecat.install @@ -40,6 +36,7 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz icecat.desktop icecat-safe.desktop mozilla-firefox-1.0-lang.patch + firefox-version.patch # Search engines internet-archive.xml jamendo-en.xml @@ -52,11 +49,12 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz # Default options firefox.js region.properties) -md5sums=('f486a11f638e208b45b04c29d41de19b' - 'e7fe1de533599f4ae645ea1661e4006a' +md5sums=('eb20dad67baeb5e71c5cfe469dbba378' + '927c3ac9ad0ba682e0ec9b66ed8cc4d3' 'e81ad01dbc16ba28bf92ba4b7c309ca7' 'd93fe402b87cd000a869e1fd6badc6c9' 'bd5db57c23c72a02a489592644f18995' + 'ff4654144499faf630271cddc2261b7c' '462c68585461f8cdc23c93c46f6ee4cf' '2d492295c4308f9bba9ece28d8b3af2d' '937ac0e5392b060d93bd33e761fbfa51' @@ -72,31 +70,26 @@ build() { ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR cd "${srcdir}/${pkgname}-${pkgver}/" - patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" + #patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" # Solve missing reporter locales and preprocessor.pl - cp --remove-destination ${srcdir}/Makefile.in ./browser/locales/ +# cp --remove-destination ${srcdir}/Makefile.in ./browser/locales/ # Default prefs, remove Google stuff 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 + cp "$srcdir/mozconfig" .mozconfig + #patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.patch" + #patch -Np1 -i "$srcdir/firefox-version.patch" - # Kill @PRE_RELEASE_SUFFIX@ from browser.xul because it - # gets set to \177 for an unknown reason - sed -i 's/@PRE_RELEASE_SUFFIX@//g' \ - browser/base/content/browser.xul + # Fix PRE_RELEASE_SUFFIX + sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ + browser/base/Makefile.in - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/icecat-$pkgver" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/icecat-7.0" export PYTHON="/usr/bin/python2" - # PGO - sed -i '/^NO_PROFILE_GUIDED_OPTIMIZE = 1$/d' \ - memory/jemalloc/Makefile.in - echo 'LDFLAGS += -lX11 -lXrender' \ - >> layout/build/Makefile.in - LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS" kill $! || true @@ -106,7 +99,7 @@ package() { ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR cd "${srcdir}/${pkgname}-${pkgver}/" - make -j1 -f client.mk install DESTDIR="${pkgdir}" + make -j1 -f client.mk DESTDIR="$pkgdir" install msg2 "Finishing..." install -m755 -d ${pkgdir}/usr/share/applications @@ -118,15 +111,17 @@ package() { cd ${pkgdir}/usr/lib ln -s ${ICECATDIR} icecat - # Remove included dictionaries, add symlink to system myspell path - # Note: this will cause file conflicts when users have installed dictionaries in the old location - rm -rf "$pkgdir/usr/lib/icecat-$pkgver/dictionaries" - ln -sf /usr/share/myspell/dicts \ - "$pkgdir/usr/lib/icecat-$pkgver/dictionaries" + 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" # We don't want the development stuff 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" + msg2 "Removing proprietary and anti-privacy search engines" rm -f ${pkgdir}${ICECATDIR}/searchplugins/{google,answers,amazondotcom,eBay,yahoo,bing}.xml msg2 "And provide better ones..." diff --git a/libre/icecat/firefox-version.patch b/libre/icecat/firefox-version.patch index a72eab698..ab5dda540 100644 --- a/libre/icecat/firefox-version.patch +++ b/libre/icecat/firefox-version.patch @@ -1,6 +1,6 @@ -diff -Nur mozilla-2.0.orig//browser/installer/Makefile.in mozilla-2.0/browser/installer/Makefile.in ---- mozilla-2.0.orig//browser/installer/Makefile.in 2011-03-03 14:11:20.000000000 -0800 -+++ mozilla-2.0/browser/installer/Makefile.in 2011-03-13 10:08:45.896702838 -0700 +diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in +--- mozilla-release.orig/browser/installer/Makefile.in 2011-09-30 08:45:28.858668017 +0000 ++++ mozilla-release/browser/installer/Makefile.in 2011-09-30 08:51:01.548314685 +0000 @@ -43,6 +43,8 @@ include $(DEPTH)/config/autoconf.mk diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig index 9ece9301f..a5810e33a 100644 --- a/libre/icecat/mozconfig +++ b/libre/icecat/mozconfig @@ -14,7 +14,6 @@ ac_add_options --with-system-libvpx ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-system-cairo -ac_add_options --enable-system-lcms ac_add_options --with-pthreads ac_add_options --enable-default-toolkit=cairo-gtk2 @@ -52,7 +51,6 @@ ac_add_options --disable-static ac_add_options --enable-gio ac_add_options --disable-gnomevfs -ac_add_options --enable-gconf ac_add_options --enable-libnotify export BUILD_OFFICIAL=1 |