update to 1.1.1

With this release the patches for the broken-status and the glib includes are obsolete See: https://github.com/obriencj/meanwhile/commit/c49837f276202ede0c8afcc9151f3054663091ad https://github.com/obriencj/meanwhile/commit/b2db429b554e6167c4762da6843b28d186d1d96a fix_groupchat remains und still applies. But dunno if really needed.
author: Narrat 2020-01-11 18:02:10 +0100
committer: Narrat 2020-01-11 18:02:10 +0100
commit: 4d70324ed5ccfe011aebbd34d2cee56e34a79157 (patch)
tree: b26f70b39bf50d394c439d15c2679904aef82b42
parent: e956f19d8e0b35af5b59c5c344162cd9adc70beb (diff)
download: aur-4d70324ed5ccfe011aebbd34d2cee56e34a79157.tar.gz
5 files changed, 29 insertions, 428 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 629ec154e776..1efeb27dc002 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,17 @@
 pkgbase = meanwhile
 	pkgdesc = Meanwhile libraries
-	pkgver = 1.0.2
-	pkgrel = 9
+	pkgver = 1.1.1
+	pkgrel = 1
+	url = https://github.com/obriencj/meanwhile
 	arch = i686
 	arch = x86_64
-	license = GPL
+	license = LGPL3
 	depends = glib2
 	conflicts = meanwhile-svn
-	source = http://downloads.sourceforge.net/sourceforge/meanwhile/meanwhile-1.0.2.tar.gz
-	source = broken-status.patch
-	source = fix_glib_includes.patch
+	source = meanwhile-1.1.1.tar.gz::https://github.com/obriencj/meanwhile/archive/v1.1.1.tar.gz
 	source = fix_groupchat.patch
-	sha256sums = 38a8059eaa549cbcb45ca0a5b453e9608ceadab360db2ae14581fb22ddabdf23
-	sha256sums = 9a60e2ca35d902d5dd9647254a20099ceb399a025f1b04c2676f90ffe2d276f0
-	sha256sums = c3dc0e423f7f4ceee65e4c08c1daebee23c61c608b970185074d118ed0199c47
-	sha256sums = 04aabfbcda84a8de9369aee330e6663c2237e038b949bb5142e58b4a11540445
+	sha256sums = 10de306f03897572b30ce68ca80dffd04ec218f6842bbe0a47bb8cce933698d0
+	sha256sums = 54d0faa5702e3b89be2a4fe994cfb2c373f409add3ba6b340a06f183c7446b21
 
 pkgname = meanwhile
 
diff --git a/PKGBUILD b/PKGBUILD
index c489828faae5..7b5d7355a37c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,30 @@
-# Maintainer: Troy C < rstrox -ta yahoo -tod com >
+# Contributor: Lex Black <autumn-wind@web.de>
+# Contributor: Troy C < rstrox -ta yahoo -tod com >
 # Contributor: Marek Skrobacki <skrobul@skrobul.com>
 # Contributor: Alasdair Haswell <ali at arhaswell dot co dot uk>
 
 pkgname=meanwhile
-pkgver=1.0.2
-pkgrel=9
+pkgver=1.1.1
+pkgrel=1
 pkgdesc="Meanwhile libraries"
 arch=('i686' 'x86_64')
-license=('GPL')
+url="https://github.com/obriencj/meanwhile"
+license=('LGPL3')
 depends=('glib2')
 conflicts=('meanwhile-svn')
