[arch-commits] Commit in xfce4-mailwatch-plugin/trunk (3 files)

[Eric Bélanger]

    Date: Saturday, October 26, 2013 @ 04:49:24
  Author: eric
Revision: 197444

upgpkg: xfce4-mailwatch-plugin 1.2.0-1

Upstream update, Update url, Remove old patches, Clean up PKGBUILD

Modified:
  xfce4-mailwatch-plugin/trunk/PKGBUILD
Deleted:
  xfce4-mailwatch-plugin/trunk/only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch
  xfce4-mailwatch-plugin/trunk/xfce4-mailwatch-plugin-1.1.0-underlink.patch

-------------------------------------------------------------+
 PKGBUILD                                                    |   32 +++-------
 only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch |   13 ----
 xfce4-mailwatch-plugin-1.1.0-underlink.patch                |   21 ------
 3 files changed, 11 insertions(+), 55 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-26 02:06:11 UTC (rev 197443)
+++ PKGBUILD	2013-10-26 02:49:24 UTC (rev 197444)
@@ -3,40 +3,30 @@
 # Contributor: Suzy Williams <suzanne.williams3 at verizon.net>
 
 pkgname=xfce4-mailwatch-plugin
-pkgver=1.1.0
-pkgrel=5
+pkgver=1.2.0
+pkgrel=1
 pkgdesc="A mailbox watch/check plugin for the Xfce4 panel"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin"
 license=('GPL2')
-url="http://spurint.org/projects/xfce4-mailwatch-plugin/"
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4' 'gnutls' 'libgcrypt' 'hicolor-icon-theme')
-makedepends=('intltool' 'xfce4-dev-tools')
-options=('!libtool')
+depends=('xfce4-panel')
+makedepends=('intltool')
 install=${pkgname}.install
-source=(http://spuriousinterrupt.org/files/mailwatch/${pkgname}-${pkgver}.tar.bz2
-	xfce4-mailwatch-plugin-1.1.0-underlink.patch
-	only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch)
-md5sums=('f84dce86be1d7f25f169f262aaacee4e'
-         '47fe8588e3bb642e1b507a854927e6db'
-         'd91ca2b9534e9e2d8dcbd94306b91ade')
+source=(http://archive.xfce.org/src/panel-plugins/xfce4-mailwatch-plugin/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('7263114ec0f2987a3aff15afeeb45577')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np0 -i ${srcdir}/only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch
-  # fix for panel4.8 from Fedora
-  patch -Np1 -i ${srcdir}/xfce4-mailwatch-plugin-1.1.0-underlink.patch
-  xdt-autogen
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
 	--localstatedir=/var \
-	--disable-static \
 	--disable-debug
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }

Deleted: only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch
===================================================================
--- only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch	2013-10-26 02:06:11 UTC (rev 197443)
+++ only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch	2013-10-26 02:49:24 UTC (rev 197444)
@@ -1,13 +0,0 @@
---- libmailwatch-core/mailwatch-net-conn.c.orig	2012-04-29 05:38:20.015564589 +0300
-+++ libmailwatch-core/mailwatch-net-conn.c	2012-04-29 05:39:01.943290639 +0300
-@@ -621,8 +621,10 @@ xfce_mailwatch_net_conn_make_secure(Xfce
-                            net_conn->gt_creds);
-     gnutls_transport_set_ptr(net_conn->gt_session,
-                              (gnutls_transport_ptr_t)net_conn->fd);
-+#if GNUTLS_VERSION_NUMBER < 0x020c00
-     if(fcntl(net_conn->fd, F_GETFL) & O_NONBLOCK)
-         gnutls_transport_set_lowat(net_conn->gt_session, 0);
-+#endif
-     
-     if(!xfce_mailwatch_net_conn_tls_handshake(net_conn, error)) {
- #if 0

Deleted: xfce4-mailwatch-plugin-1.1.0-underlink.patch
===================================================================
--- xfce4-mailwatch-plugin-1.1.0-underlink.patch	2013-10-26 02:06:11 UTC (rev 197443)
+++ xfce4-mailwatch-plugin-1.1.0-underlink.patch	2013-10-26 02:49:24 UTC (rev 197444)
@@ -1,21 +0,0 @@
---- xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am	2008-08-26 03:42:36.000000000 +0100
-+++ xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am.new	2011-01-14 17:27:44.116199383 +0000
-@@ -50,6 +50,7 @@
- 	-I$(top_srcdir)/libmailwatch-core \
- 	@GTHREAD_CFLAGS@ \
- 	@LIBXFCE4PANEL_CFLAGS@ \
-+	@LIBXFCEGUI4_CFLAGS@ \
- 	-DDATADIR=\"$(datadir)\" \
- 	-DLOCALEDIR=\"$(localedir)\"
- 
-@@ -60,7 +61,9 @@
- 	$(top_builddir)/libmailwatch-core/libmailwatch-core.la \
- 	@GTHREAD_LIBS@ \
- 	@LIBXFCE4PANEL_LIBS@ \
--	@GNUTLS_LIBS@
-+	@LIBXFCEGUI4_LIBS@ \
-+	@GNUTLS_LIBS@ \
-+	-lgcrypt
- 
- if HAVE_CYGWIN
-   xfce4_mailwatch_plugin_LDFLAGS += \