diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | 0001-Remove-call-to-g_type_init.patch | 40 | ||||
| -rw-r--r-- | PKGBUILD | 66 |
3 files changed, 75 insertions, 37 deletions
@@ -1,6 +1,6 @@ pkgbase = mbm-gps-control-git pkgdesc = Graphical interface to mbm-gpsd - pkgver = 20111213 + pkgver = r16.1d2fee0 pkgrel = 1 url = http://mbm.sourceforge.net/ arch = i686 @@ -11,6 +11,10 @@ pkgbase = mbm-gps-control-git depends = network-manager-applet depends = intltool provides = mbm-gps-control + source = mbm-gps-control::git://mbm.git.sourceforge.net/gitroot/mbm/mbm-gps-control/ + source = 0001-Remove-call-to-g_type_init.patch + md5sums = SKIP + md5sums = 0b32f46bcd6616c7288a392f183f011a pkgname = mbm-gps-control-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..17218f983aab --- /dev/null +++ b/0001-Remove-call-to-g_type_init.patch @@ -0,0 +1,40 @@ +From 059c735433eeef93c59e8e5923218349fa6da9ee Mon Sep 17 00:00:00 2001 +From: "Frederik \"Freso\" S. Olesen" <freso.dk@gmail.com> +Date: Sat, 15 Feb 2014 12:23:28 +0100 +Subject: [PATCH] Remove call to g_type_init. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is exactly the same as Olivier Mehani's patch for mbm-gpsd, that had this +commit message: +""" +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: Frederik "Freso" S. Olesen <freso.dk@gmail.com> +--- + src/gps_control.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/gps_control.c b/src/gps_control.c +index bfd1202..cfde6ab 100644 +--- a/src/gps_control.c ++++ b/src/gps_control.c +@@ -311,8 +311,6 @@ void dbus_connect (DBUS_Connection * conn) + { + GError *error; + +- g_type_init (); +- + error = NULL; + conn->connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); + if (conn->connection == NULL) { +-- +1.8.5.5 @@ -1,50 +1,44 @@ -# Contributor: Andreas Boehler <andy dot boehler at gmx dot at> +# Contributor: Andreas Boehler <andy dot boehler at gmx dot at> # Maintainer: Olivier Mehani <shtrom-aur@ssji.net> +# Contributor: Frederik "Freso" S. Olesen <freso.dk@gmail.com> -pkgname=mbm-gps-control-git -pkgver=20111213 +_gitname=mbm-gps-control +pkgname="${_gitname}-git" +pkgver=r16.1d2fee0 pkgrel=1 pkgdesc="Graphical interface to mbm-gpsd" arch=('i686' 'x86_64') url="http://mbm.sourceforge.net/" license=('GPL') -groups=() depends=('networkmanager' 'network-manager-applet' 'intltool') makedepends=('git') -optdepends=() -provides=('mbm-gps-control') -conflicts=() -replaces=() -backup=() -options=() -install= -source=() -noextract=() -md5sums=() -_gitname=mbm-gps-control -_gitroot=git://mbm.git.sourceforge.net/gitroot/mbm/${_gitname}/ +provides=("${_gitname}") +source=( +"${_gitname}::git://mbm.git.sourceforge.net/gitroot/mbm/${_gitname}/" +0001-Remove-call-to-g_type_init.patch +) +md5sums=('SKIP' + '0b32f46bcd6616c7288a392f183f011a') +pkgver() { + cd "$srcdir/$_gitname" + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} -build() { - msg "Connecting to sourceforge.net git server...." - rm -rf $startdir/src/$_gitname-build - if [[ -d $_gitname ]]; then - cd $_gitname || return 1 - git pull origin || return 1 - else - git clone $_gitroot $_gitname || return 1 - fi - msg " checkout done." - cd $srcdir || return 1 - cp -r $_gitname $_gitname-build - cd $_gitname-build || return 1 - unset CFLAGS - unset CXXFLAGS - ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 - rm -rf $srcdir/$_gitname-build - +prepare() { + cd "$srcdir/$_gitname" + git am "$srcdir/0001-Remove-call-to-g_type_init.patch" +} +build() { + cd "$srcdir/$_gitname" + unset CFLAGS + unset CXXFLAGS + ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make } +package() { + cd "$srcdir/$_gitname" + make DESTDIR="$pkgdir" install +} |