-source=(http://downloads.sourceforge.net/sourceforge/meanwhile/$pkgname-$pkgver.tar.gz
-	broken-status.patch
-	fix_glib_includes.patch
-	fix_groupchat.patch)
-sha256sums=('38a8059eaa549cbcb45ca0a5b453e9608ceadab360db2ae14581fb22ddabdf23'
-            '9a60e2ca35d902d5dd9647254a20099ceb399a025f1b04c2676f90ffe2d276f0'
-            'c3dc0e423f7f4ceee65e4c08c1daebee23c61c608b970185074d118ed0199c47'
-	    '04aabfbcda84a8de9369aee330e6663c2237e038b949bb5142e58b4a11540445')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/obriencj/meanwhile/archive/v${pkgver}.tar.gz
+        fix_groupchat.patch)
+sha256sums=('10de306f03897572b30ce68ca80dffd04ec218f6842bbe0a47bb8cce933698d0'
+            '54d0faa5702e3b89be2a4fe994cfb2c373f409add3ba6b340a06f183c7446b21')
 
 
-build() {
-  cd $srcdir/$pkgname-$pkgver/src
-  patch -Np0 -i "${srcdir}/broken-status.patch"
-  patch -Np2 -i "${srcdir}/fix_glib_includes.patch"
+prepare() {
+  cd "$pkgname-$pkgver/src"
   patch -Np2 -i "${srcdir}/fix_groupchat.patch"
+}
 
-  cd $srcdir/$pkgname-$pkgver
+build() {
+  cd "$pkgname-$pkgver"
 
   CFLAGS="-mtune=generic -pipe -fstack-protector --param=ssp-buffer-size=4"
   CXXFLAGS="${CFLAGS}"
@@ -37,6 +35,6 @@ build() {
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$pkgname-$pkgver"
   make DESTDIR=$pkgdir install
 }
diff --git a/broken-status.patch b/broken-status.patch
deleted file mode 100644
index 43313e67936b..000000000000
--- a/broken-status.patch
+++ /dev/null
@@ -1,159 +0,0 @@
---- cipher.c	2005-12-24 19:32:50.000000000 +0000
-+++ ../../../cipher.c	2010-10-26 16:30:51.234362617 +0100
-@@ -1,4 +1,3 @@
--
- /*
-   Meanwhile - Unofficial Lotus Sametime Community Client Library
-   Copyright (C) 2004  Christopher (siege) O'Brien
-@@ -718,7 +717,7 @@
- static void accepted_RC2_128(struct mwCipherInstance *ci,
- 			     struct mwEncryptItem *item) {
- 
--  return offered_RC2_128(ci, item);
-+  offered_RC2_128(ci, item);
- }
- 
- 
-@@ -965,4 +964,3 @@
- 
-   g_free(ci);
- }
--
---- common.c	2005-12-08 19:48:36.000000000 +0000
-+++ ../../../common.c	2010-10-26 16:32:48.220662572 +0100
-@@ -1,4 +1,3 @@
--
- /*
-   Meanwhile - Unofficial Lotus Sametime Community Client Library
-   Copyright (C) 2004  Christopher (siege) O'Brien
-@@ -878,24 +877,25 @@
- /* 8.4.2.4 Snapshot */
- 
- void mwAwareSnapshot_get(struct mwGetBuffer *b, struct mwAwareSnapshot *idb) {
--  guint32 junk;
--  char *empty = NULL;
-+  guint32 end_of_block;
- 
-   g_return_if_fail(b != NULL);
-   g_return_if_fail(idb != NULL);
- 
--  guint32_get(b, &junk);
-+  guint32_get(b, &end_of_block);
-   mwAwareIdBlock_get(b, &idb->id);
-   mwString_get(b, &idb->group);
-   gboolean_get(b, &idb->online);
- 
--  g_free(empty);
--
-   if(idb->online) {
-     mwString_get(b, &idb->alt_id);
-     mwUserStatus_get(b, &idb->status);
-     mwString_get(b, &idb->name);
-   }
-+
-+  if(b->ptr < b->buf + end_of_block) {
-+    mwGetBuffer_advance(b, b->buf + end_of_block - b->ptr);
-+  }
- }
- 
- 
-@@ -924,4 +924,3 @@
-   g_free(idb->group);
-   memset(idb, 0x00, sizeof(struct mwAwareSnapshot));
- }
--
---- mw_cipher.h	2005-12-15 00:30:28.000000000 +0000
-+++ ../../../mw_cipher.h	2010-10-26 16:31:39.030127293 +0100
-@@ -1,4 +1,3 @@
--
- /*
-   Meanwhile - Unofficial Lotus Sametime Community Client Library
-   Copyright (C) 2004  Christopher (siege) O'Brien
-@@ -74,8 +73,8 @@
-   struct mwSession *session;
- 
-   guint16 type;               /**< @see mwCipher_getType */
--  const char *(*get_name)();  /**< @see mwCipher_getName */
--  const char *(*get_desc)();  /**< @see mwCipher_getDesc */
-+  const char *(*get_name)(void);  /**< @see mwCipher_getName */
-+  const char *(*get_desc)(void);  /**< @see mwCipher_getDesc */
- 
-   /** Generate a new Cipher Instance for use on a channel
-       @see mwCipher_newInstance */
-@@ -252,7 +251,7 @@
- 
- 
- /** prepare a new mpi value */
--struct mwMpi *mwMpi_new();
-+struct mwMpi *mwMpi_new(void);
- 
- 
- /** destroy an mpi value */
---- mw_common.h	2005-12-15 00:30:28.000000000 +0000
-+++ ../../../mw_common.h	2010-10-26 16:33:17.914697797 +0100
-@@ -1,4 +1,3 @@
--
- /*
-   Meanwhile - Unofficial Lotus Sametime Community Client Library
-   Copyright (C) 2004  Christopher (siege) O'Brien
-@@ -153,10 +152,14 @@
- /* 8.3.5 User Status Types */
- 
- enum mwStatusType {
-+  mwStatus_OFFLINE = 0x0000,
-+
-   mwStatus_ACTIVE  = 0x0020,
-   mwStatus_IDLE    = 0x0040,
-   mwStatus_AWAY    = 0x0060,
-   mwStatus_BUSY    = 0x0080,
-+
-+  mwStatus_MASK_MOBILE = 0x0200,
- };
- 
- 
-@@ -224,7 +227,7 @@
- 
- 
- /** allocate a new empty buffer */
--struct mwPutBuffer *mwPutBuffer_new();
-+struct mwPutBuffer *mwPutBuffer_new(void);
- 
- 
- /** write raw data to the put buffer */
---- mw_st_list.h	2005-12-15 00:30:28.000000000 +0000
-+++ ../../../mw_st_list.h	2010-10-26 16:32:16.350153506 +0100
-@@ -1,4 +1,3 @@
--
- /*
-   Meanwhile - Unofficial Lotus Sametime Community Client Library
-   Copyright (C) 2004  Christopher (siege) O'Brien
-@@ -77,7 +76,7 @@
- 
- 
- /** Create a new list */
--struct mwSametimeList *mwSametimeList_new();
-+struct mwSametimeList *mwSametimeList_new(void);
- 
- 
- /** Free the list, all of its groups, and all of the groups' members */
---- srvc_conf.c	2005-12-28 02:46:54.000000000 +0000
-+++ ../../../srvc_conf.c	2010-10-26 16:33:57.337870772 +0100
-@@ -1,4 +1,3 @@
--
- /*
-   Meanwhile - Unofficial Lotus Sametime Community Client Library
-   Copyright (C) 2004  Christopher (siege) O'Brien
-@@ -156,7 +155,7 @@
-   if(conf->members)
-     g_hash_table_destroy(conf->members);
- 
--  g_list_remove_all(srvc->confs, conf);
-+  srvc->confs = g_list_remove_all(srvc->confs, conf);
- 
-   mw_datum_clear(&conf->client_data);
-   
-@@ -864,4 +863,3 @@
-   g_return_val_if_fail(srvc != NULL, NULL);
-   return g_list_copy(srvc->confs);
- }
--
diff --git a/fix_glib_includes.patch b/fix_glib_includes.patch
deleted file mode 100644
index 047eda0ef223..000000000000
--- a/fix_glib_includes.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-diff --git a/src/channel.c b/src/channel.c
-index d7215a9..932522d 100644
---- a/src/channel.c
-+++ b/src/channel.c
-@@ -19,8 +19,6 @@
- */
- 
- #include <glib.h>
--#include <glib/ghash.h>
--#include <glib/glist.h>
- #include <string.h>
- 
- #include "mw_channel.h"
-diff --git a/src/mw_debug.c b/src/mw_debug.c
-index cf47a38..d22d287 100644
---- a/src/mw_debug.c
-+++ b/src/mw_debug.c
-@@ -19,7 +19,7 @@
- */
- 
- 
--#include <glib/gstring.h>
-+#include <glib.h>
- 
- #include "mw_debug.h"
- 
-diff --git a/src/mw_message.h b/src/mw_message.h
-index 8402b8b..a825ec2 100644
---- a/src/mw_message.h
-+++ b/src/mw_message.h
-@@ -22,7 +22,7 @@
- #define _MW_MESSAGE_H
- 
- 
--#include <glib/glist.h>
-+#include <glib.h>
- #include "mw_common.h"
- 
- 
-diff --git a/src/mw_srvc_conf.h b/src/mw_srvc_conf.h
-index 156c639..66d885b 100644
---- a/src/mw_srvc_conf.h
-+++ b/src/mw_srvc_conf.h
-@@ -22,7 +22,7 @@
- #define _MW_SRVC_CONF_H
- 
- 
--#include <glib/glist.h>
-+#include <glib.h>
- #include "mw_common.h"
- 
- 
-diff --git a/src/mw_srvc_dir.h b/src/mw_srvc_dir.h
-index b9230bb..8fd1c85 100644
---- a/src/mw_srvc_dir.h
-+++ b/src/mw_srvc_dir.h
-@@ -22,7 +22,7 @@
- 
- 
- #include <glib.h>
--#include <glib/glist.h>
-+#include <glib.h>
- 
- 
- #ifdef __cplusplus
-diff --git a/src/mw_srvc_place.h b/src/mw_srvc_place.h
-index e17aa71..bba97b6 100644
---- a/src/mw_srvc_place.h
-+++ b/src/mw_srvc_place.h
-@@ -22,7 +22,7 @@
- #define _MW_SRVC_PLACE_H
- 
- 
--#include <glib/glist.h>
-+#include <glib.h>
- #include "mw_common.h"
- 
- 
-diff --git a/src/mw_srvc_resolve.h b/src/mw_srvc_resolve.h
-index 3b06b75..55aefdf 100644
---- a/src/mw_srvc_resolve.h
-+++ b/src/mw_srvc_resolve.h
-@@ -23,7 +23,7 @@
- 
- 
- #include <glib.h>
--#include <glib/glist.h>
-+#include <glib.h>
- 
- 
- #ifdef __cplusplus
-diff --git a/src/mw_st_list.h b/src/mw_st_list.h
-index 39e1cbf..c0032d4 100644
---- a/src/mw_st_list.h
-+++ b/src/mw_st_list.h
-@@ -30,7 +30,7 @@
- 
- 
- #include <glib.h>
--#include <glib/glist.h>
-+#include <glib.h>
- #include "mw_common.h"
- 
- 
-diff --git a/src/mw_util.h b/src/mw_util.h
-index b8e0b7e..10dcd69 100644
---- a/src/mw_util.h
-+++ b/src/mw_util.h
-@@ -23,9 +23,6 @@
- 
- 
- #include <glib.h>
--#include <glib/ghash.h>
--#include <glib/glist.h>
--
- 
- #define map_guint_new() \
-   g_hash_table_new(g_direct_hash, g_direct_equal)
-diff --git a/src/srvc_aware.c b/src/srvc_aware.c
-index 869f973..dc2c12f 100644
---- a/src/srvc_aware.c
-+++ b/src/srvc_aware.c
-@@ -19,8 +19,6 @@
- */
- 
- #include <glib.h>
--#include <glib/ghash.h>
--#include <glib/glist.h>
- #include <string.h>
- 
- #include "mw_channel.h"
-diff --git a/src/srvc_conf.c b/src/srvc_conf.c
-index da8e6f3..eee0051 100644
---- a/src/srvc_conf.c
-+++ b/src/srvc_conf.c
-@@ -19,8 +19,6 @@
- */
- 
- #include <glib.h>
--#include <glib/ghash.h>
--#include <glib/glist.h>
- 
- #include <stdio.h>
- #include <stdlib.h>
-diff --git a/src/srvc_dir.c b/src/srvc_dir.c
-index cf49152..ed5997e 100644
---- a/src/srvc_dir.c
-+++ b/src/srvc_dir.c
-@@ -18,7 +18,7 @@
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
- 
--#include <glib/ghash.h>
-+#include <glib.h>
- 
- #include "mw_channel.h"
- #include "mw_common.h"
-diff --git a/src/srvc_ft.c b/src/srvc_ft.c
-index 0564732..ff9f010 100644
---- a/src/srvc_ft.c
-+++ b/src/srvc_ft.c
-@@ -19,7 +19,7 @@
- */
- 
- 
--#include <glib/glist.h>
-+#include <glib.h>
- 
- #include "mw_channel.h"
- #include "mw_common.h"
-diff --git a/src/srvc_im.c b/src/srvc_im.c
-index 5930687..16714c7 100644
---- a/src/srvc_im.c
-+++ b/src/srvc_im.c
-@@ -19,7 +19,7 @@
- */
- 
- #include <glib.h>
--#include <glib/glist.h>
-+#include <glib.h>
- #include <string.h>
- 
- #include "mw_channel.h"
-diff --git a/src/srvc_place.c b/src/srvc_place.c
-index fc979ff..58ba574 100644
---- a/src/srvc_place.c
-+++ b/src/srvc_place.c
-@@ -19,8 +19,6 @@
- */
- 
- #include <glib.h>
--#include <glib/ghash.h>
--#include <glib/glist.h>
- 
- #include <stdio.h>
- #include <stdlib.h>
-diff --git a/src/srvc_resolve.c b/src/srvc_resolve.c
-index aac0d49..c71d7b3 100644
---- a/src/srvc_resolve.c
-+++ b/src/srvc_resolve.c
-@@ -18,7 +18,7 @@
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
- 
--#include <glib/ghash.h>
-+#include <glib.h>
- 
- #include "mw_channel.h"
- #include "mw_common.h"
-diff --git a/src/srvc_store.c b/src/srvc_store.c
-index 90f2efc..afbd2b6 100644
---- a/src/srvc_store.c
-+++ b/src/srvc_store.c
-@@ -18,7 +18,7 @@
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
- 
--#include <glib/glist.h>
-+#include <glib.h>
- 
- #include "mw_channel.h"
- #include "mw_debug.h"
-diff --git a/src/st_list.c b/src/st_list.c
-index 949696a..e47ec35 100644
---- a/src/st_list.c
-+++ b/src/st_list.c
-@@ -20,7 +20,7 @@
- 
- #include <stdio.h>
- #include <string.h>
--#include <glib/gstring.h>
-+#include <glib.h>
- 
- #include "mw_debug.h"
- #include "mw_util.h"
diff --git a/fix_groupchat.patch b/fix_groupchat.patch
index 433eaa323257..e55fe5b1e9c8 100644
--- a/fix_groupchat.patch
+++ b/fix_groupchat.patch
@@ -1,6 +1,6 @@
 --- a/src/srvc_place.c	2013-10-02 13:49:18.048588870 -0500
 +++ b/src/srvc_place.c	2013-10-02 13:50:18.027648225 -0500
-@@ -39,6 +39,16 @@
+@@ -37,6 +37,16 @@
  #define PROTOCOL_TYPE  0x00
  #define PROTOCOL_VER   0x05
  
@@ -17,7 +17,7 @@
  
  enum incoming_msg {
    msg_in_JOIN_RESPONSE  = 0x0000,  /* ? */
-@@ -165,6 +175,7 @@
+@@ -163,6 +173,7 @@
    guint16 login_type;
    guint32 unknown_a;
    guint32 unknown_b;
@@ -25,7 +25,7 @@
  };
  
  
-@@ -189,6 +200,7 @@
+@@ -187,6 +198,7 @@
    mwIdBlock_clear(&p->idb);
    g_free(p->login_id);
    g_free(p->name);
@@ -33,7 +33,7 @@
    g_free(p);
  }
  
