From ab69787453c83aaa677bc2f2efec0e48983b547b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 23 May 2012 08:24:43 +0200 Subject: [PATCH] geoclue: make this build with glib-2.32. --- srcpkgs/geoclue/patches/geoclue-gcc46.patch | 23 +++++++++++++++++++++ srcpkgs/geoclue/template | 11 +++++----- 2 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/geoclue/patches/geoclue-gcc46.patch diff --git a/srcpkgs/geoclue/patches/geoclue-gcc46.patch b/srcpkgs/geoclue/patches/geoclue-gcc46.patch new file mode 100644 index 0000000000..1f16e0f71e --- /dev/null +++ b/srcpkgs/geoclue/patches/geoclue-gcc46.patch @@ -0,0 +1,23 @@ +From 90669619d1d621080ef00dcb8db1c3d206ee0bfe Mon Sep 17 00:00:00 2001 +From: Dan Williams +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 +--- src/master-provider.c ++++ 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/srcpkgs/geoclue/template b/srcpkgs/geoclue/template index 2beca55e5d..d809c24630 100644 --- a/srcpkgs/geoclue/template +++ b/srcpkgs/geoclue/template @@ -15,6 +15,8 @@ long_desc=" subpackages="$pkgname-devel" +Add_dependency build automake +Add_dependency build gtk-doc Add_dependency build pkg-config Add_dependency build intltool Add_dependency build dbus-glib-devel @@ -22,11 +24,10 @@ Add_dependency build libxml2-devel Add_dependency build GConf-devel Add_dependency build libxslt Add_dependency build gtk+-devel -Add_dependency build libsoup-devel Add_dependency build libsoup-gnome-devel -pre_build() -{ - # ETOOMANYWARNINGS - sed -i -e "s|-Werror||g" src/Makefile +pre_configure() { + sed -i 's/libnm_glib/libnm-glib/g' configure.ac + sed -i '/libsoup-gnome/s/$/ gthread-2.0/' configure.ac + autoreconf -fi }