[packages/iceape] - always enable addons in system dirs - remove all references to built-in mozldap - rel 1

baggins baggins at pld-linux.org
Wed Nov 6 22:01:11 CET 2013


commit 2c28e6504ba2dc3d50ff563f1309ae297d612f77
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Nov 6 22:00:29 2013 +0100

    - always enable addons in system dirs
    - remove all references to built-in mozldap
    - rel 1

 enable-addons.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 iceape.spec         |  5 ++++-
 2 files changed, 52 insertions(+), 1 deletion(-)
---
diff --git a/iceape.spec b/iceape.spec
index ff2d8ef..30447e5 100644
--- a/iceape.spec
+++ b/iceape.spec
@@ -23,7 +23,7 @@ Summary(pl.UTF-8):	Iceape - przeglądarka WWW
 Summary(pt_BR.UTF-8):	Navegador Iceape
 Name:		iceape
 Version:	2.22
-Release:	0.1
+Release:	1
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
 Source0:	http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/source/seamonkey-%{version}.source.tar.bz2
@@ -42,6 +42,7 @@ Source9:	%{name}.sh
 Patch0:		%{name}-branding.patch
 Patch1:		%{name}-pld-branding.patch
 Patch2:		%{name}-agent.patch
+Patch3:		enable-addons.patch
 Patch4:		system-mozldap.patch
 Patch5:		makefile.patch
 # Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
@@ -261,6 +262,7 @@ tar -jxf %{SOURCE2}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p2
 %patch4 -p1
 %patch5 -p1
 %patch7 -p1
@@ -523,6 +525,7 @@ cp -p %{topdir}/comm-release/mailnews/extensions/enigmail/package/chrome.manifes
 # nspr
 #%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{nspr4,plc4,plds4}.so
 # mozldap
+%{__sed} -i '/lib\(ldap\|ldif\|prldap\)60.so/d' $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap}60.so
 # testpilot quiz
 #%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/distribution/extensions/tbtestpilot at labs.mozilla.com.xpi
diff --git a/enable-addons.patch b/enable-addons.patch
new file mode 100644
index 0000000..78fa5a7
--- /dev/null
+++ b/enable-addons.patch
@@ -0,0 +1,48 @@
+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
+@@ -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
+ // constants in AddonManager.jsm for values to use here
+-pref("extensions.autoDisableScopes", 15);
++pref("extensions.autoDisableScopes", 0);
+ 
+ // Preferences for AMO integration
+ pref("extensions.getAddons.cache.enabled", true);
+diff -up seamonkey-2.5/comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm.addons seamonkey-2.5/comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm
+--- seamonkey-2.5/comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm.addons	2011-11-21 11:28:32.000000000 +0100
++++ seamonkey-2.5/comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm	2011-12-14 12:43:42.461184351 +0100
+@@ -1591,8 +1591,8 @@ var XPIProvider = {
+       this.showUpgradeUI();
+       flushCaches = true;
+     }
+-    else if (aAppChanged === undefined) {
+-      // For new profiles we will never need to show the add-on selection UI
++    else {
++      // 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
+@@ -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);
+ 
+ // 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
+@@ -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);
+ 
+ // Dictionary download preference
+ pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/iceape.git/commitdiff/2c28e6504ba2dc3d50ff563f1309ae297d612f77



More information about the pld-cvs-commit mailing list