diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-20 10:11:09 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-20 10:11:09 +0100 |
| commit | 4a9e8bf99c82c3a601cbee219eb14487f085975b (patch) | |
| tree | 88737c6b016bcdeeda69e031e5c3509d743bd518 /extra/geoclue | |
| parent | 067a3f8c6ecfe3dc81b09e96d1015ca6e61ff2e5 (diff) | |
| parent | 3cdbec41955c7232e91ef149f77ce9ed215a10fa (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/glee/PKGBUILD
extra/brasero/PKGBUILD
extra/cups/PKGBUILD
extra/gdk-pixbuf2/PKGBUILD
extra/geoclue/PKGBUILD
extra/lilv/PKGBUILD
extra/php/PKGBUILD
extra/sord/PKGBUILD
extra/sqlite/PKGBUILD
extra/sratom/PKGBUILD
extra/suil/PKGBUILD
libre/clementine-libre/PKGBUILD
Diffstat (limited to 'extra/geoclue')
| -rw-r--r-- | extra/geoclue/PKGBUILD | 30 | ||||
| -rw-r--r-- | extra/geoclue/geoclue-gcc46.patch | 23 | ||||
| -rw-r--r-- | extra/geoclue/geoclue.install | 11 |
3 files changed, 22 insertions, 42 deletions
diff --git a/extra/geoclue/PKGBUILD b/extra/geoclue/PKGBUILD index fec20cde7..0122e3915 100644 --- a/extra/geoclue/PKGBUILD +++ b/extra/geoclue/PKGBUILD @@ -1,35 +1,27 @@ -# $Id: PKGBUILD 156782 2012-04-23 09:05:31Z ibiru $ +# $Id: PKGBUILD 180261 2013-03-19 00:26:52Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=geoclue -pkgver=0.12.0 -pkgrel=5 +pkgver=0.12.99 +pkgrel=1 pkgdesc="Modular geoinformation service built on the D-Bus messaging system." arch=('i686' 'x86_64' 'mips64el') url="http://geoclue.freedesktop.org/" -license=('LGPL') -depends=('dbus-glib' 'libxml2') +license=(LGPL) +depends=(dbus-glib libxml2 dconf) +makedepends=(networkmanager libsoup-gnome gtk-doc) optdepends=('networkmanager: geolocation' - 'gconf: geolocation' 'libsoup-gnome: Skyhook location provider') -makedepends=('gconf' 'networkmanager' 'libsoup-gnome' 'gtk-doc') options=('!libtool') -source=(https://launchpad.net/geoclue/trunk/${pkgver%.*}/+download/$pkgname-$pkgver.tar.gz - geoclue-gcc46.patch) -md5sums=('33af8307f332e0065af056ecba65fec2' - '0cf8ecc350be702f623ed9a9715818c5') +install=geoclue.install +source=(http://freedesktop.org/~hadess/$pkgname-$pkgver.tar.gz) +md5sums=('779245045bfeeec4853da8baaa3a18e6') build() { cd $pkgname-$pkgver - patch -Np1 -i ../geoclue-gcc46.patch - - sed -i 's/libnm_glib/libnm-glib/g' configure.ac - sed -i '/libsoup-gnome/s/$/ gthread-2.0/' configure.ac - autoreconf -f -i - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ - --disable-static + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname --disable-static make } diff --git a/extra/geoclue/geoclue-gcc46.patch b/extra/geoclue/geoclue-gcc46.patch deleted file mode 100644 index 11bf48547..000000000 --- a/extra/geoclue/geoclue-gcc46.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 90669619d1d621080ef00dcb8db1c3d206ee0bfe Mon Sep 17 00:00:00 2001 -From: Dan Williams <dcbw@redhat.com> -Date: Mon, 07 Mar 2011 23:46:15 +0000 -Subject: master: Fix warning with GCC 4.6 - ---- -diff --git a/src/master-provider.c b/src/master-provider.c -index 790c043..e4ea053 100644 ---- a/src/master-provider.c -+++ b/src/master-provider.c -@@ -846,10 +846,6 @@ gc_master_provider_initialize_interfaces (GcMasterProvider *provider) - static gboolean - gc_master_provider_initialize (GcMasterProvider *provider) - { -- GcMasterProviderPrivate *priv; -- -- priv = GET_PRIVATE (provider); -- - if (!gc_master_provider_initialize_interfaces (provider)) { - return FALSE; - } --- -cgit v0.8.3-6-g21f6 diff --git a/extra/geoclue/geoclue.install b/extra/geoclue/geoclue.install new file mode 100644 index 000000000..c25dff2d3 --- /dev/null +++ b/extra/geoclue/geoclue.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} |