From 19bcef7b65ce4aff87dd869746329d57f111dae5 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 3 Nov 2013 22:00:25 -0200 Subject: icedove-libre-1:17.0.10.deb1-1: updating version --- libre/icedove-libre/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libre/icedove-libre/PKGBUILD') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 18e394f61..caf158671 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -3,8 +3,8 @@ # We're getting this from Debian Sid _debname=icedove -_debver=17.0.9 -_debrel=deb2 +_debver=17.0.10 +_debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -31,8 +31,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" vendor.js ${_pkgname}.desktop) options=(!emptydirs) -md5sums=('4c2aacece253be8f177a74d90d782f45' - 'dd8ccad23583cc0d8c3b77066711f077' +md5sums=('47df9e8d62a2bf37d0f184c6b96a377a' + '07f2fb97c98ddead98ccb537a63b6a92' '5cf95ea94f69cdd36604890cfbf7b954' 'a8fc4658d45b6bf9350023e5c3f34e56' '4eecc4fc5aafaf0da651a09eadc90bee' -- cgit v1.2.3-54-g00ecf From b3b78613bf1415a17918a6ed066a24339e04a4d7 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 4 Nov 2013 14:12:24 -0200 Subject: icedove-libre-1:24.0.deb1-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 caf158671..d985906d7 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -1,9 +1,9 @@ # Maintainer : Márcio Silva # Maintainer : André Silva -# We're getting this from Debian Sid +# We're getting this from Debian Experimental _debname=icedove -_debver=17.0.10 +_debver=24.0 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -16,7 +16,7 @@ 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') -url="http://packages.debian.org/sid/${_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' 'python2-virtualenv' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') optdepends=('libcanberra: for sound support') @@ -31,8 +31,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" vendor.js ${_pkgname}.desktop) options=(!emptydirs) -md5sums=('47df9e8d62a2bf37d0f184c6b96a377a' - '07f2fb97c98ddead98ccb537a63b6a92' +md5sums=('c69b05c9a1c28d455964aed4927ef916' + 'c67dc2f46f0e4d463ebe1ccdbfae6392' '5cf95ea94f69cdd36604890cfbf7b954' 'a8fc4658d45b6bf9350023e5c3f34e56' '4eecc4fc5aafaf0da651a09eadc90bee' -- cgit v1.2.3-54-g00ecf From a8cddbb2da0c293ff1bb2eed87ceed65b7209642 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 4 Nov 2013 14:48:52 -0200 Subject: icedove-libre: disable gstreamer on mozconfig, update vendor.js and replace addons on replace-urls.txt --- libre/icedove-libre/PKGBUILD | 17 +++++++---------- libre/icedove-libre/mozconfig | 1 + libre/icedove-libre/replace-urls.txt | 26 +++++++++++++------------- libre/icedove-libre/vendor.js | 3 --- 4 files changed, 21 insertions(+), 26 deletions(-) (limited to 'libre/icedove-libre/PKGBUILD') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index d985906d7..b7bd7d5a1 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -33,13 +33,13 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" options=(!emptydirs) md5sums=('c69b05c9a1c28d455964aed4927ef916' 'c67dc2f46f0e4d463ebe1ccdbfae6392' - '5cf95ea94f69cdd36604890cfbf7b954' - 'a8fc4658d45b6bf9350023e5c3f34e56' - '4eecc4fc5aafaf0da651a09eadc90bee' + '5bd3b5b1c79d87d2720252e9b06ba09e' + 'e14242e651928bd658ec8d489088b6f2' + '5a53179d14ae9631b7afe5e4d0fc0b25' 'e785e0c267f4435ae1a9aa0b03bcacfb') prepare() { - export DEBIAN_BUILD="comm-esr17" + export DEBIAN_BUILD="comm-esr24" export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' @@ -92,14 +92,11 @@ prepare() { # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 - sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure - - # Fix virtualenv path - sed -i 's|/usr/share/pyshared/virtualenv.py|/usr/lib/python2.7/site-packages/virtualenv.py|' mozilla/configure + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure } build() { - export DEBIAN_BUILD="comm-esr17" + export DEBIAN_BUILD="comm-esr24" cd "${srcdir}/${DEBIAN_BUILD}" @@ -110,7 +107,7 @@ build() { } package() { - export DEBIAN_BUILD="comm-esr17" + export DEBIAN_BUILD="comm-esr24" cd "${srcdir}/${DEBIAN_BUILD}" diff --git a/libre/icedove-libre/mozconfig b/libre/icedove-libre/mozconfig index 4f90cb58a..563c3fc22 100644 --- a/libre/icedove-libre/mozconfig +++ b/libre/icedove-libre/mozconfig @@ -28,6 +28,7 @@ ac_add_options --with-pthreads ac_add_options --enable-startup-notification ac_add_options --enable-gio +ac_add_options --disable-gstreamer ac_add_options --disable-gnomevfs ac_add_options --disable-crashreporter ac_add_options --disable-updater diff --git a/libre/icedove-libre/replace-urls.txt b/libre/icedove-libre/replace-urls.txt index fc13e32fb..9cc6d0933 100644 --- a/libre/icedove-libre/replace-urls.txt +++ b/libre/icedove-libre/replace-urls.txt @@ -2,24 +2,24 @@ # These are whitespace-separated EREs, comments are lines starting with '#' https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)? https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell- -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)? https://gnuzilla.gnu.org/plugins/ -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#themes -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?" https://www.gnu.org/software/gnuzilla/addons.html" -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$ https://www.gnu.org/software/gnuzilla/addons.html +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)? http://directory.fsf.org/wiki/Icedove +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)? http://directory.fsf.org/wiki/Icedove +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)? http://directory.fsf.org/wiki/Icedove +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? http://directory.fsf.org/wiki/Icedove +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)? http://directory.fsf.org/wiki/Icedove +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)? http://directory.fsf.org/wiki/Icedove +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?" http://directory.fsf.org/wiki/Icedove" +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$ http://directory.fsf.org/wiki/Icedove -https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html +https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ http://directory.fsf.org/wiki/Icedove -https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/ +https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ http://directory.fsf.org/wiki/Icedove.\2/ -https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php https://gnuzilla.gnu.org/plugins/PluginFinderService.php +https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php http://directory.fsf.org/wiki/Icedove #https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php #https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php -"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html" +"https?://addons\.mozilla\.org/" "http://directory.fsf.org/wiki/Icedove" # hack: these aren't URLs, per se -(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html +(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1directory.fsf.org/wiki/Icedove diff --git a/libre/icedove-libre/vendor.js b/libre/icedove-libre/vendor.js index 279bdc158..170b505a8 100644 --- a/libre/icedove-libre/vendor.js +++ b/libre/icedove-libre/vendor.js @@ -1,6 +1,3 @@ -// Forbid application updates -lockPref("app.update.enabled", false); - // Use LANG environment variable to choose locale pref("intl.locale.matchOS", true); -- cgit v1.2.3-54-g00ecf From d63f3481bd3bde4e0b17a05da3c4a824646c8522 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 4 Nov 2013 19:03:42 -0200 Subject: icedove-libre: update source code's URL --- 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 b7bd7d5a1..fe880d03d 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -24,7 +24,7 @@ replaces=('thunderbird') conflicts=('thunderbird') provides=('thunderbird') install=${_pkgname}.install -source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" +source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz" mozconfig replace-urls.txt -- cgit v1.2.3-54-g00ecf From fe831c9bfc47f7359e80ba0413a0a536b6360fdf Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 5 Nov 2013 08:43:05 -0200 Subject: icedove-libre: update common URLs way, fix package-manifest.in and enable cairo on mozconfig --- libre/icedove-libre/PKGBUILD | 25 ++++++++++++------------- libre/icedove-libre/mozconfig | 2 +- 2 files changed, 13 insertions(+), 14 deletions(-) (limited to 'libre/icedove-libre/PKGBUILD') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index fe880d03d..20dbea731 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -18,7 +18,7 @@ arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') 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' 'python2-virtualenv' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') +makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') optdepends=('libcanberra: for sound support') replaces=('thunderbird') conflicts=('thunderbird') @@ -27,14 +27,12 @@ install=${_pkgname}.install source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz" mozconfig - replace-urls.txt vendor.js ${_pkgname}.desktop) options=(!emptydirs) md5sums=('c69b05c9a1c28d455964aed4927ef916' 'c67dc2f46f0e4d463ebe1ccdbfae6392' - '5bd3b5b1c79d87d2720252e9b06ba09e' - 'e14242e651928bd658ec8d489088b6f2' + 'c46cf2a671c8fdefcabd4c87e38f3d40' '5a53179d14ae9631b7afe5e4d0fc0b25' 'e785e0c267f4435ae1a9aa0b03bcacfb') @@ -74,19 +72,20 @@ prepare() { s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|; ' mail/branding/icedove/locales/Makefile.in + # Fix package-manifest.in + sed -i '\|; Phishing Protection| s|$|\n#ifdef MOZ_SAFE_BROWSING|; + \|@BINPATH@/components/url-classifier[.]xpt| s|$|\n#endif| + ' mail/installer/package-manifest.in + # Fix branding sed -i 's|Icedove Mail/News|Icedove|' mail/branding/icedove/locales/en-US/brand.{dtd,properties} # 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}