Update to 1.12.2 version

2 files changed, 31 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca609067ab71..f1fcba034f26 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Tue Aug 30 21:58:11 UTC 2016
 pkgbase = lib32-cairomm
 	pkgdesc = C++ bindings to Cairo vector graphics library (32 bit)
-	pkgver = 1.12.0
+	pkgver = 1.12.2
 	pkgrel = 1
 	url = http://www.cairographics.org
 	arch = x86_64
@@ -10,13 +8,15 @@ pkgbase = lib32-cairomm
 	license = MPL
 	makedepends = pkgconfig
 	makedepends = gcc-multilib
+	makedepends = git
+	makedepends = mm-common
 	depends = lib32-cairo
 	depends = lib32-libsigc++
 	depends = cairomm
 	options = !libtool
 	options = !emptydirs
-	source = http://www.cairographics.org/releases/cairomm-1.12.0.tar.gz
-	sha256sums = 50435aec6fdd976934b791e808993160113ad19ca53a5634a9b64ccbe55874cc
+	source = git+https://anongit.freedesktop.org/git/cairomm#commit=e9ef515b7b8db5b4f024ddfefe5dfc03f2b8ccea
+	sha256sums = SKIP
 
 pkgname = lib32-cairomm
 
diff --git a/PKGBUILD b/PKGBUILD
index 2daf17f356da..2620cf28b5ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,43 @@
 
 # Maintainer: Gicu Gorodenco <cyclopsihus 'at' gmail 'dot' com>
-# Contributor: josephgbr <rafael.f.f1 'at' gmail 'dot' com> 
+# Contributor: Kevin <kevin 'at' archlinux 'dot' org>
+# Contributor: criminy <criminy 'at' gmail 'dot' com>
+
 _pkgbasename=cairomm
 pkgname=lib32-$_pkgbasename
-pkgver=1.12.0
+pkgver=1.12.2
 pkgrel=1
 pkgdesc="C++ bindings to Cairo vector graphics library (32 bit)"
-arch=('x86_64')
+arch=(x86_64)
 url="http://www.cairographics.org"
-license=('LGPL' 'MPL')
-depends=('lib32-cairo' 'lib32-libsigc++' "$_pkgbasename")
-makedepends=('pkgconfig' 'gcc-multilib')
+license=(LGPL MPL)
+depends=(lib32-cairo lib32-libsigc++ "$_pkgbasename")
+makedepends=(pkgconfig gcc-multilib git mm-common)
 options=('!libtool' '!emptydirs')
-source=(http://www.cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.gz)
-sha256sums=('50435aec6fdd976934b791e808993160113ad19ca53a5634a9b64ccbe55874cc')
+_commit=e9ef515b7b8db5b4f024ddfefe5dfc03f2b8ccea  # tags/v1.12.2^0
+source=("git+https://anongit.freedesktop.org/git/cairomm#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd ${_pkgbasename}
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+prepare() {
+  cd ${_pkgbasename}
+  NOCONFIGURE=1 ./autogen.sh
+}
 
 build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  ./configure --prefix=/usr --libdir=/usr/lib32 CC='gcc -m32' CXX='g++ -m32'
+  cd ${_pkgbasename}
+  ./configure --prefix=/usr --enable-maintainer-mode --libdir=/usr/lib32 CC='gcc -m32' CXX='g++ -m32'
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+  cd ${_pkgbasename}
+  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
   make DESTDIR="${pkgdir}" install
   # Cleanup for a lib32 package
   rm -rf ${pkgdir}/usr/{include,lib32/cairomm*,share}