[arch-commits] Commit in claws-mail/trunk (PKGBUILD)

[Andreas Radke]

    Date: Wednesday, February 13, 2019 @ 18:13:49
  Author: andyrtr
Revision: 346238

upgpkg: claws-mail 3.17.3-2

build with python v3 - drop python v2/pygtk based python plugin

Modified:
  claws-mail/trunk/PKGBUILD

----------+
 PKGBUILD |   28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-13 18:11:16 UTC (rev 346237)
+++ PKGBUILD	2019-02-13 18:13:49 UTC (rev 346238)
@@ -2,7 +2,7 @@
 
 pkgname=claws-mail
 pkgver=3.17.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A GTK+ based e-mail client."
 arch=('x86_64')
 license=('GPL3')
@@ -11,12 +11,11 @@
          'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('spamassassin' 'bogofilter' 'valgrind'
              # dependencies for plugins
-             'libgdata' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk' 'libytnef' 'libical' 'dillo'
+             'libgdata' 'libnotify' 'libcanberra' 'poppler-glib' 'libytnef' 'libical' 'dillo' 'python'
              # deps to build the docs
              'docbook-utils' 'texlive-formatsextra')
-             #'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'
-            'pygtk:             needed for python plugin'
+optdepends=('python:            needed for some tools'
+            #'pygtk:             needed for python plugin'
             'perl:              needed for some tools and perl plugin'
             'spamassassin:      adds support for spamfiltering'
             'bogofilter:        adds support for spamfiltering'
@@ -32,8 +31,6 @@
             'ghostscript:       for pdf viewer plugin'
             'libical:           for vcalendar plugin'
             'dillo:             for html viewer plugin')
-replaces=('sylpheed-claws' 'claws-mail-extra-plugins')
-conflicts=('claws-mail-extra-plugins')
 provides=('claws')
 source=(http://www.claws-mail.org/download.php?file=releases/claws-mail-$pkgver.tar.xz{,.asc})
 sha256sums=('504e1f5a6f0880192662826ac07bcd083c3167b3db7143858617d6c51233d2f2'
@@ -40,23 +37,8 @@
             'SKIP')
 validpgpkeys=('8B3B297A03468356692F8D592CD716D654D6BBD4') # Paul <paul at claws-mail.org>
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-  # fix new versioned enchant pkgconfig detection
-  sed -i "s:PKG_CHECK_MODULES(ENCHANT, enchant >= 1.4.0:PKG_CHECK_MODULES(ENCHANT, enchant-2 >= 1.4.0:" configure.ac
-  sed -i "s:--cflags enchant:--cflags enchant-2:" configure.ac
-
-  autoreconf -vfi
-  sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
-  sed -i 's:python -c:python2 -c:g' configure
-}
-
 build() {
   cd ${pkgname}-${pkgver}
-
-  # fixes for python2
-  export PYTHON="/usr/bin/python2"
-
   ./configure --prefix=/usr --disable-static \
     --enable-enchant \
     --enable-gnutls \
@@ -64,7 +46,7 @@
     --enable-crash-dialog \
     --enable-pgpmime-plugin \
     --enable-spamassassin-plugin \
-    --enable-bogofilter-plugin   # --help
+    --enable-bogofilter-plugin
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }