diff options
| -rw-r--r-- | libre/iceape-libre/PKGBUILD | 31 | ||||
| -rw-r--r-- | libre/iceape-libre/mozconfig | 37 |
2 files changed, 28 insertions, 40 deletions
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index b86107e16..aeb4d528f 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=5 +pkgrel=6 pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') @@ -31,23 +31,21 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" libre.patch) md5sums=('1ee82aa6ec73c13e2099b4cb6f16a908' '1fb9c4affad5f030c4e3544aadeaeea2' - '60ba9e8f2fafd20e41268af534a55ea7' + '70575e76b339fa7e17274a8ed84429fc' '7266333e31731af8bb50c2eca8d0bd26' '25b6fe16ac24cd5c852213e5c1adb272' 'c395d443a8c4c16880c7322bcf174743' 'e6e4a2b5b5976404d7d54c21f9d1c2c3') -build() { - export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}" - export MOZ_MAKE_FLAGS="$MAKEFLAGS" - unset MAKEFLAGS +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' - export DEBIAN_BUILD="comm-release" - export DEBIAN_BRANDING_DIR="debian/branding" - export ICEAPE_ICONS_BRANDING="suite/branding/nightly" mv comm-esr10 "${DEBIAN_BUILD}" mv debian "${srcdir}/${DEBIAN_BUILD}" @@ -97,8 +95,21 @@ 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,-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 MOZ_MAKE_FLAGS="${MAKEFLAGS}" + make -j1 -f client.mk build } package() { 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 |