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.12.0

Browse Source 
* Source is taken from external git repo as before due to problems patching
  binary files (icons). The revision is 4.12 release + Date/Time setter which
  was not accepted upstream.
* Touchscreen/invisible mouse pointer patches do not apply anymore and it is
  not a matter of simple rebasing due to new libinput support. Patches were
  kept because reimplemementation is in progress. This - together with
  libinput support - will be sent in a follow up patch.
* git repo was moved to github

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller 2015-03-03 01:15:16 +01:00 committed by Martin Jansa
parent 24c6e0236a
commit 4a752fb5d1
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ index 49a4c1e..5ec94e9 100644
- <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="DoubleClickTime" type="int" value="400"/>
<property name="DoubleClickDistance" type="int" value="5"/>
<property name="DndDragThreshold" type="int" value="8"/>
--

19
meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
View File

@ -6,20 +6,13 @@ DEPENDS = "exo exo-native garcon gtk+ libxfce4util libxfce4ui xfconf dbus-glib l
inherit xfce xfce-git
SRC_URI = " git://gitorious.org/xfce/xfce4-settings.git;protocol=git;branch=for-oe \
SRC_URI = " git://github.com/schnitzeltony/xfce4-settings.git;protocol=git;branch=for-oe-4.12.0 \
file://0001-xsettings.xml-remove-trouble-causing-comment.patch \
file://0002-xsettings.xml-Set-default-themes.patch \
file://touchscreen/invisible \
file://touchscreen/wait \
file://touchscreen/0001-add-cursor-theme-xfce-invisible.patch \
file://touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch \
file://touchscreen/0003-XfcePointersHelper-gets-a-pointer-to-XfceXSettingsHe.patch \
file://touchscreen/0004-XfceXSettingsHelper-gets-a-property-touchscreen-poin.patch \
file://touchscreen/0005-pointers-detect-a-change-of-pointer-device-used-and-.patch \
"
SRCREV = "b7a0e1fd77f5bb5c372223ff62aec7acf252f061"
SRCREV = "a4540c2350cecf53f7095027edd102c6a24e36af"
S = "${WORKDIR}/git"
PV = "4.11.0+git${SRCPV}"
PV = "4.12.0+git${SRCPV}"
EXTRA_OECONF += "--enable-maintainer-mode --disable-debug"
@ -36,12 +29,6 @@ FILES_${PN} += " \
${datadir}/xfce4 \
"
do_install_prepend() {
# somehow binary files are not patched correctly by oe-patch - so copy them
cp ${WORKDIR}/touchscreen/invisible ${S}/cursors
cp ${WORKDIR}/touchscreen/wait ${S}/cursors
}
RRECOMMENDS_${PN} += "gnome-icon-theme"
RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}"
RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}"