[meta-xfce] xfce4-settings 4.8.2: change default icon theme to 'gnome'

[meta-xfce] xfce4-settings 4.8.2: change default icon theme to 'gnome'

[Koen Kooi]

'task-xfce4-base' doesn't install the 'Rodent' theme leading to missing icons. With this patch all icons show up.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 ...settingsd-use-gnome-as-default-icon-theme.patch |   29 ++++++++++++++++++++
 .../xfce4-settings/xfce4-settings_4.8.2.bb         |    6 +++-
 2 files changed, 34 insertions(+), 1 deletions(-)
 create mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xfsettingsd-use-gnome-as-default-icon-theme.patch

diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xfsettingsd-use-gnome-as-default-icon-theme.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xfsettingsd-use-gnome-as-default-icon-theme.patch
new file mode 100644
index 0000000..d428848
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xfsettingsd-use-gnome-as-default-icon-theme.patch
@@ -0,0 +1,29 @@
+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
+
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.8.2.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.8.2.bb
index 7b31dae..258c238 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.8.2.bb
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.8.2.bb
@@ -4,9 +4,13 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS = "exo gtk+ libxfce4util libxfce4ui xfconf dbus-glib libxi virtual/libx11 xrandr libnotify libxcursor libxklavier"
 
-PR = "r0"
+PR = "r1"
 
 inherit xfce
 
+SRC_URI += "file://0001-xfsettingsd-use-gnome-as-default-icon-theme.patch"
+
 SRC_URI[md5sum] = "a45420fea20f29265ab6785cb1d07377"
 SRC_URI[sha256sum] = "3f79865a6a3817f3c868f2412cbf105e73e54810438f62035699ae5fd72c29d0"
+
+RRECOMMENDS_${PN} += "gnome-icon-theme"
-- 
1.6.6.1

Re: [meta-xfce] xfce4-settings 4.8.2: change default icon theme to 'gnome'

[Andreas Müller]

On Saturday, October 15, 2011 04:56:23 PM Koen Kooi wrote:
> 'task-xfce4-base' doesn't install the 'Rodent' theme leading to missing icons. With this patch all icons show up.
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  ...settingsd-use-gnome-as-default-icon-theme.patch |   29 ++++++++++++++++++++
>  .../xfce4-settings/xfce4-settings_4.8.2.bb         |    6 +++-
>  2 files changed, 34 insertions(+), 1 deletions(-)
>  create mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xfsettingsd-use-gnome-as-default-icon-theme.patch
> 
> diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xfsettingsd-use-gnome-as-default-icon-theme.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xfsettingsd-use-gnome-as-default-icon-theme.patch
> new file mode 100644
> index 0000000..d428848
> --- /dev/null
> +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xfsettingsd-use-gnome-as-default-icon-theme.patch
> @@ -0,0 +1,29 @@
> +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
> +
> diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.8.2.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.8.2.bb
> index 7b31dae..258c238 100644
> --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.8.2.bb
> +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.8.2.bb
> @@ -4,9 +4,13 @@ LICENSE = "GPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
>  DEPENDS = "exo gtk+ libxfce4util libxfce4ui xfconf dbus-glib libxi virtual/libx11 xrandr libnotify libxcursor libxklavier"
>  
> -PR = "r0"
> +PR = "r1"
>  
>  inherit xfce
>  
> +SRC_URI += "file://0001-xfsettingsd-use-gnome-as-default-icon-theme.patch"
> +
>  SRC_URI[md5sum] = "a45420fea20f29265ab6785cb1d07377"
>  SRC_URI[sha256sum] = "3f79865a6a3817f3c868f2412cbf105e73e54810438f62035699ae5fd72c29d0"
> +
> +RRECOMMENDS_${PN} += "gnome-icon-theme"
> 
One further step to a system working 'out of the box' and saving me time setting up a new image - thanks!

Acked-by: Andreas Müller <schnitzeltony@gmx.de>

Re: [meta-xfce] xfce4-settings 4.8.2: change default icon theme to 'gnome'

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 15-10-11 17:10, Andreas Müller schreef:
> On Saturday, October 15, 2011 04:56:23 PM Koen Kooi wrote:
>> 'task-xfce4-base' doesn't install the 'Rodent' theme leading to missing
>> icons. With this patch all icons show up.
>> 
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> ---

[..]

