Date: Wednesday, April 30, 2014 @ 13:19:10 Author: foutrelis Revision: 211920
upgpkg: firefox 29.0-1 New upstream release. Modified: firefox/trunk/PKGBUILD firefox/trunk/firefox-install-dir.patch firefox/trunk/mozconfig ---------------------------+ PKGBUILD | 15 ++++++--------- firefox-install-dir.patch | 36 ++++++++++-------------------------- mozconfig | 1 + 3 files changed, 17 insertions(+), 35 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-04-30 11:18:57 UTC (rev 211919) +++ PKGBUILD 2014-04-30 11:19:10 UTC (rev 211920) @@ -3,7 +3,7 @@ # Contributor: Jakub Schmidtke <[email protected]> pkgname=firefox -pkgver=28.0 +pkgver=29.0 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="https://www.mozilla.org/firefox/"; depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'desktop-file-utils' 'hicolor-icon-theme' - 'libvpx' 'libevent' 'nss' 'hunspell' 'sqlite') + 'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite') makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'xorg-server-xvfb' 'libpulse' 'gstreamer0.10-base' 'inetutils') @@ -27,11 +27,11 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2{,.asc} mozconfig firefox.desktop firefox-install-dir.patch vendor.js firefox-20.0.1-fixed-loading-icon.png) -sha256sums=('2ffd0484e7eab52166b851681878a86d54223a6764c756721430fae8e1599628' +sha256sums=('64402a1f1359f3ea30767a94977ae823ac25b39c6d54f9fe6db444ed127db892' 'SKIP' - '759a86ad115c57a16e577a0df85ce828c538530f48342228f60e2d1bf10aa977' + 'c3ec2518bc5a5bc072584dd273dbd3ee47c80a7565a2d6226abeeb7d7ba902be' 'd2a7610393ba259c35e3227b92e02ec91095a95189f56ac93ccdf6732772719c' - 'bcf224d1f239b73e4ac6d268819c1e94a1606beee99c6d8f851f8192b6444de3' + 'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd' '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213') @@ -89,7 +89,7 @@ package() { cd mozilla-release - make -f client.mk DESTDIR="$pkgdir" install + make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install install -Dm644 ../vendor.js "$pkgdir/usr/lib/firefox/browser/defaults/preferences/vendor.js" @@ -114,9 +114,6 @@ ln -s /usr/share/hunspell "$pkgdir/usr/lib/firefox/dictionaries" ln -s /usr/share/hyphen "$pkgdir/usr/lib/firefox/hyphenation" - # We don't want the development stuff - rm -r "$pkgdir"/usr/{include,lib/firefox-devel,share/idl} - #workaround for now #https://bugzilla.mozilla.org/show_bug.cgi?id=658850 ln -sf firefox "$pkgdir/usr/lib/firefox/firefox-bin" Modified: firefox-install-dir.patch =================================================================== --- firefox-install-dir.patch 2014-04-30 11:18:57 UTC (rev 211919) +++ firefox-install-dir.patch 2014-04-30 11:19:10 UTC (rev 211920) @@ -1,28 +1,12 @@ -diff --git i/config/baseconfig.mk w/config/baseconfig.mk -index 50f4cd4..1e7c1f2 100644 ---- i/config/baseconfig.mk -+++ w/config/baseconfig.mk -@@ -1,7 +1,7 @@ --includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +diff -up firefox-29.0/mozilla-release/config/baseconfig.mk.orig firefox-29.0/mozilla-release/config/baseconfig.mk +--- mozilla-release/config/baseconfig.mk.orig 2014-04-22 15:38:52.948165295 +0200 ++++ mozilla-release/config/baseconfig.mk 2014-04-22 15:42:20.387481673 +0200 +@@ -4,7 +4,7 @@ + # whether a normal build is happening or whether the check is running. + includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + 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) -+includedir := $(includedir)/$(MOZ_APP_NAME) -+idldir = $(datadir)/idl/$(MOZ_APP_NAME) +installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - DIST = $(DEPTH)/dist - - # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't -diff --git i/js/src/config/baseconfig.mk w/js/src/config/baseconfig.mk -index 1ff076c..5386569 100644 ---- i/js/src/config/baseconfig.mk -+++ w/js/src/config/baseconfig.mk -@@ -1,5 +1,5 @@ --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 - - ifneq (,$(filter /%,$(TOP_DIST))) - DIST = $(TOP_DIST) + sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) + ifndef TOP_DIST + TOP_DIST = dist Modified: mozconfig =================================================================== --- mozconfig 2014-04-30 11:18:57 UTC (rev 211919) +++ mozconfig 2014-04-30 11:19:10 UTC (rev 211920) @@ -14,6 +14,7 @@ ac_add_options --with-system-png ac_add_options --with-system-libevent ac_add_options --with-system-libvpx +ac_add_options --with-system-icu ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi
