diff options
Diffstat (limited to 'libre/iceape-libre')
-rw-r--r-- | libre/iceape-libre/PKGBUILD | 55 | ||||
-rw-r--r-- | libre/iceape-libre/libre.patch | 8 | ||||
-rw-r--r-- | libre/iceape-libre/mozconfig | 37 |
3 files changed, 48 insertions, 52 deletions
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index 2595a36f9..aeb4d528f 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -3,7 +3,7 @@ # We're getting this from Debian Sid _debname=iceape -_debver=2.7.11 +_debver=2.7.12 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -11,17 +11,17 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=2 -pkgdesc="A libre version of Debian Iceape, the Internet Suite based on Mozilla Seamonkey." -arch=('i586' 'i686' 'x86_64' 'mips64el') -license=('GPL2' 'MPL' 'LGPL') +pkgrel=6 +pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey." +arch=('i686' 'x86_64' 'mips64el') +license=('MPL' 'GPL' 'LGPL') depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-ply' 'librsvg' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') -replaces=('mozilla' 'seamonkey') +replaces=('seamonkey') conflicts=('seamonkey') provides=('seamonkey') install=$_pkgname.install -url="http://packages.debian.org/source/sid/${_pkgname}" +url="http://packages.debian.org/sid/${_pkgname}" source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" mozconfig @@ -29,23 +29,24 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" ${_pkgname}-2.0-lang.patch clrf.patch libre.patch) -md5sums=('40473b4c662975eda865e1fc35c4953b' - 'f704b69cc0328c83edd6223420fbd412' - '60ba9e8f2fafd20e41268af534a55ea7' +md5sums=('1ee82aa6ec73c13e2099b4cb6f16a908' + '1fb9c4affad5f030c4e3544aadeaeea2' + '70575e76b339fa7e17274a8ed84429fc' '7266333e31731af8bb50c2eca8d0bd26' '25b6fe16ac24cd5c852213e5c1adb272' 'c395d443a8c4c16880c7322bcf174743' - 'ebe66195898c89644138ffc88ba26a24') + 'e6e4a2b5b5976404d7d54c21f9d1c2c3') -build() { - export QUILT_PATCHES=debian/patches - export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' - export QUILT_DIFF_ARGS='--no-timestamps' - export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}" - export PYTHON="/usr/bin/python2" +prepare() { export DEBIAN_BUILD="comm-release" export DEBIAN_BRANDING_DIR="debian/branding" + export ICEAPE_ICONS_BRANDING="suite/branding/nightly" + + export QUILT_PATCHES=debian/patches + export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' + export QUILT_DIFF_ARGS='--no-timestamps' + mv comm-esr10 "${DEBIAN_BUILD}" mv debian "${srcdir}/${DEBIAN_BUILD}" cd "${srcdir}/${DEBIAN_BUILD}" @@ -90,7 +91,25 @@ build() { rsvg-convert -w 128 -h 128 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape128.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg cp "${srcdir}/mozconfig" .mozconfig - make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" + + # 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,-rpath,/usr/lib/${_pkgname}" + export MOZ_MAKE_FLAGS="$MAKEFLAGS" + unset MAKEFLAGS + + # Don't exit with error when some libs are missing which we have in + # system. + sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \ + -i suite/installer/Makefile.in + + make -j1 -f client.mk build } package() { diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch index 6273a05a9..860fd0d82 100644 --- a/libre/iceape-libre/libre.patch +++ b/libre/iceape-libre/libre.patch @@ -46,14 +46,14 @@ # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Mibbit -gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.irc.0.name=Freenode -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/ ++gecko.handlerService.schemes.irc.0.name=Freenode Web IRC ++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Mibbit -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.ircs.0.name=Freenode -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/ ++gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net --- comm-release.orig/mozilla/modules/libpref/src/init/all.js 2012-03-16 04:46:09.000000000 -0300 +++ comm-release/mozilla/modules/libpref/src/init/all.js 2012-05-12 04:03:52.163831535 -0300 @@ -47,7 +47,7 @@ diff --git a/libre/iceape-libre/mozconfig b/libre/iceape-libre/mozconfig index 5227d77a5..3093d20ee 100644 --- a/libre/iceape-libre/mozconfig +++ b/libre/iceape-libre/mozconfig @@ -1,9 +1,12 @@ -mk_add_options MOZ_CO_PROJECT=suite ac_add_options --enable-application=suite ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib +# Iceape +ac_add_options --disable-official-branding +ac_add_options --with-branding=debian/branding + # System libraries ac_add_options --with-system-nspr ac_add_options --with-system-nss @@ -16,46 +19,20 @@ 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 --with-pthreads # Features ac_add_options --enable-startup-notification -ac_add_options --disable-safe-browsing ac_add_options --enable-gio ac_add_options --disable-gnomevfs ac_add_options --disable-crashreporter ac_add_options --disable-updater ac_add_options --disable-tests -ac_add_options --disable-mochitest ac_add_options --disable-installer -# Optimization -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 -ac_add_options --with-default-mozilla-five-home=/usr/lib/iceape -ac_add_options --enable-default-toolkit=cairo-gtk2 -ac_add_options --disable-official-branding -ac_add_options --with-branding=debian/branding -ac_add_options --enable-pango -ac_add_options --enable-svg -ac_add_options --enable-mathml -ac_add_options --disable-pedantic -ac_add_options --disable-long-long-warning -ac_add_options --disable-debug -ac_add_options --enable-canvas -ac_add_options --enable-extensions="default,-venkman,-inspector" -ac_add_options --disable-elf-dynstr-gc -ac_add_options --disable-strip -ac_add_options --disable-install-strip -ac_add_options --enable-crypto -ac_add_options --disable-javaxpcom +# Parabola features +ac_add_options --disable-safe-browsing |