summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Alff2017-12-16 13:12:06 -0500
committerTed Alff2017-12-16 13:12:06 -0500
commit693787fc2bf01d58e9dce47d981fe1f584496066 (patch)
treeede19ad4f4325de4d6fb40b742b57395e623e8f7
parent230926dfee788afc4401132d537652035c87a13e (diff)
downloadaur-693787fc2bf01d58e9dce47d981fe1f584496066.tar.gz
Update for 4.13.4. Split packaging for glade plugins.
-rw-r--r--.SRCINFO38
-rw-r--r--PKGBUILD68
2 files changed, 82 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d4666aad0555..6e07d18afae4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,49 @@
# Generated by mksrcinfo v8
-# Sat Dec 16 18:09:10 UTC 2017
-pkgbase = libxfce4ui
+# Sat Dec 16 18:11:16 UTC 2017
+pkgbase = libxfce4ui-git
pkgdesc = Commonly used Xfce widgets among Xfce applications (git checkout)
- pkgver = 4.13.3.r26.gbffab34
- pkgrel = 1
+ pkgver = 4.13.4.r1.geafab0f
+ 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
makedepends = gobject-introspection
makedepends = git
makedepends = vala
- depends = libxfce4util>=4.13.0
+ makedepends = glade
+ makedepends = glade-gtk2
+ source = libxfce4ui::git://git.xfce.org/xfce/libxfce4ui
+ sha256sums = SKIP
+
+pkgname = libxfce4ui-git
+ 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
- conflicts = libxfce4ui-devel
- source = libxfce4ui::git://git.xfce.org/xfce/libxfce4ui
- sha256sums = SKIP
-pkgname = libxfce4ui-git
+pkgname = glade-plugin-libxfce4ui-git
+ pkgdesc = Glade GTK3 interface designer plugin for libxfce4ui
+ depends = glade
+ depends = libxfce4ui>=4.13.4
+
+pkgname = glade-gtk2-plugin-libxfce4ui-git
+ pkgdesc = Glade GTK2 interface designer plugin for libxfce4ui
+ depends = glade-gtk2
+ depends = libxfce4ui>=4.13.4
diff --git a/PKGBUILD b/PKGBUILD
index 05f3ddcf3e79..746e39aad92c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,29 +3,33 @@
# Contributor: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>
-pkgbase=libxfce4ui
-pkgname=(${pkgbase}-git)
-pkgver=4.13.3.r26.gbffab34
-pkgrel=1
+_pkgname=libxfce4ui
+pkgbase="${_pkgname}"-git
+pkgname=("${pkgbase}")
+pkgver=4.13.4.r1.geafab0f
+pkgrel=2
pkgdesc="Commonly used Xfce widgets among Xfce applications (git checkout)"
arch=('i686' 'x86_64')
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' 'xfce4-dev-tools' 'gobject-introspection' 'git' 'vala')
-provides=("${pkgbase}=${pkgver%%.r*}")
-conflicts=("${pkgbase}" "${pkgbase}-devel")
-source=("${pkgbase}::git://git.xfce.org/xfce/libxfce4ui")
+# build depends
+makedepends+=('intltool' 'gtk-doc' 'xfce4-dev-tools' 'gobject-introspection' 'git' 'vala')
+source=("${_pkgname}::git://git.xfce.org/xfce/libxfce4ui")
sha256sums=('SKIP')
+if [[ "`pkg-config --modversion gladeui-2.0 2>/dev/null`" != '' ]] ; then makedepends+=('glade') ; pkgname+=('glade-plugin-libxfce4ui-git') ; fi
+if [[ "`pkg-config --modversion gladeui-1.0 2>/dev/null`" != '' ]] ; then makedepends+=('glade-gtk2') ; pkgname+=('glade-gtk2-plugin-libxfce4ui-git') ; fi
+
pkgver() {
- cd "${pkgbase}"
- git describe --long --tags | sed -r "s:^${pkgbase}.::;s/^v//;s/([^-]*-g)/r\1/;s/-/./g"
+ cd "${_pkgname}"
+ git describe --long --tags | sed -r "s:^${_pkgname}.::;s/^v//;s/([^-]*-g)/r\1/;s/-/./g"
}
build() {
- cd "${pkgbase}"
+ cd "${_pkgname}"
NOCONFIGURE=1 ./autogen.sh
./configure \
@@ -37,14 +41,50 @@ build() {
--enable-gtk-doc \
--disable-debug \
--enable-maintainer-mode \
+ --disable-gladeui \
--with-vendor-info='Arch Linux'
make
}
package_libxfce4ui-git() {
- cd "${pkgbase}"
+ 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-git() {
+ pkgdesc='Glade GTK3 interface designer plugin for libxfce4ui'
+ depends=('glade' "${_pkgname}>=${pkgver%.r*}")
+
+ cd "${_pkgname}"/glade
make DESTDIR="$pkgdir" install
}
-# vim:set ts=2 sw=2 et:
+package_glade-gtk2-plugin-libxfce4ui-git() {
+ 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
+}