summaryrefslogtreecommitdiff
path: root/nonprism/claws-mail
diff options
context:
space:
mode:
Diffstat (limited to 'nonprism/claws-mail')
-rw-r--r--nonprism/claws-mail/PKGBUILD48
-rw-r--r--nonprism/claws-mail/git_fixes.diff55
2 files changed, 20 insertions, 83 deletions
diff --git a/nonprism/claws-mail/PKGBUILD b/nonprism/claws-mail/PKGBUILD
index cf3f61990..17f760d57 100644
--- a/nonprism/claws-mail/PKGBUILD
+++ b/nonprism/claws-mail/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 241764 2015-07-03 17:39:10Z andyrtr $
+# $Id: PKGBUILD 242517 2015-07-26 12:20:39Z andyrtr $
# Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
# Maintainer: Márcio Silva <coadde@parabola.nu>
pkgname=claws-mail
-pkgver=3.11.1
-pkgrel=4.nonprism1
+pkgver=3.12.0
+pkgrel=1.nonprism1
pkgdesc="A GTK+ based e-mail client, without libgdata support"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
license=('GPL3')
-url="http://www.$pkgname.org"
+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'
@@ -30,33 +30,25 @@ optdepends=('python2: needed for some tools and python plugin'
'libsoup: for the fancy webkit html plugin'
'poppler-glib: for pdf viewer plugin'
'ghostscript: for pdf viewer plugin')
-replaces=("sylpheed-claws" "$pkgname-extra-plugins" "$pkgname-libre" "$pkgname-libre-nonprism" "$pkgname-nonprism")
-conflicts=("$pkgname-extra-plugins" "$pkgname-libre" "$pkgname-libre-nonprism" "$pkgname-nonprism")
+replaces=('sylpheed-claws' 'claws-mail-extra-plugins' 'claws-mail-libre' 'claws-mail-libre-nonprism' 'claws-mail-nonprism')
+conflicts=('claws-mail-extra-plugins' 'claws-mail-libre' 'claws-mail-libre-nonprism' 'claws-mail-nonprism')
provides=('claws')
-install=$pkgname.install
-source=(http://downloads.sourceforge.net/sourceforge/claws-mail/$pkgname-$pkgver.tar.xz{,.asc}
- git_fixes.diff)
-sha1sums=('b0c07906043f7a3ec726c7a96d6dcfc3c148b9cc'
- 'SKIP'
- '0e1bd9d696d531040f7b15b5b6164fc44784fdfc')
+install=claws-mail.install
+source=(#http://downloads.sourceforge.net/sourceforge/claws-mail/${pkgname}-${pkgver}.tar.xz{,.asc}
+ http://www.claws-mail.org/download.php?file=releases/claws-mail-3.12.0.tar.xz{,.asc})
+md5sums=('73c11bf9f260473abe0e888af19e23b8'
+ 'SKIP')
validpgpkeys=('8B3B297A03468356692F8D592CD716D654D6BBD4') # Paul <paul@claws-mail.org>
-prepare() {
- cd $pkgname-$pkgver
- # fix .desktop file creation
- patch -Np1 -i $srcdir/git_fixes.diff
- autoreconf -vfi
-}
-
build() {
- cd $pkgname-$pkgver
+ 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
- setarch $CARCH ./configure --prefix=/usr --disable-static \
+ ./configure --prefix=/usr --disable-static \
--enable-enchant \
--enable-gnutls \
--enable-ldap \
@@ -67,19 +59,19 @@ build() {
--enable-appdata \
--disable-gdata-plugin
#--help
- setarch $CARCH make
+ make
}
package() {
- cd $pkgname-$pkgver
- setarch $CARCH make DESTDIR=$pkgdir install
+ cd ${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
# build and install extra tools
cd tools
- setarch $CARCH make
+ 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/$pkgname/tools/$i
+ install -D -m755 ${i} \
+ ${pkgdir}/usr/lib/claws-mail/tools/${i}
done
}
diff --git a/nonprism/claws-mail/git_fixes.diff b/nonprism/claws-mail/git_fixes.diff
deleted file mode 100644
index 0e42a9431..000000000
--- a/nonprism/claws-mail/git_fixes.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-From cfde37a35a8b9d54bd680245a7d37a63d6779706 Mon Sep 17 00:00:00 2001
-From: Ricardo Mones <ricardo@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 <ricardo@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
-
-