Merge of gtk2 into libdbusmenu PKGBUILD after relocation to AUR and ownership transfer. Bump to 12.10.3+15.04.20150410.2

2 files changed, 46 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 827539fd81cc..76e777f85fc8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,30 @@
 # Generated by mksrcinfo v8
-# Wed Feb  3 18:05:46 UTC 2016
+# Wed Feb  3 21:14:02 UTC 2016
 pkgbase = libdbusmenu
 	pkgdesc = A library for passing menus over DBus
-	pkgver = 12.10.2
-	pkgrel = 4
+	pkgver = 12.10.3.15.04.20150410.2
+	pkgrel = 1
 	url = https://launchpad.net/libdbusmenu
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = gnome-doc-utils
 	makedepends = gobject-introspection
+	makedepends = gtk2
 	makedepends = gtk3
 	makedepends = intltool
 	makedepends = vala
 	options = !emptydirs
-	source = http://launchpad.net/dbusmenu/12.10/12.10.2/+download/libdbusmenu-12.10.2.tar.gz
-	sha256sums = 9d6ad4a0b918b342ad2ee9230cce8a095eb601cb0cee6ddc1122d0481f9d04c9
+	source = https://launchpad.net/ubuntu/+archive/primary/+files/libdbusmenu_12.10.3+15.04.20150410.2.orig.tar.gz
+	sha512sums = c15b79464bc6498cb1e912efbe648606b7bf3b5c521c4d4e5c7decf002b4e8362444177922a5abd8a057a803a8cc00e72de6e36209189eb255efb83e2ded0b06
 
 pkgname = libdbusmenu-glib
 	depends = glib2
 
+pkgname = libdbusmenu-gtk2
+	depends = gtk2
+	depends = libdbusmenu-glib
+
 pkgname = libdbusmenu-gtk3
 	depends = gtk3
 	depends = libdbusmenu-glib
diff --git a/PKGBUILD b/PKGBUILD
index 0e71f04ef696..c35792fec8dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,66 @@
-# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
-# Contributor: Balló György <ballogyor+arch@gmail.com>
-# Contributor: Branchini Massimo <max.bra.gtalk@gmail.com
+# Maintainer: Llewelyn Trahaearn <WoefulDerelict at GMail dot com>
+# Contributor: Maxime Gauduin <alucryd at archlinux dot org>
+# Contributor: FadeMind <fademind at gmail dot com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Branchini Massimo <max.bra.gtalk at gmail dot com
 
 pkgbase=libdbusmenu
-pkgname=('libdbusmenu-glib' 'libdbusmenu-gtk3')
-pkgver=12.10.2
-pkgrel=4
+pkgname=("${pkgbase}-glib" "${pkgbase}-gtk"{2,3})
+pkgver=12.10.3.15.04.20150410.2
+pkgrel=1
 pkgdesc="A library for passing menus over DBus"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/libdbusmenu"
 license=('GPL3')
-makedepends=('gnome-doc-utils' 'gobject-introspection' 'gtk3' 'intltool' 'vala')
+makedepends=('gnome-doc-utils' 'gobject-introspection' 'gtk2' 'gtk3' 'intltool' 'vala')
 options=('!emptydirs')
-source=("http://launchpad.net/dbusmenu/${pkgver%.?}/${pkgver}/+download/${pkgbase}-${pkgver}.tar.gz")
-sha256sums=('9d6ad4a0b918b342ad2ee9230cce8a095eb601cb0cee6ddc1122d0481f9d04c9')
+source=("https://launchpad.net/ubuntu/+archive/primary/+files/${pkgbase}_12.10.3+15.04.20150410.2.orig.tar.gz")
+sha512sums=('c15b79464bc6498cb1e912efbe648606b7bf3b5c521c4d4e5c7decf002b4e8362444177922a5abd8a057a803a8cc00e72de6e36209189eb255efb83e2ded0b06')
 
-build() {
-  cd ${pkgbase}-${pkgver}
+prepare() {
+  cd "${srcdir}"
+  [ -d "${pkgbase}-gtk2-12.10.3+15.04.20150410.2" ] && rm -rf "${pkgbase}-gtk2-12.10.3+15.04.20150410.2"
+  cp -a "${pkgbase}-12.10.3+15.04.20150410.2" "${pkgbase}-gtk2-12.10.3+15.04.20150410.2"
+}
 
+build() {
   export HAVE_VALGRIND_TRUE='#'
   export HAVE_VALGRIND_FALSE=''
 
-  ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --disable-{dumper,static,tests}
+  cd "${srcdir}/${pkgbase}-12.10.3+15.04.20150410.2"
+  ./autogen.sh --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --disable-{dumper,static,tests}
   make
+
+  cd "${srcdir}/${pkgbase}-gtk2-12.10.3+15.04.20150410.2"
+  ./autogen.sh --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --disable-{dumper,static,tests} --with-gtk='2'
+  make
+  
 }
 
 package_libdbusmenu-glib() {
 depends=('glib2')
 
-  cd ${pkgbase}-${pkgver}
+  cd "${srcdir}/${pkgbase}-12.10.3+15.04.20150410.2"
 
   make -j1 -C libdbusmenu-glib DESTDIR="${pkgdir}" install
 }
 
+package_libdbusmenu-gtk2() {
+depends=('gtk2' 'libdbusmenu-glib')
+
+  cd "${srcdir}/${pkgbase}-gtk2-12.10.3+15.04.20150410.2"
+
+  make -j1 -C libdbusmenu-glib DESTDIR="${pkgdir}" install
+  make -j1 -C libdbusmenu-gtk DESTDIR="${pkgdir}" install
+  make -j1 -C libdbusmenu-glib DESTDIR="${pkgdir}" uninstall
+}
+
 package_libdbusmenu-gtk3() {
 depends=('gtk3' 'libdbusmenu-glib')
 
-  cd ${pkgbase}-${pkgver}
+  cd "${srcdir}/${pkgbase}-12.10.3+15.04.20150410.2"
 
   make -j1 -C libdbusmenu-glib DESTDIR="${pkgdir}" install
   make -j1 -C libdbusmenu-gtk DESTDIR="${pkgdir}" install
   make -j1 -C libdbusmenu-glib DESTDIR="${pkgdir}" uninstall
 }
-
-# vim: ts=2 sw=2 et: