Date: Saturday, May 22, 2010 @ 11:13:10
Author: andyrtr
Revision: 80854
upgpkg: xfce4-settings 4.6.5-1
new version 4.6.5; depend on tango-icon-theme #16444/16428; use default
clearlooks engine for modern style ^Cd depend on some more engines for more
choice
Added:
xfce4-settings/trunk/xfce4-settings-4.6.0.patch
Modified:
xfce4-settings/trunk/PKGBUILD
Deleted:
xfce4-settings/trunk/xklavier-5.patch
----------------------------+
PKGBUILD | 21 ++++++++++++---------
xfce4-settings-4.6.0.patch | 18 ++++++++++++++++++
xklavier-5.patch | 37 -------------------------------------
3 files changed, 30 insertions(+), 46 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-05-22 15:00:29 UTC (rev 80853)
+++ PKGBUILD 2010-05-22 15:13:10 UTC (rev 80854)
@@ -3,30 +3,33 @@
# Contributor: Corrado Primier <ba...@aur.archlinux.org>
pkgname=xfce4-settings
-pkgver=4.6.4
-pkgrel=2
+pkgver=4.6.5
+pkgrel=1
pkgdesc="Settings manager for xfce"
arch=('i686' 'x86_64')
license=('GPL2')
url="http://www.xfce.org/";
groups=('xfce4')
-depends=('exo>=0.3.106' 'libnotify>=0.4.5' 'libxfcegui4>=4.6.1'
'libxklavier>=5.0' 'libwnck>=2.30.0')
+depends=('exo>=0.3.107' 'libnotify>=0.4.5' 'libxfcegui4>=4.6.4'
'libxklavier>=5.0' 'libwnck>=2.30.0' 'tango-icon-theme' 'gtk-engines'
'gtk-xfce-engine')
makedepends=('intltool')
optdepends=('libcanberra: for sound control')
conflicts=('xfce-mcs-manager')
replaces=('xfce-mcs-manager')
source=(http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2
- xklavier-5.patch)
-md5sums=('04985407e8e5b916c44780314a177e96'
- '41306a7a8f7117f5a1ec8bf8207878e5')
+ xfce4-settings-4.6.0.patch)
+md5sums=('f988cb732913b5fbc115ad7105d2231e'
+ '3046732e5d73c9939e7674602eadb1e2')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i "${srcdir}/xklavier-5.patch" || return 1
- autoheader || return 1
- autoconf || return 1
+ # enable Tango icon theme, clearlooks theme and font hinting by
default(taken from Fedora)
+ patch -Np1 -i ${srcdir}/xfce4-settings-4.6.0.patch || return 1
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--disable-static --enable-libxklavier --enable-sound-settings || return 1
make || return 1
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install || return 1
}
Added: xfce4-settings-4.6.0.patch
===================================================================
--- xfce4-settings-4.6.0.patch (rev 0)
+++ xfce4-settings-4.6.0.patch 2010-05-22 15:13:10 UTC (rev 80854)
@@ -0,0 +1,18 @@
+diff -Nur xfce4-settings-4.6.0.orig/xfsettingsd/xsettings.xml
xfce4-settings-4.6.0/xfsettingsd/xsettings.xml
+--- xfce4-settings-4.6.0.orig/xfsettingsd/xsettings.xml 2009-02-20
10:12:35.000000000 -0700
++++ xfce4-settings-4.6.0/xfsettingsd/xsettings.xml 2009-04-16
15:25:44.000000000 -0600
+@@ -2,10 +2,12 @@
+
+ <channel name="xsettings" version="1.0">
+ <property name="Net" type="empty">
+- <property name="ThemeName" type="string" value="Xfce"/>
+- <property name="IconThemeName" type="string" value="Rodent"/>
++ <property name="ThemeName" type="string" value="Clearlooks"/>
++ <property name="IconThemeName" type="string" value="Tango"/>
+ </property>
+ <property name="Xft" type="empty">
+ <property name="DPI" type="int" value="-1"/>
++ <property name="Antialias" type="int" value="1"/>
++ <property name="HintStyle" type="string" value="hintfull"/>
+ </property>
+ </channel>
Deleted: xklavier-5.patch
===================================================================
--- xklavier-5.patch 2010-05-22 15:00:29 UTC (rev 80853)
+++ xklavier-5.patch 2010-05-22 15:13:10 UTC (rev 80854)
@@ -1,37 +0,0 @@
-From bdeff0efd3342b36e56830fd208103c4453ad0d4 Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <mrpo...@ubuntu.com>
-Date: Mon, 25 Jan 2010 21:36:32 +0000
-Subject: Port to libxklavier 5.0 API.
-
----
-diff --git a/configure.ac.in b/configure.ac.in
-index 59e93b2..acd432e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -137,6 +137,8 @@ XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER], [libxklavier],
[0.3.0],
- [libxklavier], [Keyboard layout selection])
- XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER4], [libxklavier], [4.0],
- [libxklavier], [Keyboard layout selection])
-+XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER5], [libxklavier], [5.0],
-+ [libxklavier], [Keyboard layout selection])
-
- dnl ************************************
- dnl *** Xsettings daemon is optional ***
-diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c
b/dialogs/keyboard-settings/xfce-keyboard-settings.c
-index 631dc69..5ff7ae3 100644
---- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
-+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
-@@ -395,7 +395,11 @@ xfce_keyboard_settings_finalize (GObject *object)
-
- #ifdef HAVE_LIBXKLAVIER
- /* Stop xklavier engine */
-+#ifdef HAVE_LIBXKLAVIER5
-+ xkl_engine_stop_listen (settings->priv->xkl_engine,
XKLL_TRACK_KEYBOARD_STATE);
-+#else
- xkl_engine_stop_listen (settings->priv->xkl_engine);
-+#endif /* HAVE_LIBXKLAVIER5 */
- #endif /* HAVE_LIBXKLAVIER */
-
- g_object_unref (G_OBJECT (settings->priv->provider));
---
-cgit v0.8.2.1