-@@ -394,6 +406,9 @@
+@@ -392,6 +404,9 @@
    guint16_get(b, &pm->login_type);
    guint32_get(b, &pm->unknown_a);
    guint32_get(b, &pm->unknown_b);
@@ -43,7 +43,7 @@
  
    PUT_MEMBER(place, pm);
    if(srvc->handler && srvc->handler->peerJoined)
-@@ -519,8 +534,18 @@
+@@ -517,8 +532,18 @@
  
  static int recv_SECTION_LIST(struct mwPlace *place,
  			     struct mwGetBuffer *b) {
@@ -63,7 +63,7 @@
  
    mwGetBuffer_advance(b, 4);
    guint32_get(b, &sec);
-@@ -545,6 +570,10 @@
+@@ -542,6 +567,10 @@
      guint32_get(b, &m->unknown_a);
      guint32_get(b, &m->unknown_b);
author	Narrat	2020-01-11 18:02:10 +0100
committer	Narrat	2020-01-11 18:02:10 +0100
commit	4d70324ed5ccfe011aebbd34d2cee56e34a79157 (patch)
tree	b26f70b39bf50d394c439d15c2679904aef82b42
parent	e956f19d8e0b35af5b59c5c344162cd9adc70beb (diff)
download	aur-4d70324ed5ccfe011aebbd34d2cee56e34a79157.tar.gz