diff options
Diffstat (limited to 'libre/icedove-libre')
| -rw-r--r-- | libre/icedove-libre/Icedove-branding.patch | 37 | ||||
| -rw-r--r-- | libre/icedove-libre/PKGBUILD | 30 | ||||
| -rw-r--r-- | libre/icedove-libre/branding.patch | 19 | ||||
| -rw-r--r-- | libre/icedove-libre/libre.patch | 49 | ||||
| -rw-r--r-- | libre/icedove-libre/makefile.patch | 46 |
5 files changed, 17 insertions, 164 deletions
diff --git a/libre/icedove-libre/Icedove-branding.patch b/libre/icedove-libre/Icedove-branding.patch deleted file mode 100644 index 751305147..000000000 --- a/libre/icedove-libre/Icedove-branding.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> -Date: Sat, 24 Nov 2012 11:36:16 +0100 -Subject: Icedove branding - ---- - mail/app/application.ini | 2 +- - mail/confvars.sh | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mail/app/application.ini b/mail/app/application.ini -index 8380eb7..12902c2 100644 ---- a/mail/app/application.ini -+++ b/mail/app/application.ini -@@ -4,7 +4,7 @@ - - #filter substitution - [App] --Name=Thunderbird -+Name=Icedove - Version=@APP_VERSION@ - BuildID=@GRE_BUILDID@ - #ifdef MOZ_SOURCE_REPO -diff --git a/mail/confvars.sh b/mail/confvars.sh -index 5c34d70..395bb87 100755 ---- a/mail/confvars.sh -+++ b/mail/confvars.sh -@@ -3,8 +3,8 @@ - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - --MOZ_APP_BASENAME=Thunderbird --MOZ_APP_NAME=thunderbird -+MOZ_APP_BASENAME=Icedove -+MOZ_APP_NAME=icedove - MOZ_UPDATER=1 - MOZ_THUNDERBIRD=1 - MOZ_CHROME_FILE_FORMAT=omni diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index e793f5924..d0820b8e5 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -28,20 +28,14 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" mozconfig replace-urls.txt vendor.js - makefile.patch - branding.patch - ${_pkgname}.desktop - Icedove-branding.patch) + ${_pkgname}.desktop) options=(!emptydirs) md5sums=('37a706e6b2c17049ab70739600ef47b0' '0524d248bd0e83fa62c261700640ac0d' '5cf95ea94f69cdd36604890cfbf7b954' 'a8fc4658d45b6bf9350023e5c3f34e56' '4eecc4fc5aafaf0da651a09eadc90bee' - 'c4ed43e85945e180a89cce03e45ec62c' - '126b1446212396c33220936c01d9592d' - 'e785e0c267f4435ae1a9aa0b03bcacfb' - 'ea5f7a06967f561d47d7e5c35b23de6f') + 'e785e0c267f4435ae1a9aa0b03bcacfb') prepare() { export DEBIAN_BUILD="comm-esr17" @@ -63,14 +57,24 @@ prepare() { install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/content/icon${i/x*/}.png" done - # This patch has a orthographic issue ("Icdove" instead of "Icedove") in MOZ_APP_BASENAME line for confvars.sh. - rm -v debian/patches/debian-hacks/Icedove-branding.patch || true + # Fix orthographic issue ("Icdove" to "Icedove") in MOZ_APP_BASENAME line for confvars.sh. + sed -i 's|Icdove|Icedove|' debian/patches/debian-hacks/Icedove-branding.patch quilt push -av - patch -Np1 -i "${srcdir}/makefile.patch" # small fix - patch -Np1 -i "${srcdir}/branding.patch" # fixing branding - patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version + # Fix paths on makefile + sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/|topsrcdir = @top_srcdir@|; + s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|; + s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|; + ' mail/branding/icedove/Makefile.in + + sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/[.][.]|topsrcdir = @top_srcdir@|; + s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|; + s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|; + ' mail/branding/icedove/locales/Makefile.in + + # Fix branding + sed -i 's|Icedove Mail/News|Icedove|' mail/branding/icedove/locales/en-US/brand.{dtd,properties} # Replace common URLs sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do diff --git a/libre/icedove-libre/branding.patch b/libre/icedove-libre/branding.patch deleted file mode 100644 index d84b8075a..000000000 --- a/libre/icedove-libre/branding.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd comm-release/mail/branding/icedove/locales/en-US/brand.dtd ---- comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd 2012-10-30 16:41:16.000000000 -0200 -+++ comm-release/mail/branding/icedove/locales/en-US/brand.dtd 2012-10-31 22:35:04.203666114 -0200 -@@ -1,4 +1,4 @@ - <!ENTITY brandShortName "Icedove"> --<!ENTITY brandFullName "Icedove Mail/News"> --<!ENTITY vendorShortName "Icedove"> -+<!ENTITY brandFullName "Icedove"> -+<!ENTITY vendorShortName "Mozilla"> - <!ENTITY trademarkInfo.part1 " "> -diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties comm-release/mail/branding/icedove/locales/en-US/brand.properties ---- comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties 2012-10-30 10:13:50.000000000 -0200 -+++ comm-release/mail/branding/icedove/locales/en-US/brand.properties 2012-10-31 22:35:14.786423732 -0200 -@@ -1,3 +1,3 @@ - brandShortName=Icedove --brandFullName=Icedove Mail/News --vendorShortName=Icedove -+brandFullName=Icedove -+vendorShortName=Mozilla diff --git a/libre/icedove-libre/libre.patch b/libre/icedove-libre/libre.patch deleted file mode 100644 index a6f23bdcd..000000000 --- a/libre/icedove-libre/libre.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -Nur comm-esr17.orig/mail/app/profile/all-thunderbird.js comm-esr17/mail/app/profile/all-thunderbird.js ---- comm-esr17.orig/mail/app/profile/all-thunderbird.js 2013-05-18 18:46:27.290732014 -0300 -+++ comm-esr17/mail/app/profile/all-thunderbird.js 2013-05-18 18:10:57.239376924 -0300 -@@ -160,11 +160,11 @@ - // Preferences for AMO integration - pref("extensions.getAddons.cache.enabled", true); - pref("extensions.getAddons.maxResults", 15); --pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%"); --pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&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%/thunderbird/search?q=%TERMS%"); --pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird"); --pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%"); -+pref("extensions.getAddons.get.url", "https://trisquel.info/browser-plain"); -+pref("extensions.getAddons.getWithPerformance.url", "https://trisquel.info/browser-plain"); -+pref("extensions.getAddons.search.browseURL", "https://trisquel.info/browser-plain"); -+pref("extensions.getAddons.search.url", "https://trisquel.info/browser-plain"); -+pref("extensions.webservice.discoverURL", "https://trisquel.info/browser-plain"); - - // Blocklist preferences - pref("extensions.blocklist.enabled", true); -@@ -189,7 +189,7 @@ - pref("extensions.update.interval", 86400); // Check for updates to Extensions and - // Themes every day - --pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/themes/"); -+pref("extensions.getMoreThemesURL", "https://trisquel.info/browser-plain"); - pref("extensions.dss.enabled", false); // Dynamic Skin Switching - pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next - -@@ -390,7 +390,7 @@ - - pref("spellchecker.dictionary", ""); - // Dictionary download preference --pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.com/%LOCALE%/thunderbird/dictionaries/"); -+pref("spellchecker.dictionaries.download.url", "https://trisquel.info/browser-plain"); - - // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular - // mail application without any user intervention. Possible values are: -@@ -747,9 +747,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%&appRelease=%APP_RELEASE%"); -+pref("pfs.datasource.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%"); - - // By default we show an infobar message when pages require plugins the user has - // not installed, or are outdated. diff --git a/libre/icedove-libre/makefile.patch b/libre/icedove-libre/makefile.patch deleted file mode 100644 index 8f8137bec..000000000 --- a/libre/icedove-libre/makefile.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Nur comm-release.orig/mail/branding/icedove/Makefile.in comm-release/mail/branding/icedove/Makefile.in ---- comm-release.orig/mail/branding/icedove/Makefile.in 2012-04-18 15:42:15.000000000 -0300 -+++ comm-release/mail/branding/icedove/Makefile.in 2012-05-08 04:03:25.680643202 -0300 -@@ -38,11 +38,11 @@ - # Branding Makefile for Icedove branding - - DEPTH = ../../.. --topsrcdir = ../../../ -+topsrcdir = @top_srcdir@ - srcdir = @srcdir@ - VPATH = @srcdir@ - --include $(topsrcdir)/config/autoconf.mk -+include $(DEPTH)/config/autoconf.mk - - DIRS = \ - locales \ -@@ -50,7 +50,7 @@ - - PREF_JS_EXPORTS += $(srcdir)/thunderbird-branding.js - --include $(DEPTH)/config/rules.mk -+include $(topsrcdir)/config/rules.mk - - export:: - $(NSINSTALL) -D $(DIST)/branding -diff -Nur comm-release.orig/mail/branding/icedove/locales/Makefile.in comm-release/mail/branding/icedove/locales/Makefile.in ---- comm-release.orig/mail/branding/icedove/locales/Makefile.in 2012-04-18 15:42:15.000000000 -0300 -+++ comm-release/mail/branding/icedove/locales/Makefile.in 2012-05-08 05:32:57.481620942 -0300 -@@ -36,13 +36,13 @@ - # ***** END LICENSE BLOCK ***** - - DEPTH = ../../../.. --topsrcdir = ../../../.. -+topsrcdir = @top_srcdir@ - srcdir = @srcdir@ - VPATH = @srcdir@ - relativesrcdir = mail/branding/icedove/locales - --include $(topsrcdir)/config/autoconf.mk -+include $(DEPTH)/config/autoconf.mk - - DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID) - --include $(DEPTH)/config/rules.mk -+include $(topsrcdir)/config/rules.mk |