update pkgbuild to pacman4. add gobject-introspection-runtime conflict. rebuild

1 files changed, 16 insertions, 43 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 26e61e758daa..0218e3b9891b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Joao Cordeiro <jlcordeiro at gmail dot com>
 # Contributor: <arsenm2@rpi.edu>
+# Contributor: Lubosz Sarnecki <lubosz@gmail.com>
 
 _pkgname=gobject-introspection
 pkgname="${_pkgname}-git"
-_realver=1.41.4
-pkgver=1.41.4.3.g3701b32
+pkgver=1.45.2.3354.fb91f7e
 pkgrel=1
 pkgdesc="GObject Introspection"
 epoch=1
@@ -14,62 +14,35 @@ url="http://live.gnome.org/GObjectIntrospection/"
 depends=("glib2-git" 'python2' 'python2-mako')
 makedepends=('git' 'pkgconfig' 'autoconf' 'gtk-doc' 'gnome-common-git'
   'bison' 'cairo' 'mesa' 'flex')
-provides=("gobject-introspection=${_realver}")
-conflicts=('gobject-introspection' 'gobject-introspection-svn')
+provides=("gobject-introspection=${_realver}" "gobject-introspection-runtime=${_realver}")
+conflicts=('gobject-introspection' 'gobject-introspection-svn' "gobject-introspection-runtime")
 replaces=('gobject-introspection-svn')
 options=(!makeflags docs !libtool strip debug)
 
-_gitroot="git://git.gnome.org/gobject-introspection"
+source=("git+git://git.gnome.org/$_pkgname")
+md5sums=("SKIP")
 
-_gitname="gobject-introspection"
-_gitref="master"
-
-_fetch_git() {
-  cd "$srcdir"
-
-  if [ -d "$srcdir/$_gitname/.git" ]; then
-    cd "$_gitname"
-    msg "Reset current branch"
-    git reset --hard HEAD
-    git clean -fdx
-    msg "Fetching branch $_gitref from $_gitroot..."
-    git fetch --force --update-head-ok \
-      "$_gitroot" "$_gitref:$_gitref" --
-    msg "Checking out branch $_gitref..."
-    git checkout "$_gitref" --
-    git reset --hard "$_gitref"
-    git clean -fdx
-    msg "The local files are updated."
-  else
-    msg "Cloning branch $_gitref from $_gitroot to $_gitname..."
-    git clone --single-branch --branch "$_gitref" \
-      "$_gitroot" "$_gitname"
-    cd "$_gitname"
-  fi
-  msg "GIT checkout done or server timeout"
+subver() {
+  PREFIX="m4_define(gi_$1_version, "
+  echo $(grep "$PREFIX" configure.ac | eval sed "'s/$PREFIX//'" | sed 's/)//')
 }
-
+ 
 pkgver() {
-  local outfile=/dev/null
-  [[ -e /dev/tty ]] && outfile=/dev/tty
-  (_fetch_git &> ${outfile})
-  cd "$srcdir/$_gitname"
-
-  git describe | sed -e 's/^[^0-9]*//' -e 's/[-_]/./g'
+  cd "$srcdir/$_pkgname"
+  hash=$(git log --pretty=format:'%h' -n 1)
+  revision=$(git rev-list --count HEAD)
+  echo $(subver major).$(subver minor).$(subver micro).$revision.$hash
 }
 
 build() {
-  (_fetch_git)
-  cd "$srcdir/$_gitname"
-
-  msg "Starting build"
+  cd "$srcdir/$_pkgname"
   export PYTHON=/usr/bin/python2
   ./autogen.sh --prefix=/usr --disable-static --enable-doctool
   make
 }
 
 package() {
-  cd "$srcdir/$_gitname"
+  cd "$srcdir/$_pkgname"
   make DESTDIR="$pkgdir" install
 
   sed -i '1s|#!/usr/bin/env python$|&2|' \