diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/icedove/PKGBUILD | 12 | ||||
| -rw-r--r-- | libre/icedove/changing-the-default-search-engine.patch | 23 | ||||
| -rw-r--r-- | libre/icedove/icedove-install-dir.patch | 12 |
3 files changed, 23 insertions, 24 deletions
diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD index f2c882667..792fcdd4a 100644 --- a/libre/icedove/PKGBUILD +++ b/libre/icedove/PKGBUILD @@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } pkgname=${_debname} epoch=1 pkgver=${_debver}.${_debrel} -pkgrel=1 +pkgrel=2 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird." arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') @@ -37,7 +37,7 @@ sha256sums=('b59c74f67d2f9684d9cf0db62b5c60d3ef155807e17a91ebf0899dd55670f6a0' '29de44253624814ae3ce3e0a6a786ba229c62e78d8c97e36257f730d38d542f7' 'e3d0f5f78fede687dfc38a2787c2c8f33c8213be286abeb9176e3dcebabb0b74' '0b0d25067c64c6b829c84e5259ffca978e3971f85acc8483f47bdbed5b0b5b6a' - 'b2ecbeec986ba8ba66ac8f98faf30dabec49213cc35979d17d39cd699f41ba83' + '9765d9bbcae82d0006766741c813840db46c56ee16f79d39b8d7d96d716ee2d7' '798d5bff1e6025e9a803b67f629afac740f16e537b714ee7c7e829b2345fb6a2') prepare() { @@ -68,7 +68,7 @@ prepare() { quilt push -av - # remove url-classifier from package-manifest.in to build and disable Phishing Protection + # Remove url-classifier from package-manifest.in to build and disable Phishing Protection sed -i '\|Phishing Protection|d \|UrlClassifier|d \|URLClassifier|d @@ -87,11 +87,11 @@ prepare() { cp -v ${srcdir}/mozconfig .mozconfig - # configure script misdetects the preprocessor without an optimization level + # Configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure - # Changing the default search engine using our system-provided searchplugins + # Change the default search engine using our system-provided searchplugins patch -Np1 -i ${srcdir}/changing-the-default-search-engine.patch # Add symlinks to use jquery files built by us @@ -118,7 +118,7 @@ package() { install -vDm 644 ${srcdir}/vendor.js ${pkgdir}/usr/lib/${pkgname}/defaults/preferences/vendor.js - # install Icedove menu icon + # Install Icedove menu icon install -vDm 644 debian/${pkgname}.xpm ${pkgdir}/usr/share/pixmaps/${pkgname}.xpm # Install Icedove icons diff --git a/libre/icedove/changing-the-default-search-engine.patch b/libre/icedove/changing-the-default-search-engine.patch index 95c0af6fc..845e4f2fa 100644 --- a/libre/icedove/changing-the-default-search-engine.patch +++ b/libre/icedove/changing-the-default-search-engine.patch @@ -1,20 +1,31 @@ diff -Nur comm-esr38.orig/mail/locales/en-US/chrome/messenger-region/region.properties comm-esr38/mail/locales/en-US/chrome/messenger-region/region.properties ---- comm-esr38.orig/mail/locales/en-US/chrome/messenger-region/region.properties 2015-06-08 14:40:38.000000000 -0300 -+++ comm-esr38/mail/locales/en-US/chrome/messenger-region/region.properties 2015-07-28 18:24:25.162927640 -0300 +--- comm-esr38.orig/mail/locales/en-US/chrome/messenger-region/region.properties 2015-07-07 14:34:06.000000000 -0300 ++++ comm-esr38/mail/locales/en-US/chrome/messenger-region/region.properties 2015-08-16 13:30:55.466053010 -0300 @@ -3,12 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine -browser.search.defaultenginename=Bing -+browser.search.defaultenginename=DuckDuckGo HTML ++browser.search.defaultenginename=searx # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Bing -browser.search.order.2=Yahoo -browser.search.order.3= -+browser.search.order.1=DuckDuckGo HTML -+browser.search.order.2=DuckDuckGo Lite -+browser.search.order.3=searx ++browser.search.order.1=searx ++browser.search.order.2=DuckDuckGo HTML ++browser.search.order.3=DuckDuckGo Lite # To make mapit buttons to disappear in the addressbook, specify empty string. For example: # mail.addr_book.mapit_url.format= +@@ -19,8 +19,8 @@ + # @ST == state + # @ZI == zip code + # @CO == country +-mail.addr_book.mapit_url.format=http://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO +-mailnews.messageid_browser.url=http://groups.google.com/search?as_umsgid=%mid ++mail.addr_book.mapit_url.format= ++mailnews.messageid_browser.url= + + # Recognize non-standard versions of "Re:" in subjects from localized versions of MS Outlook et al. + # Specify a comma-separated list without spaces. For example: mailnews.localizedRe=AW,SV diff --git a/libre/icedove/icedove-install-dir.patch b/libre/icedove/icedove-install-dir.patch deleted file mode 100644 index 0c7ffaa4a..000000000 --- a/libre/icedove/icedove-install-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr comm-esr31.orig/mozilla/config/baseconfig.mk comm-esr31/mozilla/config/baseconfig.mk ---- comm-esr31.orig/mozilla/config/baseconfig.mk 2014-07-22 09:44:22.000000000 +0300 -+++ comm-esr31/mozilla/config/baseconfig.mk 2014-07-22 09:46:45.000000000 +0300 -@@ -4,7 +4,7 @@ - # whether a normal build is happening or whether the check is running. - includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) - sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) - ifndef TOP_DIST - TOP_DIST = dist |