>> 
> One further step to a system working 'out of the box' and saving me time
> setting up a new image - thanks!

AFAICS the only further tweak needed is to debug the xfwm4 crash we have
been discussing off-list. I'm warming up strace to have a look when I get
some time :)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFOmaZoMkyGM64RGpERAjlmAJ9F94kW/gVEB1crVoZZuu7mF0g42wCglYQK
IUvy6R+OWaQ0+4zHmhwm3gw=
=l/wZ
-----END PGP SIGNATURE-----

Re: [meta-xfce] xfce4-settings 4.8.2: change default icon theme to 'gnome'

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 15-10-11 17:27, Koen Kooi schreef:
> Op 15-10-11 17:10, Andreas Müller schreef:
>> On Saturday, October 15, 2011 04:56:23 PM Koen Kooi wrote:
>>> 'task-xfce4-base' doesn't install the 'Rodent' theme leading to
>>> missing icons. With this patch all icons show up.
>>> 
>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> ---
> 
> [..]
> 
>>> 
>> One further step to a system working 'out of the box' and saving me
>> time setting up a new image - thanks!
> 
> AFAICS the only further tweak needed is to debug the xfwm4 crash we have 
> been discussing off-list. I'm warming up strace to have a look when I
> get some time :)

It always crashes after the shortcuts:

poll([{fd=5, events=POLLIN}], 1, 25000) = 1 ([{fd=5, revents=POLLIN}])
recvmsg(5, {msg_name(0)=NULL,
msg_iov(1)=[{"l\2\1\1\t\0\0\0\3\0\0\0=\0\0\0\6\1s\0\5\0\0\0:1.17\0\0\0"...,
2048}], msg_controllen=0, msg_flags=MSG_CMSG_CLOEXEC}, MSG_CMSG_CLOEXEC) = 169
recvmsg(5, 0xbef8d3d4, MSG_CMSG_CLOEXEC) = -1 EAGAIN (Resource temporarily
unavailable)
clock_gettime(CLOCK_MONOTONIC, {4590, 354766862}) = 0
sendmsg(5, {msg_name(0)=NULL,
msg_iov(2)=[{"l\1\0\1&\0\0\0\6\0\0\0x\0\0\0\1\1o\0\20\0\0\0/org/xfc"...,
136}, {"\30\0\0\0xfce4-keyboard-shortcuts\0\0\0\0"..., 38}],
msg_controllen=0, msg_flags=0}, MSG_NOSIGNAL) = 174
clock_gettime(CLOCK_MONOTONIC, {4590, 370483414}) = 0
poll([{fd=5, events=POLLIN}], 1, 25000) = 1 ([{fd=5, revents=POLLIN}])
recvmsg(5, {msg_name(0)=NULL,
msg_iov(1)=[{"l\2\1\1\231\16\0\0\245\0\0\0005\0\0\0\6\1s\0\5\0\0\0:1.17\0\0\0"...,
2048}], msg_controllen=0, msg_flags=MSG_CMSG_CLOEXEC}, MSG_CMSG_CLOEXEC) = 2048
recvmsg(5, {msg_name(0)=NULL,
msg_iov(1)=[{"\0\0\0\0\33\0\0\0move_window_workspace_2_"..., 2048}],
msg_controllen=0, msg_flags=MSG_CMSG_CLOEXEC}, MSG_CMSG_CLOEXEC) = 1761
clock_gettime(CLOCK_MONOTONIC, {4590, 559967057}) = 0
sendmsg(5, {msg_name(0)=NULL,
msg_iov(2)=[{"l\1\0\1V\0\0\0\7\0\0\0q\0\0\0\1\1o\0\20\0\0\0/org/xfc"...,
136}, {"\30\0\0\0xfce4-keyboard-shortcuts\0\0\0\0"..., 86}],
msg_controllen=0, msg_flags=0}, MSG_NOSIGNAL) = 222
- --- SIGSEGV (Segmentation fault) @ 0 (0) ---
- --- SIGSEGV (Segmentation fault) @ 0 (0) ---
+++ killed by SIGSEGV +++

But running it a second time always works, so I wonder if it's missing for
file/dir the first time.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFOmampMkyGM64RGpERAnLGAJ9G7GtsQIXEQlAz/UnRcG07YWtcNACffRvc
2m+/OaxOFnmVFnMPqvLsNio=
=E/go
-----END PGP SIGNATURE-----