CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfce4-settings: update to 4.10.0 and set default themes

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller 2012-05-19 23:55:58 +02:00
parent db799a93e2
commit 63753685fe
4 changed files with 68 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xfsettingsd-use-gnome-as-default-icon-theme.patch
View File

@ -1,29 +0,0 @@
From 576e7881bdc84390cc51210ee37e5bdd87a170fc Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Sat, 15 Oct 2011 16:43:09 +0200
Subject: [PATCH] xfsettingsd: use 'gnome' as default icon theme
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
Upstream-status: unacceptable (config)
xfsettingsd/xsettings.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml
index 049b4ed..d8c6a85 100644
--- a/xfsettingsd/xsettings.xml
+++ b/xfsettingsd/xsettings.xml
@@ -3,7 +3,7 @@
<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="IconThemeName" type="string" value="gnome"/>
</property>
<property name="Xft" type="empty">
<property name="DPI" type="int" value="-1"/>
--
1.6.6.1

31
meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xsettings.xml-remove-trouble-causing-comment.patch Normal file
View File

@ -0,0 +1,31 @@
From a84a7a6537544cdf56e1d4cad47a4cf002964039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 20 May 2012 15:20:08 +0200
Subject: [PATCH 1/2] xsettings.xml: remove trouble causing comment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
xfsettingsd/xsettings.xml | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml
index 8f9e2eb..49a4c1e 100644
--- a/xfsettingsd/xsettings.xml
+++ b/xfsettingsd/xsettings.xml
@@ -1,8 +1,3 @@
-<!--
- Default values for the X settings registry as described in
- http://www.freedesktop.org/wiki/Specifications/XSettingsRegistry
--->
-
<?xml version="1.0" encoding="UTF-8"?>
<channel name="xsettings" version="1.0">
<property name="Net" type="empty">
--
1.7.4.4

32
meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0002-xsettings.xml-Set-default-themes.patch Normal file
View File

@ -0,0 +1,32 @@
From 071a390ba09a8a412f73d295be81a805804a1f24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 20 May 2012 15:22:09 +0200
Subject: [PATCH 2/2] xsettings.xml: Set default themes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstram status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
xfsettingsd/xsettings.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml
index 49a4c1e..5ec94e9 100644
--- a/xfsettingsd/xsettings.xml
+++ b/xfsettingsd/xsettings.xml
@@ -1,8 +1,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="Xfce"/>
+ <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"/>
--
1.7.4.4

8
meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.8.3.bb → meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.10.0.bb
View File

@ -6,9 +6,11 @@ DEPENDS = "exo gtk+ libxfce4util libxfce4ui xfconf dbus-glib libxi virtual/libx1
inherit xfce
SRC_URI += "file://0001-xfsettingsd-use-gnome-as-default-icon-theme.patch"
SRC_URI += "file://0001-xsettings.xml-remove-trouble-causing-comment.patch \
file://0002-xsettings.xml-Set-default-themes.patch"
SRC_URI[md5sum] = "cc4dd9179ead9046c056431f01a12000"
SRC_URI[sha256sum] = "0843f09ba9673f1d1b5df8dce4a17b63c183a9ba3be75fb6ef99a67fc8c1f77e"
SRC_URI[md5sum] = "4669298cc8a4abf0e5a410016b575030"
SRC_URI[sha256sum] = "d878cc474e1e677e9607279b9a1007cb90ed35ff078de180259a8b2b8d06bc2e"
FILES_${PN} += "${libdir}/xfce4"
RRECOMMENDS_${PN} += "gnome-icon-theme"