summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch18
-rw-r--r--libre/iceweasel-libre/PKGBUILD22
2 files changed, 17 insertions, 23 deletions
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 69fe5c072..f59454192 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
@@ -67,7 +67,7 @@ index d7fec75..d531b83 100644
component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js
contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}
diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
-index a6598fe..8f83da8 100644
+index 52722e9..0448444 100644
--- a/browser/components/migration/src/FirefoxProfileMigrator.js
+++ b/browser/components/migration/src/FirefoxProfileMigrator.js
@@ -88,7 +88,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {
@@ -78,12 +78,12 @@ index a6598fe..8f83da8 100644
+FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self";
FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");
- const NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
+ this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm
-index 0669aa8..19552e3 100644
+index 1f60879..fc83a99 100644
--- a/browser/components/migration/src/MigrationUtils.jsm
+++ b/browser/components/migration/src/MigrationUtils.jsm
-@@ -403,11 +403,6 @@ let MigrationUtils = Object.freeze({
+@@ -403,11 +403,6 @@ this.MigrationUtils = Object.freeze({
* @see nsIStringBundle
*/
getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {
@@ -95,7 +95,7 @@ index 0669aa8..19552e3 100644
if (aReplacements === undefined)
return getMigrationBundle().GetStringFromName(aKey);
return getMigrationBundle().formatStringFromName(
-@@ -622,6 +617,17 @@ let MigrationUtils = Object.freeze({
+@@ -622,6 +617,17 @@ this.MigrationUtils = Object.freeze({
},
/**
@@ -114,7 +114,7 @@ index 0669aa8..19552e3 100644
*/
finishMigration: function MU_finishMigration() {
diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js
-index 744f117..59e5a4c 100644
+index f67823b..36016b8 100644
--- a/browser/components/migration/src/ProfileMigrator.js
+++ b/browser/components/migration/src/ProfileMigrator.js
@@ -12,6 +12,7 @@ function ProfileMigrator() {
@@ -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 339ffda..6999b26 100644
+index 687c8d8..203d8cf 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
-@@ -38,7 +38,7 @@ toolkit.jar:
+@@ -39,7 +39,7 @@ toolkit.jar:
+ content/global/mozilla.xhtml (mozilla.xhtml)
content/global/nsDragAndDrop.js (nsDragAndDrop.js)
content/global/resetProfile.css (resetProfile.css)
@@ -267,7 +267,7 @@ index f35c227..7062886 100644
%{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 68a52e6..02bb30e 100644
+index e3dd0df..ef7bb74 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -3669,7 +3669,7 @@ XREMain::XRE_mainRun()
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index e34ed131e..4f7d77337 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
+_debver=18.0.1
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=iceweasel
pkgname=iceweasel-libre
pkgver=$_debver.$_debrel
-pkgrel=6
+pkgrel=1
if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
if $_pgo; then
@@ -52,11 +52,10 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
iceweasel-install-dir.patch
vendor.js
shared-libs.patch
- bug677092.patch
replace-urls.txt
Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('366e1e4847d7e00eba77ee5a4be0d3db'
- '6a571d3a3b355c331f67d57702f4fccf'
+md5sums=('5d481dd35a304702d1f311eeb3f1149f'
+ '6a4781e8ddc1b166f36930c4864e095f'
'619e8f7c8596838a7daf2b7ce2e54cd3'
'ac29b01c189f20abae2f3eef1618ffc0'
'1ee2d4bcacee73d671b9ffa17a02abaa'
@@ -64,9 +63,8 @@ md5sums=('366e1e4847d7e00eba77ee5a4be0d3db'
'abf5ecb74caa857abb42bcfbb3442d9c'
'6dd547c72bb875a3101135a1c32d4783'
'52e52f840a49eb1d14be1c0065b03a93'
- '23520aca140fb0dd3e1b6f21b21f591f'
'a8fc4658d45b6bf9350023e5c3f34e56'
- '65f68090d2a69b467bd2707d0c4ea3bd')
+ '46a4b19b414065b99b870ea79b454f6e')
if [ "$_pkgname" != "$pkgname" ]; then
provides+=("$_pkgname=$pkgver")
@@ -100,11 +98,7 @@ build() {
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/shared-libs.patch"
-
- # Back out https://bugzilla.mozilla.org/show_bug.cgi?id=677092
- # in order to fix https://bugzilla.mozilla.org/show_bug.cgi?id=818468
- patch -Rp1 -i ../bug677092.patch
-
+
# Replace common URLs
sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
if [[ -n $moz_url ]]; then
@@ -115,12 +109,12 @@ build() {
| xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g"
fi
done
-
+
# Patch anything that's left
patch -Np1 -i "$srcdir/libre.patch"
cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
-
+
if $_pgo; then
cat "$srcdir/mozconfig.pgo" >> .mozconfig
fi
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-03 02:05:08 +0000