summaryrefslogtreecommitdiff
path: root/libre/icedove-libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre/icedove-libre')
-rw-r--r--libre/icedove-libre/PKGBUILD19
-rw-r--r--libre/icedove-libre/mozconfig33
2 files changed, 19 insertions, 33 deletions
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 90aa96d1a..a6825ea97 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=${_debname}
pkgname=${_debname}-libre
pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=3
pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
arch=('i686' 'x86_64' 'mips64el')
license=('MPL' 'GPL' 'LGPL')
@@ -35,7 +35,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
options=(!emptydirs)
md5sums=('26ce85189f3b55cc2c97c57e18c1e2de'
'fafa558c1940a48c3f29de61dc27d737'
- 'd6d58d3104a44624e0a3d227cdf1c211'
+ '5cf95ea94f69cdd36604890cfbf7b954'
'476ec205162340fb0679f522c9d31c3b'
'4eecc4fc5aafaf0da651a09eadc90bee'
'c4ed43e85945e180a89cce03e45ec62c'
@@ -43,14 +43,12 @@ md5sums=('26ce85189f3b55cc2c97c57e18c1e2de'
'e785e0c267f4435ae1a9aa0b03bcacfb'
'ea5f7a06967f561d47d7e5c35b23de6f')
-build() {
- export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}"
- export PYTHON="/usr/bin/python2"
+prepare() {
+ export DEBIAN_BUILD="comm-esr17"
export QUILT_PATCHES=debian/patches
export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
export QUILT_DIFF_ARGS='--no-timestamps'
- export DEBIAN_BUILD="comm-esr17"
mv debian "${srcdir}/${DEBIAN_BUILD}"
cd "${srcdir}/${DEBIAN_BUILD}"
@@ -65,7 +63,7 @@ build() {
install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/content/icon${i/x*/}.png"
done
- # This patch fixes a orthographic issue ("Icdove" instead of "Icedove") in MOZ_APP_BASENAME line for confvars.sh
+ # 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
quilt push -av
@@ -79,6 +77,13 @@ build() {
# configure script misdetects the preprocessor without an optimization level
# https://bugs.archlinux.org/task/34644
sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
+}
+
+build() {
+ cd "${srcdir}/${DEBIAN_BUILD}"
+
+ export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}"
+ export PYTHON="/usr/bin/python2"
make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
}
diff --git a/libre/icedove-libre/mozconfig b/libre/icedove-libre/mozconfig
index 58f8ce24f..4f90cb58a 100644
--- a/libre/icedove-libre/mozconfig
+++ b/libre/icedove-libre/mozconfig
@@ -4,6 +4,10 @@ ac_add_options --enable-application=mail
ac_add_options --prefix=/usr
ac_add_options --libdir=/usr/lib
+# Icedove
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=mail/branding/icedove
+
# System libraries
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
@@ -16,7 +20,7 @@ ac_add_options --with-system-libvpx
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-cairo
ac_add_options --enable-system-pixman
ac_add_options --with-pthreads
@@ -37,28 +41,5 @@ ac_add_options --enable-optimize
export MOZILLA_OFFICIAL=1
mk_add_options MOZILLA_OFFICIAL=1
-# Parabola
-export BUILD_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-
-# Debian
-export MAIL_PKG_SHARED=1
-mk_add_options MAIL_PKG_SHARED=1
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=mail/branding/icedove
-ac_add_options --enable-extensions=default
-ac_add_options --with-default-mozilla-five-home=/usr/lib/icedove
-ac_add_options --disable-javaxpcom
-ac_add_options --disable-elf-dynstr-gc
-ac_add_options --disable-strip
-ac_add_options --disable-strip-libs
-ac_add_options --disable-install-strip
-ac_add_options --enable-pango
-ac_add_options --enable-xft
-ac_add_options --enable-xinerama
-ac_add_options --enable-svg
-ac_add_options --enable-svg-renderer=cairo
-ac_add_options --enable-canvas
-ac_add_options --enable-crypto
-ac_add_options --enable-shared-js
-ac_add_options --enable-readline
+# Parabola features
+ac_add_options --disable-safe-browsing