[arch-commits] Commit in geoclue/trunk (PKGBUILD geoclue-gcc46.patch geoclue.install)

[Jan Steffens]

    Date: Tuesday, March 19, 2013 @ 01:26:08
  Author: heftig
Revision: 180260

0.12.99 (which is apparently stable)

Added:
  geoclue/trunk/geoclue.install
Modified:
  geoclue/trunk/PKGBUILD
Deleted:
  geoclue/trunk/geoclue-gcc46.patch

---------------------+
 PKGBUILD            |   30 +++++++++++-------------------
 geoclue-gcc46.patch |   23 -----------------------
 geoclue.install     |   11 +++++++++++
 3 files changed, 22 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2013-03-18 23:57:36 UTC (rev 180259)
+++ PKGBUILD    2013-03-19 00:26:08 UTC (rev 180260)
@@ -3,33 +3,25 @@
 # Contributor: György Balló <ball...@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')
+arch=(i686 x86_64)
 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
 }
 

Deleted: geoclue-gcc46.patch
===================================================================
--- geoclue-gcc46.patch 2013-03-18 23:57:36 UTC (rev 180259)
+++ geoclue-gcc46.patch 2013-03-19 00:26:08 UTC (rev 180260)
@@ -1,23 +0,0 @@
-From 90669619d1d621080ef00dcb8db1c3d206ee0bfe Mon Sep 17 00:00:00 2001
-From: Dan Williams <d...@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

Added: geoclue.install
===================================================================
--- geoclue.install                             (rev 0)
+++ geoclue.install     2013-03-19 00:26:08 UTC (rev 180260)
@@ -0,0 +1,11 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}