summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Grapentin <andreas@grapentin.org>2019-03-04 21:07:47 +0100
committerAndreas Grapentin <andreas@grapentin.org>2019-03-04 21:07:47 +0100
commitcae02747c7f838d02bd1e51023d72a1ab95ac077 (patch)
tree7e466b58761a99ad6c17d600f80f37b8f3453ea0
parent9209289ce26afe49d02675531733dd2492f94387 (diff)
updating branding patches to 2.49HEAD2.49-1master2.49
-rwxr-xr-xrelease.sh2
-rw-r--r--src/patches/iceape-branding/branding.patch (renamed from src/patches/iceape-branding/Branding.patch)6
-rw-r--r--src/patches/series2
3 files changed, 5 insertions, 5 deletions
diff --git a/release.sh b/release.sh
index 7250138..4da244b 100755
--- a/release.sh
+++ b/release.sh
@@ -3,7 +3,7 @@
set -eu
pkgname=iceape
-brandingver=2.48
+brandingver=2.49
brandingrel=1
srcdir=src
diff --git a/src/patches/iceape-branding/Branding.patch b/src/patches/iceape-branding/branding.patch
index 53944e6..986a4d4 100644
--- a/src/patches/iceape-branding/Branding.patch
+++ b/src/patches/iceape-branding/branding.patch
@@ -2,7 +2,7 @@ diff --git a/suite/branding/nightly/moz.build b/suite/branding/nightly/moz.build
index ccd2e60..dfad066 100644
--- a/suite/branding/nightly/moz.build
+++ b/suite/branding/nightly/moz.build
-@@ -53,7 +53,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
+@@ -53,7 +53,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('win
if icon_dir == 'gtk':
FINAL_TARGET_FILES.chrome.icons.default += [
@@ -24,7 +24,7 @@ index ee2803b..f87dff8 100644
// pointer to the default engine name
pref("browser.search.defaultenginename", "chrome://communicator-region/locale/region.properties");
-@@ -639,13 +639,13 @@ pref("extensions.autoDisableScopes", 15);
+@@ -592,13 +592,13 @@ pref("extensions.autoDisableScopes", 15)
// Preferences for AMO integration
pref("extensions.getAddons.cache.enabled", true); // also toggles personalized recommendations
pref("extensions.getAddons.maxResults", 15);
@@ -60,8 +60,8 @@ index c44cc95..988131d 100755
+MOZ_APP_NAME=iceape
+MOZ_APP_DISPLAYNAME=Iceape
MOZ_LDAP_XPCOM=1
- MOZ_CHROME_FILE_FORMAT=omni
MOZ_COMPOSER=1
+ MOZ_DISABLE_EXPORT_JS=1
diff --git a/suite/locales/en-US/chrome/branding/brand.dtd b/suite/locales/en-US/chrome/branding/brand.dtd
index f9cd0b1..061e3f4 100644
--- a/suite/locales/en-US/chrome/branding/brand.dtd
diff --git a/src/patches/series b/src/patches/series
index c51bb6f..3f7656a 100644
--- a/src/patches/series
+++ b/src/patches/series
@@ -1 +1 @@
-iceape-branding/Branding.patch
+iceape-branding/branding.patch