[mbm-gpsd-git] Stop using sbin, and fix other compilation issues.

git-svn-id: svn+ssh://scm.narf.ssji.net/svn/archlinux-packages@341 df209809-8e4a-0410-9a64-c169741eb0fc

3 files changed, 46 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d84bb6b081d..e7e40b0f1cbf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mbm-gpsd-git
 	pkgdesc = GPS support files for Ericsson F3507g that provide an easy interface to gpsd
 	pkgver = 20121031
-	pkgrel = 1
+	pkgrel = 2
 	url = http://mbm.sourceforge.net/
 	arch = i686
 	arch = x86_64
@@ -13,6 +13,8 @@ pkgbase = mbm-gpsd-git
 	depends = gtk-doc
 	depends = libnl1
 	provides = mbm-gpsd
+	source = 0001-Remove-call-to-g_type_init.patch
+	md5sums = b95c87ed13611f3903ed9bc5e504b947
 
 pkgname = mbm-gpsd-git
 
diff --git a/0001-Remove-call-to-g_type_init.patch b/0001-Remove-call-to-g_type_init.patch
new file mode 100644
index 000000000000..7c6e560770a8
--- /dev/null
+++ b/0001-Remove-call-to-g_type_init.patch
@@ -0,0 +1,36 @@
+From 318fc17e6466d044bc8121d495f9db71f007d3c4 Mon Sep 17 00:00:00 2001
+From: Olivier Mehani <olivier.mehani@nicta.com.au>
+Date: Tue, 11 Jun 2013 12:25:06 +1000
+Subject: [PATCH] Remove call to g_type_init
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From [0]:
+
+“g_type_init has been deprecated since version 2.36 and should not be
+used in newly-written code. the type system is now initialised
+automatically”
+
+[0] https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g-type-init
+
+Signed-off-by: Olivier Mehani <olivier.mehani@nicta.com.au>
+---
+ src/mbm_gpsd.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/mbm_gpsd.c b/src/mbm_gpsd.c
+index 924d6df..64faddb 100644
+--- a/src/mbm_gpsd.c
++++ b/src/mbm_gpsd.c
+@@ -155,7 +155,6 @@ int main (int argc, char *argv[])
+     sigaction (SIGHUP, &sig_action, NULL);
+ 
+ 	mbm_options_parse (argc, argv);
+-	g_type_init ();
+ 
+ 	if (!mbm_foreground()) {
+ 		pid_t pid, sid;
+-- 
+1.8.3
+
diff --git a/PKGBUILD b/PKGBUILD
index 3c15f31ed216..8f14524280ce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=mbm-gpsd-git
 pkgver=20121031
-pkgrel=1
+pkgrel=2
 pkgdesc="GPS support files for Ericsson F3507g that provide an easy interface to gpsd"
 arch=('i686' 'x86_64')
 url="http://mbm.sourceforge.net/"
@@ -18,9 +18,9 @@ replaces=()
 backup=()
 options=()
 install=
-source=()
+source=(0001-Remove-call-to-g_type_init.patch)
 noextract=()
-md5sums=()
+md5sums=('b95c87ed13611f3903ed9bc5e504b947')
 _gitname=mbm-gpsd
 _gitroot=git://mbm.git.sourceforge.net/gitroot/mbm/${_gitname}/
 
@@ -38,13 +38,15 @@ build() {
   cd $srcdir || return 1
   cp -r $_gitname $_gitname-build
   cd $_gitname-build || return 1
+  patch -p1 < $srcdir/0001-Remove-call-to-g_type_init.patch
   unset CFLAGS
   unset CXXFLAGS
   ./autogen.sh  --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
-  make || return 1
+  make CFLAGS="-Wno-error" || return 1
   make DESTDIR=$pkgdir install || return 1
+  mv $pkgdir/usr/sbin/* $pkgdir/usr/bin/
+  rmdir $pkgdir/usr/sbin/
   rm -rf $srcdir/$_gitname-build
 
 
 }
-