[arch-commits] Commit in gnome-phone-manager/trunk (2 files)

[Eric Bélanger]

    Date: Sunday, April 29, 2012 @ 01:34:45
  Author: eric
Revision: 157739

upgpkg: gnome-phone-manager 0.68-2

Rebuild package (close FS#29110), Add gnome-bluetooth 3.3 patch

Added:
  gnome-phone-manager/trunk/phonemgr-gnome-bluetooth-3.3.patch
Modified:
  gnome-phone-manager/trunk/PKGBUILD

------------------------------------+
 PKGBUILD                           |   18 +++++++++++-------
 phonemgr-gnome-bluetooth-3.3.patch |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-29 05:29:44 UTC (rev 157738)
+++ PKGBUILD	2012-04-29 05:34:45 UTC (rev 157739)
@@ -3,7 +3,7 @@
 
 pkgname=gnome-phone-manager
 pkgver=0.68
-pkgrel=1
+pkgrel=2
 pkgdesc="Control your mobile phone from your GNOME desktop."
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/PhoneManager"
@@ -12,13 +12,17 @@
 makedepends=('intltool' 'gnome-common')
 options=('!emptydirs' '!libtool')
 install=gnome-phone-manager.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/${pkgver}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('3777b62ee36492274532ece965f4688600457014f17a6f21dd01fb63bbb77f8f')
+source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/${pkgver}/${pkgname}-${pkgver}.tar.xz
+        phonemgr-gnome-bluetooth-3.3.patch)
+sha256sums=('3777b62ee36492274532ece965f4688600457014f17a6f21dd01fb63bbb77f8f'
+            'a69c1d2d1d25eca4f32215d8a8ca3c8e4a048af76d7a291b86b0aa7f0f65c452')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
+  patch -p1 -i ../phonemgr-gnome-bluetooth-3.3.patch
+  autoreconf -fi
+  LIBS+="-lgthread-2.0" ./configure --prefix=/usr --sysconfdir=/etc \
+    --localstatedir=/var --disable-static
   make
 }
 
@@ -27,6 +31,6 @@
   make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
 
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-phone-manager ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-phone-manager "${pkgdir}"/etc/gconf/schemas/*.schemas
+  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
 }

Added: phonemgr-gnome-bluetooth-3.3.patch
===================================================================
--- phonemgr-gnome-bluetooth-3.3.patch	                        (rev 0)
+++ phonemgr-gnome-bluetooth-3.3.patch	2012-04-29 05:34:45 UTC (rev 157739)
@@ -0,0 +1,34 @@
+From 2877c3a41b7e8feeb6eb6d6f718f4556ffb0161c Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar at opensuse.org>
+Date: Mon, 05 Dec 2011 08:10:59 +0000
+Subject: Bug 665309: Adapt to gnome-bluetooth 3.3 API
+
+---
+diff --git a/configure.in b/configure.in
+index 101a77f..d0a7651 100644
+--- a/configure.in
++++ b/configure.in
+@@ -13,7 +13,7 @@ dnl Initialize libtool
+ AM_PROG_LIBTOOL
+ 
+ GNOKII_REQS="gnokii >= 0.6.28"
+-GNOME_BLUETOOTH_REQS="gnome-bluetooth-1.0 >= 3.0"
++GNOME_BLUETOOTH_REQS="gnome-bluetooth-1.0 >= 3.3"
+ 
+ AC_PROG_CC
+ AC_PROG_INSTALL
+diff --git a/gnome-bluetooth/phonemgr.c b/gnome-bluetooth/phonemgr.c
+index 9ebac12..fecc367 100644
+--- a/gnome-bluetooth/phonemgr.c
++++ b/gnome-bluetooth/phonemgr.c
+@@ -44,7 +44,7 @@ get_type (const char *address)
+ 	gboolean cont;
+ 
+ 	client = bluetooth_client_new (); 
+-	model = bluetooth_client_get_device_model (client, NULL);
++	model = bluetooth_client_get_device_model (client);
+ 	if (model == NULL) {
+ 		g_object_unref (client);
+ 		return type;
+--
+cgit v0.9.0.2