Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7a0778db80da78fa28b6cb74aa6bc0d2359d1b58
commit 7a0778db80da78fa28b6cb74aa6bc0d2359d1b58 Author: crazy <[email protected]> Date: Thu Sep 24 22:25:16 2015 +0200 firefox-4.1.0-1-x86_64 * Version bump * added patch to kill this weird -$version in path names * added patch to fix an weird bug in icu * fixed install file * fixed LD/C/CXX flags * fixed ff *_OPTIMIZED_* flags * cleanup mozconfig * FB cleanup * TODO: fix how icon(s) are installed * should fix some crashes.. diff --git a/source/xapps/firefox/FrugalBuild b/source/xapps/firefox/FrugalBuild index 84a9eeb..73dbe11 100644 --- a/source/xapps/firefox/FrugalBuild +++ b/source/xapps/firefox/FrugalBuild @@ -3,32 +3,32 @@ # Contributor: Janny <[email protected]> # Contributor: Miklos Vajna <[email protected]> -options+=('asneeded') - pkgname=firefox -pkgver=40.0.3 -pathver=${pkgver} # version used in path names -pkgrel=2 +pkgver=4.1.0 +pathver="41.0" # version used in path names +pkgrel=1 pkgdesc="Mozilla Firefox web browser" url="http://www.mozilla.org/products/firefox/"; depends=('libevent' 'hunspell' 'libidl' 'desktop-file-utils' 'nss>=3.19.2' 'glibc>=2.6' 'dbus-glib' 'curl>=7.19.0' 'nspr>=4.9.2' \ 'lcms' 'libxau>=1.0.4' 'libxdmcp' 'libxft>=2.1.13-2' 'libxt' 'libstdc++' 'libxdamage' 'libice' 'bzip2' 'alsa-lib' \ 'libnotify' 'wireless_tools' 'cairo' 'sqlite3>=3.8.7.4' 'startup-notification' 'libvpx' 'libpulse>=6.0' 'gstreamer1' \ - 'gst1-plugins-good' 'gst-libav' 'gst-plugins-good-pulseaudio' 'gtk+2') + 'gst1-plugins-good' 'gst-libav' 'gst1-plugins-good-pulseaudio' 'gtk+2') makedepends=('zip' 'yasm') groups=('xapps') archs=('i686' 'x86_64') -up2date="Flastarchive http://download-origin.cdn.mozilla.net/pub/mozilla.org/$pkgname/releases/latest/source/ .source.tar.bz2" -source=(http://download-origin.cdn.mozilla.net/pub/mozilla.org/$pkgname/releases/latest/source/$pkgname-$pkgver.source.tar.bz2 \ +up2date="Flastarchive http://download-origin.cdn.mozilla.net/pub/mozilla.org/$pkgname/releases/latest/source/ .source.tar.xz" +source=(http://download-origin.cdn.mozilla.net/pub/mozilla.org/$pkgname/releases/latest/source/$pkgname-$pathver.source.tar.xz \ ffremote \ $pkgname.desktop \ prefs.js \ - mozconfig) -sha1sums=('6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13' \ + mozconfig ff-no-version.patch mozilla-icu-strncat.patch) +sha1sums=('0ce7a5ccdf671a6c98eaac07d06d49a895a99449' \ 'a797c04d67d343d068c108b804883a7815f3197b' \ 'ff757068926b86e0c5ed82a0683fa645623c01d6' \ 'e6789ad3634f43a8986ef35fe1876d4cde6a2e15' \ - 'a5149fb21d726a9c5ebcbd8b664df3c794c1737c') + '50a2ec7581a6705358e6327b1feaaae6d2859889' \ + '7102fcbf1ec99dd89bab64fdb2d078b68c1f8c34' \ + 'eb2b87c704251c76d1811b893a935dbc4f62033f') options=('scriptlet') @@ -40,56 +40,39 @@ build() { # Autodetect language. sed -i '/intl.locale.matchOS/s/false/true/' modules/libpref/init/all.js || Fdie - # fix nspr as well - #Fsed '"nspr/' '"nspr4/' ipc/chromium/src/base/basictypes.h - cp "$Fsrcdir/mozconfig" .mozconfig || Fdie if [ "$CARCH" == "i686" ]; then - LDFLAGS+=" -Wl,--no-keep-memory" + LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" Fsed 'ac_add_options --disable-updater' 'ac_add_options --disable-updater\nac_add_options --enable-unified-compilation' .mozconfig fi export MOZILLA_OFFICIAL=1 export BUILD_OFFICIAL=1 export PATH="$Fsrcdir/path:$PATH" - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/firefox" + ## DO not remove .. +=('asneeded') does not work for some reason ... + export LDFLAGS="$LDFLAGS -Wl,--as-needed -Wl,-rpath,/usr/lib/firefox" Fpatchall - - make -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" || Fdie + ## these MOZ_*_OPTIMIZE_FLAGS are set by default to -Os/-O3 ... + make -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" MOZ_OPTIMIZE_FLAGS="-O2" MOZ_PGO_OPTIMIZE_FLAGS="-O2" || Fdie make -f client.mk DESTDIR="$Fdestdir" install || Fdie - - # Get rid of versions in path names. - Fmv /usr/include/$pkgname-$pathver /usr/include/$pkgname - Fmv /usr/lib/$pkgname-$pathver /usr/lib/$pkgname - Fmv /usr/share/idl/$pkgname-$pathver /usr/share/idl/$pkgname - Fln $pkgname /usr/include/$pkgname-$pathver - Fln $pkgname /usr/lib/$pkgname-$pathver - Fln $pkgname /usr/share/idl/$pkgname-$pathver - # correction on broken ff symlink Frm /usr/bin/firefox Fln /usr/lib/firefox/firefox /usr/bin/firefox # remove ff-devel dir - Frm /usr/lib/firefox-devel-$pathver + Frm /usr/lib/firefox-devel # create symlink nss headers to OOo Fln /usr/include/nss3 /usr/include/firefox/nss - # Plugins. - #Fmv /usr/lib/$pkgname/plugins /usr/lib/$pkgname/plugins.orig - #Fln ../mozilla/plugins/ /usr/lib/$pkgname/plugins - - # /usr/share/aclocal/nspr.m4 conflicts with mozilla. - # Frm /usr/share/aclocal - # Install ffremote. Fexe /usr/bin/ffremote + ## FIX ME - crazy - # Install icon for the menu file. Fmkdir /usr/share/pixmaps/ Fln /usr/lib/$pkgname/browser/icons/mozicon128.png /usr/share/pixmaps/$pkgname.png diff --git a/source/xapps/firefox/ff-no-version.patch b/source/xapps/firefox/ff-no-version.patch new file mode 100644 index 0000000..e2ebc1a --- /dev/null +++ b/source/xapps/firefox/ff-no-version.patch @@ -0,0 +1,18 @@ +diff -Naur mozilla-release/config/baseconfig.mk mozilla-release.no.version/config/baseconfig.mk +--- mozilla-release/config/baseconfig.mk 2015-09-18 00:13:29.000000000 +0200 ++++ mozilla-release.no.version/config/baseconfig.mk 2015-09-24 20:37:05.299783431 +0200 +@@ -2,10 +2,10 @@ + # directly in python/mozbuild/mozbuild/base.py for gmake validation. + # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending + # 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 + ifndef TOP_DIST + TOP_DIST = dist + endif diff --git a/source/xapps/firefox/firefox.install b/source/xapps/firefox/firefox.install index e863470..1a342c5 100644 --- a/source/xapps/firefox/firefox.install +++ b/source/xapps/firefox/firefox.install @@ -1,7 +1,7 @@ post_install() { export HOME="/root" firefox -register - update-desktop-database > /dev/null 2>&1 + update-desktop-database -q > /dev/null 2>&1 } post_upgrade() { @@ -13,7 +13,11 @@ post_remove() { if [ -d /usr/lib/firefox-$pkgver ]; then rm -rf /usr/lib/firefox-$pkgver fi - update-desktop-database > /dev/null 2>&1 + + if [ -d /usr/lib/firefox ]; then + rm -rf /usr/lib/firefox + fi + update-desktop-database -q > /dev/null 2>&1 } op=$1 diff --git a/source/xapps/firefox/mozconfig b/source/xapps/firefox/mozconfig index 226d29b..2e1d463 100644 --- a/source/xapps/firefox/mozconfig +++ b/source/xapps/firefox/mozconfig @@ -5,18 +5,23 @@ ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib ac_add_options --enable-official-branding +ac_add_options --enable-release +ac_add_options --with-pthreads +ac_add_options --disable-gconf +ac_add_options --disable-tests +ac_add_options --disable-optimize +ac_add_options --enable-strip +ac_add_options --enable-install-strip # System libraries ac_add_options --with-system-nspr ac_add_options --with-system-nss -#ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-system-bz2 -#ac_add_options --with-system-png 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 --disable-system-sqlite ac_add_options --enable-system-ffi ac_add_options --enable-system-pixman ac_add_options --enable-system-cairo diff --git a/source/xapps/firefox/mozilla-icu-strncat.patch b/source/xapps/firefox/mozilla-icu-strncat.patch new file mode 100644 index 0000000..bf72a61 --- /dev/null +++ b/source/xapps/firefox/mozilla-icu-strncat.patch @@ -0,0 +1,36 @@ +# HG changeset patch +# Parent 29be2a4daa0f512d22bde85b97b5460839026571 +# User Wolfgang Rosenauer <[email protected]> +# Parent a7d16f0faf5d4881dbea524340f881d5850710e4 +From: Jan Engelhardt <[email protected]> +Reference: http://bugs.icu-project.org/trac/ticket/7808 + +diff --git a/intl/icu/source/tools/pkgdata/pkgdata.cpp b/intl/icu/source/tools/pkgdata/pkgdata.cpp +--- a/intl/icu/source/tools/pkgdata/pkgdata.cpp ++++ b/intl/icu/source/tools/pkgdata/pkgdata.cpp +@@ -1975,22 +1975,22 @@ static void loadLists(UPKGOptions *o, UE + FILE *p = NULL; + size_t n; + static char buf[512] = ""; + char cmdBuf[1024]; + UErrorCode status = U_ZERO_ERROR; + const char cmd[] = "icu-config --incpkgdatafile"; + + /* #1 try the same path where pkgdata was called from. */ +- findDirname(progname, cmdBuf, 1024, &status); ++ findDirname(progname, cmdBuf, sizeof(cmdBuf), &status); + if(U_SUCCESS(status)) { + if (cmdBuf[0] != 0) { +- uprv_strncat(cmdBuf, U_FILE_SEP_STRING, 1024); ++ uprv_strncat(cmdBuf, U_FILE_SEP_STRING, sizeof(cmdBuf)-1-strlen(cmdBuf)); + } +- uprv_strncat(cmdBuf, cmd, 1024); ++ uprv_strncat(cmdBuf, cmd, sizeof(cmdBuf)-1-strlen(cmdBuf)); + + if(verbose) { + fprintf(stdout, "# Calling icu-config: %s\n", cmdBuf); + } + p = popen(cmdBuf, "r"); + } + + if(p == NULL || (n = fread(buf, 1, 511, p)) <= 0) { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
