Version udpate 4.13.1. Temporarily patch to allow xfconf < 4.13 which requires a rebuild of all xfce.

2 files changed, 26 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2f251b0c281..6ed2e53d6a7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
 # Generated by mksrcinfo v8
-# Sun Jun 11 16:48:19 UTC 2017
+# Mon Jun 26 15:50:41 UTC 2017
 pkgbase = xfce4-settings-devel
 	pkgdesc = Settings manager for xfce
-	pkgver = 4.13.0
-	pkgrel = 2
+	pkgver = 4.13.1
+	pkgrel = 1
 	url = http://www.xfce.org/
 	arch = i686
 	arch = x86_64
 	groups = xfce4
 	license = GPL2
 	makedepends = intltool
+	makedepends = git
+	makedepends = xfce4-dev-tools
 	depends = exo>=0.11.0
 	depends = garcon
 	depends = libxfce4ui>=4.13
@@ -19,12 +21,12 @@ pkgbase = xfce4-settings-devel
 	depends = gtk-engines
 	depends = dbus-glib
 	optdepends = libcanberra: for sound control
-	provides = xfce4-settings=4.13.0
+	provides = xfce4-settings=4.13.1
 	conflicts = xfce4-settings
-	source = http://archive.xfce.org/src/xfce/xfce4-settings/4.13/xfce4-settings-4.13.0.tar.bz2
-	source = dbus_glib_fix.patch::https://git.xfce.org/xfce/xfce4-settings/patch/?id=570aa72683535eeedd0d15527f5c11f737ac150b
-	sha256sums = 01a19a2d320617efc7de972069024f2a86255b8abf354fbd3698f361db75063d
-	sha256sums = b31d0faa79f41b3637bb5a20a74424229b4374dbbcaa29e6753434ca0dad372a
+	source = xfce4-settings-4.13.1::git://git.xfce.org/xfce/xfce4-settings#commit=3effeb4908b8d3ed00b11b5fcac27b745500c9f4
+	source = xfconf_4.13.patch::https://git.xfce.org/xfce/xfce4-settings/patch/?id=6a5930fb1050f99b6e494eedcca977e74cba7f62
+	sha256sums = SKIP
+	sha256sums = 7229829a88251676308a6fdd8100eae13a1c0228308074f0d8b983efba2a14b3
 
 pkgname = xfce4-settings-devel
 
diff --git a/PKGBUILD b/PKGBUILD
index 08fc9f5b9eb9..aad6ca6a71ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 _pkgname=xfce4-settings
 pkgname=${_pkgname}-devel
-pkgver=4.13.0
-pkgrel=2
+pkgver=4.13.1
+pkgrel=1
 pkgdesc="Settings manager for xfce"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
@@ -11,17 +11,25 @@ license=('GPL2')
 groups=('xfce4')
 depends=('exo>=0.11.0' 'garcon' 'libxfce4ui>=4.13' 'libnotify' 'libxklavier'
          'gnome-icon-theme' 'gtk-engines' 'dbus-glib')
-makedepends=('intltool')
+makedepends=('intltool' 'git' 'xfce4-dev-tools')
 optdepends=('libcanberra: for sound control')
 provides=("${_pkgname}=${pkgver}")
 conflicts=("${_pkgname}")
-source=("http://archive.xfce.org/src/xfce/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2"
-        "dbus_glib_fix.patch::https://git.xfce.org/xfce/xfce4-settings/patch/?id=570aa72683535eeedd0d15527f5c11f737ac150b")
+source=(${_pkgname}-$pkgver::git://git.xfce.org/xfce/xfce4-settings#commit=3effeb4908b8d3ed00b11b5fcac27b745500c9f4
+        #"http://archive.xfce.org/src/xfce/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2"
+        'xfconf_4.13.patch::https://git.xfce.org/xfce/xfce4-settings/patch/?id=6a5930fb1050f99b6e494eedcca977e74cba7f62')
+
+prepare() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  # Reverse the patch that requires xfconf > 4.13
+  patch -uRp1 -i ../xfconf_4.13.patch
+}
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
 
-  ./configure \
+  #./configure
+  ./autogen.sh \
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
@@ -41,5 +49,5 @@ package() {
   make DESTDIR="$pkgdir" install
 }
 
-sha256sums=('01a19a2d320617efc7de972069024f2a86255b8abf354fbd3698f361db75063d'
-            'b31d0faa79f41b3637bb5a20a74424229b4374dbbcaa29e6753434ca0dad372a')
+sha256sums=('SKIP' #'01b9e9df6801564b28f3609afee1628228cc24c0939555f60399e9675d183f7e'
+            '7229829a88251676308a6fdd8100eae13a1c0228308074f0d8b983efba2a14b3')