From 268353fc440bd8926e04758bb7457e3793024362 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 20 Feb 2013 20:28:26 -0200 Subject: fixing license on mozilla packages --- libre/icedove-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre/icedove-libre/PKGBUILD') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 5ea3ff98f..9bad144bc 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -11,10 +11,10 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=1 +pkgrel=2 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') +license=('MPL' 'GPL' 'LGPL') url="http://packages.debian.org/source/experimental/${_pkgname}" depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') -- cgit v1.2.3-54-g00ecf From c2954f9be7f6d99ae1140bc29612cafbde3a54ec Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 20 Feb 2013 22:52:37 -0200 Subject: fixing description on ice* packages --- libre/iceape-libre/PKGBUILD | 2 +- libre/icecat/PKGBUILD | 2 +- libre/icedove-libre/PKGBUILD | 2 +- libre/iceweasel-libre/PKGBUILD | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libre/icedove-libre/PKGBUILD') diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index eb3ab8a6e..01bc6558e 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -12,7 +12,7 @@ _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} pkgrel=2 -pkgdesc="A libre version of Debian Iceape, the Internet Suite based on Mozilla Seamonkey." +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') diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 3ecd1c2b5..efa122b1d 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -17,7 +17,7 @@ _pgo=false pkgname=icecat pkgver=17.0.1 pkgrel=6 -pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!' +pkgdesc='GNUzilla IceCat, the standalone web browser based on Mozilla Firefox.' arch=(i686 x86_64 mips64el) license=(MPL GPL LGPL) depends=( diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 9bad144bc..1bf14850d 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -12,7 +12,7 @@ _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} pkgrel=2 -pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla Thunderbird." +pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird." arch=('i586' 'i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') url="http://packages.debian.org/source/experimental/${_pkgname}" diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 8616ce26c..c2c6adaa5 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -29,7 +29,7 @@ if $_pgo; then pkgname+='-pgo' fi -pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox." +pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss>=3.14.1' 'sqlite3' 'startup-notification') -- cgit v1.2.3-54-g00ecf From 66c64fe4e25a6ff1c64d2c661d6c25c20113dc84 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 22 Feb 2013 12:20:49 -0200 Subject: icedove-libre: ordering PKGBUILD --- libre/icedove-libre/PKGBUILD | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'libre/icedove-libre/PKGBUILD') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 1bf14850d..406853a9b 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -44,15 +44,19 @@ md5sums=('3f7679bb98ae99be5adf73fd0025b00e' 'ea5f7a06967f561d47d7e5c35b23de6f') build() { + export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}" + export PYTHON="/usr/bin/python2" + 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" export DEBIAN_BUILD="comm-release" + mv debian "${srcdir}/${DEBIAN_BUILD}" cd "${srcdir}/${DEBIAN_BUILD}" + mv debian/${_pkgname}-branding "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}" + cp -a debian/app-icons/${_pkgname}big.svg debian/app-icons/${_pkgname}_icon.svg for i in 16x16 22x22 24x24 32x32 48x48 256x256; do install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/mailicon${i/x*/}.png" -- cgit v1.2.3-54-g00ecf From c70dcfa024da23d3b642244d0508e1ccd6f4ecce Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 17 Mar 2013 23:11:08 -0300 Subject: icedove-libre-17.0.4.1-1: updating version --- libre/icedove-libre/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libre/icedove-libre/PKGBUILD') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 406853a9b..557023556 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -3,7 +3,7 @@ # We're getting this from Debian Experimental _debname=icedove -_debver=17.0.2 +_debver=17.0.4 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -11,9 +11,9 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=2 +pkgrel=1 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird." -arch=('i586' 'i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') url="http://packages.debian.org/source/experimental/${_pkgname}" depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') @@ -33,8 +33,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" ${_pkgname}.desktop Icedove-branding.patch) options=(!emptydirs) -md5sums=('3f7679bb98ae99be5adf73fd0025b00e' - '7440def324766bcc61b91185226f8824' +md5sums=('26ce85189f3b55cc2c97c57e18c1e2de' + 'fafa558c1940a48c3f29de61dc27d737' 'd6d58d3104a44624e0a3d227cdf1c211' '476ec205162340fb0679f522c9d31c3b' '4eecc4fc5aafaf0da651a09eadc90bee' -- cgit v1.2.3-54-g00ecf From 8e6ee8d07af847f9f83dc78cc82261259749f768 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 18 Mar 2013 03:08:06 -0300 Subject: icedove-libre-17.0.4.1-1: fixing source code path --- libre/icedove-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre/icedove-libre/PKGBUILD') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 557023556..c727fb2ce 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -50,7 +50,7 @@ build() { 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_BUILD="comm-esr17" mv debian "${srcdir}/${DEBIAN_BUILD}" cd "${srcdir}/${DEBIAN_BUILD}" -- cgit v1.2.3-54-g00ecf From 93461d8e834d69d7d21d37fa0bf27b2f5fbda371 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 9 Apr 2013 07:49:28 -0300 Subject: ice{ape,dove,weasel}-l{ibre,10n}: change url description" --- libre/iceape-l10n/PKGBUILD | 4 ++-- libre/iceape-libre/PKGBUILD | 4 ++-- libre/icedove-l10n/PKGBUILD | 4 ++-- libre/icedove-libre/PKGBUILD | 4 ++-- libre/iceweasel-l10n/PKGBUILD | 2 +- libre/iceweasel-libre/PKGBUILD | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'libre/icedove-libre/PKGBUILD') diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD index d8fc4308a..ff81b3b4b 100644 --- a/libre/iceape-l10n/PKGBUILD +++ b/libre/iceape-l10n/PKGBUILD @@ -23,11 +23,11 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) pkgver=${_debver}.${_debrel} -pkgrel=3 +pkgrel=4 pkgdesc="Language packs for Debian Iceape." arch=('i686' 'x86_64' 'mips64el') -url="http://packages.debian.org/source/sid/iceape" +url="http://packages.debian.org/sid/iceape" license=('MPL' 'GPL') depends=("iceape-libre>=$pkgver") makedepends=('unzip' 'zip') diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index 1dff5d2dd..5152a456a 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=4 +pkgrel=5 pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') @@ -21,7 +21,7 @@ replaces=('mozilla' '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 diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index fd24630fe..ba1b80f5b 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -11,10 +11,10 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) -pkgrel=1 +pkgrel=2 pkgdesc="Language packs for Debian Icedove." arch=('i686' 'x86_64' 'mips64el') -url="http://packages.debian.org/source/experimental/icedove" +url="http://packages.debian.org/experimental/icedove" license=('MPL' 'GPL') depends=("icedove-libre>=$pkgver") makedepends=('unzip' 'zip') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index c727fb2ce..b5396781e 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -11,11 +11,11 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=1 +pkgrel=2 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') -url="http://packages.debian.org/source/experimental/${_pkgname}" +url="http://packages.debian.org/experimental/${_pkgname}" depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') optdepends=('libcanberra: for sound support') diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 18f6fcf38..625995ecd 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -27,7 +27,7 @@ pkgrel=2 pkgdesc="Language packs for Debian Iceweasel." arch=('any') -url="http://packages.debian.org/source/experimental/iceweasel" +url="http://packages.debian.org/experimental/iceweasel" license=('MPL' 'GPL') depends=("iceweasel-libre>=$pkgver") makedepends=('unzip' 'zip') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 6ef48eb1d..19b9ee9a2 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -36,7 +36,7 @@ if $_pgo; then fi optdepends=('networkmanager: Location detection via available WiFi networks') -url="http://packages.debian.org/source/experimental/${_pkgname}" +url="http://packages.debian.org/experimental/${_pkgname}" install=iceweasel.install replaces=('firefox') conflicts=('firefox') -- cgit v1.2.3-54-g00ecf From b2b93941f2ce88c04621ae7379d66f74e951eb17 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 9 Apr 2013 19:19:49 -0300 Subject: icedove-libre: adding new features due that building brokes --- libre/icedove-libre/PKGBUILD | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libre/icedove-libre/PKGBUILD') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index b5396781e..f7962b8f5 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -75,6 +75,9 @@ build() { patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version cp "${srcdir}/mozconfig" .mozconfig + unset CPPFLAGS + CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" + CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" } -- cgit v1.2.3-54-g00ecf From 4cf9c947c794fe5e5906d3c5350e9aada30b31ae Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 10 Apr 2013 15:03:21 -0300 Subject: ice{ape-libre,cat,dove-libre,weasel-libre}: Add workaround for preprocessor misdetection --- libre/iceape-libre/PKGBUILD | 8 +++++--- libre/icecat/PKGBUILD | 4 ++++ libre/icedove-libre/PKGBUILD | 10 ++++++---- libre/iceweasel-libre/PKGBUILD | 10 ++++------ 4 files changed, 19 insertions(+), 13 deletions(-) (limited to 'libre/icedove-libre/PKGBUILD') diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index 3c0d6942a..b86107e16 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -93,9 +93,11 @@ 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 - unset CPPFLAGS - CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" - CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" + + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" } diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 6898105d8..bf16eca0b 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -136,6 +136,10 @@ build() { chmod +x build/unix/run-icecat.sh # fix bug for bad file permition + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + 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 diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index f7962b8f5..90aa96d1a 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -65,7 +65,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 has a orthographic issue ("Icdove" instead of "Icedove") in MOZ_APP_BASENAME line for confvars.sh + # This patch fixes 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 @@ -75,9 +75,11 @@ build() { patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version cp "${srcdir}/mozconfig" .mozconfig - unset CPPFLAGS - CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" - CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" + + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" } diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 283d6e088..0c9520b17 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -143,17 +143,15 @@ build() { echo 'ac_add_options --disable-jemalloc' >> .mozconfig fi + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + if $_pgo; then - unset CPPFLAGS - export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" - export CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" 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 - unset CPPFLAGS - export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" - export CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" fi } -- cgit v1.2.3-54-g00ecf From ce3bbd6c6b332d5c7117b2477fa953b571720c73 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 12 Apr 2013 09:19:51 -0300 Subject: icedove-libre: adapting PKGBUILD with new changes --- libre/icedove-libre/PKGBUILD | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'libre/icedove-libre/PKGBUILD') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 90aa96d1a..df3717219 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -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}" } -- cgit v1.2.3-54-g00ecf From 8d7c294370dc5dcd41d63f3a4c4529fa83eb0ee4 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 12 Apr 2013 09:33:58 -0300 Subject: icedove-libre-17.0.4.1-3: updating mozconfig --- libre/icedove-libre/PKGBUILD | 4 ++-- libre/icedove-libre/mozconfig | 33 +++++++-------------------------- 2 files changed, 9 insertions(+), 28 deletions(-) (limited to 'libre/icedove-libre/PKGBUILD') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index df3717219..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' 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 -- cgit v1.2.3-54-g00ecf From 6ccf0c035c6183dbd64e7a71db340762a3789c7a Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 15 Apr 2013 06:02:00 -0300 Subject: icedove-libre-17.0.5.1-1: updating version --- libre/icedove-libre/PKGBUILD | 26 +++++++++++++++++++------- libre/icedove-libre/channel-prefs.js | 9 --------- libre/icedove-libre/replace-urls.txt | 25 +++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 16 deletions(-) delete mode 100644 libre/icedove-libre/channel-prefs.js create mode 100644 libre/icedove-libre/replace-urls.txt (limited to 'libre/icedove-libre/PKGBUILD') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index a6825ea97..43212c413 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -3,7 +3,7 @@ # We're getting this from Debian Experimental _debname=icedove -_debver=17.0.4 +_debver=17.0.5 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=3 +pkgrel=1 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') @@ -26,17 +26,17 @@ install=${_pkgname}.install source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" mozconfig - channel-prefs.js + replace-urls.txt vendor.js makefile.patch branding.patch ${_pkgname}.desktop Icedove-branding.patch) options=(!emptydirs) -md5sums=('26ce85189f3b55cc2c97c57e18c1e2de' - 'fafa558c1940a48c3f29de61dc27d737' +md5sums=('0c68298c17757257da79b6bb39e3fd10' + 'eb2a5e1877d87a16e10388f533c081a6' '5cf95ea94f69cdd36604890cfbf7b954' - '476ec205162340fb0679f522c9d31c3b' + 'a8fc4658d45b6bf9350023e5c3f34e56' '4eecc4fc5aafaf0da651a09eadc90bee' 'c4ed43e85945e180a89cce03e45ec62c' '126b1446212396c33220936c01d9592d' @@ -72,6 +72,17 @@ prepare() { patch -Np1 -i "${srcdir}/branding.patch" # fixing branding patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version + # Replace common URLs + sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do + if [[ -n $moz_url ]]; then + printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url" + grep -Erl "${moz_url}" \ + --exclude='*.'{patch,orig,rej} \ + --exclude-dir={.pc,test,tests,testing} \ + | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url} Date: Mon, 15 Apr 2013 07:45:50 -0300 Subject: icedove-libre-17.0.5.1-1: fixing PKGBUILD due that channel-prefs.js file was replaced by replace-urls.txt --- libre/icedove-libre/PKGBUILD | 3 --- 1 file changed, 3 deletions(-) (limited to 'libre/icedove-libre/PKGBUILD') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 43212c413..b16e32620 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -106,9 +106,6 @@ package() { install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences/vendor.js" - # Recommend free addons - install -m644 "${srcdir}/channel-prefs.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/pref/channel-prefs.js" - for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${_pkgname}.png" done -- cgit v1.2.3-54-g00ecf