From b5e98830d88d5797540cb4388b1424eac79e3ffa Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 20 Feb 2013 14:03:35 -0200 Subject: iceweasel-libre-19.0.1-1: updating version --- libre/iceweasel-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libre/iceweasel-libre') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 00a6fb3b0..5a701158e 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,7 +14,7 @@ _pgo=false # We're getting this from Debian Experimental _debname=iceweasel -_debver=18.0.2 +_debver=19.0 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -54,8 +54,8 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" shared-libs.patch replace-urls.txt Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('9869f5aa42cf922526d34b4946fee867' - 'a7f261b9860b9af596e0d8614d52a8cd' +md5sums=('b4c109e987f869f94220188a901d4425' + 'e1d6920cb49c9de88b8e00eb14b1b0e7' 'f90c6a70d0a6d0a9e7f9a0eed6aeffd3' 'ac29b01c189f20abae2f3eef1618ffc0' '1ee2d4bcacee73d671b9ffa17a02abaa' -- cgit v1.2.3 From cfdfb255be623d1fc10609307aa85f15f45e5d86 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 20 Feb 2013 19:28:25 -0200 Subject: iceweasel-19.0.1-1: updating md5sums --- .../Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch | 8 ++++---- libre/iceweasel-libre/PKGBUILD | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'libre/iceweasel-libre') 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 index f59454192..b7bd659a0 100644 --- 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 @@ -184,10 +184,10 @@ index 260bc29..52b32cc 100644 -64_firefox=Bookmarks Backups +64_self=Bookmarks Backups diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn -index 687c8d8..203d8cf 100644 +index 96cedd3..a0f8a75 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn -@@ -39,7 +39,7 @@ toolkit.jar: +@@ -42,7 +42,7 @@ toolkit.jar: + content/global/mozilla.xhtml (mozilla.xhtml) content/global/nsDragAndDrop.js (nsDragAndDrop.js) content/global/resetProfile.css (resetProfile.css) @@ -267,10 +267,10 @@ index f35c227..7062886 100644 %{C++ diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index e3dd0df..ef7bb74 100644 +index 1045665..04bd1aa 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -3669,7 +3669,7 @@ XREMain::XRE_mainRun() +@@ -3698,7 +3698,7 @@ XREMain::XRE_mainRun() if (gDoProfileReset) { // Automatically migrate from the current application if we just // reset the profile. diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 5a701158e..da1c191c6 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -64,7 +64,7 @@ md5sums=('b4c109e987f869f94220188a901d4425' '6dd547c72bb875a3101135a1c32d4783' '52e52f840a49eb1d14be1c0065b03a93' 'a8fc4658d45b6bf9350023e5c3f34e56' - '46a4b19b414065b99b870ea79b454f6e') + '2fde2f4bc158b217f3d71b33ef0bc626') if [ "$_pkgname" != "$pkgname" ]; then provides+=("$_pkgname=$pkgver") -- cgit v1.2.3 From 073cc8d3e877e69e60a311d9494fe96e80b45232 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 20 Feb 2013 20:01:04 -0200 Subject: iceweasel-libre-19.0.1-1: updating libre.patch's md5sum --- libre/iceweasel-libre/PKGBUILD | 2 +- libre/iceweasel-libre/libre.patch | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) (limited to 'libre/iceweasel-libre') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index da1c191c6..d0b7d7673 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -58,7 +58,7 @@ md5sums=('b4c109e987f869f94220188a901d4425' 'e1d6920cb49c9de88b8e00eb14b1b0e7' 'f90c6a70d0a6d0a9e7f9a0eed6aeffd3' 'ac29b01c189f20abae2f3eef1618ffc0' - '1ee2d4bcacee73d671b9ffa17a02abaa' + 'acb402fa414bed916fb0e09dfc1485c4' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' '6dd547c72bb875a3101135a1c32d4783' diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index f80295e55..1691a4aa1 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -156,9 +156,9 @@ diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi #searchText { diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties ---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-20 00:45:50.000000000 -0200 -+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-28 21:45:00.486713730 -0200 -@@ -3,25 +3,18 @@ +--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-02-15 19:14:45.000000000 -0200 ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-02-20 19:55:41.962705914 -0200 +@@ -3,19 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine @@ -180,16 +180,9 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio +browser.search.order.2=DuckDuckGo Lite +browser.search.order.3=Seeks Search - # URL for site-specific search engines - # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site - # to be searched and the user's search query. Place them in the appropriate location - # for your locale's URL but do not translate them. --browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} -+browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms} - # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the -@@ -30,20 +23,10 @@ +@@ -24,20 +17,10 @@ # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=3 -- cgit v1.2.3 From 268353fc440bd8926e04758bb7457e3793024362 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 20 Feb 2013 20:28:26 -0200 Subject: fixing license on mozilla packages --- libre/iceape-l10n/PKGBUILD | 4 ++-- libre/iceape-libre/PKGBUILD | 4 ++-- libre/icedove-l10n/PKGBUILD | 2 +- libre/icedove-libre/PKGBUILD | 4 ++-- libre/iceweasel-libre/PKGBUILD | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'libre/iceweasel-libre') diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD index be0a6dd07..64b0b812b 100644 --- a/libre/iceape-l10n/PKGBUILD +++ b/libre/iceape-l10n/PKGBUILD @@ -23,12 +23,12 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) pkgver=${_debver}.${_debrel} -pkgrel=1 +pkgrel=2 pkgdesc="Language packs for Debian Iceape." arch=('i686' 'x86_64' 'mips64el') url="http://packages.debian.org/source/sid/iceape" -license=('MPL') +license=('MPL' 'GPL') depends=("iceape-libre>=$pkgver") makedepends=('unzip' 'zip') source=('region.properties') diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index c46631628..eb3ab8a6e 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -11,10 +11,10 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=1 +pkgrel=2 pkgdesc="A libre version of Debian Iceape, the Internet Suite based on Mozilla Seamonkey." arch=('i686' 'x86_64' 'mips64el') -license=('GPL2' 'MPL' 'LGPL') +license=('MPL' 'GPL' 'LGPL') depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-ply' 'librsvg' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') replaces=('mozilla' 'seamonkey') diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index 208e176ba..cbeb4b741 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -10,7 +10,7 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) -pkgrel=2 +pkgrel=3 pkgdesc="Language packs for Debian Icedove." arch=('i686' 'x86_64' 'mips64el') url="http://packages.debian.org/source/experimental/icedove" diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 5ea3ff98f..9bad144bc 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -11,10 +11,10 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=1 +pkgrel=2 pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla Thunderbird." arch=('i586' 'i686' 'x86_64' 'mips64el') -license=('GPL2' 'MPL' 'LGPL') +license=('MPL' 'GPL' 'LGPL') url="http://packages.debian.org/source/experimental/${_pkgname}" depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index d0b7d7673..8616ce26c 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -31,7 +31,7 @@ fi pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox." arch=('i686' 'x86_64' 'mips64el') -license=('GPL2' 'MPL' 'LGPL') +license=('MPL' 'GPL' '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.14.1' 'sqlite3' 'startup-notification') makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'zip') [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') -- cgit v1.2.3 From c2954f9be7f6d99ae1140bc29612cafbde3a54ec Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 20 Feb 2013 22:52:37 -0200 Subject: fixing description on ice* packages --- libre/iceape-libre/PKGBUILD | 2 +- libre/icecat/PKGBUILD | 2 +- libre/icedove-libre/PKGBUILD | 2 +- libre/iceweasel-libre/PKGBUILD | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libre/iceweasel-libre') diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index eb3ab8a6e..01bc6558e 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -12,7 +12,7 @@ _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} pkgrel=2 -pkgdesc="A libre version of Debian Iceape, the Internet Suite based on Mozilla Seamonkey." +pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 3ecd1c2b5..efa122b1d 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -17,7 +17,7 @@ _pgo=false pkgname=icecat pkgver=17.0.1 pkgrel=6 -pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!' +pkgdesc='GNUzilla IceCat, the standalone web browser based on Mozilla Firefox.' arch=(i686 x86_64 mips64el) license=(MPL GPL LGPL) depends=( diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 9bad144bc..1bf14850d 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -12,7 +12,7 @@ _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} pkgrel=2 -pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla Thunderbird." +pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird." arch=('i586' 'i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') url="http://packages.debian.org/source/experimental/${_pkgname}" diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 8616ce26c..c2c6adaa5 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -29,7 +29,7 @@ if $_pgo; then pkgname+='-pgo' fi -pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox." +pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' '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.14.1' 'sqlite3' 'startup-notification') -- cgit v1.2.3 From bb0b4528591d1fb50b6683da47a210066a00fbfb Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 22 Feb 2013 02:26:57 -0200 Subject: iceweasel-19.0.1-2: enabling pgo --- libre/iceweasel-libre/PKGBUILD | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'libre/iceweasel-libre') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index c2c6adaa5..0a3225605 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -10,7 +10,7 @@ # Contributor: evr # Contributor: Muhammad 'MJ' Jassim -_pgo=false +_pgo=true # We're getting this from Debian Experimental _debname=iceweasel @@ -22,12 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=1 - -if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi -if $_pgo; then - pkgname+='-pgo' -fi +pkgrel=2 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=('i686' 'x86_64' 'mips64el') -- cgit v1.2.3 From 29e00823021242ee5a12102cfe536079024abfcd Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 22 Feb 2013 11:33:59 -0200 Subject: iceweasel-libre-19.0.1-3: improving pgo --- libre/iceweasel-libre/PKGBUILD | 18 +++++++++++------- libre/iceweasel-libre/mozconfig.pgo | 5 ++--- 2 files changed, 13 insertions(+), 10 deletions(-) (limited to 'libre/iceweasel-libre') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 0a3225605..8da5d4bdf 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=2 +pkgrel=3 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=('i686' 'x86_64' 'mips64el') @@ -52,7 +52,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" md5sums=('b4c109e987f869f94220188a901d4425' 'e1d6920cb49c9de88b8e00eb14b1b0e7' 'f90c6a70d0a6d0a9e7f9a0eed6aeffd3' - 'ac29b01c189f20abae2f3eef1618ffc0' + '383e8e2a97a8b13fe56d153adb6878b6' 'acb402fa414bed916fb0e09dfc1485c4' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' @@ -144,11 +144,15 @@ build() { fi 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" + export MOZ_PGO=1 + export DISPLAY=:99 + Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & + _fail=0 + + make -f client.mk build || _fail=1 + + kill $! || true + return $_fail fi } diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel-libre/mozconfig.pgo index b0c249ebf..2f4ebe32b 100644 --- a/libre/iceweasel-libre/mozconfig.pgo +++ b/libre/iceweasel-libre/mozconfig.pgo @@ -1,4 +1,3 @@ + # 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 48f162d6627ef7511b97c1bbbfdcdd279c9d8583 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 22 Feb 2013 12:06:38 -0200 Subject: iceweasel-libre-19.0.1-3: adding MOZ_MAKE_FLAGS export line --- libre/iceweasel-libre/PKGBUILD | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'libre/iceweasel-libre') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 8da5d4bdf..c571352f4 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -73,12 +73,14 @@ build() { ln -s /usr/bin/python2 "$srcdir/python2-path/python" export PATH="$srcdir/python2-path:$PATH" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" + export PYTHON="/usr/bin/python2" + 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" @@ -146,6 +148,9 @@ build() { if $_pgo; then export MOZ_PGO=1 export DISPLAY=:99 + export MOZ_MAKE_FLAGS="$MAKEFLAGS" + unset MAKEFLAGS + Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & _fail=0 -- cgit v1.2.3 From 10a551d11878e8d6872170293f32ec2dbf57f567 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 22 Feb 2013 15:30:17 -0200 Subject: iceweasel-libre: revert last changes due that iceweasel uses patches from debian adapted to use the previous commands --- libre/iceweasel-libre/PKGBUILD | 21 +++++++-------------- libre/iceweasel-libre/mozconfig.pgo | 4 +++- 2 files changed, 10 insertions(+), 15 deletions(-) (limited to 'libre/iceweasel-libre') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index c571352f4..065835d99 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=3 +pkgrel=2 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=('i686' 'x86_64' 'mips64el') @@ -52,7 +52,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" md5sums=('b4c109e987f869f94220188a901d4425' 'e1d6920cb49c9de88b8e00eb14b1b0e7' 'f90c6a70d0a6d0a9e7f9a0eed6aeffd3' - '383e8e2a97a8b13fe56d153adb6878b6' + 'dfeb4ab2c96aae3356a4c347eee0b97b' 'acb402fa414bed916fb0e09dfc1485c4' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' @@ -146,18 +146,11 @@ build() { fi if $_pgo; then - export MOZ_PGO=1 - export DISPLAY=:99 - export MOZ_MAKE_FLAGS="$MAKEFLAGS" - unset MAKEFLAGS - - Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & - _fail=0 - - make -f client.mk build || _fail=1 - - kill $! || true - return $_fail + 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 } diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel-libre/mozconfig.pgo index 2f4ebe32b..30464c38c 100644 --- a/libre/iceweasel-libre/mozconfig.pgo +++ b/libre/iceweasel-libre/mozconfig.pgo @@ -1,3 +1,5 @@ # PGO -mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10' +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' -- cgit v1.2.3 From 3c53b1441a03e79c0b6e4289f1cada91d0f92456 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 1 Mar 2013 00:52:12 -0200 Subject: fixing issue on Freenode's handlers --- libre/iceape-l10n/region.properties | 8 ++++---- libre/iceape-libre/libre.patch | 8 ++++---- libre/icecat-l10n/region.properties | 8 ++++---- libre/icecat/libre.patch | 8 ++++---- libre/iceweasel-l10n/region.properties | 8 ++++---- libre/iceweasel-libre/libre.patch | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) (limited to 'libre/iceweasel-libre') diff --git a/libre/iceape-l10n/region.properties b/libre/iceape-l10n/region.properties index 4399d8db7..551605dd7 100644 --- a/libre/iceape-l10n/region.properties +++ b/libre/iceape-l10n/region.properties @@ -24,9 +24,9 @@ browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+ gecko.handlerService.defaultHandlersVersion=3 # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Freenode -gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s +gecko.handlerService.schemes.irc.0.name=Freenode Web IRC +gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Freenode -gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch index e316dbf4c..860fd0d82 100644 --- a/libre/iceape-libre/libre.patch +++ b/libre/iceape-libre/libre.patch @@ -46,14 +46,14 @@ # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Mibbit -gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.irc.0.name=Freenode -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s ++gecko.handlerService.schemes.irc.0.name=Freenode Web IRC ++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Mibbit -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.ircs.0.name=Freenode -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s ++gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net --- comm-release.orig/mozilla/modules/libpref/src/init/all.js 2012-03-16 04:46:09.000000000 -0300 +++ comm-release/mozilla/modules/libpref/src/init/all.js 2012-05-12 04:03:52.163831535 -0300 @@ -47,7 +47,7 @@ diff --git a/libre/icecat-l10n/region.properties b/libre/icecat-l10n/region.properties index 4399d8db7..551605dd7 100644 --- a/libre/icecat-l10n/region.properties +++ b/libre/icecat-l10n/region.properties @@ -24,9 +24,9 @@ browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+ gecko.handlerService.defaultHandlersVersion=3 # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Freenode -gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s +gecko.handlerService.schemes.irc.0.name=Freenode Web IRC +gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Freenode -gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index 496c6b983..38b9fca01 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -59,12 +59,12 @@ diff -urN a/browser/locales/en-US/chrome/browser-region/region.properties b/brow gecko.handlerService.defaultHandlersVersion=3 + +# The default set of protocol handlers for irc: -+gecko.handlerService.schemes.irc.0.name=Freenode -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s ++gecko.handlerService.schemes.irc.0.name=Freenode Web IRC ++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net + +# The default set of protocol handlers for ircs: -+gecko.handlerService.schemes.ircs.0.name=Freenode -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s ++gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul --- a/dom/ipc/test.xul +++ b/dom/ipc/test.xul diff --git a/libre/iceweasel-l10n/region.properties b/libre/iceweasel-l10n/region.properties index a5870f54c..fe7f265ce 100644 --- a/libre/iceweasel-l10n/region.properties +++ b/libre/iceweasel-l10n/region.properties @@ -18,9 +18,9 @@ browser.search.order.3=Seeks Search gecko.handlerService.defaultHandlersVersion=3 # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Freenode -gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s +gecko.handlerService.schemes.irc.0.name=Freenode Web IRC +gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Freenode -gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 1691a4aa1..154fc3b94 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -199,14 +199,14 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Mibbit -gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.irc.0.name=Freenode -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s ++gecko.handlerService.schemes.irc.0.name=Freenode Web IRC ++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Mibbit -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.ircs.0.name=Freenode -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s ++gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff -ruN mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul --- mozilla-release.orig/dom/ipc/test.xul 2013-01-04 18:44:31.000000000 -0500 +++ mozilla-release/dom/ipc/test.xul 2013-01-10 18:19:26.000000000 -0500 -- cgit v1.2.3 From baffd85671d68cf597d38d2044536a65b2d55e54 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 1 Mar 2013 01:02:55 -0200 Subject: updating md5sum --- libre/iceape-l10n/PKGBUILD | 2 +- libre/iceape-libre/PKGBUILD | 2 +- libre/icecat-l10n/PKGBUILD | 2 +- libre/icecat/PKGBUILD | 2 +- libre/iceweasel-l10n/PKGBUILD | 2 +- libre/iceweasel-libre/PKGBUILD | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libre/iceweasel-libre') diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD index 64b0b812b..7c8a03b67 100644 --- a/libre/iceape-l10n/PKGBUILD +++ b/libre/iceape-l10n/PKGBUILD @@ -74,7 +74,7 @@ package_iceape-l10n-$(echo $lang | tr A-Z a-z)() { " done -md5sums=('428246ef3fb64103ff2cf5eaae2a92ca' +md5sums=('7558c5a34cc5f661d4e96885300d0c41' '22a14a6a2f03d0004a1fa990892094ef' 'af2379ea50672fe37ff8550d5c9e20a0' 'e5975c3b1ffaa5fcb3f5203cdfe8e0fb' diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index b84a30e72..fe9a8d5e4 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -35,7 +35,7 @@ md5sums=('1ee82aa6ec73c13e2099b4cb6f16a908' '7266333e31731af8bb50c2eca8d0bd26' '25b6fe16ac24cd5c852213e5c1adb272' 'c395d443a8c4c16880c7322bcf174743' - '3e0a275b57e5ccfeb7573e716693441a') + 'e6e4a2b5b5976404d7d54c21f9d1c2c3') build() { export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}" diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD index eeb2b0382..c76c43c63 100644 --- a/libre/icecat-l10n/PKGBUILD +++ b/libre/icecat-l10n/PKGBUILD @@ -167,7 +167,7 @@ package_icecat-l10n-$(echo $lang | tr A-Z a-z) () { done sha512sums=( - 20064992e694b3fed0f75bee9d54af3427c01ae0048e0ec220895e58127954ceb4db47ea85627e86d9ea6614ce3feaf30f652d87f7c2e896fc00774a757a640a + 1ec2a61191cdcd98678cdc823cf7b03bfad1444c5e33b5f2e264863ee302639202680207fc36c9a0337d699dcc7d7cc99a3f02b9caa07dc64d907c0c42a51138 f3c627282fa78ef67335fa70671af848f2fff2252db1c4125838bcbfd92c61ae978b9a32885f4b33beac4eb4d8dc3fc034b18703686164a4903c4180de539439 d88793ed54794833ec6200d7a1957b68ebe8dd5c1dd6f4d030440919e5ca7f85f84fefd459603d29be57fd6b9d0961356c7760aedaca638bc3b58532ceae8441 6f3f6e026bc7d4ac6d6aa9e1ebb5995d663293f9b26190d33de8857cbfd5e6454bbda49bd13d6c6c1dab544ef0f2da0cdec50b1d9fbfb73aa5d66b0a6a67a87c diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 785e3e077..d97e265ac 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -79,7 +79,7 @@ md5sums=( 2a35cf0054d0459993e3c3bae3d9841d dfeb4ab2c96aae3356a4c347eee0b97b 3009b176cc5f9b1e416b1bf7c45b064b - fcd2d895a0335c1b5fb652401e9da0d5 + 1dec37a964098fb3bc46bc767a5c0587 b41f82994fa056ffa5f8e6d99570e27a b30ba2b5562558d510fdd09d626d0faa 64826fcf48816b13090042eefddbaa58 diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 607d15feb..0f9ac778f 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -74,7 +74,7 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() { " done -md5sums=('97761543729499b0d5f150e0379a20b1' +md5sums=('e88728730ecf9f0f145de5f70e362b15' '5f91205d41a4622848e61bee463f14a1' 'e29da15887bb4ab2b569c5c4dd776a25' '7b76f37c83a29b64749cdc22c5165631' diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 065835d99..858bdf241 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -53,7 +53,7 @@ md5sums=('b4c109e987f869f94220188a901d4425' 'e1d6920cb49c9de88b8e00eb14b1b0e7' 'f90c6a70d0a6d0a9e7f9a0eed6aeffd3' 'dfeb4ab2c96aae3356a4c347eee0b97b' - 'acb402fa414bed916fb0e09dfc1485c4' + '7ef2c05dbd5631741404f2589c4ea07e' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' '6dd547c72bb875a3101135a1c32d4783' -- cgit v1.2.3 From 7b898abd2c5a80ac536bfcdadff9d49a71baaf31 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 1 Mar 2013 01:11:02 -0200 Subject: upgrade release on iceape-l10n, iceape-libre, icecat-l10n, iceweasel-l10n and iceweasel-libre --- libre/iceape-l10n/PKGBUILD | 2 +- libre/iceape-libre/PKGBUILD | 2 +- libre/icecat-l10n/PKGBUILD | 2 +- libre/iceweasel-l10n/PKGBUILD | 2 +- libre/iceweasel-libre/PKGBUILD | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'libre/iceweasel-libre') diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD index 7c8a03b67..d8fc4308a 100644 --- a/libre/iceape-l10n/PKGBUILD +++ b/libre/iceape-l10n/PKGBUILD @@ -23,7 +23,7 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) pkgver=${_debver}.${_debrel} -pkgrel=2 +pkgrel=3 pkgdesc="Language packs for Debian Iceape." arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index fe9a8d5e4..1dff5d2dd 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=3 +pkgrel=4 pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD index c76c43c63..15e559623 100644 --- a/libre/icecat-l10n/PKGBUILD +++ b/libre/icecat-l10n/PKGBUILD @@ -108,7 +108,7 @@ pkgname=( done) ) pkgver=17.0.1 -pkgrel=2 +pkgrel=3 pkgdesc='Language packs for GNU IceCat.' arch=( any diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 0f9ac778f..2e4837872 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -23,7 +23,7 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) pkgver=$_debver.$_debrel -pkgrel=1 +pkgrel=2 pkgdesc="Language packs for Debian Iceweasel." arch=('any') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 858bdf241..1c036c545 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=2 +pkgrel=3 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=('i686' 'x86_64' 'mips64el') -- cgit v1.2.3