Merge branch 'master' of gitpar:abslibre-mips64el

Conflicts:
	extra/seahorse/PKGBUILD

2 files changed, 90 insertions, 5 deletions

diff --git a/extra/libsocialweb/PKGBUILD b/extra/libsocialweb/PKGBUILD
index 07c96ab9a..d0bc80db8 100644
--- a/extra/libsocialweb/PKGBUILD
+++ b/extra/libsocialweb/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156918 2012-04-23 09:09:02Z ibiru $
+# $Id: PKGBUILD 172299 2012-12-02 08:28:48Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libsocialweb
-pkgver=0.25.20
+pkgver=0.25.21
 pkgrel=1
 pkgdesc="A personal social data server"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,11 +12,14 @@ depends=('glib2' 'gconf' 'libsoup-gnome' 'rest' 'dbus-glib' 'libgnome-keyring'
          'json-glib' 'networkmanager')
 makedepends=('intltool' 'gtk-doc' 'vala' 'gobject-introspection')
 options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('eb0078f44eb5fc4570fcee26c5670a433ca1bb83be0cead421a4a03e7d838ff5')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+       libsocialweb-gir-fix.patch)
+sha256sums=('f676567640cede66b6ff62f440c968943c2f3a164dd5f26155b6154ab93bf687'
+            'fec8d2c67c62618b89dca238ebe502c6525d42987625b6d87dd704f88219a46a')
 
 build() {
   cd $pkgname-$pkgver
+  patch -Np1 -i ../libsocialweb-gir-fix.patch
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -29,7 +32,7 @@ build() {
 
 package() {
   cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/libsocialweb/libsocialweb-gir-fix.patch b/extra/libsocialweb/libsocialweb-gir-fix.patch
new file mode 100644
index 000000000..23fc0f535
--- /dev/null
+++ b/extra/libsocialweb/libsocialweb-gir-fix.patch
@@ -0,0 +1,82 @@
+From c1791e96182815449781fcda6007b69cd88cf7bf Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Mon, 04 Jun 2012 17:54:12 +0000
+Subject: client: Fix namespacing of introspection annotations
+
+---
+diff --git a/libsocialweb-client/sw-client-contact-view.c b/libsocialweb-client/sw-client-contact-view.c
+index bb2679f..6eaee0e 100644
+--- a/libsocialweb-client/sw-client-contact-view.c
++++ b/libsocialweb-client/sw-client-contact-view.c
+@@ -384,7 +384,7 @@ sw_client_contact_view_class_init (SwClientContactViewClass *klass)
+   /**
+    * SwClientContactView::contacts-added:
+    * @self:
+-   * @contacts: (type GLib.List) (element-type Sw.Contact):
++   * @contacts: (type GLib.List) (element-type SocialWebClient.Contact):
+    */
+   signals[CONTACTS_ADDED_SIGNAL] =
+     g_signal_new ("contacts-added",
+@@ -401,7 +401,7 @@ sw_client_contact_view_class_init (SwClientContactViewClass *klass)
+   /**
+    * SwClientContactView::contacts-removed:
+    * @self:
+-   * @contacts: (type GLib.List) (element-type Sw.Contact):
++   * @contacts: (type GLib.List) (element-type SocialWebClient.Contact):
+    */
+   signals[CONTACTS_REMOVED_SIGNAL] =
+     g_signal_new ("contacts-removed",
+@@ -418,7 +418,7 @@ sw_client_contact_view_class_init (SwClientContactViewClass *klass)
+   /**
+    * SwClientContactView::contacts-changed:
+    * @self:
+-   * @contacts: (type GLib.List) (element-type Sw.Contact):
++   * @contacts: (type GLib.List) (element-type SocialWebClient.Contact):
+    */
+   signals[CONTACTS_CHANGED_SIGNAL] =
+     g_signal_new ("contacts-changed",
+diff --git a/libsocialweb-client/sw-client-item-view.c b/libsocialweb-client/sw-client-item-view.c
+index 6bfdb76..ab98fdd 100644
+--- a/libsocialweb-client/sw-client-item-view.c
++++ b/libsocialweb-client/sw-client-item-view.c
+@@ -389,7 +389,7 @@ sw_client_item_view_class_init (SwClientItemViewClass *klass)
+   /**
+    * SwClientItemView::items-added:
+    * @self:
+-   * @items: (type GLib.List) (element-type Sw.Item):
++   * @items: (type GLib.List) (element-type SocialWebClient.Item):
+    */
+   signals[ITEMS_ADDED_SIGNAL] =
+     g_signal_new ("items-added",
+@@ -406,7 +406,7 @@ sw_client_item_view_class_init (SwClientItemViewClass *klass)
+   /**
+    * SwClientItemView::items-removed:
+    * @self:
+-   * @items: (type GLib.List) (element-type Sw.Item):
++   * @items: (type GLib.List) (element-type SocialWebClient.Item):
+    */
+   signals[ITEMS_REMOVED_SIGNAL] =
+     g_signal_new ("items-removed",
+@@ -423,7 +423,7 @@ sw_client_item_view_class_init (SwClientItemViewClass *klass)
+   /**
+    * SwClientItemView::items-changed:
+    * @self:
+-   * @items: (type GLib.List) (element-type Sw.Item):
++   * @items: (type GLib.List) (element-type SocialWebClient.Item):
+    */
+   signals[ITEMS_CHANGED_SIGNAL] =
+     g_signal_new ("items-changed",
+diff --git a/libsocialweb-client/sw-contact.c b/libsocialweb-client/sw-contact.c
+index efefb37..b56ab39 100644
+--- a/libsocialweb-client/sw-contact.c
++++ b/libsocialweb-client/sw-contact.c
+@@ -104,7 +104,6 @@ sw_contact_get_value (SwContact  *contact,
+ 
+ /**
+  * sw_contact_get_value_all: 
+- *
+  * @contact: :
+  * @key: :
+  *
+--
+cgit v0.9.0.2