Date: Thursday, January 1, 2015 @ 13:49:11 Author: andyrtr Revision: 228325
upgpkg: claws-mail 3.11.1-1 upstream update 3.11.1 Added: claws-mail/trunk/git_fixes.diff Modified: claws-mail/trunk/PKGBUILD ----------------+ PKGBUILD | 21 +++++++++++++++------ git_fixes.diff | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-01-01 11:29:49 UTC (rev 228324) +++ PKGBUILD 2015-01-01 12:49:11 UTC (rev 228325) @@ -2,8 +2,8 @@ # Maintainer: Andreas Radke <[email protected]> pkgname=claws-mail -pkgver=3.11.0 -pkgrel=2 +pkgver=3.11.1 +pkgrel=1 pkgdesc="A GTK+ based e-mail client." arch=('i686' 'x86_64') license=('GPL3') @@ -10,7 +10,7 @@ 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' 'intltool' +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 @@ -34,11 +34,20 @@ conflicts=('claws-mail-extra-plugins') provides=('claws') install=claws-mail.install -source=(http://downloads.sourceforge.net/sourceforge/claws-mail/${pkgname}-${pkgver}.tar.xz{,.asc}) -sha1sums=('1fc919e7d4357408a04131c4195878ea920de4f0' - 'SKIP') +source=(http://downloads.sourceforge.net/sourceforge/claws-mail/${pkgname}-${pkgver}.tar.xz{,.asc} + git_fixes.diff) +sha1sums=('b0c07906043f7a3ec726c7a96d6dcfc3c148b9cc' + 'SKIP' + '0e1bd9d696d531040f7b15b5b6164fc44784fdfc') validpgpkeys=('8B3B297A03468356692F8D592CD716D654D6BBD4') # Paul <[email protected]> +prepare() { + cd ${pkgname}-${pkgver} + # fix .desktop file creation + patch -Np1 -i $srcdir/git_fixes.diff + autoreconf -vfi +} + build() { cd ${pkgname}-${pkgver} Added: git_fixes.diff =================================================================== --- git_fixes.diff (rev 0) +++ git_fixes.diff 2015-01-01 12:49:11 UTC (rev 228325) @@ -0,0 +1,55 @@ +From cfde37a35a8b9d54bd680245a7d37a63d6779706 Mon Sep 17 00:00:00 2001 +From: Ricardo Mones <[email protected]> +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 <[email protected]> +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 + +
