desktop/xfce4-mailwatch-plugin: Updated for version 1.2.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

7 files changed, 16 insertions, 51 deletions

diff --git a/desktop/xfce4-mailwatch-plugin/README b/desktop/xfce4-mailwatch-plugin/README
index 954f3e3ad6..96ef197386 100644
--- a/desktop/xfce4-mailwatch-plugin/README
+++ b/desktop/xfce4-mailwatch-plugin/README
@@ -1,5 +1,5 @@
-Mailwatch is a plugin for the Xfce 4 panel.  It is intended to 
-replace the old (4.0, 4.2) mail checker plugin in Xfce 4.4.
+Xfce4 Mailwatch Plugin is a multi-protocol, multi-mailbox mail watcher
+for the Xfce4 panel.
 
 Features
 * 	IMAP and Secure IMAP support
diff --git a/desktop/xfce4-mailwatch-plugin/doinst.sh b/desktop/xfce4-mailwatch-plugin/doinst.sh
index 30eb690936..8542d1c18e 100644
--- a/desktop/xfce4-mailwatch-plugin/doinst.sh
+++ b/desktop/xfce4-mailwatch-plugin/doinst.sh
@@ -3,4 +3,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
-
diff --git a/desktop/xfce4-mailwatch-plugin/gnutls-transport-set-lowat.patch b/desktop/xfce4-mailwatch-plugin/gnutls-transport-set-lowat.patch
deleted file mode 100644
index 6ff8139ebb..0000000000
--- a/desktop/xfce4-mailwatch-plugin/gnutls-transport-set-lowat.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- xfce4-mailwatch-plugin-1.1.0.orig/libmailwatch-core/mailwatch-net-conn.c	2008-08-30 10:57:36.000000000 +0200
-+++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-net-conn.c	2013-06-10 14:18:36.209263440 +0200
-@@ -621,9 +621,11 @@
-                            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
-         gnutls_bye(net_conn->gt_session, GNUTLS_SHUT_RDWR);
diff --git a/desktop/xfce4-mailwatch-plugin/mbox-save-changed-interval.patch b/desktop/xfce4-mailwatch-plugin/mbox-save-changed-interval.patch
deleted file mode 100644
index 190455386f..0000000000
--- a/desktop/xfce4-mailwatch-plugin/mbox-save-changed-interval.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xfce4-mailwatch-plugin-1.1.0.orig/libmailwatch-core/mailwatch-mailbox-mbox.c	2008-09-11 06:31:50.000000000 +0200
-+++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-mailbox-mbox.c	2013-08-12 13:38:07.613031827 +0200
-@@ -347,6 +347,7 @@
-             g_source_remove( mbox->check_id );
-         mbox->check_id = g_timeout_add( mbox->interval * 1000, mbox_check_mail_timeout, mbox );
-     }
-+    mbox->interval = val;
- }
-     
- static GtkContainer *
diff --git a/desktop/xfce4-mailwatch-plugin/slack-desc b/desktop/xfce4-mailwatch-plugin/slack-desc
index bdcc6cb64c..8d191d5d41 100644
--- a/desktop/xfce4-mailwatch-plugin/slack-desc
+++ b/desktop/xfce4-mailwatch-plugin/slack-desc
@@ -10,10 +10,10 @@ xfce4-mailwatch-plugin: xfce4-mailwatch-plugin (XFCE plugin for checking mails p
 xfce4-mailwatch-plugin:
 xfce4-mailwatch-plugin: Mailwatch is a plugin for the XFCE4 panel. It is a comfortable multi-
 xfce4-mailwatch-plugin: threaded, multi-mailbox, multi-protocol plugin for checking mails
-xfce4-mailwatch-plugin: periodically. It is intended to replace the current (4.0, 4.2) mail
-xfce4-mailwatch-plugin: checker plugin in Xfce 4.4.
+xfce4-mailwatch-plugin: periodically.
 xfce4-mailwatch-plugin:
-xfce4-mailwatch-plugin: Homepage: http://spuriousinterrupt.org/projects/xfce4-mailwatch-plugin
+xfce4-mailwatch-plugin: Homepage:
+xfce4-mailwatch-plugin: http://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin
 xfce4-mailwatch-plugin:
 xfce4-mailwatch-plugin:
 xfce4-mailwatch-plugin:
diff --git a/desktop/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.SlackBuild b/desktop/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.SlackBuild
index d265910a75..f6c7ce5660 100644
--- a/desktop/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.SlackBuild
+++ b/desktop/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.SlackBuild
@@ -27,8 +27,8 @@
 # Modified by Ján Sučan <sucan@runbox.com>
 
 PRGNAM=xfce4-mailwatch-plugin
-VERSION=${VERSION:-1.1.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.2.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -58,7 +58,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -68,22 +68,13 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Do not use a function which was removed in newer gnutls versions
-patch -p1 < $CWD/gnutls-transport-set-lowat.patch
-# Fix a bug that prevents changing the time between checks of the
-# local mbox mailbox
-patch -p1 < $CWD/mbox-save-changed-interval.patch
-
-# Add additional linker flags in order to build the plugin with the
-# newer Xfce versions
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-LIBS="-lxfcegui4 -lgcrypt" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/desktop/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.info b/desktop/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.info
index 3fb33a2bf6..018b866616 100644
--- a/desktop/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.info
+++ b/desktop/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.info
@@ -1,8 +1,8 @@
 PRGNAM="xfce4-mailwatch-plugin"
-VERSION="1.1.0"
-HOMEPAGE="http://spuriousinterrupt.org/projects/xfce4-mailwatch-plugin"
-DOWNLOAD="http://spuriousinterrupt.org/files/mailwatch/xfce4-mailwatch-plugin-1.1.0.tar.bz2"
-MD5SUM="f84dce86be1d7f25f169f262aaacee4e"
+VERSION="1.2.0"
+HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin"
+DOWNLOAD="http://archive.xfce.org/src/panel-plugins/xfce4-mailwatch-plugin/1.2/xfce4-mailwatch-plugin-1.2.0.tar.bz2"
+MD5SUM="7263114ec0f2987a3aff15afeeb45577"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""