[arch-commits] Commit in gnome-phone-manager/repos (10 files)

Eric Bélanger eric at archlinux.org
Sun Apr 29 01:35:15 EDT 2012


    Date: Sunday, April 29, 2012 @ 01:35:15
  Author: eric
Revision: 157740

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  gnome-phone-manager/repos/extra-i686/PKGBUILD
    (from rev 157739, gnome-phone-manager/trunk/PKGBUILD)
  gnome-phone-manager/repos/extra-i686/gnome-phone-manager.install
    (from rev 157739, gnome-phone-manager/trunk/gnome-phone-manager.install)
  gnome-phone-manager/repos/extra-i686/phonemgr-gnome-bluetooth-3.3.patch
    (from rev 157739, gnome-phone-manager/trunk/phonemgr-gnome-bluetooth-3.3.patch)
  gnome-phone-manager/repos/extra-x86_64/PKGBUILD
    (from rev 157739, gnome-phone-manager/trunk/PKGBUILD)
  gnome-phone-manager/repos/extra-x86_64/gnome-phone-manager.install
    (from rev 157739, gnome-phone-manager/trunk/gnome-phone-manager.install)
  gnome-phone-manager/repos/extra-x86_64/phonemgr-gnome-bluetooth-3.3.patch
    (from rev 157739, gnome-phone-manager/trunk/phonemgr-gnome-bluetooth-3.3.patch)
Deleted:
  gnome-phone-manager/repos/extra-i686/PKGBUILD
  gnome-phone-manager/repos/extra-i686/gnome-phone-manager.install
  gnome-phone-manager/repos/extra-x86_64/PKGBUILD
  gnome-phone-manager/repos/extra-x86_64/gnome-phone-manager.install

-------------------------------------------------+
 extra-i686/PKGBUILD                             |   68 +++++++++++-----------
 extra-i686/gnome-phone-manager.install          |   34 +++++------
 extra-i686/phonemgr-gnome-bluetooth-3.3.patch   |   34 +++++++++++
 extra-x86_64/PKGBUILD                           |   68 +++++++++++-----------
 extra-x86_64/gnome-phone-manager.install        |   34 +++++------
 extra-x86_64/phonemgr-gnome-bluetooth-3.3.patch |   34 +++++++++++
 6 files changed, 174 insertions(+), 98 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-04-29 05:34:45 UTC (rev 157739)
+++ extra-i686/PKGBUILD	2012-04-29 05:35:15 UTC (rev 157740)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Roman Kyrylych <roman at archlinux.org>
-
-pkgname=gnome-phone-manager
-pkgver=0.68
-pkgrel=1
-pkgdesc="Control your mobile phone from your GNOME desktop."
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/PhoneManager"
-license=('GPL')
-depends=('evolution-data-server' 'gnokii' 'gnome-bluetooth' 'gnome-icon-theme' 'libcanberra')
-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')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  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
-}

Copied: gnome-phone-manager/repos/extra-i686/PKGBUILD (from rev 157739, gnome-phone-manager/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-04-29 05:35:15 UTC (rev 157740)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Roman Kyrylych <roman at archlinux.org>
+
+pkgname=gnome-phone-manager
+pkgver=0.68
+pkgrel=2
+pkgdesc="Control your mobile phone from your GNOME desktop."
+arch=('i686' 'x86_64')
+url="http://live.gnome.org/PhoneManager"
+license=('GPL')
+depends=('evolution-data-server' 'gnokii' 'gnome-bluetooth' 'gnome-icon-theme' 'libcanberra')
+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
+        phonemgr-gnome-bluetooth-3.3.patch)
+sha256sums=('3777b62ee36492274532ece965f4688600457014f17a6f21dd01fb63bbb77f8f'
+            'a69c1d2d1d25eca4f32215d8a8ca3c8e4a048af76d7a291b86b0aa7f0f65c452')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  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
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  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
+}

Deleted: extra-i686/gnome-phone-manager.install
===================================================================
--- extra-i686/gnome-phone-manager.install	2012-04-29 05:34:45 UTC (rev 157739)
+++ extra-i686/gnome-phone-manager.install	2012-04-29 05:35:15 UTC (rev 157740)
@@ -1,17 +0,0 @@
-pkgname=gnome-phone-manager
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}

