Version bump 4.13.4. Add glade plugin packaging. Switch to git checkout to the release commit -- Issue with the official tarball.

2 files changed, 95 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fe1e4352533d..32191bff287b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,49 @@
 # Generated by mksrcinfo v8
-# Wed Aug 16 17:30:48 UTC 2017
+# Sat Dec 16 18:17:43 UTC 2017
 pkgbase = libxfce4ui-devel
-	pkgdesc = Commonly used Xfce widgets among Xfce applications
-	pkgver = 4.13.3
-	pkgrel = 2
-	url = http://www.xfce.org/
+	pkgdesc = Commonly used Xfce widgets among Xfce applications (Development version)
+	pkgver = 4.13.4
+	pkgrel = 1
+	url = https://git.xfce.org/xfce/libxfce4ui/tree/README
 	arch = i686
 	arch = x86_64
 	license = GPL2
+	makedepends = libxfce4util>=4.12.0
+	makedepends = gtk2
+	makedepends = xfconf
+	makedepends = libsm
+	makedepends = startup-notification
+	makedepends = hicolor-icon-theme
+	makedepends = gtk3
 	makedepends = intltool
 	makedepends = gtk-doc
+	makedepends = xfce4-dev-tools
 	makedepends = gobject-introspection
-	depends = libxfce4util>=4.13.0
+	makedepends = git
+	makedepends = vala
+	makedepends = glade
+	makedepends = glade-gtk2
+	source = libxfce4ui::git://git.xfce.org/xfce/libxfce4ui#commit=a663a5344d405eb93192ada5e0990ee9a5269b4c
+	sha256sums = SKIP
+
+pkgname = libxfce4ui-devel
+	depends = libxfce4util>=4.12.0
 	depends = gtk2
 	depends = xfconf
 	depends = libsm
 	depends = startup-notification
 	depends = hicolor-icon-theme
 	depends = gtk3
-	provides = libxfce4ui=4.13.3
+	provides = libxfce4ui=4.13.4
 	conflicts = libxfce4ui
-	options = !libtool
-	source = http://archive.xfce.org/src/xfce/libxfce4ui/4.13/libxfce4ui-4.13.3.tar.bz2
-	sha256sums = 815c33a49392520feb84f119cd8f558632a735e322ca55edce33f815a0624470
 
-pkgname = libxfce4ui-devel
+pkgname = glade-plugin-libxfce4ui-devel
+	pkgdesc = Glade GTK3 interface designer plugin for libxfce4ui
+	depends = glade
+	depends = libxfce4ui>=4.13.4
+
+pkgname = glade-gtk2-plugin-libxfce4ui-devel
+	pkgdesc = Glade GTK2 interface designer plugin for libxfce4ui
+	depends = glade-gtk2
+	depends = libxfce4ui>=4.13.4
 
diff --git a/PKGBUILD b/PKGBUILD
index bc16be2fed01..eb3e5e3744d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,33 @@
-# Maintainer: twa022 <twa022 at gmail dot com>
+# Maintainer:  twa022 <twa022 at gmail dot com>
+# Contributor: m4sk1n <m4sk1n@o2.pl>
+# Contributor: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>
 
 _pkgname=libxfce4ui
-pkgname=${_pkgname}-devel
-pkgver=4.13.3
-pkgrel=2
-pkgdesc="Commonly used Xfce widgets among Xfce applications"
+pkgbase="${_pkgname}"-devel
+pkgname=("${pkgbase}")
+pkgver=4.13.4
+pkgrel=1
+pkgdesc="Commonly used Xfce widgets among Xfce applications (Development version)"
 arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
+url="https://git.xfce.org/xfce/libxfce4ui/tree/README"
 license=('GPL2')
-depends=('libxfce4util>=4.13.0' 'gtk2' 'xfconf' 'libsm' 'startup-notification'
+# libxfce4ui-devel depends
+makedepends=('libxfce4util>=4.12.0' 'gtk2' 'xfconf' 'libsm' 'startup-notification'
          'hicolor-icon-theme' 'gtk3')
-makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
-provides=("${_pkgname}=${pkgver}")
-conflicts=("${_pkgname}")
-#replaces=('libxfcegui4') - later when all is ported
-options=('!libtool')
-source=(http://archive.xfce.org/src/xfce/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2)
+# build depends
+makedepends+=('intltool' 'gtk-doc' 'xfce4-dev-tools' 'gobject-introspection' 'git' 'vala')
+_commit='a663a5344d405eb93192ada5e0990ee9a5269b4c'
+source=("${_pkgname}"::git://git.xfce.org/xfce/libxfce4ui#commit="${_commit}")
+sha256sums=('SKIP')
+
+if [[ "`pkg-config --modversion gladeui-2.0 2>/dev/null`" != '' ]] ; then makedepends+=('glade') ; pkgname+=('glade-plugin-libxfce4ui-devel') ; fi
+if [[ "`pkg-config --modversion gladeui-1.0 2>/dev/null`" != '' ]] ; then makedepends+=('glade-gtk2') ; pkgname+=('glade-gtk2-plugin-libxfce4ui-devel') ; fi
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "${_pkgname}"
 
+  NOCONFIGURE=1 ./autogen.sh
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -28,13 +36,51 @@ build() {
     --disable-static \
     --enable-gtk-doc \
     --disable-debug \
+    --enable-maintainer-mode \
+    --disable-gladeui \
     --with-vendor-info='Arch Linux'
   make
 }
 
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+package_libxfce4ui-devel() {
+  depends=('libxfce4util>=4.12.0' 'gtk2' 'xfconf' 'libsm' 'startup-notification'
+           'hicolor-icon-theme' 'gtk3')
+  provides=("${_pkgname}=${pkgver%%.r*}")
+  conflicts=("${_pkgname}")
+  
+  cd "${_pkgname}"
+
   make DESTDIR="$pkgdir" install
+  rm -fr "${pkgdir}"/usr/{lib,share}/glade{,3}
 }
 
-sha256sums=('815c33a49392520feb84f119cd8f558632a735e322ca55edce33f815a0624470')
+package_glade-plugin-libxfce4ui-devel() {
+  pkgdesc='Glade GTK3 interface designer plugin for libxfce4ui'
+  depends=('glade' "${_pkgname}>=${pkgver%.r*}")
+
+  cd "${_pkgname}"/glade
+
+  make DESTDIR="$pkgdir" install
+}
+
+package_glade-gtk2-plugin-libxfce4ui-devel() {
+  pkgdesc='Glade GTK2 interface designer plugin for libxfce4ui'
+  depends=('glade-gtk2' "${_pkgname}>=${pkgver%.r*}")
+
+  cd "${_pkgname}"
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-gtk-doc \
+    --disable-debug \
+    --enable-maintainer-mode \
+    --disable-gladeui2 \
+    --with-vendor-info='Arch Linux'
+
+  cd glade
+  make
+  make DESTDIR="$pkgdir" install
+}