From 7cd2f39e028c968b690761d487cb70dc08add786 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 31 Oct 2012 15:10:02 -0200 Subject: icedove-libre-16.0.2.1-1: updating version --- libre/icedove-libre/PKGBUILD | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'libre/icedove-libre/PKGBUILD') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 6bd50cd47..f4f6c5c76 100755 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer : Márcio Silva -# Maintainer : André Silva +# Maintainer : Márcio Silva +# Maintainer : André Silva # We're getting this from Debian Experimental _debname=icedove -_debver=11.0 +_debver=16.0.2 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -28,17 +28,14 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" mozconfig channel-prefs.js vendor.js - gcc47.patch - clrf.patch makefile.patch ${_pkgname}.desktop) -md5sums=('0d4aaf892cd1cbf9bda38928947025fe' - 'd4401c080fe5190e8bb1326f10808231' +options=(!emptydirs) +md5sums=('a3724f40d28014acf593528bb8a048f0' + '53d62a4841d7989d1f6d1b04929394b4' 'd6d58d3104a44624e0a3d227cdf1c211' '476ec205162340fb0679f522c9d31c3b' '4eecc4fc5aafaf0da651a09eadc90bee' - '94d5cd599ccc4438f192d8daabf98b6a' - 'c395d443a8c4c16880c7322bcf174743' 'c4ed43e85945e180a89cce03e45ec62c' 'e785e0c267f4435ae1a9aa0b03bcacfb') @@ -61,9 +58,7 @@ build() { done quilt push -av - patch -Np1 -i "$srcdir/gcc47.patch" - patch -Np1 -i "$srcdir/clrf.patch" - patch -Np1 -i "$srcdir/makefile.patch" + patch -Np1 -i "$srcdir/makefile.patch" # small fix cp "${srcdir}/mozconfig" .mozconfig make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" @@ -74,9 +69,9 @@ package() { make -j1 -f client.mk DESTDIR="${pkgdir}" install - install -m644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/pref" + 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" + install -Dm644 "${srcdir}/channel-prefs.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences/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" -- cgit v1.2.3-54-g00ecf From 640ef17c5d21c4d0a800bb2cbf03d1fcfc280a02 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 31 Oct 2012 22:43:47 -0200 Subject: icedove-libre-16.0.2.1-2: fixing some issues --- libre/icedove-libre/PKGBUILD | 9 ++++----- libre/icedove-libre/branding.patch | 19 +++++++++++++++++++ libre/icedove-libre/channel-prefs.js | 9 --------- 3 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 libre/icedove-libre/branding.patch delete mode 100755 libre/icedove-libre/channel-prefs.js (limited to 'libre/icedove-libre/PKGBUILD') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index f4f6c5c76..9eefb9c88 100755 --- 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=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') @@ -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 vendor.js makefile.patch + branding.patch ${_pkgname}.desktop) options=(!emptydirs) md5sums=('a3724f40d28014acf593528bb8a048f0' '53d62a4841d7989d1f6d1b04929394b4' 'd6d58d3104a44624e0a3d227cdf1c211' - '476ec205162340fb0679f522c9d31c3b' '4eecc4fc5aafaf0da651a09eadc90bee' 'c4ed43e85945e180a89cce03e45ec62c' + '126b1446212396c33220936c01d9592d' 'e785e0c267f4435ae1a9aa0b03bcacfb') build() { @@ -59,6 +59,7 @@ build() { quilt push -av patch -Np1 -i "$srcdir/makefile.patch" # small fix + patch -Np1 -i "$srcdir/branding.patch" # fixing branding cp "${srcdir}/mozconfig" .mozconfig make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" @@ -70,8 +71,6 @@ package() { make -j1 -f client.mk DESTDIR="${pkgdir}" install install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences/vendor.js" - # Recommend free addons - install -Dm644 "${srcdir}/channel-prefs.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences/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" diff --git a/libre/icedove-libre/branding.patch b/libre/icedove-libre/branding.patch new file mode 100644 index 000000000..d84b8075a --- /dev/null +++ b/libre/icedove-libre/branding.patch @@ -0,0 +1,19 @@ +diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd comm-release/mail/branding/icedove/locales/en-US/brand.dtd +--- comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd 2012-10-30 16:41:16.000000000 -0200 ++++ comm-release/mail/branding/icedove/locales/en-US/brand.dtd 2012-10-31 22:35:04.203666114 -0200 +@@ -1,4 +1,4 @@ + +- +- ++ ++ + +diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties comm-release/mail/branding/icedove/locales/en-US/brand.properties +--- comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties 2012-10-30 10:13:50.000000000 -0200 ++++ comm-release/mail/branding/icedove/locales/en-US/brand.properties 2012-10-31 22:35:14.786423732 -0200 +@@ -1,3 +1,3 @@ + brandShortName=Icedove +-brandFullName=Icedove Mail/News +-vendorShortName=Icedove ++brandFullName=Icedove ++vendorShortName=Mozilla diff --git a/libre/icedove-libre/channel-prefs.js b/libre/icedove-libre/channel-prefs.js deleted file mode 100755 index 13b1ba388..000000000 --- a/libre/icedove-libre/channel-prefs.js +++ /dev/null @@ -1,9 +0,0 @@ -//@line 2 "/build/src/comm-release/mail/app/profile/channel-prefs.js" -pref("app.update.channel", "default"); - -//Recommend free addons -pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html"); -pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); -pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -- cgit v1.2.3-54-g00ecf From acc635a2df66965ebe21c44c834a45c6409d390d Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 1 Nov 2012 02:16:46 -0200 Subject: icedove-libre-16.0.2.1-3: adding channel-prefs.js to have free addons --- libre/icedove-libre/PKGBUILD | 7 ++++++- libre/icedove-libre/channel-prefs.js | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 libre/icedove-libre/channel-prefs.js (limited to 'libre/icedove-libre/PKGBUILD') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 9eefb9c88..82dc721d5 100755 --- 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=('i586' 'i686' 'x86_64' 'mips64el') license=('GPL2' 'MPL' 'LGPL') @@ -26,6 +26,7 @@ install=$_pkgname.install source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" mozconfig + channel-prefs.js vendor.js makefile.patch branding.patch @@ -34,6 +35,7 @@ options=(!emptydirs) md5sums=('a3724f40d28014acf593528bb8a048f0' '53d62a4841d7989d1f6d1b04929394b4' 'd6d58d3104a44624e0a3d227cdf1c211' + '476ec205162340fb0679f522c9d31c3b' '4eecc4fc5aafaf0da651a09eadc90bee' 'c4ed43e85945e180a89cce03e45ec62c' '126b1446212396c33220936c01d9592d' @@ -72,6 +74,9 @@ 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" + 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 diff --git a/libre/icedove-libre/channel-prefs.js b/libre/icedove-libre/channel-prefs.js new file mode 100644 index 000000000..13b1ba388 --- /dev/null +++ b/libre/icedove-libre/channel-prefs.js @@ -0,0 +1,9 @@ +//@line 2 "/build/src/comm-release/mail/app/profile/channel-prefs.js" +pref("app.update.channel", "default"); + +//Recommend free addons +pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html"); +pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); +pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); +pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); +pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -- cgit v1.2.3-54-g00ecf From de53cae3a169d6af6afb05ced4aad350ec94c07d Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 1 Nov 2012 02:20:10 -0200 Subject: icedove-libre-16.0.2.1-3: fixing some details --- 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 82dc721d5..9959f4091 100755 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -72,7 +72,7 @@ package() { make -j1 -f client.mk DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences/vendor.js" + install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences" # Recommend free addons install -m644 "${srcdir}/channel-prefs.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/pref" -- cgit v1.2.3-54-g00ecf From 8e23fd5a8ae73246c1ebd7a792770b141cf39897 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 1 Nov 2012 02:41:48 -0200 Subject: icedove-libre-16.0.2.1-3: fixing more details on PKGBUILD --- libre/icedove-libre/PKGBUILD | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libre/icedove-libre/PKGBUILD') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 9959f4091..6ec577f58 100755 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -22,7 +22,7 @@ optdepends=('libcanberra: for sound support') replaces=('thunderbird') conflicts=('thunderbird') provides=('thunderbird') -install=$_pkgname.install +install=${_pkgname}.install source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" mozconfig @@ -60,8 +60,8 @@ build() { done quilt push -av - patch -Np1 -i "$srcdir/makefile.patch" # small fix - patch -Np1 -i "$srcdir/branding.patch" # fixing branding + patch -Np1 -i "${srcdir}/makefile.patch" # small fix + patch -Np1 -i "${srcdir}/branding.patch" # fixing branding cp "${srcdir}/mozconfig" .mozconfig make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" @@ -72,18 +72,18 @@ package() { make -j1 -f client.mk DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences" + 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" + 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 install -Dm644 "debian/app-icons/${_pkgname}_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg" - install -Dm644 "$srcdir/${_pkgname}.desktop" \ - "$pkgdir/usr/share/applications/${_pkgname}.desktop" + install -Dm644 "${srcdir}/${_pkgname}.desktop" \ + "${pkgdir}/usr/share/applications/${_pkgname}.desktop" rm -rf "${pkgdir}"/usr/lib/${_pkgname}/{dictionaries,hyphenation,searchplugins} ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/${_pkgname}/dictionaries" -- cgit v1.2.3-54-g00ecf