summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/icedove/PKGBUILD136
-rw-r--r--libre/icedove/changing-the-default-search-engine.patch20
-rw-r--r--libre/icedove/mozconfig8
-rw-r--r--libre/icedove/vendor.js3
4 files changed, 92 insertions, 75 deletions
diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD
index d86927420..e641775a9 100644
--- a/libre/icedove/PKGBUILD
+++ b/libre/icedove/PKGBUILD
@@ -3,7 +3,7 @@
# We're getting this from Debian Sid
_debname=icedove
-_debver=31.7.0
+_debver=38.1.0
_debrel=deb1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -13,11 +13,14 @@ epoch=1
pkgver=${_debver}.${_debrel}
pkgrel=1
pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
license=('MPL' 'GPL' 'LGPL')
url="http://packages.debian.org/sid/${pkgname}"
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx=1.4.0' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
-makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse' 'autoconf2.13' 'quilt' 'jquery-ui')
+depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types'
+ 'dbus-glib' 'alsa-lib' 'desktop-file-utils' 'hicolor-icon-theme'
+ 'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite' 'mozilla-searchplugins')
+makedepends=('unzip' 'zip' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse'
+ 'pkg-config' 'autoconf2.13' 'quilt' 'jquery-ui')
optdepends=('libcanberra: for sound support')
replaces=('thunderbird' "${pkgname}-libre")
conflicts=('thunderbird' "${pkgname}-libre")
@@ -27,52 +30,44 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
"${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.xz"
mozconfig
${pkgname}.desktop
- ${pkgname}-install-dir.patch
+ changing-the-default-search-engine.patch
vendor.js)
-options=(!emptydirs)
-sha256sums=('00ce17575690400e22e7ce21dc5b3b4f71092b7708ee9aad74448d1401da8794'
- '04c30b4e72819b764bc463d36c39f55741d3e47ae994ba89fd14e63fe32c6561'
- '09a0041f7f12498d933284b3d3a44e19002515accaff767d145a8f404b79e86a'
+options=(!emptydirs !makeflags)
+sha256sums=('b59c74f67d2f9684d9cf0db62b5c60d3ef155807e17a91ebf0899dd55670f6a0'
+ '29de44253624814ae3ce3e0a6a786ba229c62e78d8c97e36257f730d38d542f7'
+ '4b798835ff3c76c436b5ea753cb002fd17c37675b9c87fdc1522019101e426fe'
'0b0d25067c64c6b829c84e5259ffca978e3971f85acc8483f47bdbed5b0b5b6a'
- '24599eab8862476744fe1619a9a53a5b8cdcab30b3fc5767512f31d3529bd05d'
- 'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec')
+ 'b2ecbeec986ba8ba66ac8f98faf30dabec49213cc35979d17d39cd699f41ba83'
+ '798d5bff1e6025e9a803b67f629afac740f16e537b714ee7c7e829b2345fb6a2')
prepare() {
- export DEBIAN_BUILD="comm-esr31"
+ export DEBIAN_BUILD=comm-esr${pkgver%%.*}
export QUILT_PATCHES=debian/patches
export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
export QUILT_DIFF_ARGS='--no-timestamps'
- mv debian "${srcdir}/${DEBIAN_BUILD}"
- cd "${srcdir}/${DEBIAN_BUILD}"
+ mv debian ${srcdir}/${DEBIAN_BUILD}
+ cd ${srcdir}/${DEBIAN_BUILD}
- mv debian/${pkgname}-branding "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}"
+ # Prepare branding for the Icedove packages
+ mkdir -v mail/branding/${pkgname}
- cp -a debian/app-icons/${pkgname}big.svg debian/app-icons/${pkgname}_icon.svg
- for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
- install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}/mailicon${i/x*/}.png"
+ # Copy needed icons
+ cp -va debian/${pkgname}-branding/* mail/branding/${pkgname}
+ for i in 16 22 24 32 48 256; do
+ install -vDm 644 debian/app-icons/${pkgname}${i}.png mail/branding/${pkgname}/mailicon${i}.png
done
- for i in 48x48 64x64; do
- install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}/content/icon${i/x*/}.png"
+ for i in 48 64; do
+ install -vDm 644 debian/app-icons/${pkgname}${i}.png mail/branding/${pkgname}/content/icon${i}.png
done
+ cp -va debian/preview.png mail/themes/linux/mail/preview.png
- # We are doing it from sed commands
- rm -v debian/patches/fixes/vp8_impl.cc-backporting-naming-for-constants.patch || true
+ # Useless since we are doing it ourselves
+ rm -v debian/patches/debian-hacks/changing-the-default-search-engine.patch || true
quilt push -av
- # 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 package-manifest.in
sed -i '\|; Phishing Protection| s|$|\n#ifdef MOZ_SAFE_BROWSING|;
\|@BINPATH@/components/url-classifier[.]xpt| s|$|\n#endif|
@@ -88,62 +83,59 @@ prepare() {
\|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g;
' mail/app/profile/all-thunderbird.js
- cp "${srcdir}/mozconfig" .mozconfig
+ cp -v ${srcdir}/mozconfig .mozconfig
# configure script misdetects the preprocessor without an optimization level
# https://bugs.archlinux.org/task/34644
sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure
- # Install to /usr/lib/$pkgname
- patch -Np1 -i "$srcdir/${pkgname}-install-dir.patch"
-
- # Add symlinks to use jquery files built for us
- ln -s /usr/share/javascript/jquery/jquery.min.js mail/jquery
- ln -s /usr/share/javascript/jquery-ui/jquery-ui.min.js mail/jquery
-
- # Fixing for libvpx >= 1.4.0
- sed -i 's|IMG_FMT_I420|VPX_IMG_FMT_I420|;
- s|PLANE_U|VPX_PLANE_U|;
- s|PLANE_V|VPX_PLANE_V|;
- s|PLANE_Y|VPX_PLANE_Y|;
- s|VPX_VPX_PLANE_|VPX_PLANE_|;
- ' mozilla/content/media/encoder/VP8TrackEncoder.cpp \
- mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
+ # Changing 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
+ ln -vs /usr/share/javascript/jquery/jquery.min.js mail/jquery
+ ln -vs /usr/share/javascript/jquery-ui/jquery-ui.min.js mail/jquery
}
build() {
- export DEBIAN_BUILD="comm-esr31"
+ export DEBIAN_BUILD=comm-esr${pkgver%%.*}
- cd "${srcdir}/${DEBIAN_BUILD}"
+ cd ${srcdir}/${DEBIAN_BUILD}
- export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${pkgname}"
- export PYTHON="/usr/bin/python2"
+ export PYTHON=/usr/bin/python2
- make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
+ make -f client.mk build
}
package() {
- export DEBIAN_BUILD="comm-esr31"
+ export DEBIAN_BUILD=comm-esr${pkgver%%.*}
+
+ cd ${srcdir}/${DEBIAN_BUILD}
- cd "${srcdir}/${DEBIAN_BUILD}"
+ make -f client.mk DESTDIR=${pkgdir} install
- make -j1 -f client.mk DESTDIR="${pkgdir}" install
+ install -vDm 644 ${srcdir}/vendor.js ${pkgdir}/usr/lib/${pkgname}/defaults/preferences/vendor.js
- install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${pkgname}/defaults/preferences/vendor.js"
+ # install Icedove menu icon
+ install -vDm 644 debian/${pkgname}.xpm ${pkgdir}/usr/share/pixmaps/${pkgname}.xpm
- for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do
- install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${pkgname}.png"
+ # Install Icedove icons
+ for i in 16 22 24 32 48 64 128 256; do
+ install -vDm 644 debian/app-icons/${pkgname}${i}.png ${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${pkgname}.png
done
- install -Dm644 "debian/app-icons/${pkgname}_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
-
- install -Dm644 "${srcdir}/${pkgname}.desktop" \
- "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-
- rm -rf "${pkgdir}"/usr/lib/${pkgname}/{dictionaries,hyphenation,searchplugins}
- ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/${pkgname}/dictionaries"
- ln -sf /usr/share/hyphen "${pkgdir}/usr/lib/${pkgname}/hyphenation"
- ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}/usr/lib/${pkgname}/searchplugins"
-
- # We don't want the development stuff
- rm -r "${pkgdir}"/usr/{include,lib/${pkgname}-devel,share/idl}
+ install -vDm 644 debian/app-icons/${pkgname}big.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg
+
+ # Install Icedove desktop
+ install -vDm 644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
+
+ # Use system-provided dictionaries
+ rm -vrf ${pkgdir}/usr/lib/${pkgname}/{dictionaries,hyphenation,searchplugins}
+ ln -vsf /usr/share/hunspell ${pkgdir}/usr/lib/${pkgname}/dictionaries
+ ln -vsf /usr/share/hyphen ${pkgdir}/usr/lib/${pkgname}/hyphenation
+
+ # Use system-provided searchplugins
+ ln -vsf /usr/lib/mozilla/searchplugins ${pkgdir}/usr/lib/${pkgname}/searchplugins
+
+ # Remove development stuff
+ rm -vr ${pkgdir}/usr/{include,lib/${pkgname}-devel,share/idl}
}
diff --git a/libre/icedove/changing-the-default-search-engine.patch b/libre/icedove/changing-the-default-search-engine.patch
new file mode 100644
index 000000000..95c0af6fc
--- /dev/null
+++ b/libre/icedove/changing-the-default-search-engine.patch
@@ -0,0 +1,20 @@
+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
+@@ -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
+
+ # 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
+
+ # To make mapit buttons to disappear in the addressbook, specify empty string. For example:
+ # mail.addr_book.mapit_url.format=
diff --git a/libre/icedove/mozconfig b/libre/icedove/mozconfig
index 3987c2c5a..1445636a1 100644
--- a/libre/icedove/mozconfig
+++ b/libre/icedove/mozconfig
@@ -3,10 +3,11 @@ ac_add_options --enable-application=mail
ac_add_options --prefix=/usr
ac_add_options --libdir=/usr/lib
+ac_add_options --enable-pie
# Icedove
-ac_add_options --disable-official-branding
ac_add_options --with-branding=mail/branding/icedove
+#ac_add_options --enable-calendar
# System libraries
ac_add_options --with-system-nspr
@@ -17,14 +18,15 @@ ac_add_options --with-system-bz2
ac_add_options --with-system-png
ac_add_options --with-system-libevent
ac_add_options --with-system-libvpx
+ac_add_options --with-system-icu
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
ac_add_options --enable-system-ffi
ac_add_options --enable-system-cairo
ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
# Features
+ac_add_options --enable-safe-browsing
ac_add_options --enable-startup-notification
ac_add_options --enable-gio
@@ -44,4 +46,4 @@ export MOZILLA_OFFICIAL=1
mk_add_options MOZILLA_OFFICIAL=1
# Parabola features
-ac_add_options --disable-safe-browsing
+ac_add_options --disable-official-branding
diff --git a/libre/icedove/vendor.js b/libre/icedove/vendor.js
index 05cce3d61..4d58bfc4a 100644
--- a/libre/icedove/vendor.js
+++ b/libre/icedove/vendor.js
@@ -18,3 +18,6 @@ pref("social.directories", "");
// Disable the GeoLocation API for content
pref("geo.enabled", false);
+
+// Pointing the "Help -> What's new" menu entry to mozilla.debian.net
+pref("mailnews.start_page.override_url", "http://wiki.debian.org/Icedove/WhatsNew38");