Copied: gnome-phone-manager/repos/extra-i686/gnome-phone-manager.install (from rev 157739, gnome-phone-manager/trunk/gnome-phone-manager.install)
===================================================================
--- extra-i686/gnome-phone-manager.install	                        (rev 0)
+++ extra-i686/gnome-phone-manager.install	2012-04-29 05:35:15 UTC (rev 157740)
@@ -0,0 +1,17 @@
+pkgname=gnome-phone-manager
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}

Copied: gnome-phone-manager/repos/extra-i686/phonemgr-gnome-bluetooth-3.3.patch (from rev 157739, gnome-phone-manager/trunk/phonemgr-gnome-bluetooth-3.3.patch)
===================================================================
--- extra-i686/phonemgr-gnome-bluetooth-3.3.patch	                        (rev 0)
+++ extra-i686/phonemgr-gnome-bluetooth-3.3.patch	2012-04-29 05:35:15 UTC (rev 157740)
@@ -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

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-04-29 05:34:45 UTC (rev 157739)
+++ extra-x86_64/PKGBUILD	2012-04-29 05:35:15 UTC (rev 157740)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Roman Kyrylych <roman at archlinux.org>
-
-pkgname=gnome-phone-manager
-pkgver=0.68
-pkgrel=1
-pkgdesc="Control your mobile phone from your GNOME desktop."
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/PhoneManager"
-license=('GPL')
-depends=('evolution-data-server' 'gnokii' 'gnome-bluetooth' 'gnome-icon-theme' 'libcanberra')
-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')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  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
-}

Copied: gnome-phone-manager/repos/extra-x86_64/PKGBUILD (from rev 157739, gnome-phone-manager/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-04-29 05:35:15 UTC (rev 157740)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Roman Kyrylych <roman at archlinux.org>
+
+pkgname=gnome-phone-manager
+pkgver=0.68
+pkgrel=2
+pkgdesc="Control your mobile phone from your GNOME desktop."
+arch=('i686' 'x86_64')
+url="http://live.gnome.org/PhoneManager"
+license=('GPL')
+depends=('evolution-data-server' 'gnokii' 'gnome-bluetooth' 'gnome-icon-theme' 'libcanberra')
+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
+        phonemgr-gnome-bluetooth-3.3.patch)
+sha256sums=('3777b62ee36492274532ece965f4688600457014f17a6f21dd01fb63bbb77f8f'
+            'a69c1d2d1d25eca4f32215d8a8ca3c8e4a048af76d7a291b86b0aa7f0f65c452')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  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
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  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
+}

Deleted: extra-x86_64/gnome-phone-manager.install
===================================================================
--- extra-x86_64/gnome-phone-manager.install	2012-04-29 05:34:45 UTC (rev 157739)
+++ extra-x86_64/gnome-phone-manager.install	2012-04-29 05:35:15 UTC (rev 157740)
@@ -1,17 +0,0 @@
-pkgname=gnome-phone-manager
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}

Copied: gnome-phone-manager/repos/extra-x86_64/gnome-phone-manager.install (from rev 157739, gnome-phone-manager/trunk/gnome-phone-manager.install)
===================================================================
--- extra-x86_64/gnome-phone-manager.install	                        (rev 0)
+++ extra-x86_64/gnome-phone-manager.install	2012-04-29 05:35:15 UTC (rev 157740)
@@ -0,0 +1,17 @@
+pkgname=gnome-phone-manager
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}

Copied: gnome-phone-manager/repos/extra-x86_64/phonemgr-gnome-bluetooth-3.3.patch (from rev 157739, gnome-phone-manager/trunk/phonemgr-gnome-bluetooth-3.3.patch)
===================================================================
--- extra-x86_64/phonemgr-gnome-bluetooth-3.3.patch	                        (rev 0)
+++ extra-x86_64/phonemgr-gnome-bluetooth-3.3.patch	2012-04-29 05:35:15 UTC (rev 157740)
@@ -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



More information about the arch-commits mailing list