Date: Tuesday, September 27, 2011 @ 12:40:04 Author: ibiru Revision: 138695
update to 7.0 Modified: firefox/trunk/PKGBUILD firefox/trunk/mozconfig -----------+ PKGBUILD | 29 +++++++++++------------------ mozconfig | 2 -- 2 files changed, 11 insertions(+), 20 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-09-27 16:39:51 UTC (rev 138694) +++ PKGBUILD 2011-09-27 16:40:04 UTC (rev 138695) @@ -2,23 +2,19 @@ # Contributor: Jakub Schmidtke <[email protected]> pkgname=firefox -pkgver=6.0.2 +pkgver=7.0 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org" arch=('i686' 'x86_64') 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=('unzip' 'zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'libidl2' 'xorg-server-xvfb') url="http://www.mozilla.org/projects/firefox"; install=firefox.install source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//${pkgver}/source/firefox-${pkgver}.source.tar.bz2 mozconfig firefox.desktop mozilla-firefox-1.0-lang.patch) -md5sums=('140ca0cfd57905139f8f71a527afb283' - '5eb9abbd2591ee337981024008d93988' +md5sums=('673a015a23e3fefa18d80db68c8b9fc1' + 'd88607e98806db2a7eb222b0c8635af0' 'bdeb0380c7fae30dd0ead6d2d3bc5873' 'bd5db57c23c72a02a489592644f18995') @@ -28,10 +24,9 @@ cp "$srcdir/mozconfig" .mozconfig patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.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="-Wl,-rpath,/usr/lib/firefox-$pkgver -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed" export PYTHON="/usr/bin/python2" @@ -59,11 +54,9 @@ install -Dm644 "$srcdir/firefox.desktop" \ "$pkgdir/usr/share/applications/firefox.desktop" - # 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/firefox-$pkgver/dictionaries" - ln -sf /usr/share/myspell/dicts \ - "$pkgdir/usr/lib/firefox-$pkgver/dictionaries" + rm -rf "$pkgdir"/usr/lib/firefox-$pkgver/{dictionaries,hyphenation} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/firefox-$pkgver/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/firefox-$pkgver/hyphenation" # We don't want the development stuff rm -r "$pkgdir"/usr/{include,lib/firefox-devel-$pkgver,share/idl} Modified: mozconfig =================================================================== --- mozconfig 2011-09-27 16:39:51 UTC (rev 138694) +++ mozconfig 2011-09-27 16:40:04 UTC (rev 138695) @@ -13,7 +13,6 @@ 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 @@ -49,7 +48,6 @@ ac_add_options --enable-gio ac_add_options --disable-gnomevfs -ac_add_options --enable-gconf ac_add_options --enable-libnotify export BUILD_OFFICIAL=1
