summaryrefslogtreecommitdiffstats
path: root/meta-xfce/recipes-xfce/xfce4-settings
diff options
context:
space:
mode:
Diffstat (limited to 'meta-xfce/recipes-xfce/xfce4-settings')
-rw-r--r--meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0002-xsettings.xml-Set-default-themes.patch2
-rw-r--r--meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb19
2 files changed, 4 insertions, 17 deletions
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0002-xsettings.xml-Set-default-themes.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0002-xsettings.xml-Set-default-themes.patch
index 498f8d00d..44478e6d8 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0002-xsettings.xml-Set-default-themes.patch
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0002-xsettings.xml-Set-default-themes.patch
@@ -24,7 +24,7 @@ index 49a4c1e..5ec94e9 100644
24- <property name="IconThemeName" type="empty"/> 24- <property name="IconThemeName" type="empty"/>
25+ <property name="ThemeName" type="string" value="Xfce"/> 25+ <property name="ThemeName" type="string" value="Xfce"/>
26+ <property name="IconThemeName" type="string" value="gnome"/> 26+ <property name="IconThemeName" type="string" value="gnome"/>
27 <property name="DoubleClickTime" type="int" value="250"/> 27 <property name="DoubleClickTime" type="int" value="400"/>
28 <property name="DoubleClickDistance" type="int" value="5"/> 28 <property name="DoubleClickDistance" type="int" value="5"/>
29 <property name="DndDragThreshold" type="int" value="8"/> 29 <property name="DndDragThreshold" type="int" value="8"/>
30-- 30--
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
index 290ec3de5..5ce38b913 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
@@ -6,20 +6,13 @@ DEPENDS = "exo exo-native garcon gtk+ libxfce4util libxfce4ui xfconf dbus-glib l
6 6
7inherit xfce xfce-git 7inherit xfce xfce-git
8 8
9SRC_URI = " git://gitorious.org/xfce/xfce4-settings.git;protocol=git;branch=for-oe \ 9SRC_URI = " git://github.com/schnitzeltony/xfce4-settings.git;protocol=git;branch=for-oe-4.12.0 \
10 file://0001-xsettings.xml-remove-trouble-causing-comment.patch \ 10 file://0001-xsettings.xml-remove-trouble-causing-comment.patch \
11 file://0002-xsettings.xml-Set-default-themes.patch \ 11 file://0002-xsettings.xml-Set-default-themes.patch \
12 file://touchscreen/invisible \
13 file://touchscreen/wait \
14 file://touchscreen/0001-add-cursor-theme-xfce-invisible.patch \
15 file://touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch \
16 file://touchscreen/0003-XfcePointersHelper-gets-a-pointer-to-XfceXSettingsHe.patch \
17 file://touchscreen/0004-XfceXSettingsHelper-gets-a-property-touchscreen-poin.patch \
18 file://touchscreen/0005-pointers-detect-a-change-of-pointer-device-used-and-.patch \
19" 12"
20SRCREV = "b7a0e1fd77f5bb5c372223ff62aec7acf252f061" 13SRCREV = "a4540c2350cecf53f7095027edd102c6a24e36af"
21S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
22PV = "4.11.0+git${SRCPV}" 15PV = "4.12.0+git${SRCPV}"
23 16
24EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" 17EXTRA_OECONF += "--enable-maintainer-mode --disable-debug"
25 18
@@ -36,12 +29,6 @@ FILES_${PN} += " \
36 ${datadir}/xfce4 \ 29 ${datadir}/xfce4 \
37" 30"
38 31
39do_install_prepend() {
40 # somehow binary files are not patched correctly by oe-patch - so copy them
41 cp ${WORKDIR}/touchscreen/invisible ${S}/cursors
42 cp ${WORKDIR}/touchscreen/wait ${S}/cursors
43}
44
45RRECOMMENDS_${PN} += "gnome-icon-theme" 32RRECOMMENDS_${PN} += "gnome-icon-theme"
46RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}" 33RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}"
47RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}" 34RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}"