[arch-commits] Commit in claws-mail/repos (10 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Thu Dec 8 21:06:16 UTC 2011


    Date: Thursday, December 8, 2011 @ 16:06:16
  Author: andyrtr
Revision: 144878

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  claws-mail/repos/extra-i686/PKGBUILD
    (from rev 144877, claws-mail/trunk/PKGBUILD)
  claws-mail/repos/extra-i686/claws-mail.install
    (from rev 144877, claws-mail/trunk/claws-mail.install)
  claws-mail/repos/extra-i686/gnutls_buildfix.patch
    (from rev 144877, claws-mail/trunk/gnutls_buildfix.patch)
  claws-mail/repos/extra-x86_64/PKGBUILD
    (from rev 144877, claws-mail/trunk/PKGBUILD)
  claws-mail/repos/extra-x86_64/claws-mail.install
    (from rev 144877, claws-mail/trunk/claws-mail.install)
  claws-mail/repos/extra-x86_64/gnutls_buildfix.patch
    (from rev 144877, claws-mail/trunk/gnutls_buildfix.patch)
Deleted:
  claws-mail/repos/extra-i686/PKGBUILD
  claws-mail/repos/extra-i686/claws-mail.install
  claws-mail/repos/extra-x86_64/PKGBUILD
  claws-mail/repos/extra-x86_64/claws-mail.install

------------------------------------+
 extra-i686/PKGBUILD                |  117 ++++++++++++++++++-----------------
 extra-i686/claws-mail.install      |   32 ++++-----
 extra-i686/gnutls_buildfix.patch   |   12 +++
 extra-x86_64/PKGBUILD              |  117 ++++++++++++++++++-----------------
 extra-x86_64/claws-mail.install    |   32 ++++-----
 extra-x86_64/gnutls_buildfix.patch |   12 +++
 6 files changed, 178 insertions(+), 144 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-12-08 21:05:30 UTC (rev 144877)
+++ extra-i686/PKGBUILD	2011-12-08 21:06:16 UTC (rev 144878)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=claws-mail
-pkgver=3.7.10
-pkgrel=1
-pkgdesc="A GTK+ based e-mail client."
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://www.claws-mail.org"
-depends=('gtk2' 'gnutls' 'startup-notification' 'pilot-link' 'enchant'
-         'gpgme' 'libetpan' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind')
-optdepends=('python2:           needed for some tools'
-            'perl:              needed for some tools'
-            'spamassassin:      adds support for spamfiltering'
-            'bogofilter:        adds support for spamfiltering')
-replaces=('sylpheed-claws')
-provides=('claws')
-options=(!libtool)
-install=claws-mail.install
-source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('fcf58dcff52f0908ff3bc368d820408b')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
-
-  ./configure --prefix=/usr --disable-static \
-    --enable-enchant \
-    --enable-gnutls \
-    --enable-ldap \
-    --disable-dillo-viewer-plugin \
-    --enable-crash-dialog \
-    --enable-pgpmime-plugin \
-    --enable-spamassassin-plugin \
-    --enable-bogofilter-plugin \
-    --enable-jpilot
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${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/extra-i686/PKGBUILD (from rev 144877, claws-mail/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-12-08 21:06:16 UTC (rev 144878)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=claws-mail
+pkgver=3.7.10
+pkgrel=2
+pkgdesc="A GTK+ based e-mail client."
+arch=('i686' 'x86_64')
+license=('GPL3')
+url="http://www.claws-mail.org"
+depends=('gtk2' 'gnutls' 'startup-notification' 'pilot-link' 'enchant'
+         'gpgme' 'libetpan' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind')
+optdepends=('python2:           needed for some tools'
+            'perl:              needed for some tools'
+            'spamassassin:      adds support for spamfiltering'
+            'bogofilter:        adds support for spamfiltering')
+replaces=('sylpheed-claws')
+provides=('claws')
+options=(!libtool)
+install=claws-mail.install
+source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2
+	gnutls_buildfix.patch)
+md5sums=('fcf58dcff52f0908ff3bc368d820408b'
+         '372bf7a9da58ae49d9da50f79db69fb6')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # fix build with latest gnutls
+  patch -Np1 -i ${srcdir}/gnutls_buildfix.patch
+  
+  sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
+
+  ./configure --prefix=/usr --disable-static \
+    --enable-enchant \
+    --enable-gnutls \
+    --enable-ldap \
+    --disable-dillo-viewer-plugin \
+    --enable-crash-dialog \
+    --enable-pgpmime-plugin \
+    --enable-spamassassin-plugin \
+    --enable-bogofilter-plugin \
+    --enable-jpilot
+
+  make
+}
+
+package() {
+  cd ${srcdir}/${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
+}

Deleted: extra-i686/claws-mail.install
===================================================================
--- extra-i686/claws-mail.install	2011-12-08 21:05:30 UTC (rev 144877)
+++ extra-i686/claws-mail.install	2011-12-08 21:06:16 UTC (rev 144878)
@@ -1,16 +0,0 @@
-post_install() {
-  echo "install \"html2ps\" from AUR to add support for printing html mails together with html plugins"
-  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/extra-i686/claws-mail.install (from rev 144877, claws-mail/trunk/claws-mail.install)
===================================================================
--- extra-i686/claws-mail.install	                        (rev 0)
+++ extra-i686/claws-mail.install	2011-12-08 21:06:16 UTC (rev 144878)
@@ -0,0 +1,16 @@
+post_install() {
+  echo "install \"html2ps\" from AUR to add support for printing html mails together with html plugins"
+  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/extra-i686/gnutls_buildfix.patch (from rev 144877, claws-mail/trunk/gnutls_buildfix.patch)
===================================================================
--- extra-i686/gnutls_buildfix.patch	                        (rev 0)
+++ extra-i686/gnutls_buildfix.patch	2011-12-08 21:06:16 UTC (rev 144878)
@@ -0,0 +1,12 @@
+--- claws-mail-3.7.10/src/common/ssl.c	2011-12-07 14:55:08.682553870 +0100
++++ claws-mail-3.7.10/src/common/ssl.c	2011-12-07 14:55:43.808349602 +0100
+@@ -270,7 +270,9 @@ gboolean ssl_init_socket_with_method(Soc
+ 	if (session == NULL || r != 0)
+ 		return FALSE;
+   
++#if GNUTLS_VERSION_NUMBER < 0x020c00
+ 	gnutls_transport_set_lowat (session, 1); 
++#endif
+ 	gnutls_set_default_priority(session);
+ 	gnutls_protocol_set_priority (session, proto_prio);
+ 	gnutls_cipher_set_priority (session, cipher_prio);

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2011-12-08 21:05:30 UTC (rev 144877)
+++ extra-x86_64/PKGBUILD	2011-12-08 21:06:16 UTC (rev 144878)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=claws-mail
-pkgver=3.7.10
-pkgrel=1
-pkgdesc="A GTK+ based e-mail client."
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://www.claws-mail.org"
-depends=('gtk2' 'gnutls' 'startup-notification' 'pilot-link' 'enchant'
-         'gpgme' 'libetpan' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind')
-optdepends=('python2:           needed for some tools'
-            'perl:              needed for some tools'
-            'spamassassin:      adds support for spamfiltering'
-            'bogofilter:        adds support for spamfiltering')
-replaces=('sylpheed-claws')
-provides=('claws')
-options=(!libtool)
-install=claws-mail.install
-source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('fcf58dcff52f0908ff3bc368d820408b')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
-
-  ./configure --prefix=/usr --disable-static \
-    --enable-enchant \
-    --enable-gnutls \
-    --enable-ldap \
-    --disable-dillo-viewer-plugin \
-    --enable-crash-dialog \
-    --enable-pgpmime-plugin \
-    --enable-spamassassin-plugin \
-    --enable-bogofilter-plugin \
-    --enable-jpilot
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${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/extra-x86_64/PKGBUILD (from rev 144877, claws-mail/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2011-12-08 21:06:16 UTC (rev 144878)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=claws-mail
+pkgver=3.7.10
+pkgrel=2
+pkgdesc="A GTK+ based e-mail client."
+arch=('i686' 'x86_64')
+license=('GPL3')
+url="http://www.claws-mail.org"
+depends=('gtk2' 'gnutls' 'startup-notification' 'pilot-link' 'enchant'
+         'gpgme' 'libetpan' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind')
+optdepends=('python2:           needed for some tools'
+            'perl:              needed for some tools'
+            'spamassassin:      adds support for spamfiltering'
+            'bogofilter:        adds support for spamfiltering')
+replaces=('sylpheed-claws')
+provides=('claws')
+options=(!libtool)
+install=claws-mail.install
+source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2
+	gnutls_buildfix.patch)
+md5sums=('fcf58dcff52f0908ff3bc368d820408b'
+         '372bf7a9da58ae49d9da50f79db69fb6')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # fix build with latest gnutls
+  patch -Np1 -i ${srcdir}/gnutls_buildfix.patch
+  
+  sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
+
+  ./configure --prefix=/usr --disable-static \
+    --enable-enchant \
+    --enable-gnutls \
+    --enable-ldap \
+    --disable-dillo-viewer-plugin \
+    --enable-crash-dialog \
+    --enable-pgpmime-plugin \
+    --enable-spamassassin-plugin \
+    --enable-bogofilter-plugin \
+    --enable-jpilot
+
+  make
+}
+
+package() {
+  cd ${srcdir}/${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
+}

Deleted: extra-x86_64/claws-mail.install
===================================================================
--- extra-x86_64/claws-mail.install	2011-12-08 21:05:30 UTC (rev 144877)
+++ extra-x86_64/claws-mail.install	2011-12-08 21:06:16 UTC (rev 144878)
@@ -1,16 +0,0 @@
-post_install() {
-  echo "install \"html2ps\" from AUR to add support for printing html mails together with html plugins"
-  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/extra-x86_64/claws-mail.install (from rev 144877, claws-mail/trunk/claws-mail.install)
===================================================================
--- extra-x86_64/claws-mail.install	                        (rev 0)
+++ extra-x86_64/claws-mail.install	2011-12-08 21:06:16 UTC (rev 144878)
@@ -0,0 +1,16 @@
+post_install() {
+  echo "install \"html2ps\" from AUR to add support for printing html mails together with html plugins"
+  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/extra-x86_64/gnutls_buildfix.patch (from rev 144877, claws-mail/trunk/gnutls_buildfix.patch)
===================================================================
--- extra-x86_64/gnutls_buildfix.patch	                        (rev 0)
+++ extra-x86_64/gnutls_buildfix.patch	2011-12-08 21:06:16 UTC (rev 144878)
@@ -0,0 +1,12 @@
+--- claws-mail-3.7.10/src/common/ssl.c	2011-12-07 14:55:08.682553870 +0100
++++ claws-mail-3.7.10/src/common/ssl.c	2011-12-07 14:55:43.808349602 +0100
+@@ -270,7 +270,9 @@ gboolean ssl_init_socket_with_method(Soc
+ 	if (session == NULL || r != 0)
+ 		return FALSE;
+   
++#if GNUTLS_VERSION_NUMBER < 0x020c00
+ 	gnutls_transport_set_lowat (session, 1); 
++#endif
+ 	gnutls_set_default_priority(session);
+ 	gnutls_protocol_set_priority (session, proto_prio);
+ 	gnutls_cipher_set_priority (session, cipher_prio);




More information about the arch-commits mailing list