diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-01 14:47:52 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-01 14:47:52 +0200 |
| commit | c8bd9200906149d53827aaa64e85a7008d51339f (patch) | |
| tree | 9e366130f0f7afde9d7a478b5c898d873aed0483 /extra/gnome-phone-manager | |
| parent | d9a9508e07a00015e2a2f278719a9665ff565961 (diff) | |
| parent | 752015395fc8b95cc4a86b68189cb747fe9a8499 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/jack2/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/vim/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
testing/dmraid/PKGBUILD
testing/dmraid/dmraid_hook
testing/dmraid/dmraid_install
testing/e2fsprogs/PKGBUILD
testing/openssh/PKGBUILD
testing/openssh/sshd.pam
testing/php/PKGBUILD
testing/php/php-fpm.conf.in.patch
testing/php/php.ini.patch
testing/xfce4-session/PKGBUILD
Diffstat (limited to 'extra/gnome-phone-manager')
| -rw-r--r-- | extra/gnome-phone-manager/PKGBUILD | 20 | ||||
| -rw-r--r-- | extra/gnome-phone-manager/phonemgr-gnome-bluetooth-3.3.patch | 34 |
2 files changed, 46 insertions, 8 deletions
diff --git a/extra/gnome-phone-manager/PKGBUILD b/extra/gnome-phone-manager/PKGBUILD index 6304baeba..42b4f5757 100644 --- a/extra/gnome-phone-manager/PKGBUILD +++ b/extra/gnome-phone-manager/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140561 2011-10-17 08:06:31Z heftig $ +# $Id: PKGBUILD 157740 2012-04-29 05:35:15Z eric $ # Maintainer: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-phone-manager pkgver=0.68 -pkgrel=1 +pkgrel=2 pkgdesc="Control your mobile phone from your GNOME desktop." arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/PhoneManager" @@ -12,13 +12,17 @@ depends=('evolution-data-server' 'gnokii' 'gnome-bluetooth' 'gnome-icon-theme' ' 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 @@ package() { 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 } diff --git a/extra/gnome-phone-manager/phonemgr-gnome-bluetooth-3.3.patch b/extra/gnome-phone-manager/phonemgr-gnome-bluetooth-3.3.patch new file mode 100644 index 000000000..2200f9dcf --- /dev/null +++ b/extra/gnome-phone-manager/phonemgr-gnome-bluetooth-3.3.patch @@ -0,0 +1,34 @@ +From 2877c3a41b7e8feeb6eb6d6f718f4556ffb0161c Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger <dimstar@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 |