[arch-commits] Commit in xfce4-settings/trunk (4 files)

[Evangelos Foutras]

    Date: Sunday, March 1, 2015 @ 09:49:08
  Author: foutrelis
Revision: 232208

upgpkg: xfce4-settings 4.12.0-1

New upstream release.

Added:
  xfce4-settings/trunk/default-xsettings-xml.patch
  xfce4-settings/trunk/xfce4-settings.install
Modified:
  xfce4-settings/trunk/PKGBUILD
Deleted:
  xfce4-settings/trunk/xfce4-settings-xml-4.10.0.patch

---------------------------------+
 PKGBUILD                        |   22 +++++++++++-----------
 default-xsettings-xml.patch     |   26 ++++++++++++++++++++++++++
 xfce4-settings-xml-4.10.0.patch |   26 --------------------------
 xfce4-settings.install          |   13 +++++++++++++
 4 files changed, 50 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-01 07:50:34 UTC (rev 232207)
+++ PKGBUILD	2015-03-01 08:49:08 UTC (rev 232208)
@@ -4,7 +4,7 @@
 # Contributor: Corrado Primier <bardo at aur.archlinux.org>
 
 pkgname=xfce4-settings
-pkgver=4.10.1
+pkgver=4.12.0
 pkgrel=1
 pkgdesc="Settings manager for xfce"
 arch=('i686' 'x86_64')
@@ -11,20 +11,20 @@
 url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
-depends=('exo' 'garcon' 'libxfce4ui' 'libnotify' 'libxklavier'
-         'gnome-icon-theme' 'gtk-engines')
-makedepends=('intltool')
+depends=('exo' 'garcon' 'libxfce4ui' 'libnotify' 'libxklavier' 'upower'
+         'gnome-icon-theme' 'gtk3')
+makedepends=('intltool' 'xf86-input-libinput')
 optdepends=('libcanberra: for sound control')
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
-        xfce4-settings-xml-4.10.0.patch)
-sha256sums=('118a6959ea50e3a533d7aa18ec5a878a47a30608b3ce9ce59a93c3888f4e13d5'
-            '78e68ef2cbf19760707ba24f3d57dd59fbf40a540d50d20e7cc62ba02196aaaa')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+        default-xsettings-xml.patch)
+sha256sums=('04becef105c19d0266cfe8dbf42619e7233c3b9fa99b43dbfc9c6a5959501f81'
+            '1c4110fd5ce0f17564cda892b72d59a87b515fdb4580c7154bbb4c1979f5ade7')
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # enable gnome icon theme, clearlooks theme and font hinting by default
-  # (taken from Fedora)
-  patch -Np1 -i "$srcdir/xfce4-settings-xml-4.10.0.patch"
+  # Enable GNOME icon theme, Adwaita theme and font hinting by default
+  patch -Np1 -i "$srcdir/default-xsettings-xml.patch"
 }
 
 build() {

Added: default-xsettings-xml.patch
===================================================================
--- default-xsettings-xml.patch	                        (rev 0)
+++ default-xsettings-xml.patch	2015-03-01 08:49:08 UTC (rev 232208)
@@ -0,0 +1,26 @@
+diff -upr xfce4-settings-4.12.0.orig/xfsettingsd/xsettings.xml xfce4-settings-4.12.0/xfsettingsd/xsettings.xml
+--- xfce4-settings-4.12.0.orig/xfsettingsd/xsettings.xml	2015-02-24 03:33:11.000000000 +0200
++++ xfce4-settings-4.12.0/xfsettingsd/xsettings.xml	2015-03-01 09:52:24.376869688 +0200
+@@ -6,8 +6,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <channel name="xsettings" version="1.0">
+   <property name="Net" type="empty">
+-    <property name="ThemeName" type="empty"/>
+-    <property name="IconThemeName" type="empty"/>
++    <property name="ThemeName" type="string" value="Adwaita"/>
++    <property name="IconThemeName" type="string" value="gnome"/>
+     <property name="DoubleClickTime" type="int" value="400"/>
+     <property name="DoubleClickDistance" type="int" value="5"/>
+     <property name="DndDragThreshold" type="int" value="8"/>
+@@ -19,9 +19,9 @@
+   </property>
+   <property name="Xft" type="empty">
+     <property name="DPI" type="empty"/>
+-    <property name="Antialias" type="int" value="-1"/>
++    <property name="Antialias" type="int" value="1"/>
+     <property name="Hinting" type="int" value="-1"/>
+-    <property name="HintStyle" type="string" value="hintnone"/>
++    <property name="HintStyle" type="string" value="hintfull"/>
+     <property name="RGBA" type="string" value="none"/>
+     <!-- <property name="Lcdfilter" type="string" value="none"/> -->
+   </property>

Deleted: xfce4-settings-xml-4.10.0.patch
===================================================================
--- xfce4-settings-xml-4.10.0.patch	2015-03-01 07:50:34 UTC (rev 232207)
+++ xfce4-settings-xml-4.10.0.patch	2015-03-01 08:49:08 UTC (rev 232208)
@@ -1,26 +0,0 @@
-diff -Nur xfce4-settings-4.9.4.orig/xfsettingsd/xsettings.xml xfce4-settings-4.9.4/xfsettingsd/xsettings.xml
---- xfce4-settings-4.9.4.orig/xfsettingsd/xsettings.xml	2012-04-01 03:58:17.000000000 -0600
-+++ xfce4-settings-4.9.4/xfsettingsd/xsettings.xml	2012-04-02 14:59:57.555572009 -0600
-@@ -6,8 +6,8 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <channel name="xsettings" version="1.0">
-   <property name="Net" type="empty">
--    <property name="ThemeName" type="empty"/>
--    <property name="IconThemeName" type="empty"/>
-+    <property name="ThemeName" type="string" value="Clearlooks"/>
-+    <property name="IconThemeName" type="string" value="gnome"/>
-     <property name="DoubleClickTime" type="int" value="250"/>
-     <property name="DoubleClickDistance" type="int" value="5"/>
-     <property name="DndDragThreshold" type="int" value="8"/>
-@@ -19,9 +19,9 @@
-   </property>
-   <property name="Xft" type="empty">
-     <property name="DPI" type="empty"/>
--    <property name="Antialias" type="int" value="-1"/>
-+    <property name="Antialias" type="int" value="1"/>
-     <property name="Hinting" type="int" value="-1"/>
--    <property name="HintStyle" type="string" value="hintnone"/>
-+    <property name="HintStyle" type="string" value="hintfull"/>
-     <property name="RGBA" type="string" value="none"/>
-     <!-- <property name="Lcdfilter" type="string" value="none"/> -->
-   </property>

Added: xfce4-settings.install
===================================================================
--- xfce4-settings.install	                        (rev 0)
+++ xfce4-settings.install	2015-03-01 08:49:08 UTC (rev 232208)
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et: