Date: Thursday, June 4, 2015 @ 20:35:44 Author: andyrtr Revision: 240345
archrelease: copy trunk to staging-i686, staging-x86_64 Added: claws-mail/repos/staging-i686/ claws-mail/repos/staging-i686/PKGBUILD (from rev 240344, claws-mail/trunk/PKGBUILD) claws-mail/repos/staging-i686/claws-mail.install (from rev 240344, claws-mail/trunk/claws-mail.install) claws-mail/repos/staging-i686/git_fixes.diff (from rev 240344, claws-mail/trunk/git_fixes.diff) claws-mail/repos/staging-x86_64/ claws-mail/repos/staging-x86_64/PKGBUILD (from rev 240344, claws-mail/trunk/PKGBUILD) claws-mail/repos/staging-x86_64/claws-mail.install (from rev 240344, claws-mail/trunk/claws-mail.install) claws-mail/repos/staging-x86_64/git_fixes.diff (from rev 240344, claws-mail/trunk/git_fixes.diff) -----------------------------------+ staging-i686/PKGBUILD | 84 ++++++++++++++++++++++++++++++++++++ staging-i686/claws-mail.install | 16 ++++++ staging-i686/git_fixes.diff | 55 +++++++++++++++++++++++ staging-x86_64/PKGBUILD | 84 ++++++++++++++++++++++++++++++++++++ staging-x86_64/claws-mail.install | 16 ++++++ staging-x86_64/git_fixes.diff | 55 +++++++++++++++++++++++ 6 files changed, 310 insertions(+) Copied: claws-mail/repos/staging-i686/PKGBUILD (from rev 240344, claws-mail/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2015-06-04 18:35:44 UTC (rev 240345) @@ -0,0 +1,84 @@ +# $Id$ +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgname=claws-mail +pkgver=3.11.1 +pkgrel=3 +pkgdesc="A GTK+ based e-mail client." +arch=('i686' 'x86_64') +license=('GPL3') +url="http://www.claws-mail.org" +depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan' 'compface' + 'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils') +makedepends=('spamassassin' 'bogofilter' 'valgrind' + # dependencies for plugins + 'libsoup' 'libgdata' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') + #'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases +optdepends=('python2: needed for some tools and python plugin' + 'perl: needed for some tools and perl plugin' + 'spamassassin: adds support for spamfiltering' + 'bogofilter: adds support for spamfiltering' + 'libnotify: for notification plugin' + 'libcanberra: for notification plugin' + 'dbus: for notification plugin' + 'libxml2: for gtkhtml2_viewer and rssyl plugins' + 'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins' + 'libarchive: for archive plugin and various other plugins' + 'libytnef: for tnef_parse plugin' + 'webkitgtk2: for the fancy webkit html plugin' + 'libsoup: for the fancy webkit html plugin' + 'libgdata: for gdata plugin' + 'poppler-glib: for pdf viewer plugin' + 'ghostscript: for pdf viewer plugin') +replaces=('sylpheed-claws' 'claws-mail-extra-plugins') +conflicts=('claws-mail-extra-plugins') +provides=('claws') +install=claws-mail.install +source=(http://downloads.sourceforge.net/sourceforge/claws-mail/${pkgname}-${pkgver}.tar.xz{,.asc} + git_fixes.diff) +sha1sums=('b0c07906043f7a3ec726c7a96d6dcfc3c148b9cc' + 'SKIP' + '0e1bd9d696d531040f7b15b5b6164fc44784fdfc') +validpgpkeys=('8B3B297A03468356692F8D592CD716D654D6BBD4') # Paul <p...@claws-mail.org> + +prepare() { + cd ${pkgname}-${pkgver} + # fix .desktop file creation + patch -Np1 -i $srcdir/git_fixes.diff + autoreconf -vfi +} + +build() { + cd ${pkgname}-${pkgver} + + # fixes for python2 + export PYTHON="/usr/bin/python2" + sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py + sed -i 's:python -c:python2 -c:g' configure + + ./configure --prefix=/usr --disable-static \ + --enable-enchant \ + --enable-gnutls \ + --enable-ldap \ + --enable-crash-dialog \ + --enable-pgpmime-plugin \ + --enable-spamassassin-plugin \ + --enable-bogofilter-plugin \ + --enable-appdata + #--help + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + # build and install extra tools + cd tools + make + # all executables and .conf files ; only top directory + find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do + install -D -m755 ${i} \ + ${pkgdir}/usr/lib/claws-mail/tools/${i} + done +} Copied: claws-mail/repos/staging-i686/claws-mail.install (from rev 240344, claws-mail/trunk/claws-mail.install) =================================================================== --- staging-i686/claws-mail.install (rev 0) +++ staging-i686/claws-mail.install 2015-06-04 18:35:44 UTC (rev 240345) @@ -0,0 +1,16 @@ +post_install() { + echo "install \"html2ps\" from AUR to add support for printing html mails with fancy plugin" + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + Copied: claws-mail/repos/staging-i686/git_fixes.diff (from rev 240344, claws-mail/trunk/git_fixes.diff) =================================================================== --- staging-i686/git_fixes.diff (rev 0) +++ staging-i686/git_fixes.diff 2015-06-04 18:35:44 UTC (rev 240345) @@ -0,0 +1,55 @@ +From cfde37a35a8b9d54bd680245a7d37a63d6779706 Mon Sep 17 00:00:00 2001 +From: Ricardo Mones <rica...@mones.org> +Date: Tue, 28 Oct 2014 16:59:16 +0100 +Subject: [PATCH] Fix categories and recover keywords in desktop file + +--- + claws-mail.desktop | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/claws-mail.desktop b/claws-mail.desktop +index 116c9cb..df0bb00 100644 +--- a/claws-mail.desktop ++++ b/claws-mail.desktop +@@ -18,7 +18,8 @@ GenericName[sk]=Poštový klient + GenericName[sv]=E-postklient + Exec=claws-mail %u + Icon=claws-mail +-Categories=Network;Office;Email; ++Categories=Network;Email; ++Keywords=lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news; + Comment=Lightweight and Fast GTK+ based Mail Client + Comment[ca]=Client de correu electrònic rà pid i lleuger basat en GTK+ + Comment[cs]=Lehký a rychlý mailový klient založený na GTK+ +-- +1.7.10.4 + +From 44131ac697f1a55f65cf3916b0ca09ff8d3c1af8 Mon Sep 17 00:00:00 2001 +From: Ricardo Mones <rica...@mones.org> +Date: Tue, 28 Oct 2014 17:20:23 +0100 +Subject: [PATCH] Recover desktop file installation + +--- + Makefile.am | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 6b221fc..3fdb4aa 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -34,6 +34,11 @@ pixmap64_DATA=claws-mail-64x64.png + pixmap128dir=$(datadir)/icons/hicolor/128x128/apps + pixmap128_DATA=claws-mail-128x128.png + ++# when changing the name or location of the .desktop file, ++# also update src/common/Makefile.am ++gnomapdir = $(datadir)/applications ++gnomap_DATA=claws-mail.desktop ++ + rename-icons: + @cd $(DESTDIR)$(datadir)/icons/hicolor/64x64/apps && \ + mv claws-mail-64x64.png claws-mail.png +-- +1.7.10.4 + + Copied: claws-mail/repos/staging-x86_64/PKGBUILD (from rev 240344, claws-mail/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2015-06-04 18:35:44 UTC (rev 240345) @@ -0,0 +1,84 @@ +# $Id$ +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgname=claws-mail +pkgver=3.11.1 +pkgrel=3 +pkgdesc="A GTK+ based e-mail client." +arch=('i686' 'x86_64') +license=('GPL3') +url="http://www.claws-mail.org" +depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan' 'compface' + 'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils') +makedepends=('spamassassin' 'bogofilter' 'valgrind' + # dependencies for plugins + 'libsoup' 'libgdata' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') + #'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases +optdepends=('python2: needed for some tools and python plugin' + 'perl: needed for some tools and perl plugin' + 'spamassassin: adds support for spamfiltering' + 'bogofilter: adds support for spamfiltering' + 'libnotify: for notification plugin' + 'libcanberra: for notification plugin' + 'dbus: for notification plugin' + 'libxml2: for gtkhtml2_viewer and rssyl plugins' + 'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins' + 'libarchive: for archive plugin and various other plugins' + 'libytnef: for tnef_parse plugin' + 'webkitgtk2: for the fancy webkit html plugin' + 'libsoup: for the fancy webkit html plugin' + 'libgdata: for gdata plugin' + 'poppler-glib: for pdf viewer plugin' + 'ghostscript: for pdf viewer plugin') +replaces=('sylpheed-claws' 'claws-mail-extra-plugins') +conflicts=('claws-mail-extra-plugins') +provides=('claws') +install=claws-mail.install +source=(http://downloads.sourceforge.net/sourceforge/claws-mail/${pkgname}-${pkgver}.tar.xz{,.asc} + git_fixes.diff) +sha1sums=('b0c07906043f7a3ec726c7a96d6dcfc3c148b9cc' + 'SKIP' + '0e1bd9d696d531040f7b15b5b6164fc44784fdfc') +validpgpkeys=('8B3B297A03468356692F8D592CD716D654D6BBD4') # Paul <p...@claws-mail.org> + +prepare() { + cd ${pkgname}-${pkgver} + # fix .desktop file creation + patch -Np1 -i $srcdir/git_fixes.diff + autoreconf -vfi +} + +build() { + cd ${pkgname}-${pkgver} + + # fixes for python2 + export PYTHON="/usr/bin/python2" + sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py + sed -i 's:python -c:python2 -c:g' configure + + ./configure --prefix=/usr --disable-static \ + --enable-enchant \ + --enable-gnutls \ + --enable-ldap \ + --enable-crash-dialog \ + --enable-pgpmime-plugin \ + --enable-spamassassin-plugin \ + --enable-bogofilter-plugin \ + --enable-appdata + #--help + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + # build and install extra tools + cd tools + make + # all executables and .conf files ; only top directory + find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do + install -D -m755 ${i} \ + ${pkgdir}/usr/lib/claws-mail/tools/${i} + done +} Copied: claws-mail/repos/staging-x86_64/claws-mail.install (from rev 240344, claws-mail/trunk/claws-mail.install) =================================================================== --- staging-x86_64/claws-mail.install (rev 0) +++ staging-x86_64/claws-mail.install 2015-06-04 18:35:44 UTC (rev 240345) @@ -0,0 +1,16 @@ +post_install() { + echo "install \"html2ps\" from AUR to add support for printing html mails with fancy plugin" + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + Copied: claws-mail/repos/staging-x86_64/git_fixes.diff (from rev 240344, claws-mail/trunk/git_fixes.diff) =================================================================== --- staging-x86_64/git_fixes.diff (rev 0) +++ staging-x86_64/git_fixes.diff 2015-06-04 18:35:44 UTC (rev 240345) @@ -0,0 +1,55 @@ +From cfde37a35a8b9d54bd680245a7d37a63d6779706 Mon Sep 17 00:00:00 2001 +From: Ricardo Mones <rica...@mones.org> +Date: Tue, 28 Oct 2014 16:59:16 +0100 +Subject: [PATCH] Fix categories and recover keywords in desktop file + +--- + claws-mail.desktop | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/claws-mail.desktop b/claws-mail.desktop +index 116c9cb..df0bb00 100644 +--- a/claws-mail.desktop ++++ b/claws-mail.desktop +@@ -18,7 +18,8 @@ GenericName[sk]=Poštový klient + GenericName[sv]=E-postklient + Exec=claws-mail %u + Icon=claws-mail +-Categories=Network;Office;Email; ++Categories=Network;Email; ++Keywords=lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news; + Comment=Lightweight and Fast GTK+ based Mail Client + Comment[ca]=Client de correu electrònic rà pid i lleuger basat en GTK+ + Comment[cs]=Lehký a rychlý mailový klient založený na GTK+ +-- +1.7.10.4 + +From 44131ac697f1a55f65cf3916b0ca09ff8d3c1af8 Mon Sep 17 00:00:00 2001 +From: Ricardo Mones <rica...@mones.org> +Date: Tue, 28 Oct 2014 17:20:23 +0100 +Subject: [PATCH] Recover desktop file installation + +--- + Makefile.am | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 6b221fc..3fdb4aa 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -34,6 +34,11 @@ pixmap64_DATA=claws-mail-64x64.png + pixmap128dir=$(datadir)/icons/hicolor/128x128/apps + pixmap128_DATA=claws-mail-128x128.png + ++# when changing the name or location of the .desktop file, ++# also update src/common/Makefile.am ++gnomapdir = $(datadir)/applications ++gnomap_DATA=claws-mail.desktop ++ + rename-icons: + @cd $(DESTDIR)$(datadir)/icons/hicolor/64x64/apps && \ + mv claws-mail-64x64.png claws-mail.png +-- +1.7.10.4 + +