From b453854f5cbc46a46f1a35fb853e252e18951885 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 12 Jan 2013 16:01:34 -0500 Subject: libre/{icecat,iceweasel-libre}: run through moz-normalize-* --- libre/iceweasel-libre/PKGBUILD | 53 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 6 deletions(-) (limited to 'libre/iceweasel-libre/PKGBUILD') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 56f1e4dfa..b58061577 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -8,7 +8,7 @@ # Contributor (Arch): Jakub Schmidtke # Thank you very much to the older contributors: # Contributor: evr -# Contributor: Muhammad 'MJ' Jassim +# Contributor: Muhammad 'MJ' Jassim _pgo=false @@ -29,11 +29,52 @@ if $_pgo; then pkgname+='-pgo' fi +if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox." -arch=('i586' 'i686' 'x86_64' 'mips64el') -license=('GPL2' 'MPL' 'LGPL') -depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss>=3.13.1' 'sqlite3' 'startup-notification') -makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'wireless_tools' 'zip') +arch=( + 'i586' + 'i686' + 'mips64el' + 'x86_64' +) +license=( + 'GPL2' + 'LGPL' + 'MPL' +) +depends=( + 'alsa-lib' + 'dbus-glib' + 'desktop-file-utils' + 'gtk2' + 'hicolor-icon-theme' + 'hunspell' + 'libevent' + 'libnotify' + 'libvpx' + 'libxt' + 'mime-types' + 'mozilla-common' + 'mozilla-searchplugins' + 'nss>=3.13.1' + 'sqlite3' + 'startup-notification' +) +makedepends=( + 'autoconf2.13' + 'diffutils' + 'imagemagick' + 'libidl2' + 'librsvg' + 'libxslt' + 'mesa' + 'pkg-config' + 'python2' + 'quilt' + 'unzip' + 'wireless_tools' + 'zip' +) [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') if $_pgo; then makedepends+=('xorg-server-xvfb') @@ -93,7 +134,7 @@ build() { patch -Np1 -i "$srcdir/shared-libs.patch" cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch - + if $_pgo; then cat "$srcdir/mozconfig.pgo" >> .mozconfig fi -- cgit v1.2.3 From 6bafdd178eae7fe285a158da7ff6176deb9ca5e2 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 12 Jan 2013 16:44:09 -0500 Subject: libre/{icecat,iceweasel-libre}: fix PGO, make more similar to firefox The biggest part of that change is using the variable "pkgbase" so they don't all have to be different. Note that I ran firefox through moz-normalize before comparing them. --- libre/icecat/PKGBUILD | 135 ++++++++++++++++++++---------------- libre/icecat/mozconfig.pgo | 4 +- libre/iceweasel-libre/PKGBUILD | 95 ++++++++++++++----------- libre/iceweasel-libre/mozconfig.pgo | 4 +- 4 files changed, 130 insertions(+), 108 deletions(-) (limited to 'libre/iceweasel-libre/PKGBUILD') diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 9f901f3b6..c94062713 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -1,11 +1,15 @@ -# Contributor (ConnochaetOS): Henry Jensen +# Maintainer: Márcio Silva # Contributor (Parabola): Luke Shumaker -# Contributor: Figue # Contributor (Parabola): fauno # Contributor (Parabola): vando # Contributor (Parabola): André Silva -# Maintainer (Parabola): Márcio Silva + +# Maintainer (ConnochaetOS): Henry Jensen + +# Maintainer (Arch) : Ionut Biru # Contributor (Arch): Jakub Schmidtke + +# Contributor: Figue # Thank you very much to the older contributors: # Contributor: evr # Contributor: Muhammad 'MJ' Jassim @@ -20,50 +24,49 @@ pkgrel=1 if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!' arch=( - i686 - mips64el - x86_64 + 'i686' + 'mips64el' + 'x86_64' ) license=( - GPL2 - LGPL - MPL + 'GPL2' + 'LGPL' + 'MPL' ) depends=( - alsa-lib - dbus-glib - desktop-file-utils - gtk2 - hicolor-icon-theme - hunspell - libevent - libnotify - libvpx - libxt - mime-types - mozilla-common - mozilla-searchplugins + 'alsa-lib' + 'dbus-glib' + 'desktop-file-utils' + 'gtk2' + 'hicolor-icon-theme' + 'hunspell' + 'libevent' + 'libnotify' + 'libvpx' + 'libxt' + 'mime-types' + 'mozilla-common' + 'mozilla-searchplugins' 'nss>=3.13.3' - sqlite3 - startup-notification + 'sqlite' + 'startup-notification' ) makedepends=( - autoconf2.13 - diffutils - imagemagick - libidl2 - librsvg - libxslt - mesa - pkg-config - python2 - unzip - wireless_tools - zip -) -optdepends=( - 'wireless_tools: Location detection via available WiFi networks' + 'autoconf2.13' + 'diffutils' + 'imagemagick' + 'imake' + 'libidl2' + 'librsvg' + 'libxslt' + 'mesa' + 'pkg-config' + 'python2' + 'unzip' + 'wireless_tools' + 'zip' ) +optdepends=('wireless_tools: Location detection via available WiFi networks') if $_pgo; then makedepends+=(xorg-server-xvfb) options=(!ccache) @@ -100,14 +103,14 @@ build() { mv $pkgname-$pkgver $srcdir/gnuzilla-build cd $srcdir/gnuzilla-build - cp $srcdir/mozconfig .mozconfig # Load our build config, disable SafeSearch + cp ../mozconfig .mozconfig if $_pgo; then cat $srcdir/mozconfig.pgo >> .mozconfig fi - patch -Np1 -i $srcdir/$pkgname-install-dir.patch # install to /usr/lib/$pkgname - patch -Np1 -i $srcdir/xulrunner-copy-stub.patch # small fix - patch -Np1 -i $srcdir/libre.patch # Remove Google+Mozilla stuff - #patch -Np1 -i $srcdir/cairo.patch # fix cairo + patch -Np1 -i ../$pkgname-install-dir.patch + patch -Np1 -i ../xulrunner-copy-stub.patc + patch -Np1 -i ../libre.patch + #patch -Np1 -i ../cairo.patch # Fix for use nspr, sqlite and nss external sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \ @@ -132,43 +135,53 @@ build() { fi chmod +x build/unix/run-icecat.sh # fix bug for bad file permition - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname" - export PYTHON=/usr/bin/python2 + + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgbase" + export PYTHON="/usr/bin/python2" + export MOZ_MAKE_FLAGS="$MAKEFLAGS" + unset MAKEFLAGS + + if $_pgo; then + export MOZ_PGO=1 + export DISPLAY=:99 + Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & + fi + + _fail=0 + make -f client.mk build || _fail=1 if $_pgo; then - 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 - else - LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS fi + return $_fail } package() { cd $srcdir/gnuzilla-build - make -j1 -f client.mk DESTDIR=$pkgdir install + make -j1 -f client.mk DESTDIR="$pkgdir" install - install -Dm644 $srcdir/vendor.js $pkgdir/usr/lib/$pkgname/defaults/pref + install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgbase/defaults/preferences/vendor.js" brandingdir=browser/branding/unofficial icondir=$pkgdir/usr/share/icons/hicolor for i in 16x16 32x32 48x48; do - install -Dm644 $brandingdir/default${i/x*/}.png $icondir/$i/apps/$pkgname.png + install -Dm644 $brandingdir/default${i/x*/}.png $icondir/$i/apps/$pkgbase.png done for d in $pkgname $pkgname-safe; do install -Dm644 $srcdir/$d.desktop $pkgdir/usr/share/applications/$d.desktop done - rm -rf $pkgdir/usr/lib/$pkgname/{dictionaries,hyphenation,searchplugins,plugins} - ln -sf /usr/share/hunspell $pkgdir/usr/lib/$pkgname/dictionaries - ln -sf /usr/share/hyphen $pkgdir/usr/lib/$pkgname/hyphenation - ln -sf /usr/lib/mozilla/plugins $pkgdir/usr/lib/$pkgname/plugins - ln -sf /usr/lib/mozilla/searchplugins $pkgdir/usr/lib/$pkgname/searchplugins + rm -rf "$pkgdir/usr/lib/$pkgbase/"{dictionaries,hyphenation,searchplugins,plugins} + ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries" + ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation" + ln -s /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$pkgbase/plugins" + ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins" # We don't want the development stuff - rm -rf $pkgdir/usr/{include,lib/$pkgname-devel,share/idl} + rm -r "$pkgdir"/usr/{include,lib/$pkgbase-devel,share/idl} - # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850 - ln -sf $pkgname $pkgdir/usr/lib/$pkgname/$pkgname-bin + #workaround for now + #https://bugzilla.mozilla.org/show_bug.cgi?id=658850 + ln -sf $pkgbase "$pkgdir/usr/lib/$pkgbase/$pkgbase-bin" } diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo index b0c249ebf..57d11eed0 100644 --- a/libre/icecat/mozconfig.pgo +++ b/libre/icecat/mozconfig.pgo @@ -1,4 +1,2 @@ # PGO -ac_add_options --enable-profile-guided-optimization -mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' -mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10' diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index b58061577..01be6223d 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -1,11 +1,15 @@ -# Contributor (ConnochaetOS): Henry Jensen +# Maintainer: Márcio Silva # Contributor (Parabola): Luke Shumaker -# Contributor: Figue # Contributor (Parabola): fauno # Contributor (Parabola): vando # Contributor (Parabola): André Silva -# Contributor (Parabola): Márcio Silva + +# Maintainer (ConnochaetOS): Henry Jensen + +# Maintainer (Arch) : Ionut Biru # Contributor (Arch): Jakub Schmidtke + +# Contributor: Figue # Thank you very much to the older contributors: # Contributor: evr # Contributor: Muhammad 'MJ' Jassim @@ -19,17 +23,16 @@ _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } -_pkgname=iceweasel +pkgbase=iceweasel pkgname=iceweasel-libre pkgver=${_debver}.${_debrel} pkgrel=4 -if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi +if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi if $_pgo; then pkgname+='-pgo' fi -if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox." arch=( 'i586' @@ -56,14 +59,15 @@ depends=( 'mime-types' 'mozilla-common' 'mozilla-searchplugins' - 'nss>=3.13.1' - 'sqlite3' + 'nss>=3.13.3' + 'sqlite' 'startup-notification' ) makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' + 'imake' 'libidl2' 'librsvg' 'libxslt' @@ -81,6 +85,7 @@ if $_pgo; then options=(!ccache) fi +optdepends=('wireless_tools: Location detection via available WiFi networks') url="http://www.geticeweasel.org/" install=iceweasel.install source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" @@ -104,17 +109,15 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f' '52e52f840a49eb1d14be1c0065b03a93' '65f68090d2a69b467bd2707d0c4ea3bd') -if [ "$_pkgname" != "$pkgname" ]; then - provides+=("$_pkgname=$pkgver") - conflicts+=("$_pkgname") +if [ "$pkgbase" != "$pkgname" ]; then + provides+=("$pkgbase=$pkgver") + conflicts+=("$pkgbase") fi build() { export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" - export PYTHON="/usr/bin/python2" export DEBIAN_BUILD="mozilla-release" mv debian "${srcdir}/${DEBIAN_BUILD}" cd "${srcdir}/${DEBIAN_BUILD}" @@ -127,18 +130,17 @@ build() { quilt push -a - patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch - patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname - patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix - patch -Np1 -i "$srcdir/libre.patch" - patch -Np1 -i "$srcdir/shared-libs.patch" - - cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch - + cp ../mozconfig .mozconfig if $_pgo; then cat "$srcdir/mozconfig.pgo" >> .mozconfig fi + patch -Np1 -i ../Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch + patch -Np1 -i ../iceweasel-install-dir.patch + patch -Np1 -i ../xulrunner-copy-stub.patch + patch -Np1 -i ../libre.patch + patch -Np1 -i ../shared-libs.patch + # From js on abslibre-mips64el.git if [ "$CARCH" = "mips64el" ]; then msg "Force disabling JIT." @@ -155,7 +157,7 @@ build() { browser/base/Makefile.in # This is a bug, we should fix it. - if [ "$CARCH" = "mips64el" ]; then + if [ $CARCH = mips64el ]; then # Fix MIPS N32 support. sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ js/src/assembler/wtf/Platform.h @@ -168,44 +170,55 @@ build() { echo 'ac_add_options --disable-jemalloc' >> .mozconfig fi + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgbase" + export PYTHON="/usr/bin/python2" + export MOZ_MAKE_FLAGS="$MAKEFLAGS" + unset MAKEFLAGS + + if $_pgo; then + export MOZ_PGO=1 + export DISPLAY=:99 + Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & + fi + + _fail=0 + make -f client.mk build || _fail=1 + if $_pgo; then - 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 - else - LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" fi + return $_fail } package() { cd "${srcdir}/${DEBIAN_BUILD}" make -j1 -f client.mk DESTDIR="$pkgdir" install - install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js" + install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgbase/defaults/preferences/vendor.js" # I don't even know why we're hitting the objdir, and ConnOS didn't. _brandingdir=debian/branding brandingdir=moz-objdir/$_brandingdir icondir="$pkgdir/usr/share/icons/hicolor" for i in 16x16 32x32 48x48 64x64; do - install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png" + install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$pkgbase.png" done - install -Dm644 "$brandingdir/mozicon128.png" "$icondir/128x128/apps/$_pkgname.png" - install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$_pkgname.svg" + install -Dm644 "$brandingdir/mozicon128.png" "$icondir/128x128/apps/$pkgbase.png" + install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$pkgbase.svg" - install -d "$pkgdir/usr/share/applications" - install -m644 debian/iceweasel.desktop "$pkgdir/usr/share/applications" - #install -m644 debian/iceweasel-safe.desktop "$pkgdir/usr/share/applications" + install -Dm644 debian/iceweasel.desktop \ + "$pkgdir/usr/share/applications/$pkgbase.desktop" - rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins} - ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries" - ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation" - ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$_pkgname/plugins" - ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins" + rm -rf "$pkgdir/usr/lib/$pkgbase/"{dictionaries,hyphenation,searchplugins,plugins} + ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries" + ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation" + ln -s /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$pkgbase/plugins" + ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins" # We don't want the development stuff - rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} + rm -r "$pkgdir"/usr/{include,lib/$pkgbase-devel,share/idl} - # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850 - ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin" + #workaround for now + #https://bugzilla.mozilla.org/show_bug.cgi?id=658850 + ln -sf $pkgbase "$pkgdir/usr/lib/$pkgbase/$pkgbase-bin" } diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel-libre/mozconfig.pgo index b0c249ebf..57d11eed0 100644 --- a/libre/iceweasel-libre/mozconfig.pgo +++ b/libre/iceweasel-libre/mozconfig.pgo @@ -1,4 +1,2 @@ # PGO -ac_add_options --enable-profile-guided-optimization -mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' -mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10' -- cgit v1.2.3 From 867dbcc116fbed767fa4262aedf445546bb11d06 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 12 Jan 2013 16:47:23 -0500 Subject: libre/{icecat,iceweasel-libre}: clean up a bit * don't duplicate the mis64el fix in iceweasel * clean up whitespace and quoting * re-order a few things * don't give geticeweasel.org as iceweasel's url * don't symlink /usr/lib/mozilla/plugins to /usr/lib/$pkgbase/plugins * more elegant version of debfile() for iceweasel. * drop i586 from arch=(), ours has changed too greatly --- libre/icecat/PKGBUILD | 40 +++++++++++++++++--------- libre/iceweasel-libre/PKGBUILD | 64 ++++++++++++++++++------------------------ 2 files changed, 54 insertions(+), 50 deletions(-) (limited to 'libre/iceweasel-libre/PKGBUILD') diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index c94062713..2cb4f355f 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -17,12 +17,24 @@ # If you are updating this package, don't forget to update the version number in # the value for 'browser.dictionaries.download.url' in 'libre.patch' +# Version Configuration ############################################## + _pgo=false + pkgname=icecat pkgver=17.0.1 pkgrel=1 + +###################################################################### + if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi -pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!' +if $_pgo; then pkgname+='-pgo'; fi +if [ "$pkgbase" != "$pkgname" ]; then + provides+=("$pkgbase=$pkgver") + conflicts+=("$pkgbase") +fi + +pkgdesc="The GNUzilla web browser, based on Mozilla Firefox." arch=( 'i686' 'mips64el' @@ -66,12 +78,12 @@ makedepends=( 'wireless_tools' 'zip' ) -optdepends=('wireless_tools: Location detection via available WiFi networks') +[[ $CARCH != mips64el ]] && makedepends+=('yasm') if $_pgo; then - makedepends+=(xorg-server-xvfb) - options=(!ccache) + makedepends+=('xorg-server-xvfb') + options+=(!ccache) fi -options=(!emptydirs) +optdepends=('wireless_tools: Location detection via available WiFi networks') url=http://www.gnu.org/software/gnuzilla/ install=$pkgname.install source=( @@ -105,7 +117,7 @@ build() { cp ../mozconfig .mozconfig if $_pgo; then - cat $srcdir/mozconfig.pgo >> .mozconfig + cat ../mozconfig.pgo >> .mozconfig fi patch -Np1 -i ../$pkgname-install-dir.patch patch -Np1 -i ../xulrunner-copy-stub.patc @@ -121,7 +133,7 @@ build() { browser/base/Makefile.in # This is a bug, we should fix it. - if [ $CARCH = mips64el ]; then + if [[ $CARCH == mips64el ]]; then # Fix MIPS N32 support. sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ js/src/assembler/wtf/Platform.h @@ -147,8 +159,8 @@ build() { Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & fi - _fail=0 - make -f client.mk build || _fail=1 + _fail=0 + make -f client.mk build || _fail=1 if $_pgo; then kill $! || true @@ -172,10 +184,12 @@ package() { install -Dm644 $srcdir/$d.desktop $pkgdir/usr/share/applications/$d.desktop done - rm -rf "$pkgdir/usr/lib/$pkgbase/"{dictionaries,hyphenation,searchplugins,plugins} - ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries" - ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation" - ln -s /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$pkgbase/plugins" + # Use system-provided dictionaries + rm -rf "$pkgdir"/usr/lib/$pkgbase/{dictionaries,hyphenation} + ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries" + ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation" + # use mozilla-searchplugins + rm -rf "$pkgdir"/usr/lib/$pkgbase/searchplugins ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins" # We don't want the development stuff diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 01be6223d..a3e2363f0 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,28 +14,33 @@ # Contributor: evr # Contributor: Muhammad 'MJ' Jassim +# Version Configuration ############################################## + _pgo=false -# We're getting this from Debian Experimental _debname=iceweasel _debver=17.0.1 _debrel=1 -_debrepo=http://ftp.debian.org/debian/pool/main/ -debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } +_debrepo=http://ftp.debian.org/debian/pool/main pkgbase=iceweasel pkgname=iceweasel-libre pkgver=${_debver}.${_debrel} pkgrel=4 +###################################################################### + +debfile() { echo "${_debrepo}/${1:0:1}/${1%_*}/${1}"; } + if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi -if $_pgo; then - pkgname+='-pgo' +if $_pgo; then pkgname+='-pgo'; fi +if [ "$pkgbase" != "$pkgname" ]; then + provides+=("$pkgbase=$pkgver") + conflicts+=("$pkgbase") fi -pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox." +pkgdesc="A libre version of Debian Iceweasel, the web browser based on Mozilla Firefox." arch=( - 'i586' 'i686' 'mips64el' 'x86_64' @@ -79,17 +84,16 @@ makedepends=( 'wireless_tools' 'zip' ) -[ "$CARCH" != "mips64el" ] && makedepends+=('yasm') +[[ $CARCH != mips64el ]] && makedepends+=('yasm') if $_pgo; then makedepends+=('xorg-server-xvfb') - options=(!ccache) + options+=(!ccache) fi - optdepends=('wireless_tools: Location detection via available WiFi networks') -url="http://www.geticeweasel.org/" +url="http://packages.debian.org/source/experimental/$_debname" install=iceweasel.install -source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" - "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" +source=($(debfile ${_debname}_${_debver}.orig.tar.bz2) + $(debfile ${_debname}_${_debver}-${_debrel}.debian.tar.gz) mozconfig mozconfig.pgo xulrunner-copy-stub.patch @@ -109,11 +113,6 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f' '52e52f840a49eb1d14be1c0065b03a93' '65f68090d2a69b467bd2707d0c4ea3bd') -if [ "$pkgbase" != "$pkgname" ]; then - provides+=("$pkgbase=$pkgver") - conflicts+=("$pkgbase") -fi - build() { export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' @@ -132,7 +131,7 @@ build() { cp ../mozconfig .mozconfig if $_pgo; then - cat "$srcdir/mozconfig.pgo" >> .mozconfig + cat ../mozconfig.pgo >> .mozconfig fi patch -Np1 -i ../Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -141,23 +140,12 @@ build() { patch -Np1 -i ../libre.patch patch -Np1 -i ../shared-libs.patch -# From js on abslibre-mips64el.git - if [ "$CARCH" = "mips64el" ]; then - msg "Force disabling JIT." - sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \ - js/src/assembler/wtf/Platform.h - sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.{in,ref} - - echo "ac_add_options --disable-methodjit" >> .mozconfig - echo "ac_add_options --disable-tracejit" >> .mozconfig - fi - # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in # This is a bug, we should fix it. - if [ $CARCH = mips64el ]; then + if [[ $CARCH == mips64el ]]; then # Fix MIPS N32 support. sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ js/src/assembler/wtf/Platform.h @@ -181,8 +169,8 @@ build() { Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & fi - _fail=0 - make -f client.mk build || _fail=1 + _fail=0 + make -f client.mk build || _fail=1 if $_pgo; then kill $! || true @@ -209,10 +197,12 @@ package() { install -Dm644 debian/iceweasel.desktop \ "$pkgdir/usr/share/applications/$pkgbase.desktop" - rm -rf "$pkgdir/usr/lib/$pkgbase/"{dictionaries,hyphenation,searchplugins,plugins} - ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries" - ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation" - ln -s /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$pkgbase/plugins" + # Use system-provided dictionaries + rm -rf "$pkgdir"/usr/lib/$pkgbase/{dictionaries,hyphenation} + ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries" + ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation" + # use mozilla-searchplugins + rm -rf "$pkgdir"/usr/lib/$pkgbase/searchplugins ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins" # We don't want the development stuff -- cgit v1.2.3 From a705f546158d49645fca2a4c101f429fdc1b45f4 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 12 Jan 2013 17:14:53 -0500 Subject: libre/iceweasel-libre: use `dpkg-source -x` instead of `quilt` This does mean that we also have to fetch a bunch of locale tarballs, but that hints at another change to the package that I've been asked to make ;) --- libre/iceweasel-libre/PKGBUILD | 140 +++++++++++++++++++++++++++++++++-------- 1 file changed, 113 insertions(+), 27 deletions(-) (limited to 'libre/iceweasel-libre/PKGBUILD') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index a3e2363f0..7e3cc5aa3 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -23,6 +23,10 @@ _debver=17.0.1 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main +# locales can be easily generated by running +# $ sed -rn 's/.*-l10n-([^.]*)\..*/\1/p' src/*.dsc | sort -u +_locales=(ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu) + pkgbase=iceweasel pkgname=iceweasel-libre pkgver=${_debver}.${_debrel} @@ -71,6 +75,7 @@ depends=( makedepends=( 'autoconf2.13' 'diffutils' + 'dpkg-devtools' 'imagemagick' 'imake' 'libidl2' @@ -79,7 +84,6 @@ makedepends=( 'mesa' 'pkg-config' 'python2' - 'quilt' 'unzip' 'wireless_tools' 'zip' @@ -92,8 +96,11 @@ fi optdepends=('wireless_tools: Location detection via available WiFi networks') url="http://packages.debian.org/source/experimental/$_debname" install=iceweasel.install -source=($(debfile ${_debname}_${_debver}.orig.tar.bz2) +source=($(debfile ${_debname}_${_debver}-${_debrel}.dsc) $(debfile ${_debname}_${_debver}-${_debrel}.debian.tar.gz) + $(debfile ${_debname}_${_debver}.orig.tar.bz2) + $(debfile ${_debname}_${_debver}.orig-compare-locales.tar.bz2) + $(for locale in "${_locales[@]}"; do debfile ${_debname}_${_debver}.orig-l10n-${locale}.tar.bz2; done) mozconfig mozconfig.pgo xulrunner-copy-stub.patch @@ -102,32 +109,10 @@ source=($(debfile ${_debname}_${_debver}.orig.tar.bz2) vendor.js shared-libs.patch Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f' - '1bbf435ff33f9824de23c0b13fbfb452' - 'eab149c1994ab14392e55af3abb08e80' - 'ac29b01c189f20abae2f3eef1618ffc0' - 'a485a2b5dc544a8a2bd40c985d2e5813' - 'c8040002668fae7d1b950833bae51607' - 'abf5ecb74caa857abb42bcfbb3442d9c' - '0d053487907de4376d67d8f499c5502b' - '52e52f840a49eb1d14be1c0065b03a93' - '65f68090d2a69b467bd2707d0c4ea3bd') build() { - export QUILT_PATCHES=debian/patches - export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' - export QUILT_DIFF_ARGS='--no-timestamps' - export DEBIAN_BUILD="mozilla-release" - mv debian "${srcdir}/${DEBIAN_BUILD}" - cd "${srcdir}/${DEBIAN_BUILD}" - - # Doesn't apply and seems unimportant - rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true - - # This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it - rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true - - quilt push -a + dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc mozilla-release + cd mozilla-release cp ../mozconfig .mozconfig if $_pgo; then @@ -179,7 +164,7 @@ build() { } package() { - cd "${srcdir}/${DEBIAN_BUILD}" + cd mozilla-release make -j1 -f client.mk DESTDIR="$pkgdir" install install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgbase/defaults/preferences/vendor.js" @@ -212,3 +197,104 @@ package() { #https://bugzilla.mozilla.org/show_bug.cgi?id=658850 ln -sf $pkgbase "$pkgdir/usr/lib/$pkgbase/$pkgbase-bin" } + +md5sums=('7fe75c8797381adf9f0845d88064e24a' + '1bbf435ff33f9824de23c0b13fbfb452' + '37b9b7eafc8affa9b8a5942f8ff19f8f' + '80dd4a702302fb36719c67445b487895' + 'c99d7605c0e0bb0d77e71cd54f305a9a' + '1f4aeabf6c28fcf6539d13f65f8b366b' + 'cb9cc5f721d81442f1a93d134054f23c' + 'f926850d2071114f4ba719230ce43168' + '8c414a4f8d6d137dcca41b203fce4d0c' + 'a16081e4da9daf6df5f6fcce2000cec1' + '88dd4c5837485acea83e97f3cb4f1e31' + '8751f0a634656ba973c53f96d1fa34e1' + 'a3905a8a62c0b5ba4c11fee49ad6d184' + '740667ba651f0562b45bbfe63b8ec84e' + '85a7a4de61e5546487dae32849ae63f2' + '3d00ad2734c890930441d6cd919f11c8' + '80a49422e0973ed8d6fd7920cf0a4379' + '30ce51ca764b091c59df5c08e35e8a7f' + '3fdbb51a5cbea3f6a7c43534a8c67d5a' + '1eacf81985d9993b2b94f98fd4c453e0' + 'ccd6c210bf596909137c4159580042eb' + '688c3eeca95418703bf6c2cb0dbe18d0' + '3830cab7a1b48890588cfbeb42444a22' + '6924436432149b668e14c3595602af79' + 'ae6007384d85dbd14fbe6496e0b9e47b' + '3859dac30bf0ec9d49419c83b116407e' + '4c200fc11efb425ba1ed0c6254f323a5' + '200f856b50a7485a1d5447cbf8dee77c' + '5b8d0c552c0ca7abb48ef4e94908edd2' + 'c6dde21438789ccf4c666afc22ee713c' + 'b234e98c5155fb597fa6f5b1242492ec' + '5abfc72599632a0ac85f18b4f706ee71' + 'a78698a63ef66d5532601f76f48613c3' + 'cca18bf0e95da80578d1e71a7592a545' + '9213e16598b0595710583956fa95dfff' + '120a4a00c1775a8445d35266b3157112' + 'cf94d425550530b34e355ed445618626' + 'dbf451ef9ecf1816973ac4dffe7e2b8e' + '87a12e25b99886ac25cb0d9f0ca201ad' + '0efff47ab838fd320c710ffd46ee3a57' + '28e5d445e7a91ddd64d50478b05edb51' + '770dcdf1a8d6d2db64dadb6e4f6149fb' + '7732b021cdf73ace33cb41609b327f3d' + 'ac79148f7bbdeff056d10cf0542f6ea0' + '4718bff38f0a6c8ec7b41df148255f34' + '2edcd565c19828e3d4a2da19f8529edd' + '531c54a91d509e768b55bfd88a96a527' + 'c8a4d346560350fd45533e52c0e6a15e' + '707d055b9d86ba16b2a44376a6cf3fb9' + '66b2b23c7e16840554521c748a22d083' + '61e53be2eeb528742c19d3a13252a961' + '89c23536240f86a776fb62728297e13d' + '535f68d0cfa4dee9df0cddbee42a4c94' + '7c91dc4f2bbcdac2f8547caad24516ea' + '4476b94e676b3cfb309f972f7c42da1b' + '792700b40ba53de7de5b48187b604b29' + '500861d2d8bebc85596a3ee343adb75e' + 'b2f5d243b28a9137189b6fa001c0207e' + 'a36a7b1785532e659d3b972e4e767f45' + '46509bb591bf54b6fed025814bfc11bf' + '715a3f8c2fcdab17b24ce61f55c49183' + '658226211d66a724d0335a173ef8512f' + 'ecb41c7536c95cf2ca118d7ab6b7d357' + '3b832ba3a5d1543809395171e5a105f6' + '46380a60795095514004bc19c512e1c5' + 'fba979124cd393f1164a59e3b9183ccc' + 'db0e3b1146b0350e23e35958ee896aa5' + '665140babab027228eb195b6c0e83d4e' + 'e71a740bfc52d25968f8e2c4c1896897' + '47bd00559728578bfc257b80c72ce393' + '0b77be5ee8a66f5b819f9bf032f1b744' + '38df23959bd6940a82e78f76a00cc973' + 'b6c74d7b9cf5f6722c661bdba78c3769' + '481db49b914f33d6c594ecebbc291e4c' + '6a680e3aa71a39a1d59f877535eb7bbc' + '9ee935f09dc89b42db9ad8db3473717d' + 'e9ad600f21766465aed4ae8473290077' + 'b70d217d69692ea3fb26e87fa468f4eb' + '32b73226e95ae47dc11a554a7208d960' + '5b78c67c024c683f4c0f1bc9931a2b28' + 'f7a347a3d5679d82340d227474de938f' + '2939f738602daee17e63e14374db86be' + '73bead055152cd4885b9834691c9066a' + '722a0d2212060e2044cbac859db3e063' + '8f259efea0bf1b67fd4b4dae492e2e00' + '03c2a59eab8ef4ad3687b91c07f96165' + '726317125b44225273307235f609d341' + 'b75b729e9ab3ff9a908115ab520339a9' + 'cd696e70fdb4f5ab9d50040abea46b82' + 'cdd2dba79e929e6585799d7f3f7fa7d4' + '0b611a362d7e566805c2df474ff407b6' + 'de6037c0a65e7b86e0929637156ba587' + 'ec03a45c3b403786c91f0d44357f321c' + 'e4cd438a0b2a42dfb14bc7716e901e5f' + 'a485a2b5dc544a8a2bd40c985d2e5813' + 'c8040002668fae7d1b950833bae51607' + 'abf5ecb74caa857abb42bcfbb3442d9c' + '0d053487907de4376d67d8f499c5502b' + '52e52f840a49eb1d14be1c0065b03a93' + '65f68090d2a69b467bd2707d0c4ea3bd') -- cgit v1.2.3 From f996597c6b79f714ec28ef04bd3fbd4d18bf2046 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 12 Jan 2013 17:48:50 -0500 Subject: libre/iceweasel-libre: reorganize, use firefox.install * Use a iceweasel.desktop based on Arch's firefox.desktop * Use firefox.install * re-organize things in PKGBUILD into separate functions --- libre/iceweasel-libre/PKGBUILD | 104 +++++++++++++++++++--------- libre/iceweasel-libre/firefox.install | 13 ++++ libre/iceweasel-libre/iceweasel.desktop | 116 ++++++++++++++++++++++++++++++++ libre/iceweasel-libre/iceweasel.install | 13 ---- 4 files changed, 200 insertions(+), 46 deletions(-) create mode 100644 libre/iceweasel-libre/firefox.install create mode 100644 libre/iceweasel-libre/iceweasel.desktop delete mode 100644 libre/iceweasel-libre/iceweasel.install (limited to 'libre/iceweasel-libre/PKGBUILD') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 7e3cc5aa3..c1c7d393c 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -82,7 +82,6 @@ makedepends=( 'librsvg' 'libxslt' 'mesa' - 'pkg-config' 'python2' 'unzip' 'wireless_tools' @@ -95,7 +94,8 @@ if $_pgo; then fi optdepends=('wireless_tools: Location detection via available WiFi networks') url="http://packages.debian.org/source/experimental/$_debname" -install=iceweasel.install +install=firefox.install +options=(!emptydirs) source=($(debfile ${_debname}_${_debver}-${_debrel}.dsc) $(debfile ${_debname}_${_debver}-${_debrel}.debian.tar.gz) $(debfile ${_debname}_${_debver}.orig.tar.bz2) @@ -108,40 +108,63 @@ source=($(debfile ${_debname}_${_debver}-${_debrel}.dsc) iceweasel-install-dir.patch vendor.js shared-libs.patch - Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) + Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch + $pkgbase.desktop +) +# use dpkg-source to extract everything +noextract=(); for file in "${source[@]}"; do noextract+=("${file##*/}"); done -build() { - dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc mozilla-release - cd mozilla-release +# This is a bug, we should fix it. +mips64el-prepare() { + # Fix MIPS N32 support. + sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ + js/src/assembler/wtf/Platform.h + # Disable JIT. + sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \ + js/src/assembler/wtf/Platform.h + sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in +} +misp64el-configure() { + echo 'ac_add_options --disable-methodjit' >> .mozconfig + echo 'ac_add_options --disable-tracejit' >> .mozconfig + echo 'ac_add_options --disable-jemalloc' >> .mozconfig +} - cp ../mozconfig .mozconfig - if $_pgo; then - cat ../mozconfig.pgo >> .mozconfig +prepare() { + if [[ -d "/usr/lib/$pkgbase" ]]; then + error "Because of how rpath is set, this package cannot be installed during build" + return 1 fi + dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc mozilla-release + cd mozilla-release patch -Np1 -i ../Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch patch -Np1 -i ../iceweasel-install-dir.patch patch -Np1 -i ../xulrunner-copy-stub.patch - patch -Np1 -i ../libre.patch patch -Np1 -i ../shared-libs.patch + patch -Np1 -i ../libre.patch # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in - # This is a bug, we should fix it. - if [[ $CARCH == mips64el ]]; then - # Fix MIPS N32 support. - sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ - js/src/assembler/wtf/Platform.h - # Disable JIT. - sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \ - js/src/assembler/wtf/Platform.h - sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in - echo 'ac_add_options --disable-methodjit' >> .mozconfig - echo 'ac_add_options --disable-tracejit' >> .mozconfig - echo 'ac_add_options --disable-jemalloc' >> .mozconfig - fi + if [[ $CARCH == mips64el ]]; then mips64el-prepare; fi + + touch "$srcdir/.makepkg-prepare" +} + +build() { + [[ -f "$srcdir/.makepkg-prepare" ]] || { prepare || return $?; cd "$srcdir"; } + cd "$srcdir" + build_browser +} + +build_browser() { + cd mozilla-release + + cp ../mozconfig .mozconfig + if $_pgo; then cat ../mozconfig.pgo >> .mozconfig; fi + if [[ $CARCH == mips64el ]]; then mips64el-configure; fi export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgbase" export PYTHON="/usr/bin/python2" @@ -163,23 +186,37 @@ build() { return $_fail } +install-icon() { + local brandingdir=$1 prog=$2 size=$3 + local sizedir=${size}x${size} ext=png + [[ $size == scalable ]] && { sizedir=$size; ext=svg; size=''; } + + dirs=({moz-objdir/,}"$brandingdir") + files=({default,mozicon,${prog}{,_icon}}${size}.${ext}) + + for dir in "${dirs[@]}"; do + for files in "${files[@]}"; do + if [[ -e "$dir/$file" ]]; then + install -Dm644 "$dir/$file" \ + "$pkgdir/usr/share/icons/hicolor/$sizedir/apps/$prog.png" + return 0 + fi + done + done + #return 1 +} + package() { cd mozilla-release make -j1 -f client.mk DESTDIR="$pkgdir" install install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgbase/defaults/preferences/vendor.js" - # I don't even know why we're hitting the objdir, and ConnOS didn't. - _brandingdir=debian/branding - brandingdir=moz-objdir/$_brandingdir - icondir="$pkgdir/usr/share/icons/hicolor" - for i in 16x16 32x32 48x48 64x64; do - install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$pkgbase.png" + for size in 16 32 48 64 128 scalable; do + install-icon debian/branding $pkgbase $size done - install -Dm644 "$brandingdir/mozicon128.png" "$icondir/128x128/apps/$pkgbase.png" - install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$pkgbase.svg" - install -Dm644 debian/iceweasel.desktop \ + install -Dm644 ../$pkgbase.desktop \ "$pkgdir/usr/share/applications/$pkgbase.desktop" # Use system-provided dictionaries @@ -297,4 +334,5 @@ md5sums=('7fe75c8797381adf9f0845d88064e24a' 'abf5ecb74caa857abb42bcfbb3442d9c' '0d053487907de4376d67d8f499c5502b' '52e52f840a49eb1d14be1c0065b03a93' - '65f68090d2a69b467bd2707d0c4ea3bd') + '65f68090d2a69b467bd2707d0c4ea3bd' + '39d8b9249c5effe5fe24d2e9f80a9a94') diff --git a/libre/iceweasel-libre/firefox.install b/libre/iceweasel-libre/firefox.install new file mode 100644 index 000000000..1a1f4b16b --- /dev/null +++ b/libre/iceweasel-libre/firefox.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + diff --git a/libre/iceweasel-libre/iceweasel.desktop b/libre/iceweasel-libre/iceweasel.desktop new file mode 100644 index 000000000..740ed5b31 --- /dev/null +++ b/libre/iceweasel-libre/iceweasel.desktop @@ -0,0 +1,116 @@ +[Desktop Entry] +Name=Iceweasel +GenericName=Web Browser +GenericName[af]=Web Blaaier +GenericName[ar]=متصفح ويب +GenericName[az]=Veb Səyyahı +GenericName[bg]=Браузър +GenericName[bn]=ওয়েব ব্রাউজার +GenericName[br]=Furcher ar Gwiad +GenericName[bs]=WWW Preglednik +GenericName[ca]=Fullejador web +GenericName[cs]=WWW prohlížeč +GenericName[cy]=Porydd Gwe +GenericName[da]=Browser +GenericName[de]=Web-Browser +GenericName[el]=Περιηγητής Ιστού +GenericName[eo]=TTT-legilo +GenericName[es]=Navegador web +GenericName[et]=Veebilehitseja +GenericName[eu]=Web arakatzailea +GenericName[fa]=مرورگر وب +GenericName[fi]=WWW-selain +GenericName[fo]=Alnótsfar +GenericName[fr]=Navigateur web +GenericName[gl]=Navegador Web +GenericName[he]=דפדפן אינטרנט +GenericName[hi]=वेब ब्राउज़र +GenericName[hr]=Web preglednik +GenericName[hu]=Webböngésző +GenericName[is]=Vafri +GenericName[it]=Browser Web +GenericName[ja]=ウェブブラウザ +GenericName[ko]=웹 브라우저 +GenericName[lo]=ເວັບບຣາວເຊີ +GenericName[lt]=Žiniatinklio naršyklė +GenericName[lv]=Web Pārlūks +GenericName[mk]=Прелистувач на Интернет +GenericName[mn]=Веб-Хөтөч +GenericName[nb]=Nettleser +GenericName[nds]=Nettkieker +GenericName[nl]=Webbrowser +GenericName[nn]=Nettlesar +GenericName[nso]=Seinyakisi sa Web +GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador Web +GenericName[ro]=Navigator de web +GenericName[ru]=Веб-браузер +GenericName[se]=Fierpmádatlogan +GenericName[sk]=Webový prehliadač +GenericName[sl]=Spletni brskalnik +GenericName[sr]=Веб претраживач +GenericName[sr@Latn]=Veb pretraživač +GenericName[ss]=Ibrawuza yeWeb +GenericName[sv]=Webbläsare +GenericName[ta]=வலை உலாவி +GenericName[tg]=Тафсиргари вэб +GenericName[th]=เว็บบราวเซอร์ +GenericName[tr]=Web Tarayıcı +GenericName[uk]=Навігатор Тенет +GenericName[uz]=Веб-браузер +GenericName[ven]=Buronza ya Webu +GenericName[vi]=Trình duyệt Web +GenericName[wa]=Betchteu waibe +GenericName[xh]=Umkhangeli zincwadi we Web +GenericName[zh_CN]=网页浏览器 +GenericName[zh_TW]=網頁瀏覽器 +GenericName[zu]=Umcingi we-Web +Comment=Browse the World Wide Web +Comment[ar]=تصفح الشبكة العنكبوتية العالمية +Comment[ast]=Restola pela Rede +Comment[bn]=ইন্টারনেট ব্রাউজ করুন +Comment[ca]=Navegueu per la web +Comment[cs]=Prohlížení stránek World Wide Webu +Comment[da]=Surf på internettet +Comment[de]=Im Internet surfen +Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web) +Comment[es]=Navegue por la web +Comment[et]=Lehitse veebi +Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید +Comment[fi]=Selaa Internetin WWW-sivuja +Comment[fr]=Naviguer sur le Web +Comment[gl]=Navegar pola rede +Comment[he]=גלישה ברחבי האינטרנט +Comment[hr]=Pretražite web +Comment[hu]=A világháló böngészése +Comment[it]=Esplora il web +Comment[ja]=ウェブを閲覧します +Comment[ko]=웹을 돌아 다닙니다 +Comment[ku]=Li torê bigere +Comment[lt]=Naršykite internete +Comment[nb]=Surf på nettet +Comment[nl]=Verken het internet +Comment[nn]=Surf på nettet +Comment[no]=Surf på nettet +Comment[pl]=Przeglądanie stron WWW +Comment[pt]=Navegue na Internet +Comment[pt_BR]=Navegue na Internet +Comment[ro]=Navigați pe Internet +Comment[ru]=Доступ в Интернет +Comment[sk]=Prehliadanie internetu +Comment[sl]=Brskajte po spletu +Comment[sv]=Surfa på webben +Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ +Comment[uk]=Перегляд сторінок Інтернету +Comment[vi]=Để duyệt các trang web +Comment[zh_CN]=浏览互联网 +Comment[zh_TW]=瀏覽網際網路 +Exec=/usr/lib/iceweasel/iceweasel %u +Icon=iceweasel +Terminal=false +Type=Application +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; +StartupNotify=true +Categories=Network;WebBrowser; diff --git a/libre/iceweasel-libre/iceweasel.install b/libre/iceweasel-libre/iceweasel.install deleted file mode 100644 index c1fe8284a..000000000 --- a/libre/iceweasel-libre/iceweasel.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} - -- cgit v1.2.3 From 005cec01792d1fc62eb011ea35acad0f6d9cb70e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 12 Jan 2013 17:56:54 -0500 Subject: libre/iceweasel-libre: update to 18.0.1, simplify libre.patch This means * tweaking the depends * removing now-upstream patches libre.patch: * use vendor.js for some of it * use a sed script for other parts --- ...Make-the-Reset-Firefox-feature-more-gener.patch | 281 --------- libre/iceweasel-libre/PKGBUILD | 156 ++--- libre/iceweasel-libre/iceweasel-install-dir.patch | 12 +- libre/iceweasel-libre/libre.patch | 661 +++------------------ libre/iceweasel-libre/mozconfig | 18 +- libre/iceweasel-libre/replace-urls.txt | 25 + libre/iceweasel-libre/vendor.js | 17 + libre/iceweasel-libre/xulrunner-copy-stub.patch | 11 - 8 files changed, 218 insertions(+), 963 deletions(-) delete mode 100644 libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch create mode 100644 libre/iceweasel-libre/replace-urls.txt delete mode 100644 libre/iceweasel-libre/xulrunner-copy-stub.patch (limited to 'libre/iceweasel-libre/PKGBUILD') diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch deleted file mode 100644 index 69fe5c072..000000000 --- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ /dev/null @@ -1,281 +0,0 @@ -From: Mike Hommey -Date: Tue, 5 Jun 2012 08:57:06 +0200 -Subject: Bug 756390 - Make the "Reset Firefox" feature more generic - -diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js -index 0e8ccf5..fa46c08 100644 ---- a/browser/components/migration/content/migration.js -+++ b/browser/components/migration/content/migration.js -@@ -249,7 +249,7 @@ var MigrationWizard = { - } - - var brandBundle = document.getElementById("brandBundle"); -- // These strings don't exist when not using official branding. If that's -+ // These strings may not exist when not using official branding. If that's - // the case, just skip this page. - try { - var pageTitle = brandBundle.getString("homePageMigrationPageTitle"); -@@ -281,8 +281,8 @@ var MigrationWizard = { - case "chrome": - source = "sourceNameChrome"; - break; -- case "firefox": -- source = "sourceNameFirefox"; -+ case "self": -+ source = "brand"; - break; - } - -@@ -292,7 +292,12 @@ var MigrationWizard = { - var oldHomePageURL = this._migrator.sourceHomePageURL; - - if (oldHomePageURL && source) { -- var appName = MigrationUtils.getLocalizedString(source); -+ var appName; -+ if (source == "brand") { -+ appName = brandBundle.GetStringFromName("brandFullName"); -+ } else { -+ appName = MigrationUtils.getLocalizedString(source); -+ } - var oldHomePageLabel = - brandBundle.getFormattedString("homePageImport", [appName]); - var oldHomePage = document.getElementById("oldHomePage"); -diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul -index f030756..23e37ff 100644 ---- a/browser/components/migration/content/migration.xul -+++ b/browser/components/migration/content/migration.xul -@@ -42,7 +42,7 @@ - #elifdef XP_UNIX - - #endif -- -+