iceape-libre-2.7.4-1: adding libre.patch that is better than gnuzilla-addons.patch

2 files changed, 291 insertions, 3 deletions

diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index f777e988b..1927fe51b 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -29,7 +29,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         ${_pkgname}-2.0-lang.patch
         gcc47.patch
         clrf.patch
-        gnuzilla-addons.patch)
+        libre.patch)
 md5sums=('aedc7546db1fdc50cc9c5f21a7ad6138'
          '46908aec059166ac48592a8119badf3e'
          '60ba9e8f2fafd20e41268af534a55ea7'
@@ -37,7 +37,7 @@ md5sums=('aedc7546db1fdc50cc9c5f21a7ad6138'
          '25b6fe16ac24cd5c852213e5c1adb272'
          '94d5cd599ccc4438f192d8daabf98b6a'
          'c395d443a8c4c16880c7322bcf174743'
-         'a1da44f87b8f86fd5a810bbe14e983e8')
+         '79f99d8cda03dbcc1e88ef96776f591a')
 
 build() {
   export QUILT_PATCHES=debian/patches
@@ -56,7 +56,7 @@ build() {
   patch -Np1 -i "$srcdir/$_pkgname-2.0-lang.patch"
   patch -Np1 -i "$srcdir/gcc47.patch"
   patch -Np1 -i "$srcdir/clrf.patch"
-  patch -Np1 -i "$srcdir/gnuzilla-addons.patch"
+  patch -Np1 -i "$srcdir/libre.patch"
 
   # set up a simple non-animated throbber from the icon
   install -m644 debian/extras/Throbber-small.gif suite/themes/classic/communicator/brand/throbber-anim.png
diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch
new file mode 100644
index 000000000..fef11cbad
--- /dev/null
+++ b/libre/iceape-libre/libre.patch
@@ -0,0 +1,288 @@
+--- comm-release.orig/mozilla/browser/locales/en-US/chrome/browser-region/region.properties	2012-02-16 12:08:39.000000000 -0200
++++ comm-release/mozilla/browser/locales/en-US/chrome/browser-region/region.properties	2012-05-12 05:03:27.306166002 -0300
+@@ -1,45 +1,23 @@
+ # Default search engine
+-browser.search.defaultenginename=Google
++browser.search.defaultenginename=DuckDuckGo
+ 
+ # Search engine order (order displayed in the search bar dropdown)s
+-browser.search.order.1=Google
+-browser.search.order.2=Yahoo
+-browser.search.order.3=Bing
++browser.search.order.1=DuckDuckGo
+ 
+ # This is the default set of web based feed handlers shown in the reader
+ # selection UI
+-browser.contentHandlers.types.0.title=Google
+-browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
+-browser.contentHandlers.types.1.title=My Yahoo!
+-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
++browser.contentHandlers.types.0.title=DuckDuckGo
++browser.contentHandlers.types.0.uri=https://duckduckgo.com/search_box.html
+ 
+ # 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=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=http://duckduckgo.com/?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 
+ # profile database.  Note that "new" is defined as "has a different URL"; this
+ # means that it's not possible to update the name of existing handler, so 
+ # don't make any spelling errors here.
+-gecko.handlerService.defaultHandlersVersion=3
+-
+-# The default set of protocol handlers for webcal:
+-gecko.handlerService.schemes.webcal.0.name=30 Boxes
+-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
+-
+-# The default set of protocol handlers for mailto:
+-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
+-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s 
+-gecko.handlerService.schemes.mailto.1.name=Gmail
+-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
+-
+-# 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
+-
+-# 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.defaultHandlersVersion=0
+--- 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 @@
+ // SYNTAX HINTS:  dashes are delimiters.  Use underscores instead.
+ //  The first character after a period must be alphabetic.
+ 
+-pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
++pref("keyword.URL", "http://duckduckgo.com/?q=");
+ pref("keyword.enabled", false);
+ pref("general.useragent.locale", "chrome://global/locale/intl.properties");
+ pref("general.useragent.compatMode.firefox", false);
+--- comm-release.orig/mozilla/toolkit/content/plugins.html	2012-02-16 12:09:35.000000000 -0200
++++ comm-release/mozilla/toolkit/content/plugins.html	2012-05-12 03:56:16.599192244 -0300
+@@ -98,18 +98,6 @@
+   else
+     document.writeln("<h1 id=\"noplugs\">" + pluginsbundle.GetStringFromName("nopluginsareenabled_label") + "<\/h1>");
+ 
+-  document.writeln("<div id=\"findmore\">" + pluginsbundle.GetStringFromName("findmore_label") + " ");
+-  document.writeln("<a href=\"" + regionbundle.GetStringFromName("more_plugins_url") + "\">" + regionbundle.GetStringFromName("more_plugins_label") + "<\/a>.");
+-  document.writeln("<\/div>");
+-
+-  document.writeln("<div id=\"findpluginupdates\">" + pluginsbundle.GetStringFromName("findpluginupdates_label") + " ");
+-  document.writeln("<a href=\"" + regionbundle.GetStringFromName("pluginupdates_url") + "\">" + regionbundle.GetStringFromName("pluginupdates_label") + "<\/a>.");
+-  document.writeln("<\/div>");
+-
+-  document.writeln("<div id=\"installhelp\">" + pluginsbundle.GetStringFromName("installhelp_label") + " ");
+-  document.writeln("<a href=\"" + regionbundle.GetStringFromName("plugindoc_url") + "\">" + regionbundle.GetStringFromName("plugindoc_label") + "<\/a>.");
+-  document.writeln("<\/div><hr>");
+-
+   for (var i = 0; i < numPlugins; i++)
+   {
+     var plugin = navigator.plugins[i];
+--- comm-release.orig/mozilla/toolkit/mozapps/plugins/content/pluginInstallerWizard.js	2012-02-16 12:09:38.000000000 -0200
++++ comm-release/mozilla/toolkit/mozapps/plugins/content/pluginInstallerWizard.js	2012-05-12 03:59:11.639451163 -0300
+@@ -107,6 +107,7 @@
+     this.mPluginInfoArrayLength++;
+   } else {
+     this.mPluginNotFoundArray[aPluginRequestItem.mimetype] = aPluginRequestItem;
++    this.mPluginNotFoundArray[aPluginRequestItem.mimetype].pluginsPage = null;
+     this.mPluginNotFoundArrayLength++;
+   }
+ 
+--- comm-release.orig/mozilla/toolkit/mozapps/plugins/content/pluginInstallerWizard.xul	2012-02-16 12:09:38.000000000 -0200
++++ comm-release/mozilla/toolkit/mozapps/plugins/content/pluginInstallerWizard.xul	2012-05-12 04:01:29.208462907 -0300
+@@ -138,10 +138,6 @@
+ 
+     <description id="pluginSummaryRestartNeeded" style="padding-top:10px;"
+                  value="&pluginWizard.finalPage.restart.label;"/>
+-    <spacer flex="1" />
+-    <description id="moreInfoLink"
+-      style="color:rgb(0, 0, 255); cursor:pointer; text-decoration:underline;"
+-      value="&pluginWizard.finalPage.moreInfo.label;"/>
+   </wizardpage>
+ 
+ </wizard>
+--- comm-release.orig/suite/locales/en-US/chrome/browser/region.properties	2012-02-16 11:59:54.000000000 -0200
++++ comm-release/suite/locales/en-US/chrome/browser/region.properties	2012-05-12 04:10:18.982249044 -0300
+@@ -4,7 +4,7 @@
+ #
+ browser.startup.homepage=about:
+ browser.throbber.url=about:
+-browser.search.defaulturl=http://www.google.com/search?q=
++browser.search.defaulturl=http://duckduckgo.com/?q=
+ 
+ browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=
+ browser.translation.serviceDomain=translate.google.com
+@@ -15,7 +15,5 @@
+ 
+ # This is the default set of web based feed handlers shown in the reader
+ # selection UI
+-browser.contentHandlers.types.0.title=Google
+-browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
+-browser.contentHandlers.types.1.title=My Yahoo!
+-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
++browser.contentHandlers.types.0.title=DuckDuckGo
++browser.contentHandlers.types.0.uri=https://duckduckgo.com/search_box.html
+--- comm-release.orig/suite/locales/en-US/chrome/common/region.properties	2012-02-16 11:59:54.000000000 -0200
++++ comm-release/suite/locales/en-US/chrome/common/region.properties	2012-05-12 05:49:20.084819625 -0300
+@@ -1,10 +1,9 @@
+ # Default search engine
+-browser.search.defaultenginename=Google
++browser.search.defaultenginename=DuckDuckGo
+ 
+ # Search engine order (order displayed in the search bar dropdown)
+-browser.search.order.1=Google
+-browser.search.order.2=Yahoo
++browser.search.order.1=DuckDuckGo
+ 
+ # More information about this update link available in the update wizard.
+ # Only change this if you are providing localized release notes.
+-app.update.url.details=http://www.seamonkey-project.org/releases/
++app.update.url.details=http://packages.debian.org/source/sid/iceape
+--- comm-release.orig/suite/locales/en-US/chrome/mailnews/region.properties	2012-02-16 11:59:54.000000000 -0200
++++ comm-release/suite/locales/en-US/chrome/mailnews/region.properties	2012-05-12 04:28:05.202481512 -0300
+@@ -2,9 +2,9 @@
+ # messenger.properties
+ # mailnews.js
+ mailnews.start_page.url=chrome://messenger/content/start.xhtml
+-messenger.throbber.url=http://www.seamonkey-project.org/
+-compose.throbber.url=http://www.seamonkey-project.org/
+-addressbook.throbber.url=http://www.seamonkey-project.org/
++messenger.throbber.url=about:blank
++compose.throbber.url=about:blank
++addressbook.throbber.url=about:blank
+ # To make mapit buttons to disappear in the addressbook, specify empty string.  For example:
+ # mail.addr_book.mapit_url.format=
+ # The format for "mail.addr_book.mapit_url.format" is:
+--- comm-release.orig/suite/locales/en-US/profile/bookmarks.extra	2012-02-16 11:59:54.000000000 -0200
++++ comm-release/suite/locales/en-US/profile/bookmarks.extra	2012-05-12 04:34:50.172992393 -0300
+@@ -9,9 +9,7 @@
+ 
+     <DT><H3>Search the Web</H3>
+     <DL><p>
+-        <DT><A HREF="http://www.google.com/">Google</A>
+-        <DT><A HREF="http://groups.google.com/">Google Groups</A>
+-        <DT><A HREF="http://news.google.com/">Google News</A>
++        <DT><A HREF="http://duckduckgo.com/">DuckDuckGo</A>
+     </DL><p>
+ 
+ #unfilter emptyLines
+--- comm-release.orig/suite/browser/browser-prefs.js	2012-02-16 11:59:53.000000000 -0200
++++ comm-release/suite/browser/browser-prefs.js	2012-05-12 04:19:25.031793983 -0300
+@@ -67,7 +67,7 @@
+ 
+ // 0 = blank, 1 = home (browser.startup.homepage), 2 = last
+ pref("browser.startup.page",                1);
+-pref("browser.startup.homepage",	   "chrome://navigator-region/locale/region.properties");
++pref("browser.startup.homepage",          "about:blank");
+ pref("browser.startup.homepage.count", 1);
+ 
+ pref("browser.warnOnQuit", true);
+@@ -110,7 +110,7 @@
+ pref("browser.doorhanger.enabled", true);
+ 
+ // search engines URL
+-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/search-engines/");
++pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html");
+ 
+ // pointer to the default engine name
+ pref("browser.search.defaultenginename", "chrome://communicator-region/locale/region.properties");
+@@ -587,10 +587,10 @@
+ // 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%/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.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%");
++pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html");
+ 
+ // getMoreThemes is used by our UI under our switch theme menu
+ pref("extensions.getMoreThemesURL", "chrome://branding/locale/brand.properties");
+@@ -716,7 +715,7 @@
+ #endif
+ 
+ // plugin finder service url
+-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%");
++pref("pfs.datasource.url", "http://www.gnu.org/software/gnuzilla/addons.html");
+ pref("plugins.update.url", "http://www.mozilla.com/%LOCALE%/plugincheck/");
+ pref("plugins.update.notifyUser", false);
+ pref("plugins.hide_infobar_for_outdated_plugin", false);
+--- comm-release.orig/suite/locales/en-US/chrome/branding/brand.dtd	2012-05-12 05:14:55.000000000 -0300
++++ comm-release/suite/locales/en-US/chrome/branding/brand.dtd	2012-05-12 05:32:18.992033502 -0300
+@@ -1,4 +1,4 @@
+ <!ENTITY  brandFullName         "Iceape">
+ <!ENTITY  brandShortName        "Iceape">
+-<!ENTITY  vendorShortName       "Debian">
++<!ENTITY  vendorShortName       "Parabola">
+ <!ENTITY  sidebarName           "Sidebar">
+--- comm-release.orig/suite/locales/en-US/chrome/branding/brand.properties	2012-05-12 05:14:55.000000000 -0300
++++ comm-release/suite/locales/en-US/chrome/branding/brand.properties	2012-05-12 05:36:38.640803397 -0300
+@@ -1,9 +1,9 @@
+ brandFullName=Iceape
+ brandShortName=Iceape
+-vendorShortName=Debian
++vendorShortName=Parabola
+ sidebarName=Sidebar
+-extensions.getMoreThemesURL=https://addons.mozilla.org/%LOCALE%/%APP%/themes
++extensions.getMoreThemesURL=http://www.gnu.org/software/gnuzilla/addons.html#themes
+ extensions.getPersonasURL=https://addons.mozilla.org/%LOCALE%/%APP%/personas
+ spellchecker.dictionaries.download.url=https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries
+-app.releaseNotesURL=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/
+-app.vendorURL=http://www.seamonkey-project.org/
++app.releaseNotesURL=http://packages.debian.org/source/sid/iceape
++app.vendorURL=http://packages.debian.org/source/sid/iceape
+--- comm-release.orig/suite/locales/generic/profile/bookmarks.html.in	2012-02-16 11:59:54.000000000 -0200
++++ comm-release/suite/locales/generic/profile/bookmarks.html.in	2012-05-12 04:40:19.221095752 -0300
+@@ -11,37 +11,14 @@
+ <DL><p>
+     <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">@personal_toolbarfolder@</H3>
+     <DL><p>
+-        <DT><A HREF="http://www.seamonkey-project.org/">@seamonkey@</a>
+-        @seamonkey_l10n@
+-        <DT><A HREF="http://www.mozilla.org/">@mozilla_org@</A>
+-        <DT><A HREF="http://www.mozillazine.org/">@mozillazine@</A>
+-        <DT><A HREF="http://www.mozdev.org/">@mozdev@</A>
++        <DT><A HREF="https://parabolagnulinux.org/">Parabola GNU/Linux-libre</a>
++        <DT><A HREF="http://www.fsf.org/">Free Software Foundation</A>
++        <DT><A HREF="http://libreplanet.org/">LibrePlanet</A>
+     </DL><p>
+-    <DT><H3>@seamonkey_and_mozilla@</H3>
++    <DT><H3>GNUzilla</H3>
+     <DL><p>
+-        <DT><A HREF="http://www.seamonkey-project.org/">@seamonkey_long@</a>
+-        @seamonkey_l10n_long@
+-        <DT><H3>@mozilla_org@</H3>
+-        <DL><p>
+-            <DT><A HREF="http://www.mozilla.org/">@mozilla_org_long@</A>
+-            <DT><A HREF="http://www.mozilla.org/projects/">@mozilla_projects@</A>
+-            <DT><A HREF="http://www.mozilla.org/about/">@mozilla_about@</A>
+-        </DL><p>
+-        <DT><H3>@extend_seamonkey@</H3>
+-        <DL><p>
+-            <DT><A HREF="https://addons.mozilla.org/@AB_CD@/seamonkey/">@seamonkey_addons@</a>
+-            <DT><A HREF="https://addons.mozilla.org/@AB_CD@/seamonkey/themes">@seamonkey_themes@</a>
+-            <DT><A HREF="https://addons.mozilla.org/@AB_CD@/seamonkey/dictionaries">@seamonkey_dictionaries@</a>
+-            <DT><A HREF="https://addons.mozilla.org/@AB_CD@/seamonkey/plugins">@seamonkey_plugins@</a>
+-            <DT><A HREF="http://www.mozdev.org/">@mozdev@</A>
+-            <DT><A HREF="http://www.mozdev.org/projects/applications/SeaMonkey.html">@mozdev_seamonkey@</A>
+-        </DL><p>
+-        <DT><H3>@community_support@</H3>
+-        <DL><p>
+-            <DT><A HREF="http://www.seamonkey-project.org/community">@seamonkey_community@</a>
+-            <DT><A HREF="http://www.mozillazine.org/">@mozillazine@</A>
+-            <DT><A HREF="http://forums.mozillazine.org/viewforum.php?f=40">@seamonkey_support@</A>
+-        </DL><p>
++        <DT><A HREF="http://www.gnu.org/software/gnuzilla/">GNUzilla and IceCat</a>
++        <DT><a href="http://www.gnu.org/software/gnuzilla/addons.html">Free addons</a>
+     </DL><p>
+ #include bookmarks.extra
+     <HR>