From 03793386933d6995649d999ce7373eb76fc86a25 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 29 May 2016 00:17:53 -0300 Subject: icedove-1:45.1.0.deb1-1{,.nonprism1}: updating version --- libre/icedove/PKGBUILD | 155 +++++++++++++++++++++++++++---------------------- 1 file changed, 86 insertions(+), 69 deletions(-) (limited to 'libre/icedove/PKGBUILD') diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD index ddc12950e..e2ee08730 100644 --- a/libre/icedove/PKGBUILD +++ b/libre/icedove/PKGBUILD @@ -1,73 +1,83 @@ -# Maintainer : André Silva -# Contributor : Márcio Silva +# Maintainer: André Silva +# Contributor: Márcio Silva # We're getting this from Debian Sid _debname=icedove -_debver=38.7.2 +_debver=45.1.0 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } -pkgname=${_debname} +_pkgname=thunderbird +pkgname=icedove epoch=1 -pkgver=${_debver}.${_debrel} +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') -license=('MPL' 'GPL' 'LGPL') -url="https://wiki.parabola.nu/${pkgname}" -depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' - 'dbus-glib' 'alsa-lib' 'desktop-file-utils' 'hicolor-icon-theme' - 'libvpx=1.5.0' 'icu=57.1' 'libevent' 'nss' 'hunspell' 'sqlite' 'mozilla-searchplugins') -makedepends=('unzip' 'zip' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse' - 'pkg-config' 'autoconf2.13' 'quilt' 'jquery-ui') + +pkgdesc="A libre version of Debian Icedove, the standalone mail and news reader based on Mozilla Thunderbird." +arch=(i686 x86_64) +license=(MPL GPL LGPL) +depends=(alsa-lib dbus-glib gtk2 hunspell icu=57.1 libevent libvpx=1.5.0 libxt mime-types mozilla-common nss sqlite startup-notification ttf-font) +makedepends=(autoconf2.13 diffutils gconf imake inetutils libpulse mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip) +options=(!emptydirs !makeflags) optdepends=('libcanberra: for sound support') -replaces=('thunderbird' "${pkgname}-libre") -conflicts=('thunderbird' "${pkgname}-libre") -provides=('thunderbird') -install=${pkgname}.install -source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" - "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.xz" +url="https://wiki.parabola.nu/$pkgname" +replaces=("$pkgname-libre" "$_pkgname") +conflicts=("$pkgname-libre" "$_pkgname") +provides=("$_pkgname") +install=$pkgname.install +source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz" + "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.xz" mozconfig - ${pkgname}.desktop + $pkgname.desktop changing-the-default-search-engine.patch - vendor.js) -options=(!emptydirs !makeflags) -sha256sums=('b423630e772c521aa7f5b390133e6f784270d5b57804675ac498bfd52b8c7f78' - '76cf43de8f5b8d918efa722da72f648556cd6bcbd7af2a85d4f1fc0df177242a' - 'e3d0f5f78fede687dfc38a2787c2c8f33c8213be286abeb9176e3dcebabb0b74' + firefox-gcc-6.0.patch mozilla-1228540.patch mozilla-1228540-1.patch + vendor.js + fix-missing-files.patch) +sha256sums=('2dbb5007b1e0bd23714aec5edfe108a303bc9223576cd0545fcd73dc519978f6' + '886e81e42d8d12826be44bb13e39ef86f357c91dcdf90ca32721f1631d45a996' + 'cafe29302adcfd6ab4bfb13e6aeef2b405c48877e3c31879945b81e1e3b55cb3' '0b0d25067c64c6b829c84e5259ffca978e3971f85acc8483f47bdbed5b0b5b6a' - '9765d9bbcae82d0006766741c813840db46c56ee16f79d39b8d7d96d716ee2d7' - '798d5bff1e6025e9a803b67f629afac740f16e537b714ee7c7e829b2345fb6a2') + 'e1f72c44e31f191271207fc874dcfbf3d504b6b42dc1bb063ba8c7c9ee032130' + '4d1e1ddabc9e975ed39f49e134559a29e01cd49439e358233f1ede43bf5a52bf' + '2588c567fec88b44b65f0cd111e8769361c138d4c964310684f7bb80066f8f9f' + 'd1ccbaf0973615c57f7893355e5cd3a89efb4e91071d0ec376e429b50cf6ed19' + '283095a636985e5cbec4056ac23438eafcf9703c3174fcc2bb759bdc40883ab3' + '294a2cc7b0477ad285af10ac2a04b767cabec07f03b23da23014bda71caea510') prepare() { - export DEBIAN_BUILD=comm-esr${pkgver%%.*} + cd "$srcdir/$_pkgname-$_debver" + mv "$srcdir/debian" . 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} - # Prepare branding for the Icedove packages - mkdir -v mail/branding/${pkgname} + mkdir -v mail/branding/$pkgname # Copy needed icons - cp -va debian/${pkgname}-branding/* mail/branding/${pkgname} + 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 + install -Dm644 debian/app-icons/$pkgname$i.png \ + mail/branding/$pkgname/mailicon$i.png done for i in 48 64; do - install -vDm 644 debian/app-icons/${pkgname}${i}.png mail/branding/${pkgname}/content/icon${i}.png + install -Dm644 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 + cp -av debian/preview.png mail/themes/linux/mail/preview.png # Useless since we are doing it ourselves + rm -rv debian/patches/icedove-l10n || true + rm -rv debian/patches/iceowl-l10n || true rm -v debian/patches/debian-hacks/changing-the-default-search-engine.patch || true quilt push -av + # Fix missing files + patch -Np1 -i "$srcdir/fix-missing-files.patch" + # Remove url-classifier from package-manifest.in to build and disable Phishing Protection sed -i '\|Phishing Protection|d \|UrlClassifier|d @@ -76,7 +86,8 @@ prepare() { ' mail/installer/package-manifest.in # Fix branding - sed -i 's|Icedove Mail/News|Icedove|' mail/branding/icedove/locales/en-US/brand.{dtd,properties} + sed -i 's|Icedove Mail/News|Icedove| + ' mail/branding/icedove/locales/en-US/brand.{dtd,properties} # Replace common URLs sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://directory.fsf.org/wiki/Icedove");|g; @@ -85,63 +96,69 @@ prepare() { \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://directory.fsf.org/wiki/Icedove");|g; ' mail/app/profile/all-thunderbird.js - cp -v ${srcdir}/mozconfig .mozconfig + # Required for GCC 6 + patch -d mozilla -Np1 < ../firefox-gcc-6.0.patch + patch -d mozilla -Np1 < ../mozilla-1228540.patch + patch -d mozilla -Np1 < ../mozilla-1228540-1.patch + + 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 + mkdir "$srcdir/path" + ln -s /usr/bin/python2 "$srcdir/path/python" # Change the default search engine using our system-provided searchplugins - patch -Np1 -i ${srcdir}/changing-the-default-search-engine.patch + 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 + # Load our searchplugins + rm -rv mail/locales/en-US/searchplugins + cp -av /usr/lib/mozilla/searchplugins mail/locales/en-US } build() { - export DEBIAN_BUILD=comm-esr${pkgver%%.*} + cd "$srcdir/$_pkgname-$_debver" - cd ${srcdir}/${DEBIAN_BUILD} + # _FORTIFY_SOURCE causes configure failures + CPPFLAGS+=" -O2" - export PYTHON=/usr/bin/python2 + # GCC 6 + CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse" + CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse" + + export PATH="$srcdir/path:$PATH" make -f client.mk build } package() { - export DEBIAN_BUILD=comm-esr${pkgver%%.*} - - cd ${srcdir}/${DEBIAN_BUILD} - - make -f client.mk DESTDIR=${pkgdir} install + cd "$srcdir/$_pkgname-$_debver" + make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install - install -vDm 644 ${srcdir}/vendor.js ${pkgdir}/usr/lib/${pkgname}/defaults/preferences/vendor.js + install -Dm644 ../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 + install -Dm644 debian/$pkgname.xpm "$pkgdir/usr/share/pixmaps/$pkgname.xpm" # Install Icedove icons + brandingdir=debian/app-icons + icondir="$pkgdir/usr/share/icons/hicolor" 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 + install -Dm644 "$brandingdir/$pkgname$i.png" \ + "$icondir/${i}x${i}/apps/$pkgname.png" done - install -vDm 644 debian/app-icons/${pkgname}big.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg + install -Dm644 "$brandingdir/${pkgname}big.svg" \ + "$icondir/scalable/apps/$pkgname.svg" # Install Icedove desktop - install -vDm 644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop + install -d "$pkgdir/usr/share/applications" + install -m644 "$srcdir/$pkgname.desktop" \ + "$pkgdir/usr/share/applications" # 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 + rm -rf "$pkgdir/usr/lib/$pkgname/"{dictionaries,hyphenation} + ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries" + ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgname/hyphenation" # Replace duplicate binary with symlink # https://bugzilla.mozilla.org/show_bug.cgi?id=658850 - ln -vsf ${pkgname} ${pkgdir}/usr/lib/${pkgname}/${pkgname}-bin - - # Remove development stuff - rm -vr ${pkgdir}/usr/{include,lib/${pkgname}-devel,share/idl} + ln -sf $pkgname "$pkgdir/usr/lib/$pkgname/$pkgname-bin" } -- cgit v1.2.3