commit 4eff36cb38b93ebf91ab3a16383ea38ecf202f1f
Author: Jan Rękorajski <[email protected]>
Date: Sun Jun 12 21:48:01 2016 +0000
- updated patches and script for 2.40
enable-addons.patch | 42 +++++++++++++++++++++++-------------------
iceape-branding.patch | 24 ++++++++++++++----------
iceape.sh | 40 +++++++++++-----------------------------
system-virtualenv.patch | 2 +-
4 files changed, 49 insertions(+), 59 deletions(-)
---
diff --git a/enable-addons.patch b/enable-addons.patch
index 6eb395b..1808ff0 100644
--- a/enable-addons.patch
+++ b/enable-addons.patch
@@ -1,6 +1,5 @@
-diff -up seamonkey-2.5/comm-release/mail/app/profile/all-thunderbird.js.old
seamonkey-2.5/comm-release/mail/app/profile/all-thunderbird.js
---- seamonkey-2.5/comm-release/mail/app/profile/all-thunderbird.js.old
2011-11-21 11:20:08.000000000 +0100
-+++ seamonkey-2.5/comm-release/mail/app/profile/all-thunderbird.js
2011-12-14 12:40:24.074179826 +0100
+--- seamonkey-2.5/mail/app/profile/all-thunderbird.js.old 2011-11-21
11:20:08.000000000 +0100
++++ seamonkey-2.5/mail/app/profile/all-thunderbird.js 2011-12-14
12:40:24.074179826 +0100
@@ -138,7 +138,7 @@ pref("extensions.update.autoUpdateDefaul
// Disable add-ons installed into the shared user and shared system areas by
// default. This does not include the application directory. See the SCOPE
@@ -10,36 +9,41 @@ diff -up
seamonkey-2.5/comm-release/mail/app/profile/all-thunderbird.js.old seam
// Preferences for AMO integration
pref("extensions.getAddons.cache.enabled", true);
----
iceape-2.26/comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm.orig
2014-05-14 18:10:44.574018230 +0200
-+++
iceape-2.26/comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm
2014-05-14 18:13:00.020682073 +0200
-@@ -2051,7 +2051,7 @@
- this.showUpgradeUI();
- flushCaches = true;
- }
-- else if (aAppChanged === undefined) {
-+ else {
- // For new profiles we will never need to show the add-on selection UI
+---
iceape-2.26/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm.orig
2014-05-14 18:10:44.574018230 +0200
++++ iceape-2.26/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm
2014-05-14 18:13:00.020682073 +0200
+@@ -2102,11 +2102,9 @@ var XPIProvider = {
+
+ AddonManagerPrivate.markProviderSafe(this);
+
+- if (aAppChanged === undefined) {
+- // For new profiles we will never need to show the add-on selection UI
++ // For all profiles we will never need to show the add-on selection UI
Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true);
- }
---- iceape-2.22/comm-release/suite/browser/browser-prefs.js~ 2013-11-06
19:54:38.789734061 +0100
-+++ iceape-2.22/comm-release/suite/browser/browser-prefs.js 2013-11-06
20:55:33.765611935 +0100
+- }
+- else if (aAppChanged && !this.allAppGlobal &&
++ if (aAppChanged && !this.allAppGlobal &&
+ Preferences.get(PREF_EM_SHOW_MISMATCH_UI, true)) {
+ if (!Preferences.get(PREF_SHOWN_SELECTION_UI, false)) {
+ // Flip a flag to indicate that we interrupted startup with an
interactive prompt
+--- iceape-2.22/suite/browser/browser-prefs.js~ 2013-11-06
19:54:38.789734061 +0100
++++ iceape-2.22/suite/browser/browser-prefs.js 2013-11-06 20:55:33.765611935
+0100
@@ -616,7 +616,7 @@
// Disable add-ons installed into the shared user and shared system areas by
// default. This does not include the application directory. See the SCOPE
// constants in AddonManager.jsm for values to use here.
-pref("extensions.autoDisableScopes", 15);
-+pref("extensions.autoDisableScopes", 0);
++pref("extensions.autoDisableScopes", 3);
// Preferences for AMO integration
pref("extensions.getAddons.cache.enabled", true); // also toggles
personalized recommendations
---- iceape-2.22/comm-release/mozilla/browser/app/profile/firefox.js~
2013-10-29 02:20:40.000000000 +0100
-+++ iceape-2.22/comm-release/mozilla/browser/app/profile/firefox.js
2013-11-06 20:56:58.633092070 +0100
+--- iceape-2.22/mozilla/browser/app/profile/firefox.js~ 2013-10-29
02:20:40.000000000 +0100
++++ iceape-2.22/mozilla/browser/app/profile/firefox.js 2013-11-06
20:56:58.633092070 +0100
@@ -62,7 +62,7 @@
// Disable add-ons that are not installed by the user in all scopes by
default.
// See the SCOPE constants in AddonManager.jsm for values to use here.
-pref("extensions.autoDisableScopes", 15);
-+pref("extensions.autoDisableScopes", 0);
++pref("extensions.autoDisableScopes", 3);
// Dictionary download preference
pref("browser.dictionaries.download.url",
"https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/";);
diff --git a/iceape-branding.patch b/iceape-branding.patch
index b3e9086..15f9821 100644
--- a/iceape-branding.patch
+++ b/iceape-branding.patch
@@ -22,24 +22,28 @@ index 1e3799e..ae4cb1f 100644
pref("browser.search.defaultenginename",
"chrome://communicator-region/locale/region.properties");
@@ -563,7 +563,7 @@ pref("extensions.blocklist.interval", 86400);
pref("extensions.blocklist.level", 2);
- pref("extensions.blocklist.url",
"https://addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/";);
+ pref("extensions.blocklist.url",
"https://blocklist.addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/";);
pref("extensions.blocklist.detailsURL",
"https://www.mozilla.com/%LOCALE%/blocklist/";);
--pref("extensions.blocklist.itemURL",
"https://addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%";);
-+pref("extensions.blocklist.itemURL",
"https://addons.mozilla.org/%LOCALE%/seamonkey/blocked/%blockID%";);
+-pref("extensions.blocklist.itemURL",
"https://blocklist.addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%";);
++pref("extensions.blocklist.itemURL",
"https://blocklist.addons.mozilla.org/%LOCALE%/seamonkey/blocked/%blockID%";);
// Update preferences for installed Extensions and Themes.
// Symmetric (can be overridden by individual extensions),
-@@ -587,11 +587,11 @@ pref("extensions.autoDisableScopes", 15);
+@@ -587,13 +587,13 @@ pref("extensions.autoDisableScopes", 15);
// Preferences for AMO integration
pref("extensions.getAddons.cache.enabled", true); // also toggles
personalized recommendations
pref("extensions.getAddons.maxResults", 15);
-pref("extensions.getAddons.get.url",
"https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%";);
-pref("extensions.getAddons.getWithPerformance.url",
"https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%";);
+-pref("extensions.getAddons.link.url",
"https://addons.mozilla.org/%LOCALE%/%APP%/";);
+-pref("extensions.getAddons.recommended.url",
"https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=seamonkey";);
-pref("extensions.getAddons.search.browseURL",
"https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%";);
-pref("extensions.getAddons.search.url",
"https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey";);
-pref("extensions.webservice.discoverURL",
"https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%";);
+pref("extensions.getAddons.get.url",
"https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%";);
+pref("extensions.getAddons.getWithPerformance.url",
"https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%";);
++pref("extensions.getAddons.link.url",
"https://addons.mozilla.org/%LOCALE%/seamonkey/";);
++pref("extensions.getAddons.recommended.url",
"https://services.addons.mozilla.org/%LOCALE%/seamonkey%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=seamonkey";);
+pref("extensions.getAddons.search.browseURL",
"https://addons.mozilla.org/%LOCALE%/seamonkey/search?q=%TERMS%";);
+pref("extensions.getAddons.search.url",
"https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey";);
+pref("extensions.webservice.discoverURL",
"https://services.addons.mozilla.org/%LOCALE%/seamonkey/discovery/pane/%VERSION%/%OS%";);
@@ -58,9 +62,9 @@ index f56a77e..56e49f2 100644
-browser.throbber.url=http://www.seamonkey-project.org/
+browser.startup.homepage=about:
+browser.throbber.url=http://www.pld-linux.org/Packages/Iceape
- browser.search.defaulturl=http://www.google.com/search?q=
browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=
+ browser.translation.serviceDomain=translate.google.com
@@ -11,7 +11,7 @@ browser.translation.serviceDomain=translate.google.com
#config.js
@@ -128,12 +132,12 @@ index d20cb5b..4fa63af 100644
--- comm-release/suite/installer/package-manifest.in~ 2012-06-05
07:50:28.000000000 +0200
+++ comm-release/suite/installer/package-manifest.in 2012-06-06
14:55:27.764056749 +0200
@@ -480,7 +480,6 @@
- @BINPATH@/chrome/icons/default/places.png
- @BINPATH@/chrome/icons/default/places16.png
- @BINPATH@/chrome/icons/default/places48.png
--@BINPATH@/chrome/icons/default/seamonkey.png
+ @RESPATH@/chrome/icons/default/places.png
+ @RESPATH@/chrome/icons/default/places16.png
+ @RESPATH@/chrome/icons/default/places48.png
+-@RESPATH@/chrome/icons/default/seamonkey.png
#ifdef MOZ_UPDATER
- @BINPATH@/icons/updater.png
+ @RESPATH@/icons/updater.png
#endif
--- comm-release/iceape/branding/moz.build.orig 2013-06-26
01:46:34.000000000 +0200
+++ comm-release/iceape/branding/moz.build 2014-05-14 19:15:04.603937775
+0200
diff --git a/iceape.sh b/iceape.sh
index a98e6e6..087b590 100644
--- a/iceape.sh
+++ b/iceape.sh
@@ -1,38 +1,20 @@
#!/bin/sh
# based on script by (c) vip at linux.pl, wolf at pld-linux.org
-LIBDIR="@LIBDIR@/iceape"
-
-ICEAPE="$LIBDIR/iceape"
+ICEAPE="@LIBDIR@/iceape/iceape"
PWD=${PWD:-$(pwd)}
-if [ "$1" = "-remote" ]; then
- exec $ICEAPE "$@"
+if [ -z "$1" ]; then
+ exec $ICEAPE
else
- if ! $ICEAPE -remote 'ping()' 2>/dev/null; then
- if [ -f "$PWD/$1" ]; then
- exec $ICEAPE "file://$PWD/$1"
- else
- exec $ICEAPE "$@"
- fi
+ if [ -f "$PWD/$1" ]; then
+ URL="file://$PWD/$1"
+ else
+ URL="$1"
+ fi
+ if ! grep -q browser.tabs.opentabfor.middleclick.*false
~/.mozilla/seamonkey/*/prefs.js; then
+ exec $ICEAPE -new-tab "$URL"
else
- if [ -z "$1" ]; then
- exec $ICEAPE -remote 'xfeDoCommand(openBrowser)'
- elif [ "$1" = "-mail" ]; then
- exec $ICEAPE -remote 'xfeDoCommand(openInbox)'
- elif [ "$1" = "-compose" -o "$1" = "-editor" ]; then
- exec $ICEAPE -remote 'xfeDoCommand(composeMessage)'
- else
- if [ -f "$PWD/$1" ]; then
- URL="file://$PWD/$1"
- else
- URL="$1"
- fi
- if ! grep -q browser.tabs.opentabfor.middleclick.*false
~/.mozilla/seamonkey/*/prefs.js; then
- exec $ICEAPE -new-tab "$URL"
- else
- exec $ICEAPE -new-window "$URL"
- fi
- fi
+ exec $ICEAPE -new-window "$URL"
fi
fi
diff --git a/system-virtualenv.patch b/system-virtualenv.patch
index 3650d56..c97400c 100644
--- a/system-virtualenv.patch
+++ b/system-virtualenv.patch
@@ -6,7 +6,7 @@
"""Path to virtualenv's own populator script."""
- return os.path.join(self.topsrcdir, 'python', 'virtualenv',
- 'virtualenv.py')
-+ return '/usr/bin/virtualenv'
++ return '/usr/bin/virtualenv-2'
@property
def python_path(self):
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iceape.git/commitdiff/1ac3d5d8fa17ea9cfcdb16df76c6a22ef75bf2c0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
