Combine glade plugin into package. Drop gtk2 glade plugin.

2 files changed, 18 insertions, 85 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 272d7a5a9fe1..5a726115e5bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,13 @@
 # Generated by mksrcinfo v8
-# Sat Dec 16 18:21:20 UTC 2017
+# Sat Sep  8 14:44:08 UTC 2018
 pkgbase = libxfce4ui-devel
 	pkgdesc = Commonly used Xfce widgets among Xfce applications (Development version)
 	pkgver = 4.13.4
-	pkgrel = 1
+	pkgrel = 2
 	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
@@ -22,11 +15,6 @@ pkgbase = libxfce4ui-devel
 	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
@@ -34,20 +22,11 @@ pkgname = libxfce4ui-devel
 	depends = startup-notification
 	depends = hicolor-icon-theme
 	depends = gtk3
+	optdepends = glade: Glade designer plugin
 	provides = libxfce4ui=4.13.4
 	conflicts = libxfce4ui
+	source = http://archive.xfce.org/src/xfce/libxfce4ui/4.13/libxfce4ui-4.13.4.tar.bz2
+	sha256sums = d63fcdb8e5acb6f0d26075ea17d320dbfbec2058567cd67cb99824c7402a1f79
 
-pkgname = glade-plugin-libxfce4ui-devel
-	pkgdesc = Glade GTK3 interface designer plugin for libxfce4ui
-	depends = glade
-	depends = libxfce4ui>=4.13.4
-	provides = glade-plugin-libxfce4ui=4.13.4
-	conflicts = glade-plugin-libxfce4ui
-
-pkgname = glade-gtk2-plugin-libxfce4ui-devel
-	pkgdesc = Glade GTK2 interface designer plugin for libxfce4ui
-	depends = glade-gtk2
-	depends = libxfce4ui>=4.13.4
-	provides = glade-gtk2-plugin-libxfce4ui=4.13.4
-	conflicts = glade-gtk2-plugin-libxfce4ui
+pkgname = libxfce4ui-devel
 
diff --git a/PKGBUILD b/PKGBUILD
index c7b5dd57ea76..663d92e4cc26 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,30 +4,25 @@
 # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>
 
 _pkgname=libxfce4ui
-pkgbase="${_pkgname}"-devel
-pkgname=("${pkgbase}")
+pkgname="${_pkgname}"-devel
 pkgver=4.13.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Commonly used Xfce widgets among Xfce applications (Development version)"
 arch=('i686' 'x86_64')
 url="https://git.xfce.org/xfce/libxfce4ui/tree/README"
 license=('GPL2')
-# libxfce4ui-devel depends
-makedepends=('libxfce4util>=4.12.0' 'gtk2' 'xfconf' 'libsm' 'startup-notification'
+depends=('libxfce4util>=4.12.0' 'gtk2' 'xfconf' 'libsm' 'startup-notification'
          'hicolor-icon-theme' 'gtk3')
-# 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
+makedepends=('intltool' 'gtk-doc' 'xfce4-dev-tools' 'gobject-introspection' 'git' 'vala' 'glade')
+optdepends=('glade: Glade designer plugin')
+provides=("${_pkgname}=${pkgver}")
+conflicts=("${_pkgname}")
+source=("http://archive.xfce.org/src/xfce/${_pkgname}/${pkgver%.*}/${_pkgname}-${pkgver}.tar.bz2")
+sha256sums=('d63fcdb8e5acb6f0d26075ea17d320dbfbec2058567cd67cb99824c7402a1f79')
 
 build() {
-  cd "${_pkgname}"
+  cd "${_pkgname}-${pkgver}"
 
-  NOCONFIGURE=1 ./autogen.sh
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -42,49 +37,8 @@ build() {
   make
 }
 
-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}
-}
-
-package_glade-plugin-libxfce4ui-devel() {
-  pkgdesc='Glade GTK3 interface designer plugin for libxfce4ui'
-  depends=('glade' "${_pkgname}>=${pkgver%.r*}")
-  provides=("glade-plugin-libxfce4ui=${pkgver}")
-  conflicts=('glade-plugin-libxfce4ui')
-  
-  cd "${_pkgname}"/glade
+package() {
+  cd "${_pkgname}-${pkgver}"
 
   make DESTDIR="$pkgdir" install
 }
-
-package_glade-gtk2-plugin-libxfce4ui-devel() {
-  pkgdesc='Glade GTK2 interface designer plugin for libxfce4ui'
-  depends=('glade-gtk2' "${_pkgname}>=${pkgver%.r*}")
-  provides=("glade-gtk2-plugin-libxfce4ui=${pkgver}")
-  conflicts=('glade-gtk2-plugin-libxfce4ui')
-
-  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
-}