Rebase on extra. Change version format.

2 files changed, 29 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3b8e608eec99..539a063aa3fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,31 @@
-# Generated by mksrcinfo v8
-# Sat Jan 20 13:18:43 UTC 2018
 pkgbase = xfce4-settings-git
 	pkgdesc = Settings manager for xfce (git checkout)
-	pkgver = 4.13.1.r102.g571cb6d
+	pkgver = 4.14.0+113+g4930c124
 	pkgrel = 1
 	url = http://www.xfce.org/
 	arch = i686
 	arch = x86_64
-	groups = xfce4
+	groups = xfce4-git
 	license = GPL2
 	makedepends = intltool
 	makedepends = git
 	makedepends = xfce4-dev-tools
-	depends = exo>=0.11.0
+	depends = exo
 	depends = garcon
-	depends = libxfce4ui>=4.13
+	depends = libxfce4ui
+	depends = xfconf
 	depends = libnotify
+	depends = colord
 	depends = libxklavier
-	depends = gnome-icon-theme
-	depends = gtk-engines
-	depends = dbus-glib
-	depends = xfconf>4.13.0
+	depends = adwaita-icon-theme
+	depends = gnome-themes-extra
 	optdepends = libcanberra: for sound control
-	provides = xfce4-settings=4.13.1
+	provides = xfce4-settings=4.14.0
 	conflicts = xfce4-settings
 	source = xfce4-settings::git://git.xfce.org/xfce/xfce4-settings
+	source = default-xsettings-xml.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/default-xsettings-xml.patch?h=packages/xfce4-settings
 	sha256sums = SKIP
+	sha256sums = 8e9a6c70ab0ceb5d91b637dc290768f8a47edb5d7b6e2eebc4459dbc4ee040d7
 
 pkgname = xfce4-settings-git
 
diff --git a/PKGBUILD b/PKGBUILD
index cf9979c26d07..847f2da0ba00 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,25 +2,34 @@
 
 _pkgname=xfce4-settings
 pkgname=${_pkgname}-git
-pkgver=4.13.1.r102.g571cb6d
+pkgver=4.14.0+113+g4930c124
 pkgrel=1
 pkgdesc="Settings manager for xfce (git checkout)"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
 license=('GPL2')
-groups=('xfce4')
-depends=('exo>=0.11.0' 'garcon' 'libxfce4ui>=4.13' 'libnotify' 'libxklavier'
-         'gnome-icon-theme' 'gtk-engines' 'dbus-glib' 'xfconf>4.13.0')
+groups=('xfce4-git')
+depends=('exo' 'garcon' 'libxfce4ui' 'xfconf' 'libnotify' 'colord'
+         'libxklavier' 'adwaita-icon-theme' 'gnome-themes-extra')
 makedepends=('intltool' 'git' 'xfce4-dev-tools')
 optdepends=('libcanberra: for sound control')
-provides=("${_pkgname}=${pkgver%%.r*}")
+provides=("${_pkgname}=${pkgver%%+*}")
 conflicts=("${_pkgname}")
-source=("${_pkgname}::git://git.xfce.org/xfce/${_pkgname}")
-sha256sums=('SKIP')
+source=("${_pkgname}::git://git.xfce.org/xfce/${_pkgname}"
+        'default-xsettings-xml.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/default-xsettings-xml.patch?h=packages/xfce4-settings')
+sha256sums=('SKIP'
+            '8e9a6c70ab0ceb5d91b637dc290768f8a47edb5d7b6e2eebc4459dbc4ee040d7')
 
 pkgver() {
   cd "${_pkgname}"
-  git describe --long --tags | sed -r "s:^${_pkgname}.::;s/^v//;s/([^-]*-g)/r\1/;s/-/./g"
+  git describe --long --tags | sed -r "s:^${_pkgname}.::;s/^v//;s/^xfce-//;s/-/+/g"
+}
+
+prepare() {
+  cd "${_pkgname}"
+
+  # Enable Adwaita theme and font hinting by default
+  patch -Np1 -i "$srcdir/default-xsettings-xml.patch"
 }
 
 build() {
@@ -37,6 +46,7 @@ build() {
     --enable-libxklavier \
     --enable-pluggable-dialogs \
     --enable-sound-settings \
+    --disable-upower-glib \
     --disable-debug
   make
 }