diff options
Diffstat (limited to 'libre-testing')
| -rw-r--r-- | libre-testing/icedove-libre/PKGBUILD | 123 | ||||
| -rw-r--r-- | libre-testing/icedove-libre/gcc47.patch | 44 | ||||
| -rw-r--r-- | libre-testing/icedove-libre/makefile.patch | 11 | ||||
| -rw-r--r-- | libre-testing/icedove-libre/mozconfig | 2 | ||||
| -rw-r--r-- | libre-testing/icedove-libre/vendor.js | 3 |
5 files changed, 94 insertions, 89 deletions
diff --git a/libre-testing/icedove-libre/PKGBUILD b/libre-testing/icedove-libre/PKGBUILD index f3c186937..998e57d04 100644 --- a/libre-testing/icedove-libre/PKGBUILD +++ b/libre-testing/icedove-libre/PKGBUILD @@ -1,7 +1,5 @@ # Maintainer : Márcio Silva <coadde@adinet.com.uy> -# Contributor: André Silva <andre.paulista@adinet.com.uy> - -_pgo=false +# Maintainer : André Silva <andre.paulista@adinet.com.uy> # We're getting this from Debian Sid _debname=icedove @@ -10,121 +8,70 @@ _debrel=3 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } -_pkgname=icedove -pkgname=icedove-libre -pkgver=${_debver} +_pkgname=$_debname +pkgname=$_debname-libre +pkgver=$_debver.$_debrel pkgrel=1 - -if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi -if $_pgo; then - pkgname+='-pgo' -fi - pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla thunderbird." arch=('i586' 'i686' 'x86_64' 'mips64el') license=('GPL2' 'MPL' 'LGPL') depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification') -makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13') +makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') optdepends=('libcanberra: for sound support') -if $_pgo; then - makedepends+=('xorg-server-xvfb') - options=(!ccache) -fi - -url="http://packages.debian.org/source/sid/icedove" -install=icedove.install -source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" - "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" - "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc" +url="http://packages.debian.org/source/sid/$_pkgname" +install=$_pkgname.install +source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" + "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz" + "$_debrepo/`debfile $_debname`_$_debver-$_debrel.dsc" mozconfig - mozconfig.pgo - icedove.desktop channel-prefs.js - vendor.js) -# libvpx.patch) + vendor.js + makefile.patch + gcc47.patch) md5sums=('3efe2ef4d5471aae3b79531ce8aee9dc' 'cb3dba2916bdf2deb72248b0984c4302' '57e21e997a75d85fcc0dcfe30b83f1ee' - '3c87a2c89bd778d7cb40fc4fb2ccc52d' - 'ac29b01c189f20abae2f3eef1618ffc0' - 'e785e0c267f4435ae1a9aa0b03bcacfb' + 'fda2ff093ddbddf7f4cc3a1ed3bf9dcd' '476ec205162340fb0679f522c9d31c3b' - '5a53179d14ae9631b7afe5e4d0fc0b25') -# '5b2aaff7dfe7f1f94ad965905b20e782') - -if [ "$_pkgname" != "$pkgname" ]; then - provides+=("$_pkgname=$pkgver") - conflicts+=("$_pkgname") -fi + '4eecc4fc5aafaf0da651a09eadc90bee' + '5a6282bb005d596aa4ab1884ac6b0517' + '66376a8e934013078f0e646e49614937') -dpkg-source() { - # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc +build() { export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' - mv comm-esr10 "${_debname}-${_debver}" - mv debian "${_debname}-${_debver}" - cd "${_debname}-${_debver}" - quilt push -a - find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this? - cd .. -} + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" + export PYTHON="/usr/bin/python2" -build() { -# Don't run this if we're using -e -if [ $NOEXTRACT -eq 0 ]; then - msg2 "Applying Debian patches..." - cd "${srcdir}" - dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc + mv comm-esr10 "$srcdir/mozilla-build" + mv debian "$srcdir/mozilla-build" - msg2 "Starting normal build..." - mv "${_debname}-${_debver}" "$srcdir/mozilla-build" cd "$srcdir/mozilla-build" + quilt push -a -# patch -Np1 -i "$srcdir/libvpx.patch" - - cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch -fi - - if $_pgo; then - cat "$srcdir/mozconfig.pgo" >> .mozconfig - fi - - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" - export PYTHON="/usr/bin/python2" + cp "$srcdir/mozconfig" .mozconfig + patch -Np1 -i "$srcdir/makefile.patch" + patch -Np1 -i "$srcdir/gcc47.patch" + rm "$srcdir"/mozilla-build/mail/locales/en-US/searchplugins/{amazondotcom,aol-web-search,bing,twitter,yahoo}.xml - if $_pgo; then - LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & - LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS" - kill $! || true - else - LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" - fi + make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" } package() { cd "$srcdir/mozilla-build" make -j1 -f client.mk DESTDIR="$pkgdir" install - install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref/" - - brandingdir=other-licenses/branding/ - icondir="$pkgdir/usr/share/icons/hicolor" - for i in 16x16 22x22 24x24 32x32 48x48 256x256; do - install -Dm644 $brandingdir/$_pkgname/mailicon${i/x*/}.png "$icondir/$i/apps/$_pkgname.png" - done + install -m644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/defaults/pref" + install -m644 "$srcdir/channel-prefs.js" "$pkgdir/usr/lib/$_pkgname/defaults/pref" # Recommend free addons - install -Dm644 "$srcdir/$_pkgname.desktop" \ - "$pkgdir/usr/share/applications/$_pkgname.desktop" +# for i in 16x16 22x22 24x24 32x32 48x48 256x256; do +# install -Dm644 "$debian/app-icons/$_pkgname${i/x*/}.png" "/usr/share/icons/hicolor/$i/apps/$_pkgname.png" +# done +# install -Dm644 "$debian/app-icons/$_pkgname_icon.svg" "/usr/share/icons/hicolor/scalable/apps/$_pkgname.svg" rm -rf "$pkgdir"/usr/lib/$_pkgname/{dictionaries,hyphenation} ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries" ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation" - - # We don't want the development stuff - rm -r "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} - -# Recommend free addons - cp --remove-destination "${srcdir}/channel-prefs.js" \ - "${pkgdir}/usr/lib/$_pkgname/defaults/pref/channel-prefs.js" + rm -r "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} # We don't want the development stuff } diff --git a/libre-testing/icedove-libre/gcc47.patch b/libre-testing/icedove-libre/gcc47.patch new file mode 100644 index 000000000..9824e6ab2 --- /dev/null +++ b/libre-testing/icedove-libre/gcc47.patch @@ -0,0 +1,44 @@ +--- mozilla-build.orig/mozilla/ipc/chromium/src/base/file_util.cc 2012-03-06 14:26:03.000000000 -0200 ++++ mozilla-build/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-04 18:50:02.094431651 -0300 +@@ -8,7 +8,7 @@ + #include <io.h> + #endif + #include <stdio.h> +-#if defined(ANDROID) ++#if defined(ANDROID) || defined(OS_POSIX) + #include <unistd.h> + #endif + +--- mozilla-build.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc 2012-03-06 14:26:03.000000000 -0200 ++++ mozilla-build/mozilla/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-04 19:55:24.140455837 -0300 +@@ -6,6 +6,7 @@ + + #include <errno.h> + #include <fcntl.h> ++#include <unistd.h> + + #include "eintr_wrapper.h" + #include "base/logging.h" + +--- mozilla-build.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc 2012-03-06 14:26:03.000000000 -0200 ++++ mozilla-build/mozilla/ipc/chromium/src/base/file_util_linux.cc 2012-04-04 20:49:49.756138306 -0300 +@@ -5,6 +5,7 @@ + #include "base/file_util.h" + + #include <fcntl.h> ++#include <unistd.h> + + #include <string> + #include <vector> + +--- mozilla-build.orig/mozilla/ipc/chromium/src/base/time_posix.cc 2012-03-06 14:26:03.000000000 -0200 ++++ mozilla-build/mozilla/ipc/chromium/src/base/time_posix.cc 2012-04-04 20:55:12.678037291 -0300 +@@ -8,6 +8,7 @@ + #include <mach/mach_time.h> + #endif + #include <sys/time.h> ++#include <unistd.h> + #ifdef ANDROID + #include <time64.h> + #else + diff --git a/libre-testing/icedove-libre/makefile.patch b/libre-testing/icedove-libre/makefile.patch new file mode 100644 index 000000000..284ca68c2 --- /dev/null +++ b/libre-testing/icedove-libre/makefile.patch @@ -0,0 +1,11 @@ +--- mozilla-build/debian/icedove-branding/Makefile.in 2012-04-05 06:50:17.708640714 -0300 ++++ mozilla-build/debian/icedove-branding/Makefile.in 2012-04-05 06:50:41.902614597 -0300 +@@ -38,7 +38,7 @@ + # Branding Makefile for Icedove branding + + DEPTH = ../../.. +-topsrcdir = ../../../ ++topsrcdir = ../../ + srcdir = @srcdir@ + VPATH = @srcdir@ + diff --git a/libre-testing/icedove-libre/mozconfig b/libre-testing/icedove-libre/mozconfig index 469047991..fc00d1fdd 100644 --- a/libre-testing/icedove-libre/mozconfig +++ b/libre-testing/icedove-libre/mozconfig @@ -46,4 +46,4 @@ ac_add_options --disable-safe-browsing export BUILD_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 -# Build-generated +# Build-generated
\ No newline at end of file diff --git a/libre-testing/icedove-libre/vendor.js b/libre-testing/icedove-libre/vendor.js index 170b505a8..279bdc158 100644 --- a/libre-testing/icedove-libre/vendor.js +++ b/libre-testing/icedove-libre/vendor.js @@ -1,3 +1,6 @@ +// Forbid application updates +lockPref("app.update.enabled", false); + // Use LANG environment variable to choose locale pref("intl.locale.matchOS", true); |