From 1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Thu, 8 Oct 2015 22:51:41 +0200 Subject: initial commit for Enea Linux 5.0 arm Signed-off-by: Tudor Florea --- meta-xfce/README | 28 + meta-xfce/classes/thunar-plugin.bbclass | 10 + meta-xfce/classes/xfce-app.bbclass | 4 + meta-xfce/classes/xfce-git.bbclass | 7 + meta-xfce/classes/xfce-panel-plugin.bbclass | 11 + meta-xfce/classes/xfce.bbclass | 20 + meta-xfce/conf/layer.conf | 9 + meta-xfce/recipes-apps/gigolo/gigolo_0.4.2.bb | 11 + meta-xfce/recipes-apps/mousepad/mousepad_0.3.0.bb | 14 + meta-xfce/recipes-apps/orage/orage_4.10.0.bb | 19 + .../recipes-apps/ristretto/ristretto_0.6.3.bb | 13 + meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb | 24 + .../recipes-apps/xfce4-mixer/xfce4-mixer_4.10.0.bb | 14 + .../xfce4-notifyd/xfce4-notifyd_0.2.2.bb | 21 + .../files/0001-Fix-panel-plugin-build.patch | 43 ++ .../xfce4-screenshooter_1.8.1.bb | 19 + ...d-documantation-Makefile-has-no-install-t.patch | 29 + .../xfce4-taskmanager/xfce4-taskmanager_1.0.1.bb | 10 + .../xfce4-terminal/xfce4-terminal_0.6.3.bb | 12 + .../recipes-art/cursor-themes/openzone_1.2.3.bb | 29 + .../xfce4-icon-theme/xfce4-icon-theme_4.4.3.bb | 14 + .../xfwm4-themes/xfwm4-themes_4.10.0.bb | 19 + .../recipes-bindings/vala/xfce4-vala_4.10.3.bb | 14 + .../packagegroups/packagegroup-xfce-multimedia.bb | 10 + .../xfce4-mpc-plugin/xfce4-mpc-plugin_0.4.4.bb | 15 + meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.2.bb | 13 + .../battery/xfce4-battery-plugin_1.0.5.bb | 9 + .../clipman/xfce4-clipman-plugin_1.2.6.bb | 17 + .../closebutton/xfce4-closebutton-plugin_git.bb | 18 + .../cpufreq/xfce4-cpufreq-plugin_1.1.0.bb | 15 + .../cpugraph/xfce4-cpugraph-plugin_1.0.5.bb | 9 + .../datetime/xfce4-datetime-plugin_0.6.2.bb | 9 + .../diskperf/xfce4-diskperf-plugin_2.5.4.bb | 9 + .../embed/xfce4-embed-plugin_1.0.0.bb | 12 + .../equake/xfce4-equake-plugin_1.3.5.bb | 12 + .../eyes/xfce4-eyes-plugin_4.4.2.bb | 11 + .../fsguard/xfce4-fsguard-plugin_1.0.1.bb | 9 + ...-period-to-be-set-at-250ms-resolution.-Pa.patch | 36 ++ .../genmon/xfce4-genmon-plugin_3.4.0.bb | 13 + .../mailwatch/xfce4-mailwatch-plugin_1.2.0.bb | 11 + .../mount/xfce4-mount-plugin_0.6.4.bb | 10 + .../netload/xfce4-netload-plugin_1.2.0.bb | 9 + .../files/0001-Bump-dependency-to-Xfce-4.10.patch | 128 +++++ ...atus-icon.c-remove-deprecated-g_type_init.patch | 32 ++ .../notes/xfce4-notes-plugin_1.7.7.bb | 20 + .../places/xfce4-places-plugin_1.6.0.bb | 12 + .../systemload/xfce4-systemload-plugin_1.1.1.bb | 11 + .../time-out/xfce4-time-out-plugin_1.0.1.bb | 10 + .../wavelan/xfce4-wavelan-plugin_0.5.11.bb | 9 + ...-ready-for-met.no-locationforecast-1.2-AP.patch | 162 ++++++ ...et.no-locationforecastLTS-1.2-API-bug-109.patch | 27 + .../weather/xfce4-weather-plugin_0.8.3.bb | 17 + .../whisker/xfce4-whiskermenu-plugin_1.3.2.bb | 10 + .../xkb/xfce4-xkb-plugin_0.7.0.bb | 16 + .../archive/thunar-archive-plugin_0.3.1.bb | 12 + .../media-tags/thunar-media-tags-plugin_0.2.1.bb | 11 + meta-xfce/recipes-xfce/exo/exo/configure.patch | 43 ++ .../recipes-xfce/exo/exo/exo-no-tests-0.8.patch | 31 ++ .../exo/exo/reduce-build-to-exo-csource-only.patch | 80 +++ meta-xfce/recipes-xfce/exo/exo_0.10.2.bb | 37 ++ ...ations.menu-don-t-bloat-settings-menu-by-.patch | 35 ++ meta-xfce/recipes-xfce/garcon/garcon_0.2.1.bb | 14 + .../gtk-xfce-engine/gtk-xfce-engine_3.0.1.bb | 23 + ...-private-xfce4-keyboard-shortcuts.xml-fix.patch | 31 ++ ...figure.ac.in-remove-optional-gtk3-support.patch | 37 ++ .../recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb | 29 + .../libxfce4util/libxfce4util_4.10.1.bb | 10 + .../packagegroups/packagegroup-xfce-base.bb | 35 ++ .../packagegroups/packagegroup-xfce-extended.bb | 56 ++ .../thunar-volman/thunar-volman_0.8.0.bb | 15 + meta-xfce/recipes-xfce/thunar/thunar_1.6.3.bb | 29 + ...01-configure-use-pkg-config-for-freetype2.patch | 45 ++ meta-xfce/recipes-xfce/tumbler/tumbler_0.1.30.bb | 36 ++ .../xfce4-appfinder/xfce4-appfinder_4.10.1.bb | 10 + .../xdt-autogen_dependency.patch | 13 + .../xfce4-dev-tools/xfce4-dev-tools_4.11.0.bb | 26 + .../recipes-xfce/xfce4-panel/xfce4-panel_4.10.1.bb | 29 + .../xfce4-power-manager_1.4.1.bb | 42 ++ ...01-configure.in-hard-code-path-to-iceauth.patch | 40 ++ .../xfce4-session/xfce4-session_4.10.1.bb | 36 ++ ...ttings.xml-remove-trouble-causing-comment.patch | 31 ++ .../0002-xsettings.xml-Set-default-themes.patch | 32 ++ .../0001-add-cursor-theme-xfce-invisible.patch | 248 +++++++++ ...ngs-dialog-add-touchscreen-pointer-option.patch | 152 ++++++ ...sHelper-gets-a-pointer-to-XfceXSettingsHe.patch | 137 +++++ ...gsHelper-gets-a-property-touchscreen-poin.patch | 249 +++++++++ ...tect-a-change-of-pointer-device-used-and-.patch | 589 +++++++++++++++++++++ .../xfce4-settings/touchscreen/invisible | Bin 0 -> 4160 bytes .../xfce4-settings/xfce4-settings/touchscreen/wait | Bin 0 -> 126096 bytes .../xfce4-settings/xfce4-settings_git.bb | 47 ++ .../xfconf/files/0001-Simplify-checks.patch | 112 ++++ meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb | 16 + .../recipes-xfce/xfdesktop/xfdesktop_4.10.2.bb | 15 + ...-display-events-when-time-is-set-backward.patch | 33 ++ meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb | 36 ++ 95 files changed, 3597 insertions(+) create mode 100644 meta-xfce/README create mode 100644 meta-xfce/classes/thunar-plugin.bbclass create mode 100644 meta-xfce/classes/xfce-app.bbclass create mode 100644 meta-xfce/classes/xfce-git.bbclass create mode 100644 meta-xfce/classes/xfce-panel-plugin.bbclass create mode 100644 meta-xfce/classes/xfce.bbclass create mode 100644 meta-xfce/conf/layer.conf create mode 100644 meta-xfce/recipes-apps/gigolo/gigolo_0.4.2.bb create mode 100644 meta-xfce/recipes-apps/mousepad/mousepad_0.3.0.bb create mode 100644 meta-xfce/recipes-apps/orage/orage_4.10.0.bb create mode 100644 meta-xfce/recipes-apps/ristretto/ristretto_0.6.3.bb create mode 100644 meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb create mode 100644 meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.10.0.bb create mode 100644 meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.2.2.bb create mode 100644 meta-xfce/recipes-apps/xfce4-screenshooter/files/0001-Fix-panel-plugin-build.patch create mode 100644 meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb create mode 100644 meta-xfce/recipes-apps/xfce4-taskmanager/files/0001-do-not-build-documantation-Makefile-has-no-install-t.patch create mode 100644 meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.0.1.bb create mode 100644 meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.6.3.bb create mode 100644 meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb create mode 100644 meta-xfce/recipes-art/xfce4-icon-theme/xfce4-icon-theme_4.4.3.bb create mode 100644 meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb create mode 100644 meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb create mode 100644 meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb create mode 100644 meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.4.4.bb create mode 100644 meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.2.bb create mode 100644 meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.0.5.bb create mode 100644 meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.2.6.bb create mode 100644 meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb create mode 100644 meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.1.0.bb create mode 100644 meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.5.bb create mode 100644 meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.6.2.bb create mode 100644 meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.5.4.bb create mode 100644 meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb create mode 100644 meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.5.bb create mode 100644 meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.4.2.bb create mode 100644 meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.0.1.bb create mode 100644 meta-xfce/recipes-panel-plugins/genmon/files/0001-Allow-timer-period-to-be-set-at-250ms-resolution.-Pa.patch create mode 100644 meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_3.4.0.bb create mode 100644 meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.2.0.bb create mode 100644 meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_0.6.4.bb create mode 100644 meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.2.0.bb create mode 100644 meta-xfce/recipes-panel-plugins/notes/files/0001-Bump-dependency-to-Xfce-4.10.patch create mode 100644 meta-xfce/recipes-panel-plugins/notes/files/0002-main-status-icon.c-remove-deprecated-g_type_init.patch create mode 100644 meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.7.7.bb create mode 100644 meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.6.0.bb create mode 100644 meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.1.1.bb create mode 100644 meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.1.bb create mode 100644 meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.11.bb create mode 100644 meta-xfce/recipes-panel-plugins/weather/files/0001-Make-plugin-ready-for-met.no-locationforecast-1.2-AP.patch create mode 100644 meta-xfce/recipes-panel-plugins/weather/files/0002-Switch-to-met.no-locationforecastLTS-1.2-API-bug-109.patch create mode 100644 meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.3.bb create mode 100644 meta-xfce/recipes-panel-plugins/whisker/xfce4-whiskermenu-plugin_1.3.2.bb create mode 100644 meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.7.0.bb create mode 100644 meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.3.1.bb create mode 100644 meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.2.1.bb create mode 100644 meta-xfce/recipes-xfce/exo/exo/configure.patch create mode 100644 meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch create mode 100644 meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch create mode 100644 meta-xfce/recipes-xfce/exo/exo_0.10.2.bb create mode 100644 meta-xfce/recipes-xfce/garcon/files/0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch create mode 100644 meta-xfce/recipes-xfce/garcon/garcon_0.2.1.bb create mode 100644 meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.0.1.bb create mode 100644 meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch create mode 100644 meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch create mode 100644 meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb create mode 100644 meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.10.1.bb create mode 100644 meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb create mode 100644 meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb create mode 100644 meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.0.bb create mode 100644 meta-xfce/recipes-xfce/thunar/thunar_1.6.3.bb create mode 100644 meta-xfce/recipes-xfce/tumbler/tumbler/0001-configure-use-pkg-config-for-freetype2.patch create mode 100644 meta-xfce/recipes-xfce/tumbler/tumbler_0.1.30.bb create mode 100644 meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.10.1.bb create mode 100644 meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools-4.11.0/xdt-autogen_dependency.patch create mode 100644 meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.11.0.bb create mode 100644 meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.10.1.bb create mode 100644 meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.4.1.bb create mode 100644 meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch create mode 100644 meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.1.bb create mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xsettings.xml-remove-trouble-causing-comment.patch create mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0002-xsettings.xml-Set-default-themes.patch create mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch create mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch create mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0003-XfcePointersHelper-gets-a-pointer-to-XfceXSettingsHe.patch create mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0004-XfceXSettingsHelper-gets-a-property-touchscreen-poin.patch create mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0005-pointers-detect-a-change-of-pointer-device-used-and-.patch create mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/invisible create mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/wait create mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb create mode 100644 meta-xfce/recipes-xfce/xfconf/files/0001-Simplify-checks.patch create mode 100644 meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb create mode 100644 meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.10.2.bb create mode 100644 meta-xfce/recipes-xfce/xfwm4/files/0001-don-t-block-display-events-when-time-is-set-backward.patch create mode 100644 meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb (limited to 'meta-xfce') diff --git a/meta-xfce/README b/meta-xfce/README new file mode 100644 index 000000000..5caff8fd0 --- /dev/null +++ b/meta-xfce/README @@ -0,0 +1,28 @@ +This layer depends on: + +URI: git://github.com/openembedded/oe-core.git +branch: dizzy +revision: HEAD + +URI: git://github.com/openembedded/meta-oe.git +branch: dizzy +revision: HEAD +meta-xfce depends on meta-oe and meta-multimedia in this repository. + +To avoid dependencies on meta-multimedia you need to mask recipes by adding +this to local.conf: + +BBMASK = "meta-xfce/recipes-multimedia" + +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce][dizzy]' in the subject' + +When sending single patches, please using something like: +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-xfce][dizzy][PATCH' + +Interim layer maintainer: Andreas Müller + +Dizzy branch maintainers: + Otavio Salvador + Armin Kuster + +Prefix email subject with: [dizzy] diff --git a/meta-xfce/classes/thunar-plugin.bbclass b/meta-xfce/classes/thunar-plugin.bbclass new file mode 100644 index 000000000..4ec073a67 --- /dev/null +++ b/meta-xfce/classes/thunar-plugin.bbclass @@ -0,0 +1,10 @@ +inherit xfce + +DEPENDS += "thunar" + +SRC_URI = "http://archive.xfce.org/src/thunar-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2" + +FILES_${PN} += "${libdir}/thunarx-2/*.so" +FILES_${PN}-dbg += "${libdir}/thunarx-2/.debug" +FILES_${PN}-dev += "${libdir}/thunarx-2/*.la" + diff --git a/meta-xfce/classes/xfce-app.bbclass b/meta-xfce/classes/xfce-app.bbclass new file mode 100644 index 000000000..8780ebfd9 --- /dev/null +++ b/meta-xfce/classes/xfce-app.bbclass @@ -0,0 +1,4 @@ +inherit xfce + +SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2" + diff --git a/meta-xfce/classes/xfce-git.bbclass b/meta-xfce/classes/xfce-git.bbclass new file mode 100644 index 000000000..3fc18d275 --- /dev/null +++ b/meta-xfce/classes/xfce-git.bbclass @@ -0,0 +1,7 @@ +do_configure_prepend() { + cd ${S} + NOCONFIGURE=yes ./autogen.sh + cd ${B} +} + +AUTOTOOLS_COPYACLOCAL = "1" diff --git a/meta-xfce/classes/xfce-panel-plugin.bbclass b/meta-xfce/classes/xfce-panel-plugin.bbclass new file mode 100644 index 000000000..b2f06781d --- /dev/null +++ b/meta-xfce/classes/xfce-panel-plugin.bbclass @@ -0,0 +1,11 @@ +inherit xfce + +DEPENDS += "libxfce4ui libxfce4util xfce4-panel" + +SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2" + +FILES_${PN} += "${datadir}/xfce4/panel-plugins/" +FILES_${PN} += "${datadir}/xfce4/panel/plugins/" +FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so" +FILES_${PN} += "${libdir}/xfce4/panel/plugins/*.so" +FILES_${PN}-dbg += "${libexecdir}/xfce4/panel-plugins/.debug" diff --git a/meta-xfce/classes/xfce.bbclass b/meta-xfce/classes/xfce.bbclass new file mode 100644 index 000000000..f4ef55643 --- /dev/null +++ b/meta-xfce/classes/xfce.bbclass @@ -0,0 +1,20 @@ +def xfce_verdir(v): + import re + m = re.match("^([0-9]+)\.([0-9]+)", v) + return "%s.%s" % (m.group(1), m.group(2)) + +HOMEPAGE = "http://www.xfce.org" +SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2" + +inherit autotools gettext gtk-icon-cache pkgconfig + +FILES_${PN} += "${datadir}/icons/* ${datadir}/applications/* ${libdir}/xfce4/modules/*.so*" +FILES_${PN}-doc += "${datadir}/xfce4/doc" + +FILES_${PN}-dev += "${libdir}/xfce4/*/*.la" +FILES_${PN}-dev += "${libdir}/xfce4/*/*/*.la" +FILES_${PN}-staticdev += "${libdir}/xfce4/*/*.a" +FILES_${PN}-staticdev += "${libdir}/xfce4/*/*/*.a" +FILES_${PN}-dbg += "${libdir}/xfce4/*/.debug" +FILES_${PN}-dbg += "${libdir}/xfce4/*/*/.debug" + diff --git a/meta-xfce/conf/layer.conf b/meta-xfce/conf/layer.conf new file mode 100644 index 000000000..d669e4e95 --- /dev/null +++ b/meta-xfce/conf/layer.conf @@ -0,0 +1,9 @@ +# We have a conf and classes directory, append to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have a recipes directory, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "xfce-layer" +BBFILE_PATTERN_xfce-layer := "^${LAYERDIR}/" +BBFILE_PRIORITY_xfce-layer = "7" diff --git a/meta-xfce/recipes-apps/gigolo/gigolo_0.4.2.bb b/meta-xfce/recipes-apps/gigolo/gigolo_0.4.2.bb new file mode 100644 index 000000000..c846e7802 --- /dev/null +++ b/meta-xfce/recipes-apps/gigolo/gigolo_0.4.2.bb @@ -0,0 +1,11 @@ +SUMMARY = "Gigolo is a frontend to easily manage connections to remote filesystems using GIO/GVfs" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "gtk+ intltool-native xfce4-dev-tools-native" + +inherit xfce-app + +SRC_URI[md5sum] = "4abc6fde56572adf3ec3a0181092584c" +SRC_URI[sha256sum] = "553fc78fe4e7bd2f01f3851baea7e63f6414fe652dfb4b08c60b5c4b2b909164" diff --git a/meta-xfce/recipes-apps/mousepad/mousepad_0.3.0.bb b/meta-xfce/recipes-apps/mousepad/mousepad_0.3.0.bb new file mode 100644 index 000000000..494753190 --- /dev/null +++ b/meta-xfce/recipes-apps/mousepad/mousepad_0.3.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "A simple text editor for Xfce" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +# intltool to provide intltool.m4 with AC_PROG_INTLTOOL +# xfce4-dev-tools-native for XDT_I18N macro and more importantly XDT_CHECK_OPTIONAL_PACKAGE +# which fixes mousepad/Makefile.am:72: error: HAVE_DBUS does not appear in AM_CONDITIONAL +DEPENDS = "gtk+ dbus dbus-glib gtksourceview2 intltool-native xfce4-dev-tools-native" + +inherit xfce-app + +SRC_URI[md5sum] = "dcfcdfaa8a19c89f35d5f6f64753e6e1" +SRC_URI[sha256sum] = "10f27506994d0d0b8f9e02555404a144babedab97517abe3b6be8b2d21ff046d" diff --git a/meta-xfce/recipes-apps/orage/orage_4.10.0.bb b/meta-xfce/recipes-apps/orage/orage_4.10.0.bb new file mode 100644 index 000000000..8164c3c14 --- /dev/null +++ b/meta-xfce/recipes-apps/orage/orage_4.10.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "Xfce Calender" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" +DEPENDS = "gtk+ xfce4-panel libical popt" + +inherit xfce-app + +SRC_URI[md5sum] = "b33fa272d92f539a224a7a40b1926dfc" +SRC_URI[sha256sum] = "6cb854f3437e31bab23abfce97bd10afa1636a9a1480d80e14e26c85d06be7c0" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" + +PACKAGES =+ "xfce4-orageclock-plugin" +FILES_${PN} += "${datadir}/dbus-1" +FILES_${PN}-dbg += "${libdir}/orage/xfce4/panel-plugins/.debug" +FILES_xfce4-orageclock-plugin = "${libdir}/orage/xfce4/panel-plugins/xfce4-orageclock-plugin ${datadir}/xfce4/panel-plugins" + diff --git a/meta-xfce/recipes-apps/ristretto/ristretto_0.6.3.bb b/meta-xfce/recipes-apps/ristretto/ristretto_0.6.3.bb new file mode 100644 index 000000000..8e485f950 --- /dev/null +++ b/meta-xfce/recipes-apps/ristretto/ristretto_0.6.3.bb @@ -0,0 +1,13 @@ +SUMMARY = "Tiny image-viewer" +HOMEPAGE = "http://goodies.xfce.org/projects/applications/ristretto" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=35d145429ad3cbf5308d1dc93f66376b" +DEPENDS = "exo libexif gtk+ dbus-glib libxfce4ui libxfce4util xfconf cairo" + +inherit xfce-app + +RRECOMMENDS_${PN} += "tumbler" + +SRC_URI[md5sum] = "6b8c9a5d7ed319e4c84a9fefaa18792c" +SRC_URI[sha256sum] = "2b6816de298e9a0d9b95662664690713c4123a9ac813a27bdde4727a03472d79" diff --git a/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb new file mode 100644 index 000000000..9e4b6963c --- /dev/null +++ b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb @@ -0,0 +1,24 @@ +SUMMARY = "Lightweight, desktop independent GTK+ archive manager" +HOMEPAGE = "http://xarchiver.sourceforge.net" +SECTION = "x11" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "gtk+ glib-2.0 xfce4-dev-tools-native intltool-native" + +SRC_URI = "git://gitorious.org/xfce/xarchiver.git;branch=master" +SRCREV = "e80e90528c9aab2fe36d9078b945b44c05cc20d3" +PV = "0.5.3" +S = "${WORKDIR}/git" + +inherit xfce-git gettext pkgconfig autotools gtk-icon-cache + +# install tap files for thunar-archive-plugin in ${libdir}/thunar-archive-plugin +EXTRA_OECONF += "--libexecdir=${libdir}" + +EXTRA_OECONF += "--enable-maintainer-mode" + +FILES_${PN} += "${libdir}/thunar-archive-plugin" + +RRECOMMENDS_${PN} = "lzop zip tar bzip2 unzip xz" diff --git a/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.10.0.bb b/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.10.0.bb new file mode 100644 index 000000000..aa3202fb8 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.10.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "A volume control application based on GStreamer" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit xfce-panel-plugin + +DEPENDS += "glib-2.0 gst-plugins-base gtk+ xfconf libunique" + +SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2" + +SRC_URI[md5sum] = "e47d5b3e873fdee3fa80d309a5f53e9c" +SRC_URI[sha256sum] = "a8c589001b438171ea5a6b46ce9895c3ffbc5081ab67805ab9870e540068dade" + +RDEPENDS_${PN} = "gst-meta-audio" diff --git a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.2.2.bb b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.2.2.bb new file mode 100644 index 000000000..eb554ce0a --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.2.2.bb @@ -0,0 +1,21 @@ +SUMMARY = "Easily themable notification daemon with transparency effects" +HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-notifyd" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "libxfce4util libxfce4ui xfconf gtk+ dbus dbus-glib" + + +inherit xfce-app + +do_compile_prepend() { + mkdir -p xfce4-notifyd +} + +FILES_${PN} += " \ + ${libdir}/xfce4/notifyd \ + ${datadir}/themes \ + ${datadir}/dbus-1 \ +" + +SRC_URI[md5sum] = "8687fb7a0f270231ada265e363b6ffcc" +SRC_URI[sha256sum] = "b66e68dfc2164bcf479acd3c7e8b6f83065d23aef988535e2db3506d06a39168" diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/files/0001-Fix-panel-plugin-build.patch b/meta-xfce/recipes-apps/xfce4-screenshooter/files/0001-Fix-panel-plugin-build.patch new file mode 100644 index 000000000..98ce875b7 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-screenshooter/files/0001-Fix-panel-plugin-build.patch @@ -0,0 +1,43 @@ +From 08053be7adc6d4a83191efed735c3f565bcbcf1f Mon Sep 17 00:00:00 2001 +From: Samuli Suominen +Date: Sat, 5 May 2012 17:13:45 +0200 +Subject: [PATCH] Fix panel plugin build. + +- Don't use a versioned library. +- Build as a module. +- Only export needed symbols. +--- +Upstream-Status: applied + Makefile.am | 12 +++++++++--- + 1 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 45100fd..d0c0adb 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -132,13 +132,19 @@ panel_plugin_libscreenshooterplugin_la_CFLAGS = \ + @SOUP_CFLAGS@ + + panel_plugin_libscreenshooterplugin_la_LDFLAGS = \ ++ -avoid-version \ ++ -module \ ++ -no-undefined \ ++ -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \ ++ $(PLATFORM_LDFLAGS) ++ ++panel_plugin_libscreenshooterplugin_la_LIBADD = \ + @EXO_LIBS@ \ + @LIBXFCE4PANEL_LIBS@ \ + @GTHREAD_LIBS@ \ + @SOUP_LIBS@ \ +- @LIBXFCE4UI_LIBS@ +- +-panel_plugin_libscreenshooterplugin_la_LIBADD = lib/libscreenshooter.la ++ @LIBXFCE4UI_LIBS@ \ ++ lib/libscreenshooter.la + + panel_plugin_libscreenshooterplugin_la_SOURCES = \ + panel-plugin/screenshooter-plugin.c +-- +1.7.4.4 + diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb new file mode 100644 index 000000000..0e2e327f0 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb @@ -0,0 +1,19 @@ +SUMMARY = "Application to take screenshots" +HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-screenshooter" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" +DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11" + +inherit xfce-app + +SRC_URI += "file://0001-Fix-panel-plugin-build.patch" +SRC_URI[md5sum] = "d0ffea2052a8e70154cf13789070711f" +SRC_URI[sha256sum] = "40419892bd28989315eed053c159bba0f4264ed8c6c6738806024e481eab9492" + +do_compile_prepend() { + mkdir -p lib +} + +FILES_${PN} += "${datadir}/xfce4/panel/plugins \ + ${libdir}/xfce4/panel/plugins" diff --git a/meta-xfce/recipes-apps/xfce4-taskmanager/files/0001-do-not-build-documantation-Makefile-has-no-install-t.patch b/meta-xfce/recipes-apps/xfce4-taskmanager/files/0001-do-not-build-documantation-Makefile-has-no-install-t.patch new file mode 100644 index 000000000..eeee8f73b --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-taskmanager/files/0001-do-not-build-documantation-Makefile-has-no-install-t.patch @@ -0,0 +1,29 @@ +From 9902fb9d4fce474426c35b73617149014799a0c8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 19 Sep 2013 16:43:59 +0200 +Subject: [PATCH] do not build documantation - Makefile has no install target +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [config] + +Signed-off-by: Andreas Müller +--- + Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 6ffa8d9..6aef17a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,5 @@ + SUBDIRS = \ + po \ +- doc \ + src + + desktopdir = $(datadir)/applications +-- +1.8.3.1 + diff --git a/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.0.1.bb b/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.0.1.bb new file mode 100644 index 000000000..e59710823 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.0.1.bb @@ -0,0 +1,10 @@ +SUMMARY = "Easy to use task manager" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit xfce-app + +DEPENDS = "gtk+ cairo libwnck xfce4-dev-tools-native exo-native" + +SRC_URI[md5sum] = "b8a707b25e32c1a296eb50d609aa49b8" +SRC_URI[sha256sum] = "f5aa2796dd9971f8ae400238bfcdd9fa1322dba1466d1e6fd5bf8ee7e88bee86" diff --git a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.6.3.bb b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.6.3.bb new file mode 100644 index 000000000..1049b27a8 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.6.3.bb @@ -0,0 +1,12 @@ +SUMMARY = "Terminal emulator for the Xfce desktop environment" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "glib-2.0 gtk+ vte libxfce4ui" + +inherit xfce-app + +FILES_${PN} += "${datadir}/xfce4 \ + ${datadir}/gnome-control-center" + +SRC_URI[md5sum] = "6a2816d8b0933cd707ed456ceb731399" +SRC_URI[sha256sum] = "912f4716c2395a14a80620ef982b4af1e2a67a8df9a1ef0b802ecae826057e08" diff --git a/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb b/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb new file mode 100644 index 000000000..9547736bd --- /dev/null +++ b/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb @@ -0,0 +1,29 @@ +SUMMARY = "X11 Mouse Theme" +HOMEPAGE = "http://xfce-look.org/content/show.php/OpenZone?content=111343" +SECTION = "x11/wm" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=a2f562fb8fb1e138b810d69521c4bcd7" +DEPENDS = "icon-slicer-native xcursorgen-native" + +inherit allarch + +SRC_URI = "http://xfce-look.org/CONTENT/content-files/111343-OpenZone-${PV}.tar.xz" +SRC_URI[md5sum] = "4dae968cbd525072664ef7a4fc7c4154" +SRC_URI[sha256sum] = "dc20f97a49e1ff1becf7853ef5f137ed30a4c27490540e755021d78d339efd92" + +S = "${WORKDIR}/OpenZone" + +do_install() { + install -d ${D}${datadir}/icons + for theme in `find -name '*.tar.xz'`; do + tar -Jxf ${theme} -C ${D}${datadir}/icons + done +} + +python populate_packages_prepend () { + icondir = bb.data.expand('${datadir}/icons', d) + do_split_packages(d, icondir, '^(.*)', '%s', 'Open Zone cursors %s', allow_dirs=True) +} + +PACKAGES_DYNAMIC += "^openzone-.*" +ALLOW_EMPTY_${PN} = "1" diff --git a/meta-xfce/recipes-art/xfce4-icon-theme/xfce4-icon-theme_4.4.3.bb b/meta-xfce/recipes-art/xfce4-icon-theme/xfce4-icon-theme_4.4.3.bb new file mode 100644 index 000000000..1e4b06bfe --- /dev/null +++ b/meta-xfce/recipes-art/xfce4-icon-theme/xfce4-icon-theme_4.4.3.bb @@ -0,0 +1,14 @@ +SUMMARY = "xfce4 icon theme rodent" +SECTION = "x11/wm" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "intltool-native xfce4-dev-tools-native" + +inherit xfce + +SRC_URI = "http://archive.xfce.org/src/art/${BPN}/${@'${PV}'[0:3]}/${BP}.tar.bz2" +SRC_URI[md5sum] = "73ce2977b84f634a6a6c5d9c27e336db" +SRC_URI[sha256sum] = "d4786692d56b8a563f66a5f260f1f13ade11e86c78cbcb25a9f9a5fc47cf66fa" + +FILES_${PN} += "${datadir}/xfce4/mime" diff --git a/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb b/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb new file mode 100644 index 000000000..7030f7a26 --- /dev/null +++ b/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "Additional (old) themes for Xfwm4" +SECTION = "x11/wm" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +inherit xfce + +SRC_URI = "http://archive.xfce.org/src/art/${BPN}/${@'${PV}'[0:4]}/${BP}.tar.bz2" +SRC_URI[md5sum] = "eaa58362053a3549c8be0b32efd3c54f" +SRC_URI[sha256sum] = "3214d5f00e9703b5e8c9e7c3287d606dedec7285ceb4d5db332e93ada66fd575" + +# using xfwm4-theme as in xfwm4 might cause warnings of packages supplied by +# multiple providers. So we use xfwm4-old-theme here. +python populate_packages_prepend () { + themedir = d.expand('${datadir}/themes') + do_split_packages(d, themedir, '^(.*)', 'xfwm4-old-theme-%s', 'XFWM4 theme %s', allow_dirs=True) +} + +PACKAGES_DYNAMIC += "^xfwm4-old-theme-.*" diff --git a/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb b/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb new file mode 100644 index 000000000..8e8e69129 --- /dev/null +++ b/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb @@ -0,0 +1,14 @@ +SUMMARY = "Xfce4 Vala provides bindings for the Xfce framework" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad" +DEPENDS = "libxfce4util garcon xfconf libxfce4ui xfce4-panel exo vala xfce4-dev-tools-native" + +inherit xfce + +SRC_URI = "http://archive.xfce.org/src/bindings/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2" +SRC_URI[md5sum] = "0bbb1d6e473e0fe9b335b7b1b49d8a71" +SRC_URI[sha256sum] = "07a8f2b7c09fcdd3d86e0c52adea3c58ca011d0142a93997a01b4af77260ae7b" + +FILES_${PN} += "${datadir}/vala-*/vapi" + +RDEPENDS_${PN} = "vala" diff --git a/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb b/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb new file mode 100644 index 000000000..00b0b9135 --- /dev/null +++ b/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb @@ -0,0 +1,10 @@ +SUMMARY = "All packages multimedia packages available for XFCE" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" + +inherit packagegroup + +RDEPENDS_${PN} = " \ + xfmpc \ + xfce4-mpc-plugin \ +" diff --git a/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.4.4.bb b/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.4.4.bb new file mode 100644 index 000000000..ebef2baca --- /dev/null +++ b/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.4.4.bb @@ -0,0 +1,15 @@ +SUMMARY = "Simple client plugin for Music Player Daemon" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin" +SECTION = "x11/application" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=3604d987e6dfdfc672c754d08953b0e0" + +inherit xfce-panel-plugin + +DEPENDS += "libmpd" + +# for now we recommend our own mpd-server +RRECOMMENDS_${PN} = "mpd" + +SRC_URI[md5sum] = "1c126ca71d6db1ac6a0cc6720554e7bd" +SRC_URI[sha256sum] = "4f0ce6146aa2680a4c1ca7bad1be30187a8a179e8c4355a8fe13d1fc38dac5c5" diff --git a/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.2.bb b/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.2.bb new file mode 100644 index 000000000..b1cabd682 --- /dev/null +++ b/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.2.bb @@ -0,0 +1,13 @@ +SUMMARY = "Music Player Daemon (MPD) client written in GTK+" +HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfmpc" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "gtk+ libxfce4util libxfce4ui libmpd vala-native" + +# for now we recommend our own mpd-server +RRECOMMENDS_${PN} = "mpd" + +inherit xfce-app + +SRC_URI[md5sum] = "e4e198850c2467c47783969ac9c16ec0" +SRC_URI[sha256sum] = "ed0cc2940bd5928bb30fab1531c22185a97bd0cc5beacd9e3be4d4cd994a6862" diff --git a/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.0.5.bb b/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.0.5.bb new file mode 100644 index 000000000..36cb444c4 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.0.5.bb @@ -0,0 +1,9 @@ +SUMMARY = "A battery monitor panel plugin for Xfce4, compatible with APM and ACP" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "ca2d394e411a20442a519efa0d14f8ec" +SRC_URI[sha256sum] = "f659b1af40ab72c93448affaa693ab551827a5600ce9b97a799b7c2419bdeb11" diff --git a/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.2.6.bb b/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.2.6.bb new file mode 100644 index 000000000..aee4a3dc2 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.2.6.bb @@ -0,0 +1,17 @@ +SUMMARY = "Clipman is a clipboard manager for Xfce" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +inherit xfce-panel-plugin + +DEPENDS += "xfconf xproto libxtst" + +SRC_URI[md5sum] = "f7f2440647493243cbd7787eaee92fcb" +SRC_URI[sha256sum] = "23043f99c3e5257d1f3d68b5ee5125e3469c15620d098e22c6250386197f48a5" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[unique] = "--enable-unique,--disable-unique,libunique" + +FILES_${PN} += "${datadir}/appdata" diff --git a/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb new file mode 100644 index 000000000..f96009eee --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb @@ -0,0 +1,18 @@ +SUMMARY = "Plugin displaying close button for application currently active" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f" + +inherit xfce-panel-plugin xfce-git gtk-icon-cache perlnative + +DEPENDS += "exo-native libwnck xfconf" + +PV = "0.1.0+gitr${SRCPV}" + +SRC_URI = "git://gitorious.org/xfce/xfce4-closebutton-plugin.git;branch=master" +SRCREV = "bd76154afe26ba8a5251a1887d88f9d855301850" +S = "${WORKDIR}/git" + +EXTRA_OECONF += "--enable-maintainer-mode" + +FILES_${PN} += "${datadir}/xfce4/closebutton/themes" diff --git a/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.1.0.bb b/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.1.0.bb new file mode 100644 index 000000000..7a99b4f75 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.1.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "Panel plugin to display frequency of all cpus" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=1f6f1c0be32491a0c8d2915607a28f36" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "dcc56af0e19266956c297d124ba551f4" +SRC_URI[sha256sum] = "eafa261bf984231ed8487c08decea6d916339d82b52f4bbe748e5c6a95c7f6b6" + +# defaults in xfce4-panel-plugin.bbclass don't match so override here +FILES_${PN} = "${datadir}/icons ${datadir}/xfce4 ${libdir}/xfce4/panel/plugins/*.so*" + +# *.so are required for plugin detection +INSANE_SKIP_${PN} = "dev-so" diff --git a/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.5.bb b/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.5.bb new file mode 100644 index 000000000..83e2bb5c0 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.5.bb @@ -0,0 +1,9 @@ +SUMMARY = "Panel plugin with graphical representation of the cpu frequency" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=415654f59d8fa70fe4eac2c3f86c8f5e" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "f0ebfabb273adf69361b37a3fa4b7912" +SRC_URI[sha256sum] = "85da0ec89aacfd31e0bbafcefea37cdca618d62e681c1c9da8bdd492f028f4c7" diff --git a/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.6.2.bb b/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.6.2.bb new file mode 100644 index 000000000..a97ba6c7d --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.6.2.bb @@ -0,0 +1,9 @@ +SUMMARY = "Panel plugin displaying date and time and a calendar when left-clicked" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "fe604a251eadbc5b0f2b4737b85d92c8" +SRC_URI[sha256sum] = "9734da671e8d1d7de5fae92093a05d653c9245b838542fb9aff3e10368cc9e2c" diff --git a/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.5.4.bb b/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.5.4.bb new file mode 100644 index 000000000..2df9b9f52 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.5.4.bb @@ -0,0 +1,9 @@ +SUMMARY = "Panel plugin displaying instant disk/partition performance" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=d3e627798d6a60bece47aa8b3532e1f1" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "2db453fc3ea2e4fe073ec313a25b0961" +SRC_URI[sha256sum] = "aab6b9c4e2f78620920efac6874c4edf426f05b63b94cfda0da8c99a91110a0b" diff --git a/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb b/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb new file mode 100644 index 000000000..32d6edfb4 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "A panel plugin that embeds arbitrary windows (or GtkPlug widgets) into the panel." +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit xfce-panel-plugin + +# DEPENDS += "xfconf xproto libxtst" + +SRC_URI[md5sum] = "c5b86cbc1c54ee7c1d2e95a4502fed8e" +SRC_URI[sha256sum] = "35d4c6c56dd6468c0e5afe66f657c1526f2d830a577105a51da43657651832e3" diff --git a/meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.5.bb b/meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.5.bb new file mode 100644 index 000000000..76cd5d4df --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.5.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Equake XFCE is a panel plugin for the XFCE panel which monitors earthquakes and displays an update each time a new earthquake occurs." +HOMEPAGE = "http://freecode.com/projects/equake-xfce" +SECTION = "x11/application" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "7c520e2f1cd0cc5e33d8346b12e31c02" +SRC_URI[sha256sum] = "43bbc781575c357c13ac6720eb8e8485115099411d5382668e106de58ab0e416" + +FILES_${PN} += "${libdir}/xfce4/panel-plugins/xfce4-equake-plugin" diff --git a/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.4.2.bb b/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.4.2.bb new file mode 100644 index 000000000..f1ed6c7c4 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.4.2.bb @@ -0,0 +1,11 @@ +SUMMARY = "Panel plugin with graphical representation of the cpu frequency" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "1ef352c68dd8929c9e8743200b758b3c" +SRC_URI[sha256sum] = "dad102fedd0d9e6df45338a018387b2aacaf24b05eb798275be0dfc05ffa3021" + +FILES_${PN} += "${datadir}/xfce4/eyes" diff --git a/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.0.1.bb b/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.0.1.bb new file mode 100644 index 000000000..144611521 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.0.1.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "The FSGuard panel plugin checks free space on a chosen mount point frequently and displays a message when a limit is reached" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin?&#recet_releases" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "9c179371475e2837004cc208026e30c1" +SRC_URI[sha256sum] = "fffb7ee09769ec0b991b8752b848578e6434a675a939c5588f0728c2ef33aab7" diff --git a/meta-xfce/recipes-panel-plugins/genmon/files/0001-Allow-timer-period-to-be-set-at-250ms-resolution.-Pa.patch b/meta-xfce/recipes-panel-plugins/genmon/files/0001-Allow-timer-period-to-be-set-at-250ms-resolution.-Pa.patch new file mode 100644 index 000000000..28c0eb144 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/genmon/files/0001-Allow-timer-period-to-be-set-at-250ms-resolution.-Pa.patch @@ -0,0 +1,36 @@ +From 2d5fa307827a7b32af4f7b2ae0604f943e3a6e99 Mon Sep 17 00:00:00 2001 +From: John Lindgren +Date: Tue, 21 Aug 2012 19:33:45 -0400 +Subject: [PATCH] Allow timer period to be set at 250ms resolution. Patch + from Miguel Guedes. Closes: #9102. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Applied [1] + +[1] http://git.xfce.org/panel-plugins/xfce4-genmon-plugin/commit/?id=2d5fa307827a7b32af4f7b2ae0604f943e3a6e99 + +Signed-off-by: Andreas Müller +--- + panel-plugin/config_gui.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/panel-plugin/config_gui.c b/panel-plugin/config_gui.c +index a4c891d..90e55c1 100644 +--- a/panel-plugin/config_gui.c ++++ b/panel-plugin/config_gui.c +@@ -106,8 +106,8 @@ int genmon_CreateConfigGUI (GtkWidget *vbox1, + gtk_widget_show (alignment1); + gtk_container_add (GTK_CONTAINER (eventbox1), alignment1); + +- wSc_Period_adj = gtk_adjustment_new (15, 1, 60*60*24, 1, 1, 0); +- wSc_Period = gtk_spin_button_new (GTK_ADJUSTMENT (wSc_Period_adj), 1, 0); ++ wSc_Period_adj = gtk_adjustment_new (15, .25, 60*60*24, .25, 1, 0); ++ wSc_Period = gtk_spin_button_new (GTK_ADJUSTMENT (wSc_Period_adj), .25, 2); + gtk_widget_show (wSc_Period); + gtk_container_add (GTK_CONTAINER (alignment1), wSc_Period); + gtk_tooltips_set_tip (tooltips, wSc_Period, +-- +1.7.6.5 + diff --git a/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_3.4.0.bb b/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_3.4.0.bb new file mode 100644 index 000000000..a13db62a3 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_3.4.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "This plugin cyclically spawns the indicated script/program, captures its output (stdout) and displays the resulting string into the panel." +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=68ad62c64cc6c620126241fd429e68fe" + +inherit xfce-panel-plugin + +SRC_URI += "file://0001-Allow-timer-period-to-be-set-at-250ms-resolution.-Pa.patch" + +SRC_URI[md5sum] = "24108b339bb040ed360266f53a245224" +SRC_URI[sha256sum] = "b0a5337b49c85623dc89f3c9e47c7374b1d466af2418033d2d6dfc57a9790387" + +S = "${WORKDIR}/xfce4-genmon-plugin-3.4" diff --git a/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.2.0.bb b/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.2.0.bb new file mode 100644 index 000000000..00859a176 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.2.0.bb @@ -0,0 +1,11 @@ +SUMMARY = "Multi-protocol, multi-mailbox mail watcher for the Xfce4 panel" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit xfce-panel-plugin + +DEPENDS += "gnutls libgcrypt" + +SRC_URI[md5sum] = "7263114ec0f2987a3aff15afeeb45577" +SRC_URI[sha256sum] = "624acc8229a8593c0dfeb28f883f4958119a715cc81cecdbaf29efc8ab1edcad" diff --git a/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_0.6.4.bb b/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_0.6.4.bb new file mode 100644 index 000000000..6dc2c1721 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_0.6.4.bb @@ -0,0 +1,10 @@ +SUMMARY = "Mount/umount utility for the xfce panel" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "f5917e9aa2a06bc6a872cc10d2ee4f6f" +SRC_URI[sha256sum] = "541d7af84d7d0b00ae547aa1f438e2fac51ee4195c4d0a17173c4f72accb227d" diff --git a/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.2.0.bb b/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.2.0.bb new file mode 100644 index 000000000..ef1039b79 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.2.0.bb @@ -0,0 +1,9 @@ +SUMMARY = "Panel plugin displaying current load of the network interfaces" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=35a7203c41b86d15546dddc05995f97f" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "05180d60ed347029dc125368c1d4406e" +SRC_URI[sha256sum] = "c824f09e2d3860011b44d8272d661c458237786828027f3d9ad6a1d4f0096845" diff --git a/meta-xfce/recipes-panel-plugins/notes/files/0001-Bump-dependency-to-Xfce-4.10.patch b/meta-xfce/recipes-panel-plugins/notes/files/0001-Bump-dependency-to-Xfce-4.10.patch new file mode 100644 index 000000000..4a3b1ce58 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/notes/files/0001-Bump-dependency-to-Xfce-4.10.patch @@ -0,0 +1,128 @@ +From 26c4ad1765d0d59b3918363d38174c5f5bfe0dcd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 20 Sep 2013 22:49:47 +0200 +Subject: [PATCH] Bump dependency to Xfce 4.10 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Drop support for Xfce <= 4.6. +Replace libxfcegui4 dependency against libxfce4ui. +Update to new libtool syntax (use LT_PREREQ.) + +Upstream-status: Backport [1] + +[1] http://git.xfce.org/panel-plugins/xfce4-notes-plugin/commit/?id=d11fe51fae95b5b4963847be76ae4a07409a6076 + +Signed-off-by: Andreas Müller +--- + configure.ac | 23 ++++++++++------------- + src/Makefile.am | 4 ++-- + src/xfce4-notes-settings.c | 6 +++--- + 3 files changed, 15 insertions(+), 18 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 20d27e5..8d4113f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -24,21 +24,17 @@ AC_INIT([Notes], [xfce4_notes_plugin_version], [http://bugzilla.xfce.org/], [xfc + AC_REVISION([xfce4_notes_plugin_version_build]) + AC_CANONICAL_TARGET() + ++LT_PREREQ([2.2.6]) ++LT_INIT([disable-static]) ++ + AM_INIT_AUTOMAKE([1.11 dist-bzip2]) + AM_CONFIG_HEADER([config.h]) + AM_MAINTAINER_MODE() + AM_SILENT_RULES([yes]) + +-dnl Avoid g77 and g++ checks +-m4_undefine([AC_PROG_CXX]) +-m4_defun([AC_PROG_CXX],[]) +-m4_undefine([AC_PROG_F77]) +-m4_defun([AC_PROG_F77],[]) +- + dnl Check for basic programs + AM_PROG_CC_C_O() + AC_PROG_LD() +-AC_PROG_LIBTOOL() + AC_PROG_INSTALL() + AC_PROG_INTLTOOL() + +@@ -51,12 +47,13 @@ AC_SUBST([MATH_LIBS], [" -lm"]) + + dnl Check for required packages + XDT_CHECK_LIBX11_REQUIRE() +-XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.16.0]) +-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0]) +-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0]) +-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0]) +-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0]) +-XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0]) ++XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0]) ++XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.24.0]) ++XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0]) ++XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0]) ++XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) ++XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.10.0]) ++XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0]) + XDT_CHECK_PACKAGE([UNIQUE], [unique-1.0], [1.0.0]) + + dnl Check for libxfce4panel >= 4.7 +diff --git a/src/Makefile.am b/src/Makefile.am +index f69ab0f..2d97b63 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -36,7 +36,7 @@ xfce4_notes_settings_SOURCES = \ + xfce4_notes_settings_CFLAGS = \ + @LIBX11_CFLAGS@ \ + @GTK_CFLAGS@ \ +- @LIBXFCEGUI4_CFLAGS@ \ ++ @LIBXFCE4UI_CFLAGS@ \ + @XFCONF_CFLAGS@ \ + @UNIQUE_CFLAGS@ + +@@ -44,7 +44,7 @@ xfce4_notes_settings_LDADD = \ + $(top_builddir)/lib/libnotes.la \ + @LIBX11_LIBS@ \ + @GTK_LIBS@ \ +- @LIBXFCEGUI4_LIBS@ \ ++ @LIBXFCE4UI_LIBS@ \ + @XFCONF_LIBS@ \ + @UNIQUE_LIBS@ + +diff --git a/src/xfce4-notes-settings.c b/src/xfce4-notes-settings.c +index f66bb13..1d7cc70 100644 +--- a/src/xfce4-notes-settings.c ++++ b/src/xfce4-notes-settings.c +@@ -25,7 +25,7 @@ + #include + #include + #include +-#include ++#include + + #include "defines.h" + #include "color.h" +@@ -115,7 +115,7 @@ prop_dialog_new (void) + + /* === Global settings === */ + box = gtk_vbox_new (FALSE, BORDER); +- frame = xfce_create_framebox_with_content (_("Global settings"), box); ++ frame = xfce_gtk_frame_box_new_with_content (_("Global settings"), box); + gtk_container_set_border_width (GTK_CONTAINER (frame), BORDER); + gtk_container_add (GTK_CONTAINER (vbox), frame); + +@@ -163,7 +163,7 @@ prop_dialog_new (void) + + /* === New window settings === */ + box = gtk_vbox_new (FALSE, BORDER); +- frame = xfce_create_framebox_with_content (_("New group settings"), box); ++ frame = xfce_gtk_frame_box_new_with_content (_("New group settings"), box); + gtk_container_set_border_width (GTK_CONTAINER (frame), BORDER); + gtk_container_add (GTK_CONTAINER (vbox), frame); + +-- +1.8.3.1 + diff --git a/meta-xfce/recipes-panel-plugins/notes/files/0002-main-status-icon.c-remove-deprecated-g_type_init.patch b/meta-xfce/recipes-panel-plugins/notes/files/0002-main-status-icon.c-remove-deprecated-g_type_init.patch new file mode 100644 index 000000000..e1ede27c4 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/notes/files/0002-main-status-icon.c-remove-deprecated-g_type_init.patch @@ -0,0 +1,32 @@ +From 0218e5ebf38f94d58b908fca451ba3789efa8899 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 20 Sep 2013 23:09:25 +0200 +Subject: [PATCH] main-status-icon.c remove deprecated g_type_init +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +this file was auto created by valac and xfce-vala when creating tarball. So + +Upstream-Status: Inappropriate [other] + +Signed-off-by: Andreas Müller +--- + src/main-status-icon.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/main-status-icon.c b/src/main-status-icon.c +index c6d73f8..f7db773 100644 +--- a/src/main-status-icon.c ++++ b/src/main-status-icon.c +@@ -290,7 +290,6 @@ gint _vala_main (char** args, int args_length1) { + + + int main (int argc, char ** argv) { +- g_type_init (); + return _vala_main (argv, argc); + } + +-- +1.8.3.1 + diff --git a/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.7.7.bb b/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.7.7.bb new file mode 100644 index 000000000..fee5a4d9c --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.7.7.bb @@ -0,0 +1,20 @@ +SUMMARY = "Notes plugin for the Xfce Panel" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit xfce-panel-plugin + +DEPENDS = "gtk+ libxfce4ui xfce4-panel xfconf libunique" + +SRC_URI += " \ + file://0001-Bump-dependency-to-Xfce-4.10.patch \ + file://0002-main-status-icon.c-remove-deprecated-g_type_init.patch \ +" +SRC_URI[md5sum] = "42b924b23f2fec6a1099e9b7a87db4a3" +SRC_URI[sha256sum] = "a7baa105b37ad05dea4d6b55d98fd3214c77ad5c7a0e91471d4906c81e5f5217" + +FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so.*" + +# *.so are required for plugin detection +INSANE_SKIP_${PN} = "dev-so" diff --git a/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.6.0.bb b/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.6.0.bb new file mode 100644 index 000000000..c76340fcf --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.6.0.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Panel plugin displaying menu with quick access to folders, documents, and removable media" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "8f3ec883efb0775052eeea816bbd8a23" +SRC_URI[sha256sum] = "07b044025a75f02b84e8848d6f81b0fcbb0cd9b8a4bf919cb7f0777b096b27a4" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" diff --git a/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.1.1.bb b/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.1.1.bb new file mode 100644 index 000000000..53f6c4a3c --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.1.1.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Panel plugin displaying current CPU load, the memory in use, the swap space and the system uptime" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=9acb172a93ff6c43cce2aff790a8aef8" + +inherit xfce-panel-plugin + +DEPENDS += "upower" + +SRC_URI[md5sum] = "22d48c0883f9d598bce24e81d93e692e" +SRC_URI[sha256sum] = "1ac13efbe9e576c9effd5e0675574a57c8fd44cfee60d6e319eb4d03c1c8d9ae" diff --git a/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.1.bb b/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.1.bb new file mode 100644 index 000000000..1f6ea046e --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.1.bb @@ -0,0 +1,10 @@ +SUMMARY = "This plugin makes it possible to take periodical breaks" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "b6e4a3145d31c341e2506fb17b014587" +SRC_URI[sha256sum] = "e342f73315fa8176ac4fc321680a3959aa2e06fafed1ac78031fae64713a3db8" diff --git a/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.11.bb b/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.11.bb new file mode 100644 index 000000000..1883a0c7d --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.11.bb @@ -0,0 +1,9 @@ +SUMMARY = "Panel plugin displaying stats from a wireless lan interface" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin" +LICENSE = "BenediktMeurer FlorianRivoal" +LIC_FILES_CHKSUM = "file://COPYING;md5=e1e5872df9c5cf1a23f16493d9104920" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "50514bb286f1ed6761a1b36832bb7fe3" +SRC_URI[sha256sum] = "fe06c7ffc29c2d4ca7bc452b3356825354e276565de9b0a2d087ab55471755ae" diff --git a/meta-xfce/recipes-panel-plugins/weather/files/0001-Make-plugin-ready-for-met.no-locationforecast-1.2-AP.patch b/meta-xfce/recipes-panel-plugins/weather/files/0001-Make-plugin-ready-for-met.no-locationforecast-1.2-AP.patch new file mode 100644 index 000000000..d4ad24054 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/weather/files/0001-Make-plugin-ready-for-met.no-locationforecast-1.2-AP.patch @@ -0,0 +1,162 @@ +From 1ff71669644a0b824a8a5ba9b40771ee4fb8a76b Mon Sep 17 00:00:00 2001 +From: Harald Judt +Date: Wed, 28 May 2014 20:08:02 +0200 +Subject: [PATCH 1/2] Make plugin ready for met.no locationforecast-1.2 API + (bug #10916). + +http://api.yr.no/weatherapi/locationforecastlts/1.1/documentation#version_1_2___2014_05_20 + +The updated API version uses CamelCase symbol names instead of UPPERCASE +ones and has added some new names (like 'Drizzle'), which unfortunately +have not been documented (yet?). + +What's more, the typo 'celcius' has been replaced by the fixed 'celsius', +but luckily the plugin will not be affected by that change. + +What's a bit more unfortunate is that the existing icon themes do not +cover the new symbol names, so one would have to create quite a lot of +new icons. Also, new translations would have to be added for the symbols, +and maybe existing ones would have to be altered. To prevent this, we're +simply going to map the new symbols to existing ones as good as possible. +This should be good enough for the time being. + +Upstream-Status: Applied +--- + panel-plugin/weather-parsers.c | 3 +- + panel-plugin/weather-translate.c | 70 +++++++++++++++++++++++++++++++++++++++- + panel-plugin/weather-translate.h | 2 ++ + 3 files changed, 73 insertions(+), 2 deletions(-) + +diff --git a/panel-plugin/weather-parsers.c b/panel-plugin/weather-parsers.c +index 0f321ba..5a9b30a 100644 +--- a/panel-plugin/weather-parsers.c ++++ b/panel-plugin/weather-parsers.c +@@ -28,6 +28,7 @@ + #define _XOPEN_SOURCE + #define _XOPEN_SOURCE_EXTENDED 1 + #include "weather-parsers.h" ++#include "weather-translate.h" + #include "weather-debug.h" + + #include +@@ -220,8 +221,8 @@ parse_location(xmlNode *cur_node, + } + if (NODE_IS_TYPE(child_node, "symbol")) { + g_free(loc->symbol); +- loc->symbol = PROP(child_node, "id"); + loc->symbol_id = strtol(PROP(child_node, "number"), NULL, 10); ++ loc->symbol = g_strdup(get_symbol_for_id(loc->symbol_id)); + } + } + +diff --git a/panel-plugin/weather-translate.c b/panel-plugin/weather-translate.c +index 0c1606d..c38919a 100644 +--- a/panel-plugin/weather-translate.c ++++ b/panel-plugin/weather-translate.c +@@ -29,6 +29,7 @@ + #include "weather-translate.h" + + #define DAY_LOC_N (sizeof(gchar) * 100) ++#define NODATA "NODATA" + + + static const gchar *moon_phases[] = { +@@ -117,7 +118,7 @@ static const symbol_desc symbol_to_desc[] = { + + { 15, "FOG", N_("Fog"), N_("Fog") }, + +- /* Symbols 16-19 are used for polar days */ ++ /* Symbols 16-19 are used for polar days (unused beginning with API version 1.2) */ + { 16, "SUN", N_("Sunny"), N_("Clear") }, + { 17, "LIGHTCLOUD", N_("Lightly cloudy"), N_("Lightly cloudy") }, + { 18, "LIGHTRAINSUN", N_("Rain showers"), N_("Rain showers") }, +@@ -133,6 +134,73 @@ static const symbol_desc symbol_to_desc[] = { + #define NUM_SYMBOLS (sizeof(symbol_to_desc) / sizeof(symbol_to_desc[0])) + + ++/* ++ * API version 1.2, published in May 2014, introduced new symbols. We ++ * try to match these with existing symbols, in order to be compatible ++ * with existing icon themes and to maintain translation completeness. ++ * ++ * See http://api.met.no/weatherapi/weathericon/1.1/documentation ++ * for a list of symbols. For a list of symbols with descriptions, ++ * see http://om.yr.no/forklaring/symbol. ++ */ ++gint ++replace_symbol_id(gint id) ++{ ++ /* Symbol ids greater than 100 are used for indicating polar ++ * night. These ids are over the ordinary id + 100. Since we ++ * don't support polar icons, we can simply subtract 100 to ++ * get the non-polar symbol ids. ++ */ ++ if (id > 100) ++ id -= 100; ++ ++ switch (id) { ++ case 24: return 22; /* Light rain showers and thunder */ ++ case 25: return 6; /* Heavy rain showers and thunder */ ++ case 26: return 20; /* Light sleet showers and thunder */ ++ case 27: return 20; /* Heavy sleet showers and thunder */ ++ case 28: return 21; /* Light snow showers and thunder */ ++ case 29: return 21; /* Heavy snow showers and thunder */ ++ case 30: return 22; /* Light rain and thunder */ ++ case 31: return 23; /* Light sleet and thunder */ ++ case 32: return 23; /* Heavy sleet and thunder */ ++ case 33: return 14; /* Light snow and thunder */ ++ case 34: return 14; /* Heavy snow and thunder */ ++ ++ /* symbols 35-39 are unused */ ++ ++ case 40: return 5; /* Light rain showers */ ++ case 41: return 5; /* Heavy rain showers */ ++ case 42: return 7; /* Light sleet showers */ ++ case 43: return 7; /* Heavy sleet showers */ ++ case 44: return 8; /* Light snow showers */ ++ case 45: return 8; /* Heavy snow showers */ ++ case 46: return 9; /* Light rain */ ++ case 47: return 12; /* Light sleet */ ++ case 48: return 12; /* Heavy sleet */ ++ case 49: return 13; /* Light snow */ ++ case 50: return 13; /* Heavy snow */ ++ default: return id; ++ } ++} ++ ++ ++const gchar * ++get_symbol_for_id(gint id) ++{ ++ if (G_UNLIKELY(id < 1)) ++ return NODATA; ++ ++ if (id >= NUM_SYMBOLS) ++ id = replace_symbol_id(id); ++ ++ if (id < NUM_SYMBOLS) ++ return symbol_to_desc[id-1].symbol; ++ ++ return NODATA; ++} ++ ++ + const gchar * + translate_desc(const gchar *desc, + const gboolean nighttime) +diff --git a/panel-plugin/weather-translate.h b/panel-plugin/weather-translate.h +index 2116795..854e24f 100644 +--- a/panel-plugin/weather-translate.h ++++ b/panel-plugin/weather-translate.h +@@ -24,6 +24,8 @@ + + G_BEGIN_DECLS + ++const gchar *get_symbol_for_id(gint id); ++ + const gchar *translate_desc(const gchar *desc, + gboolean nighttime); + +-- +1.8.3.1 + diff --git a/meta-xfce/recipes-panel-plugins/weather/files/0002-Switch-to-met.no-locationforecastLTS-1.2-API-bug-109.patch b/meta-xfce/recipes-panel-plugins/weather/files/0002-Switch-to-met.no-locationforecastLTS-1.2-API-bug-109.patch new file mode 100644 index 000000000..4c385a469 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/weather/files/0002-Switch-to-met.no-locationforecastLTS-1.2-API-bug-109.patch @@ -0,0 +1,27 @@ +From 7df303bc5fa649299e18efeb5d4b801614030488 Mon Sep 17 00:00:00 2001 +From: Harald Judt +Date: Tue, 3 Jun 2014 19:59:05 +0200 +Subject: [PATCH 2/2] Switch to met.no locationforecastLTS-1.2 API (bug + #10916). + +Upstream-Status: Applied +--- + panel-plugin/weather.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c +index efa8559..63451fd 100644 +--- a/panel-plugin/weather.c ++++ b/panel-plugin/weather.c +@@ -660,7 +660,7 @@ update_handler(plugin_data *data) + /* build url */ + url = + g_strdup_printf("http://api.yr.no/weatherapi" +- "/locationforecastlts/1.1/?lat=%s;lon=%s;msl=%d", ++ "/locationforecastlts/1.2/?lat=%s;lon=%s;msl=%d", + data->lat, data->lon, data->msl); + + /* start receive thread */ +-- +1.8.3.1 + diff --git a/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.3.bb b/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.3.bb new file mode 100644 index 000000000..6e4c86db5 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.3.bb @@ -0,0 +1,17 @@ +SUMMARY = "Panel plugin to display current temperature and weather condition" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit xfce-panel-plugin + +DEPENDS += "libsoup-2.4 dbus-glib upower" + +SRC_URI += " \ + file://0001-Make-plugin-ready-for-met.no-locationforecast-1.2-AP.patch \ + file://0002-Switch-to-met.no-locationforecastLTS-1.2-API-bug-109.patch \ +" +SRC_URI[md5sum] = "755b33089c02afe88abb39253003a7f3" +SRC_URI[sha256sum] = "40a6a22be7653b15a47174a430da89040f178695b48e5e01e77990050f715ce4" + +FILES_${PN} += "${datadir}/xfce4/weather" diff --git a/meta-xfce/recipes-panel-plugins/whisker/xfce4-whiskermenu-plugin_1.3.2.bb b/meta-xfce/recipes-panel-plugins/whisker/xfce4-whiskermenu-plugin_1.3.2.bb new file mode 100644 index 000000000..dd3d8fd6e --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/whisker/xfce4-whiskermenu-plugin_1.3.2.bb @@ -0,0 +1,10 @@ +SUMMARY = "An alternate menu for the Xfce desktop environment" +HOMEPAGE = "http://gottcode.org/xfce4-whiskermenu-plugin/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit xfce-panel-plugin cmake + +SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2" +SRC_URI[md5sum] = "f4de7546588952f84df8a4ad3552c526" +SRC_URI[sha256sum] = "a104b2266675a3ea3c7b98aab7b075a351d813ea29098504031a62f365e5a0fc" diff --git a/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.7.0.bb b/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.7.0.bb new file mode 100644 index 000000000..22ead2a1c --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.7.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "XKB layout switching panel plug-in for the Xfce desktop environment" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=496f09f084b0f7e6f02f769a84490c6b" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "7fbc3d8c84d6662d819dd1803f0fee34" +SRC_URI[sha256sum] = "28367c309863581ae4de529b35bdedf5a1c918096a9a2e6e771554cba7bf5a6a" + +DEPENDS += "libxklavier libwnck librsvg garcon" + +FILES_${PN} += "${datadir}/xfce4/xkb" + +RDEPENDS_${PN} = "xfce4-settings" diff --git a/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.3.1.bb b/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.3.1.bb new file mode 100644 index 000000000..90ab6af19 --- /dev/null +++ b/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.3.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Thunar Archive Plugin allows you to create and extract archive files using file context menus in Thunar" +HOMEPAGE = "http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" + +inherit thunar-plugin + +SRC_URI[md5sum] = "425f4faaace6dc7a4716a35b7795463a" +SRC_URI[sha256sum] = "9ad559b0c11308f6897ad56604e5a06dc8f369f649eb20120b2d3018ef5da54c" + +# install tap files in ${libdir}/thunar-archive-plugin +EXTRA_OECONF += "--libexecdir=${libdir}" diff --git a/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.2.1.bb b/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.2.1.bb new file mode 100644 index 000000000..90f150b6e --- /dev/null +++ b/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.2.1.bb @@ -0,0 +1,11 @@ +SUMMARY = "Adds ID3/OGG tag support to the Thunar bulk rename dialog" +HOMEPAGE = "http://thunar.xfce.org" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit thunar-plugin + +DEPENDS += "taglib" + +SRC_URI[md5sum] = "0106e900714f86ccbafdc72238d3cf8d" +SRC_URI[sha256sum] = "056d012a10403ee3e2e55b6ff2faecb796821de9ebee000315589b95d95ed253" diff --git a/meta-xfce/recipes-xfce/exo/exo/configure.patch b/meta-xfce/recipes-xfce/exo/exo/configure.patch new file mode 100644 index 000000000..ef27e423b --- /dev/null +++ b/meta-xfce/recipes-xfce/exo/exo/configure.patch @@ -0,0 +1,43 @@ +--- a/configure.ac 2007-12-02 10:37:06.000000000 -0200 ++++ b/configure.ac 2008-06-05 17:21:42.000000000 -0300 +@@ -127,22 +127,24 @@ + dnl *************************************** + dnl *** Check for strftime() extensions *** + dnl *************************************** +-AC_TRY_RUN([ +- #include +- #include +- int +- main (int argc, char **argv) +- { +- struct tm tm; +- char buffer[16]; +- tm.tm_year = 81; +- if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0) +- return 0; +- return 1; +- } +-], [ +- AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.]) +-]) ++dnl grrrr... this doesn't work for cross compiling, define it for OE ++AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.]) ++dnl AC_TRY_RUN([ ++dnl #include ++dnl #include ++dnl int ++dnl main (int argc, char **argv) ++dnl { ++dnl struct tm tm; ++dnl char buffer[16]; ++dnl tm.tm_year = 81; ++dnl if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0) ++dnl return 0; ++dnl return 1; ++dnl } ++dnl ], [ ++dnl AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.]) ++dnl ]) + + dnl ****************************** + dnl *** Check for i18n support *** diff --git a/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch b/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch new file mode 100644 index 000000000..ac8bca5f3 --- /dev/null +++ b/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch @@ -0,0 +1,31 @@ +From 5f1e19860d89647488bdd32a02fb332f69434405 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 18 May 2012 21:13:00 +0200 +Subject: [PATCH] Do not run tests at build time +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +Upstream-Status: Not-Applicable + +Signed-off-by: Andreas Müller +--- + Makefile.am | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 0ab3853..3e72391 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -8,8 +8,7 @@ SUBDIRS = \ + docs \ + icons \ + pixmaps \ +- po \ +- tests ++ po + + AUTOMAKE_OPTIONS = \ + 1.9 \ +-- +1.7.4.4 + diff --git a/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch b/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch new file mode 100644 index 000000000..84b237096 --- /dev/null +++ b/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch @@ -0,0 +1,80 @@ +From e710d8d4a3e3480416826c70d56ea3d2598a77e4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 28 Mar 2013 23:41:03 +0100 +Subject: [PATCH] reduce build to exo-csource only +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +exo-csource creates c-header files from glade resource output files. When +building xfce-packages from git instead of tarball this exo-csource-native is +required. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Andreas Müller +--- + Makefile.am | 10 +--------- + configure.ac | 20 -------------------- + 2 files changed, 1 insertions(+), 29 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index c2e3fff..79b0931 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,13 +1,5 @@ + SUBDIRS = \ +- exo \ +- exo-csource \ +- exo-desktop-item-edit \ +- exo-helper \ +- exo-open \ +- docs \ +- icons \ +- pixmaps \ +- po ++ exo-csource + + AUTOMAKE_OPTIONS = \ + 1.9 \ +diff --git a/configure.ac b/configure.ac +index efcd62e..aac2495 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -110,15 +110,6 @@ AC_PROG_CC() + AM_PROG_CC_C_O() + AC_PROG_INSTALL() + AC_PROG_INTLTOOL([0.31], [no-xml]) +-AC_CHECK_PROGS([PERL], [perl5 perl]) +- +-dnl *************************************** +-dnl *** Check for required Perl modules *** +-dnl *************************************** +-AC_PROG_PERL_MODULES([URI::Escape URI::file URI::URL], [], +-[ +- AC_MSG_ERROR([Atleast one of the required Perl modules (URI::Escape, URI::file and URI::URL) was not found on your system]) +-]) + + dnl *************************************** + dnl *** Check for standard header files *** +@@ -165,17 +156,6 @@ dnl *********************************** + dnl *** Check for required packages *** + dnl *********************************** + XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.30.0]) +-XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.30.0]) +-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) +-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0]) +-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) +-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0]) +-XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.30.0], [gio-unix], [GIO-Unix features]) +- +-dnl ********************* +-dnl *** Check for X11 *** +-dnl ********************* +-XDT_CHECK_LIBX11_REQUIRE() + + dnl ************************* + dnl *** Check for gtk-doc *** +-- +1.7.4.4 + diff --git a/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb b/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb new file mode 100644 index 000000000..ef8e55fa6 --- /dev/null +++ b/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb @@ -0,0 +1,37 @@ +DESCRIPTION="Application library for the Xfce desktop environment" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "gtk+ libxfce4util libxfce4ui virtual/libx11 liburi-perl-native cairo" +DEPENDS_class-native = "glib-2.0-native xfce4-dev-tools-native intltool-native" +PR = "r4" + +inherit xfce pythonnative perlnative gtk-doc + +# SRC_URI must follow inherited one +SRC_URI += " \ + file://exo-no-tests-0.8.patch \ + file://configure.patch \ +" + +SRC_URI_append_class-native = " \ + file://reduce-build-to-exo-csource-only.patch \ +" + +SRC_URI[md5sum] = "c70f2a217811bfba2e62f938d4b8f748" +SRC_URI[sha256sum] = "b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce" + +PACKAGES =+ "exo-csource" + +# Note: python bindings did not work in oe-dev and are about to be moved to +# pyxfce see http://comments.gmane.org/gmane.comp.desktop.xfce.devel.version4/19560 +FILES_${PN} += "${datadir}/xfce4/ \ + ${libdir}/xfce4/exo-1 \ +" + +FILES_${PN}-dbg += "${libdir}/gio/modules/.debug \ +" + +FILES_exo-csource += "${bindir}/exo-csource" + +BBCLASSEXTEND = "native" diff --git a/meta-xfce/recipes-xfce/garcon/files/0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch b/meta-xfce/recipes-xfce/garcon/files/0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch new file mode 100644 index 000000000..e5ad4e1a1 --- /dev/null +++ b/meta-xfce/recipes-xfce/garcon/files/0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch @@ -0,0 +1,35 @@ +From f5398b49cc6fd7a53562aae2abbac0d9c656559c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 15 May 2013 14:17:49 +0200 +Subject: [garcon] xfce-applications.menu: don't bloat settings menu by + entries found in settings manager +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Submitted [1] + +[1] https://bugzilla.xfce.org/show_bug.cgi?id=10092 + +Signed-off-by: Andreas Müller +--- + data/xfce/xfce-applications.menu | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/data/xfce/xfce-applications.menu b/data/xfce/xfce-applications.menu +index dc3056b..c2aa0bb 100644 +--- a/data/xfce/xfce-applications.menu ++++ b/data/xfce/xfce-applications.menu +@@ -34,6 +34,9 @@ + + Settings + ++ ++ X-XFCE-SettingsDialog ++ + + + xfce-settings-manager.desktop +-- +1.7.6.5 + diff --git a/meta-xfce/recipes-xfce/garcon/garcon_0.2.1.bb b/meta-xfce/recipes-xfce/garcon/garcon_0.2.1.bb new file mode 100644 index 000000000..44ae51f07 --- /dev/null +++ b/meta-xfce/recipes-xfce/garcon/garcon_0.2.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION="Xfce Menu Library" +SECTION = "x11/libs" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=04a01abcbdabffae1ca26335a293276b" +DEPENDS = "glib-2.0 xfce4-dev-tools-native libxfce4util intltool-native" +PR = "r1" + +inherit xfce gtk-doc + +SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch" +SRC_URI[md5sum] = "c3cf89c836be0ddb281c81e4808fb68b" +SRC_URI[sha256sum] = "48b644b8b2ffe597974e2526ca1a5d2d7da6a09c2d434f008dec80e9152701f7" + +FILES_${PN} += "${datadir}/desktop-directories" diff --git a/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.0.1.bb b/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.0.1.bb new file mode 100644 index 000000000..d62208fb4 --- /dev/null +++ b/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.0.1.bb @@ -0,0 +1,23 @@ +SUMMARY = "XFCE theme for GTK" +SECTION = "x11/libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "gtk+ gtk+3 xfce4-dev-tools-native" + +inherit xfce + +SRC_URI[md5sum] = "174e774d0debb052ec457640275f065d" +SRC_URI[sha256sum] = "eb03cf81da1a91e426a2141c092ed7a1634cab29ea2f3546480e901290a7a06d" + +PACKAGES += "${PN}-themes gtk3-xfce-engine" +FILES_${PN} += "${libdir}/gtk-2.0/*/engines/*.so" +FILES_gtk3-xfce-engine += "${libdir}/gtk-3.0/*/theming-engines/*.so" +FILES_${PN}-themes += "${datadir}/themes" + +FILES_${PN}-dbg += "${libdir}/gtk-3.0/*/theming-engines/.debug \ + ${libdir}/gtk-2.0/*/engines/.debug" +FILES_${PN}-dev += "${libdir}/gtk-2.0/*/engines/*.la \ + ${libdir}/gtk-3.0/*/theming-engines/*.la" + +RDEPENDS_${PN} += "${PN}-themes" +RDEPENDS_gtk3-xfce-engine += "${PN}-themes" diff --git a/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch b/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch new file mode 100644 index 000000000..b8c917883 --- /dev/null +++ b/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch @@ -0,0 +1,31 @@ +From 708e59caaf1c0c271a96a4d1fe46b122aff45e34 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 27 Aug 2012 09:16:29 +0200 +Subject: [PATCH] libxfce4kbd-private/xfce4-keyboard-shortcuts.xml: fix xfwm4 + crash on first start +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending +Signed-off-by: Andreas Müller +--- + libxfce4kbd-private/xfce4-keyboard-shortcuts.xml | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml +index 723a10d..e6502f3 100644 +--- a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml ++++ b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml +@@ -66,4 +66,8 @@ + + + ++ ++ ++ ++ + +-- +1.7.6.5 + diff --git a/meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch b/meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch new file mode 100644 index 000000000..a93fabfac --- /dev/null +++ b/meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch @@ -0,0 +1,37 @@ +From d61dc6718a2abaf70d19f17d34128cb7e161e057 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 18 Sep 2013 20:50:11 +0200 +Subject: [PATCH] configure.ac.in: remove optional gtk3 support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +it drags in gtk3 if that was build before. This is not yet wanted + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Andreas Müller +--- + configure.ac.in | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/configure.ac.in b/configure.ac.in +index e47df04..b6edab1 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -129,12 +129,6 @@ XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.28.0]) + XDT_CHECK_PACKAGE([GTK2], [gtk+-2.0], [2.24.0]) + XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) + +-dnl *********************************************************** +-dnl *** Optional support for a GTK+3 version of the library *** +-dnl *********************************************************** +-XDT_CHECK_OPTIONAL_PACKAGE([GTK3], +- [gtk+-3.0], [3.2.0], [gtk3], +- [GTK+ 3 support]) + AM_CONDITIONAL([ENABLE_GTK3_LIBRARY], [test "x$GTK3_FOUND" = "xyes"]) + + dnl ************************************************* +-- +1.8.3.1 + diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb new file mode 100644 index 000000000..6534f940c --- /dev/null +++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb @@ -0,0 +1,29 @@ +SUMMARY = "Xfce4 Widget library and X Window System interaction" +SECTION = "x11/libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" +DEPENDS = "perl-native glib-2.0 gtk+ intltool libxfce4util xfconf xfce4-dev-tools virtual/libx11 libsm libice" + +inherit autotools gettext gtk-doc xfce xfce-git + +SRC_URI = " \ + git://git.xfce.org/xfce/libxfce4ui;protocol=git \ + file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \ + file://0002-configure.ac.in-remove-optional-gtk3-support.patch \ +" +SRCREV = "530b72f50fcbd8cb4b970fcc97be0321bf78183e" +PV = "4.10.0+git${SRCPV}" +S = "${WORKDIR}/git" + +EXTRA_OECONF += "--enable-maintainer-mode --disable-debug --with-vendor-info=${DISTRO}" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[gladeui] = "--enable-gladeui,--disable-gladeui,glade3" +PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" + +FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug" +FILES_${PN}-dev += "${libdir}/glade3/modules/*.la \ + ${datadir}/glade3/catalogs/*.in" +PACKAGES += "${PN}-glade" +FILES_${PN}-glade = "${libdir}/glade3 \ + ${datadir}/glade3" diff --git a/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.10.1.bb b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.10.1.bb new file mode 100644 index 000000000..4a79f8233 --- /dev/null +++ b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.10.1.bb @@ -0,0 +1,10 @@ +SUMMARY = "Basic utility library for Xfce4" +SECTION = "x11/libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" +DEPENDS = "intltool-native xfce4-dev-tools-native glib-2.0" + +inherit xfce gtk-doc + +SRC_URI[md5sum] = "11eec87e8eda2bc62512c2416cb807a1" +SRC_URI[sha256sum] = "e82cd1ad715c02a385b3cf6646cb89aa3c4724446dac1d7e424971df12f6cfbb" diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb new file mode 100644 index 000000000..28cfc7f0f --- /dev/null +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb @@ -0,0 +1,35 @@ +SUMMARY = "All packages required for a base installation of XFCE" +SECTION = "x11/wm" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" +PR = "r5" + +inherit packagegroup + +RDEPENDS_${PN} = " \ + xfwm4 \ + xfce4-session \ + xfconf \ + xfdesktop \ + xfce4-panel \ + \ + gtk-xfce-engine \ + \ + xfce4-panel-plugin-actions \ + xfce4-panel-plugin-applicationsmenu \ + xfce4-panel-plugin-clock \ + xfce4-panel-plugin-directorymenu \ + xfce4-panel-plugin-launcher \ + xfce4-panel-plugin-pager \ + xfce4-panel-plugin-separator \ + xfce4-panel-plugin-showdesktop \ + xfce4-panel-plugin-systray \ + xfce4-panel-plugin-tasklist \ + xfce4-panel-plugin-windowmenu \ + xfce4-settings \ + \ + xfce4-notifyd \ + xfce4-terminal \ + thunar \ + thunar-volman \ +" diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb new file mode 100644 index 000000000..af8977d38 --- /dev/null +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb @@ -0,0 +1,56 @@ +SUMMARY = "All packages for full XFCE installation" +SECTION = "x11/wm" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" + +PR = "r10" + +inherit packagegroup + +# mandatory +RDEPENDS_${PN} = " \ + packagegroup-xfce-base \ +" + +# nice to have +RRECOMMENDS_${PN} = " \ + xfwm4-theme-daloa \ + xfwm4-theme-kokodi \ + xfwm4-theme-moheli \ + \ + xfce4-cpufreq-plugin \ + xfce4-cpugraph-plugin \ + xfce4-datetime-plugin \ + xfce4-eyes-plugin \ + xfce4-clipman-plugin \ + xfce4-diskperf-plugin \ + xfce4-netload-plugin \ + xfce4-genmon-plugin \ + xfce4-xkb-plugin \ + xfce4-wavelan-plugin \ + xfce4-places-plugin \ + xfce4-systemload-plugin \ + xfce4-time-out-plugin \ + xfce4-embed-plugin \ + xfce4-weather-plugin \ + xfce4-fsguard-plugin \ + xfce4-battery-plugin \ + xfce4-mount-plugin \ + xfce4-powermanager-plugin \ + xfce4-closebutton-plugin \ + xfce4-equake-plugin \ + xfce4-notes-plugin \ + xfce4-whiskermenu-plugin \ + xfce4-mailwatch-plugin \ + \ + thunar-media-tags-plugin \ + thunar-archive-plugin \ + \ + xfce4-appfinder \ + xfce4-screenshooter \ + xfce4-power-manager \ + xfce4-mixer \ + ristretto \ + xfce4-taskmanager \ + gigolo \ +" diff --git a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.0.bb b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.0.bb new file mode 100644 index 000000000..909ae85dd --- /dev/null +++ b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "Automatic management of removable drives and media for thunar" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "exo glib-2.0 gtk+ libxfce4ui libxfce4util xfconf libnotify udev" + +inherit xfce + +SRC_URI[md5sum] = "250af757ea629c7c27f554d17119080c" +SRC_URI[sha256sum] = "ff0887c862b578580d05f4cd7db66081382ff143f9cc7ea3c9ba58cf5d02bceb" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" + +RDEPENDS_${PN} = "eject" diff --git a/meta-xfce/recipes-xfce/thunar/thunar_1.6.3.bb b/meta-xfce/recipes-xfce/thunar/thunar_1.6.3.bb new file mode 100644 index 000000000..36c5ed07e --- /dev/null +++ b/meta-xfce/recipes-xfce/thunar/thunar_1.6.3.bb @@ -0,0 +1,29 @@ +SUMMARY = "File manager for the Xfce Desktop Environment" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "exo glib-2.0 gtk+ gdk-pixbuf libxfce4util libxfce4ui libsm dbus-glib startup-notification libnotify xfce4-panel udev" + +inherit xfce + +SRC_URI[md5sum] = "4f10d5d5576ce5127308d6badbac3afa" +SRC_URI[sha256sum] = "9a2706f6881ac29cda9f0b0325d179153bc09e37bcbafcab9823c1c1ec89579d" +SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:3]}/Thunar-${PV}.tar.bz2" + +S = "${WORKDIR}/Thunar-${PV}/" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre" + +FILES_${PN} += "${libdir}/thunarx-2/* \ + ${libdir}/xfce4/panel/plugins/* \ + ${libdir}/Thunar/[Tt]hunar* \ + ${datadir}/dbus-1 \ + ${datadir}/Thunar \ + ${datadir}/xfce4/panel-plugins/*" + +FILES_${PN}-dbg += "${libdir}/thunarx-2/.debug/ \ + ${libdir}/xfce4/panel/plugins/.debug/ \ + ${libdir}/Thunar/.debug/" + +RRECOMMENDS_${PN} = "gvfs gvfsd-trash udisks" diff --git a/meta-xfce/recipes-xfce/tumbler/tumbler/0001-configure-use-pkg-config-for-freetype2.patch b/meta-xfce/recipes-xfce/tumbler/tumbler/0001-configure-use-pkg-config-for-freetype2.patch new file mode 100644 index 000000000..5ecc35e37 --- /dev/null +++ b/meta-xfce/recipes-xfce/tumbler/tumbler/0001-configure-use-pkg-config-for-freetype2.patch @@ -0,0 +1,45 @@ +From f5c283b1251ad005da7342e654cd2ec5ae9e5fb2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 26 Sep 2014 13:44:36 +0200 +Subject: [PATCH] configure: use pkg-config for freetype2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-status: Pending + +Signed-off-by: Andreas Müller +--- + acinclude.m4 | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 66e79d1..4c70b00 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -52,21 +52,7 @@ if test x"$ac_tumbler_font_thumbnailer" = x"yes"; then + PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 >= 2.14], + [ + dnl Check for FreeType 2.x +- FREETYPE_LIBS="" +- FREETYPE_CFLAGS="" +- AC_PATH_PROG([FREETYPE_CONFIG], [freetype-config], [no]) +- if test x"$FREETYPE_CONFIG" != x"no"; then +- AC_MSG_CHECKING([FREETYPE_CFLAGS]) +- FREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`" +- AC_MSG_RESULT([$FREETYPE_CFLAGS]) +- +- AC_MSG_CHECKING([FREETYPE_LIBS]) +- FREETYPE_LIBS="`$FREETYPE_CONFIG --libs`" +- AC_MSG_RESULT([$FREETYPE_LIBS]) +- else +- dnl We can only build the font thumbnailer if FreeType 2.x is available +- ac_tumbler_font_thumbnailer=no +- fi ++ PKG_CHECK_MODULES(FREETYPE, freetype2, , [ac_tumbler_font_thumbnailer=no]) + AC_SUBST([FREETYPE_CFLAGS]) + AC_SUBST([FREETYPE_LIBS]) + ], [ac_tumbler_font_thumbnailer=no]) +-- +1.8.3.1 + diff --git a/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.30.bb b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.30.bb new file mode 100644 index 000000000..535954533 --- /dev/null +++ b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.30.bb @@ -0,0 +1,36 @@ +DESCRIPTION="Thumbnail service implementing the thumbnail management D-Bus specification" +SECTION = "x11/libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "dbus-glib freetype gdk-pixbuf poppler curl xfce4-dev-tools-native libxml2 libgsf" + +inherit xfce gtk-doc + +SRC_URI[md5sum] = "2524e39439c13238565160da0b6fed2d" +SRC_URI[sha256sum] = "e7c20d79c830465f8b3b792893f05e8b8d5ba90aec4973e7517e07ef31537304" +SRC_URI += "file://0001-configure-use-pkg-config-for-freetype2.patch" + +INSANE_SKIP_${PN} = "dev-so" + +do_install_append() { + # correct tumbler-cache-plugin.so link (see plugins/xdg-cache/Makefile.am) + ln -sf ${libdir}/tumbler-1/plugins/cache/tumbler-xdg-cache.so ${D}${libdir}/tumbler-1/plugins/cache/tumbler-cache-plugin.so +} + +PACKAGECONFIG ??= "" +PACKAGECONFIG[gstreamer-thumbnailer] = "--enable-gstreamer-thumbnailer,--disable-gstreamer-thumbnailer,gstreamer1.0 gstreamer1.0-plugins-base" + +FILES_${PN} += "${datadir}/dbus-1/services \ + ${libdir}/tumbler-1/tumblerd \ + ${libdir}/tumbler-1/plugins/*.so \ + ${libdir}/tumbler-1/plugins/cache/*.so \ +" + +FILES_${PN}-dev += "${libdir}/tumbler-1/plugins/*.la \ + ${libdir}/tumbler-1/plugins/cache/*.la" +FILES_${PN}-staticdev += "${libdir}/tumbler-1/plugins/*.a \ + ${libdir}/tumbler-1/plugins/cache/*.a" +FILES_${PN}-dbg += "${libdir}/tumbler-1/.debug \ + ${libdir}/tumbler-1/plugins/.debug \ + ${libdir}/tumbler-1/plugins/cache/.debug \ +" diff --git a/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.10.1.bb b/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.10.1.bb new file mode 100644 index 000000000..f2d688f2d --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.10.1.bb @@ -0,0 +1,10 @@ +DESCRIPTION="Xfce4 Application Finder" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS="glib-2.0 gtk+ libxfce4util libxfce4ui garcon dbus-glib xfconf" + +inherit xfce + +SRC_URI[md5sum] = "bea253956638e2df2dd950343b3b1b7b" +SRC_URI[sha256sum] = "65ee74ffa76334d273e4c9ae501ec7f81f7de028813849f7d1441cbf7788eb77" diff --git a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools-4.11.0/xdt-autogen_dependency.patch b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools-4.11.0/xdt-autogen_dependency.patch new file mode 100644 index 000000000..8e6bd3542 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools-4.11.0/xdt-autogen_dependency.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/Makefile.am b/scripts/Makefile.am +index f2f0600..8e677dc 100644 +--- a/scripts/Makefile.am ++++ b/scripts/Makefile.am +@@ -10,7 +10,7 @@ bin_SCRIPTS = \ + xdt-autogen \ + xdt-commit + +-xdt-autogen: Makefile $(srcdir)/xdt-autogen.in ++xdt-autogen: Makefile xdt-autogen.in + rm -f xdt-autogen xdt-autogen.gen + sed -e 's,\@DATADIR\@,$(datadir),g' \ + xdt-autogen.in \ diff --git a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.11.0.bb b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.11.0.bb new file mode 100644 index 000000000..5884ef64c --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.11.0.bb @@ -0,0 +1,26 @@ +SUMMARY = "Xfce4 development tools" +HOMEPAGE = "http://www.xfce.org" +SECTION = "x11/libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" +DEPENDS = "glib-2.0" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native" + +SRC_URI = " \ + http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:4]}/${BPN}-${PV}.tar.bz2 \ + file://xdt-autogen_dependency.patch \ +" +SRC_URI[md5sum] = "36112d0256092c30bd1b47105c547edf" +SRC_URI[sha256sum] = "2dccdd4935716a97db28464ba2403572ce03134fd7adf294e1a59eaf297e6555" + +do_install_append() { + install -d ${D}${datadir}/aclocal + install -m 644 ${S}/m4macros/*.m4 ${D}${datadir}/aclocal/ +} + +FILES_${PN} += "${datadir}/xfce4/dev-tools/m4macros/*.m4" + +RDEPENDS_${PN} = "bash" diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.10.1.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.10.1.bb new file mode 100644 index 000000000..08703e788 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.10.1.bb @@ -0,0 +1,29 @@ +SUMMARY = "Xfce4 Panel" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" +DEPENDS = "libxfce4util garcon libxfce4ui xfconf exo gtk+ dbus cairo virtual/libx11 libxml2 libwnck" + +inherit xfce + +SRC_URI[md5sum] = "8a1f8371fc725ba00f4594c5c0f81c59" +SRC_URI[sha256sum] = "573052ed1b65e247415f92df120c8a78f9e4152c2636d38c923f82e32b8475d6" + +python populate_packages_prepend() { + plugin_dir = d.expand('${libdir}/xfce4/panel/plugins/') + plugin_name = d.expand('${PN}-plugin-%s') + do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name, + '${PN} plugin for %s', extra_depends='', prepend=True, + aux_files_pattern=['${datadir}/xfce4/panel/plugins/%s.desktop', + '${sysconfdir}/xdg/xfce/panel/%s-*', + '${datadir}/icons/hicolor/48x48/apps/*-%s.png', + '${bindir}/*%s*']) +} + +PACKAGES_DYNAMIC += "^${PN}-plugin-.*" + +FILES_${PN} += "${libdir}/xfce4/panel/migrate \ + ${libdir}/xfce4/panel/wrapper" + +FILES_${PN}-dbg += "${libdir}/xfce4/panel/plugins/.debug \ +" diff --git a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.4.1.bb b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.4.1.bb new file mode 100644 index 000000000..a4aaf668d --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.4.1.bb @@ -0,0 +1,42 @@ +SUMMARY = "Power manager for the Xfce desktop environment" +HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-power-manager" +SECTION = "x11" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit xfce + +DEPENDS = "gtk+ glib-2.0 dbus-glib xfconf libxfce4ui libxfce4util libnotify \ + libxrandr virtual/libx11 libxext xfce4-panel" + +SRC_URI[md5sum] = "808a2630487d75e6eae915e464b7fda3" +SRC_URI[sha256sum] = "16a9e9bf3e0f8480d05b248817fbdc59e701e9161d3d0c7e53f3de28ed491f58" + +EXTRA_OECONF = " \ + --enable-network-manager \ + --enable-panel-plugins \ +" + +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','',d)}" +PACKAGECONFIG[systemd] = "--enable-polkit, --disable-polkit, polkit" + +PACKAGES += "xfce4-powermanager-plugin" + +FILES_${PN} += " \ + ${datadir}/polkit-1 \ + ${datadir}/appdata \ +" + +FILES_xfce4-powermanager-plugin = " \ + ${libdir}/xfce4 \ + ${datadir}/xfce4 \ +" + +RDEPENDS_xfce4-powermanager-plugin = "${PN}" +RDEPENDS_${PN} = "networkmanager udisks upower ${@base_contains('DISTRO_FEATURES','systemd','','consolekit',d)}" + +# xfce4-brightness-plugin was replaced by xfce4-powermanager-plugin +RPROVIDES_xfce4-powermanager-plugin += "xfce4-brightness-plugin" +RREPLACES_xfce4-powermanager-plugin += "xfce4-brightness-plugin" +RCONFLICTS_xfce4-powermanager-plugin += "xfce4-brightness-plugin" diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch new file mode 100644 index 000000000..d619cde6c --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch @@ -0,0 +1,40 @@ +From a629b051f4e5462150c77b95574bbc7a33bc9666 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 31 Dec 2012 16:35:29 +0100 +Subject: [PATCH] configure.ac: hard code path to iceauth +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +workaround AC_PATH_PROG which was meant to find programs required at build-time +not at run-time. + +Upstream-Status: Inappropriate [config] + +Signed-off-by: Andreas Müller +--- + configure.ac | 8 +------- + 1 files changed, 1 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3cf3510..505e744 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -111,13 +111,7 @@ XDT_FEATURE_DEBUG([xfsm_debug_default]) + dnl Check for linker optimizations + XDT_FEATURE_LINKER_OPTS() + +-dnl Check for iceauth +-AC_PATH_PROG([ICEAUTH], [iceauth]) +-if test x"$ICEAUTH" != x""; then +- AC_DEFINE_UNQUOTED([ICEAUTH_CMD], ["$ICEAUTH"], [path to iceauth]) +-else +- AC_MSG_ERROR([iceauth missing, please check your X11 installation]) +-fi ++AC_DEFINE_UNQUOTED([ICEAUTH_CMD], ["$bindir/iceauth"], [path to iceauth]) + + dnl Find a location for the session desktop file + AC_MSG_CHECKING([what xsession-prefix to use]) +-- +1.7.4.4 + diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.1.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.1.bb new file mode 100644 index 000000000..74289fb35 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.1.bb @@ -0,0 +1,36 @@ +SUMMARY = "xfce4-session is a session manager for Xfce 4 Desktop Environment" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" +DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf" +RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth upower" + +inherit xfce update-alternatives + +SRC_URI[md5sum] = "1757657c1d590aa6274b7b7cbba33352" +SRC_URI[sha256sum] = "0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83" +SRC_URI += " \ + file://0001-configure.in-hard-code-path-to-iceauth.patch \ +" + +ALTERNATIVE_${PN} = "x-session-manager" +ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/xfce4-session" +ALTERNATIVE_PRIORITY_${PN} = "100" + +# protect from frightening message that xfce might not work correctly +pkg_postinst_${PN} () { + echo 127.0.0.1 ${MACHINE} >> /etc/hosts +} + +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}" +PACKAGECONFIG[systemd] = "--enable-systemd, --disable-systemd, polkit, systemd" +PACKAGECONFIG[consolekit] = ",,,consolekit" + +FILES_${PN} += "${libdir}/xfce4/*/*/*.so \ + ${libdir}/xfce4/session/*-*-* \ + ${datadir}/xsessions \ + ${datadir}/themes/Default/balou/*" + +FILES_${PN}-dbg += "${libdir}/xfce4/*/*/.debug" + +FILES_${PN}-staticdev += "${libdir}/xfce4/*/*/*.*a" diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xsettings.xml-remove-trouble-causing-comment.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xsettings.xml-remove-trouble-causing-comment.patch new file mode 100644 index 000000000..f926a93d4 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xsettings.xml-remove-trouble-causing-comment.patch @@ -0,0 +1,31 @@ +From a84a7a6537544cdf56e1d4cad47a4cf002964039 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +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 +--- + 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 @@ +- +- + + + +-- +1.7.4.4 + 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 new file mode 100644 index 000000000..498f8d00d --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0002-xsettings.xml-Set-default-themes.patch @@ -0,0 +1,32 @@ +From 071a390ba09a8a412f73d295be81a805804a1f24 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +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 +--- + 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 @@ + + + +- +- ++ ++ + + + +-- +1.7.4.4 + diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch new file mode 100644 index 000000000..5de14fc8e --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch @@ -0,0 +1,248 @@ +From 4be18d7c8f2ac72b402dcbe8385922638fcd0a89 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 30 Oct 2012 13:14:11 +0100 +Subject: [PATCH 1/5] add cursor-theme "xfce-invisible" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Müller +Upstream-Status: Submitted [1] +[1] https://bugzilla.xfce.org/show_bug.cgi?id=9474 +--- + Makefile.am | 1 + + configure.ac.in | 2 + + cursors/Makefile.am | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++ + cursors/index.theme | 3 + + 6 files changed, 184 insertions(+), 0 deletions(-) + create mode 100644 cursors/Makefile.am + create mode 100644 cursors/index.theme + +diff --git a/Makefile.am b/Makefile.am +index 3060bac..3f0dd1d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,7 @@ + # $Id$ + + SUBDIRS = \ ++ cursors \ + dialogs \ + xfce4-settings-manager \ + xfce4-settings-editor \ +diff --git a/configure.ac.in b/configure.ac.in +index 0e7907d..1378049 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -157,6 +157,7 @@ dnl *** Optional support for Xcursor *** + dnl ************************************ + XDT_CHECK_OPTIONAL_PACKAGE([XCURSOR], [xcursor], [1.1.0], + [xcursor], [Cursor themes support]) ++AC_SUBST(cursordir, "\${datadir}/icons/xfce-invisible/cursors") + + dnl **************************************** + dnl *** Optional support for Libxklavier *** +@@ -232,6 +233,7 @@ AC_SUBST([PLATFORM_LDFLAGS]) + AC_OUTPUT([ + Makefile + po/Makefile.in ++cursors/Makefile + dialogs/Makefile + dialogs/appearance-settings/Makefile + dialogs/accessibility-settings/Makefile +diff --git a/cursors/Makefile.am b/cursors/Makefile.am +new file mode 100644 +index 0000000..c9e5a9f +--- /dev/null ++++ b/cursors/Makefile.am +@@ -0,0 +1,178 @@ ++CURSOR_NAMES_INVISIBLE = \ ++ 00008160000006810000408080010102 \ ++ 028006030e0e7ebffc7f7070c0600140 \ ++ 2870a09082c103050810ffdffffe0204 \ ++ 03b6e0fcb3499374a867c041f52298f0 \ ++ 0876e1c15ff2fc01f906f1c363074c0f \ ++ 08ffe1cb5fe6fc01f906f1c063814ccf \ ++ 08ffe1e65f80fcfdf9fff11263e74c48 \ ++ 1001208387f90000800003000700f6ff \ ++ 1081e37283d90000800003c07f3ef6bf \ ++ 14fef782d02440884392942c11205230 \ ++ 208530c400c041818281048008011002 \ ++ 3085a0e285430894940527032f8b26df \ ++ 4498f0e0c1937ffe01fd06f973665830 \ ++ 5aca4d189052212118709018842178c0 \ ++ 5c6cd98b3f3ebcb1f9c7f1c204630408 \ ++ 6407b0e94181790501fd1e167b474872 \ ++ 640fb0e74195791501fd1ed57b41487f \ ++ 9081237383d90e509aa00f00170e968f \ ++ 9d800788f1b08800ae810202380a0822 \ ++ a2a266d0498c3104214a47bd64ab0fc8 \ ++ b66166c04f8c3109214a4fbd64a50fc8 \ ++ c7088f0f3e6c8088236ef8e1e3e70000 \ ++ d9ce0ab605698f320427677b458ad60b \ ++ e29285e634086352946a0e7090d73106 \ ++ f41c0e382c94c0958e07017e42b00462 \ ++ f41c0e382c97c0938e07017e42800402 \ ++ fcf1c3c7cd4491d801f1e1c78f100000 \ ++ fcf21c00b30f7e3f83fe0dfd12e71cff \ ++ alias \ ++ all-scroll \ ++ arrow \ ++ base_arrow_down \ ++ base_arrow_up \ ++ based_arrow_down \ ++ based_arrow_up \ ++ bd_double_arrow \ ++ boat \ ++ bottom_left_corner \ ++ bottom_right_corner \ ++ bottom_side \ ++ bottom_tee \ ++ cell \ ++ center_ptr \ ++ circle \ ++ closedhand \ ++ color-picker \ ++ col-resize \ ++ copy \ ++ cross \ ++ cross_reverse \ ++ crossed_circle \ ++ crosshair \ ++ default \ ++ diamond_cross \ ++ dnd-ask \ ++ dnd-copy \ ++ dnd-link \ ++ dnd-move \ ++ dnd-no-drop \ ++ dnd-none \ ++ dot \ ++ dot_box_mask \ ++ dotbox \ ++ double_arrow \ ++ down_arrow \ ++ draft_large \ ++ draft_small \ ++ draped_box \ ++ e-resize \ ++ ew-resize \ ++ exchange \ ++ fd_double_arrow \ ++ fleur \ ++ forbidden \ ++ grab \ ++ grabbing \ ++ gumby \ ++ h_double_arrow \ ++ hand \ ++ hand1 \ ++ hand2 \ ++ help \ ++ ibeam \ ++ icon \ ++ left_arrow \ ++ left_ptr \ ++ left_side \ ++ left_tee \ ++ link \ ++ ll_angle \ ++ lr_angle \ ++ move \ ++ ne-resize \ ++ nesw-resize \ ++ no-drop \ ++ not-allowed \ ++ n-resize \ ++ ns-resize \ ++ nw-resize \ ++ nwse-resize \ ++ openhand \ ++ pencil \ ++ pirate \ ++ plus \ ++ pointer \ ++ pointing_hand \ ++ question_arrow \ ++ right_arrow \ ++ right_ptr \ ++ right_side \ ++ right_tee \ ++ row-resize \ ++ sailboat \ ++ sb_down_arrow \ ++ sb_h_double_arrow \ ++ sb_left_arrow \ ++ sb_right_arrow \ ++ sb_up_arrow \ ++ sb_v_double_arrow \ ++ se-resize \ ++ size_all \ ++ size_bdiag \ ++ size_fdiag \ ++ size_hor \ ++ size_ver \ ++ sizing \ ++ shuttle \ ++ split_h \ ++ split_v \ ++ s-resize \ ++ sw-resize \ ++ target \ ++ tcross \ ++ text \ ++ top_left_arrow \ ++ top_left_corner \ ++ top_right_corner \ ++ top_side \ ++ top_tee \ ++ trek \ ++ ul_angle \ ++ up_arrow \ ++ ur_angle \ ++ vertical-text \ ++ v_double_arrow \ ++ whats_this \ ++ w-resize \ ++ X_cursor \ ++ xterm \ ++ zoom-in \ ++ zoom-out ++ ++CURSOR_NAMES = \ ++ 3ecb610c1bf2410f44200f48c40d3599 \ ++ 08e8e1c95fe2fc01f976f1e063a24ccd \ ++ 00000000000000020006000e7e9ffc3f \ ++ half-busy \ ++ left_ptr_watch \ ++ progress \ ++ watch ++ ++ ++EXTRA_DIST = invisible wait index.theme ++ ++install-data-local: ++ $(mkinstalldirs) $(DESTDIR)@cursordir@; ++ $(INSTALL_DATA) $(srcdir)/index.theme $(DESTDIR)/@cursordir@/.. ++ $(INSTALL_DATA) $(srcdir)/invisible $(srcdir)/wait $(DESTDIR)@cursordir@/ ++ for CURSOR in $(CURSOR_NAMES_INVISIBLE); do \ ++ echo '-- Installing invisible cursor '$$CURSOR; \ ++ ln -s $(srcdir)/invisible $(DESTDIR)@cursordir@/$$CURSOR; \ ++ done ++ for CURSOR in $(CURSOR_NAMES); do \ ++ echo '-- Installing visible cursor '$$CURSOR; \ ++ ln -s $(srcdir)/wait $(DESTDIR)@cursordir@/$$CURSOR; \ ++ done ++ +diff --git a/cursors/index.theme b/cursors/index.theme +new file mode 100644 +index 0000000..0c48458 +--- /dev/null ++++ b/cursors/index.theme +@@ -0,0 +1,3 @@ ++[Icon Theme] ++Name=xfce-invisible ++Example=invisible +-- +1.7.6.5 + diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch new file mode 100644 index 000000000..cf58f73d8 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch @@ -0,0 +1,152 @@ +From 7c87f8f202a7743a18b8d7fdab5c66a3d54badd5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 1 Nov 2012 21:01:59 +0100 +Subject: [PATCH 2/5] mouse settings dialog: add touchscreen-pointer option +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + +Signed-off-by: Andreas Müller +Upstream-Status: Submitted [1] +[1] https://bugzilla.xfce.org/show_bug.cgi?id=9474 +--- + dialogs/mouse-settings/main.c | 56 +++++++++++++++++++++++++++++ + dialogs/mouse-settings/mouse-dialog.glade | 28 ++++++++++++++- + 3 files changed, 422 insertions(+), 329 deletions(-) + +diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c +index f4b475b..ff08219 100644 +--- a/dialogs/mouse-settings/main.c ++++ b/dialogs/mouse-settings/main.c +@@ -956,6 +956,50 @@ mouse_settings_device_set_enabled (GtkToggleButton *button, + + + ++#ifdef HAVE_XCURSOR ++static void ++mouse_settings_on_touchscreen_pointer (GtkToggleButton *button, ++ GtkBuilder *builder) ++{ ++ gchar *name = NULL; ++ gchar *prop; ++ gboolean enabled; ++ ++ if (locked > 0) ++ return; ++ ++ if (mouse_settings_device_get_selected (builder, NULL, &name)) ++ { ++ enabled = gtk_toggle_button_get_active (button); ++ prop = g_strconcat ("/", name, "/TouchscreenPointer", NULL); ++ xfconf_channel_set_bool (pointers_channel, prop, enabled); ++ g_free (prop); ++ } ++ g_free (name); ++} ++ ++static void ++mouse_settings_set_touchscreen_pointer (GtkBuilder *builder) ++{ ++ gchar *name = NULL; ++ gchar *prop; ++ gboolean enabled; ++ GtkToggleButton *button; ++ ++ if (mouse_settings_device_get_selected (builder, NULL, &name)) ++ { ++ button = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "touchscreen-pointer")); ++ prop = g_strconcat ("/", name, "/TouchscreenPointer", NULL); ++ enabled = xfconf_channel_get_bool (pointers_channel, prop, FALSE); ++ gtk_toggle_button_set_active (button, enabled); ++ g_free (prop); ++ } ++ g_free (name); ++} ++#endif ++ ++ ++ + static void + mouse_settings_device_selection_changed (GtkBuilder *builder) + { +@@ -1007,6 +1051,9 @@ mouse_settings_device_selection_changed (GtkBuilder *builder) + /* get the selected item */ + if (mouse_settings_device_get_selected (builder, &device, NULL)) + { ++#ifdef HAVE_XCURSOR ++ mouse_settings_set_touchscreen_pointer (builder); ++#endif + gdk_error_trap_push (); + device_info = XListInputDevices (xdisplay, &ndevices); + if (gdk_error_trap_pop () == 0 && device_info != NULL) +@@ -1735,11 +1782,20 @@ main (gint argc, gchar **argv) + /* populate the themes treeview */ + mouse_settings_themes_populate_store (builder); + ++ /* connect & fill touchscreen-pointer */ ++ object = gtk_builder_get_object (builder, "touchscreen-pointer"); ++ g_signal_connect (G_OBJECT (object), "toggled", ++ G_CALLBACK (mouse_settings_on_touchscreen_pointer), builder); ++ mouse_settings_set_touchscreen_pointer (builder); ++ + /* connect the cursor size in the cursor tab */ + object = gtk_builder_get_object (builder, "theme-cursor-size"); + xfconf_g_property_bind (xsettings_channel, "/Gtk/CursorThemeSize", + G_TYPE_INT, G_OBJECT (object), "value"); + #else ++ /* hide touchscreen-pointer */ ++ object = gtk_builder_get_object (builder, "touchscreen-pointer"); ++ gtk_widget_hide (GTK_WIDGET (object)); + /* hide the themes tab */ + object = gtk_builder_get_object (builder, "themes-hbox"); + gtk_widget_hide (GTK_WIDGET (object)); +diff --git a/dialogs/mouse-settings/mouse-dialog.glade b/dialogs/mouse-settings/mouse-dialog.glade +index d3aab0d..573c551 100644 +--- a/dialogs/mouse-settings/mouse-dialog.glade ++++ b/dialogs/mouse-settings/mouse-dialog.glade +@@ -323,7 +323,7 @@ + True + False + 6 +- 3 ++ 4 + 2 + 12 + 6 +@@ -415,6 +415,32 @@ + 3 + + ++ ++ ++ True ++ False ++ 0 ++ 0 ++ 0 ++ ++ ++ _Touchscreen pointer ++ False ++ True ++ True ++ False ++ When selected, no mouse pointer is displayed for this device and gtk TouchscreenMode is activated ++ True ++ True ++ ++ ++ ++ ++ 2 ++ 3 ++ 4 ++ ++ + + + +-- +1.7.6.5 + diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0003-XfcePointersHelper-gets-a-pointer-to-XfceXSettingsHe.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0003-XfcePointersHelper-gets-a-pointer-to-XfceXSettingsHe.patch new file mode 100644 index 000000000..eff052b68 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0003-XfcePointersHelper-gets-a-pointer-to-XfceXSettingsHe.patch @@ -0,0 +1,137 @@ +From a3b0218137c8796fbb7bd6d852dc8ab5895a65cb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 3 Nov 2012 18:32:01 +0100 +Subject: [PATCH 3/5] XfcePointersHelper gets a pointer to XfceXSettingsHelper +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + +Signed-off-by: Andreas Müller +Upstream-Status: Submitted [1] +[1] https://bugzilla.xfce.org/show_bug.cgi?id=9474 +--- + xfsettingsd/main.c | 2 +- + xfsettingsd/pointers.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 56 insertions(+), 1 deletions(-) + +diff --git a/xfsettingsd/main.c b/xfsettingsd/main.c +index 55c4183..99982f7 100644 +--- a/xfsettingsd/main.c ++++ b/xfsettingsd/main.c +@@ -273,7 +273,7 @@ main (gint argc, gchar **argv) + #ifdef HAVE_XRANDR + displays_helper = g_object_new (XFCE_TYPE_DISPLAYS_HELPER, NULL); + #endif +- pointer_helper = g_object_new (XFCE_TYPE_POINTERS_HELPER, NULL); ++ pointer_helper = g_object_new (XFCE_TYPE_POINTERS_HELPER, "xsettings-helper", xsettings_helper, NULL); + keyboards_helper = g_object_new (XFCE_TYPE_KEYBOARDS_HELPER, NULL); + accessibility_helper = g_object_new (XFCE_TYPE_ACCESSIBILITY_HELPER, NULL); + shortcuts_helper = g_object_new (XFCE_TYPE_KEYBOARD_SHORTCUTS_HELPER, NULL); +diff --git a/xfsettingsd/pointers.c b/xfsettingsd/pointers.c +index e7192e7..62ebc60 100644 +--- a/xfsettingsd/pointers.c ++++ b/xfsettingsd/pointers.c +@@ -47,8 +47,16 @@ + + #define XFCONF_TYPE_G_VALUE_ARRAY (dbus_g_type_get_collection ("GPtrArray", G_TYPE_VALUE)) + ++/* Property identifiers */ ++enum ++{ ++ PROP_0, ++ PROP_XSETTINGS_HELPER, ++}; ++ + + ++static void xfce_pointers_helper_constructed (GObject *object); + static void xfce_pointers_helper_finalize (GObject *object); + static void xfce_pointers_helper_syndaemon_stop (XfcePointersHelper *helper); + static void xfce_pointers_helper_syndaemon_check (XfcePointersHelper *helper); +@@ -63,6 +71,10 @@ static GdkFilterReturn xfce_pointers_helper_event_filter (GdkXEvent + GdkEvent *gdk_event, + gpointer user_data); + #endif ++static void xfce_pointers_helper_set_property (GObject *object, ++ guint prop_id, ++ const GValue *value, ++ GParamSpec *pspec); + + + +@@ -75,6 +87,8 @@ struct _XfcePointersHelper + { + GObject __parent__; + ++ GObject *xsettings_helper; ++ + /* xfconf channel */ + XfconfChannel *channel; + +@@ -108,7 +122,18 @@ xfce_pointers_helper_class_init (XfcePointersHelperClass *klass) + { + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + ++ gobject_class->constructed = xfce_pointers_helper_constructed; + gobject_class->finalize = xfce_pointers_helper_finalize; ++ gobject_class->set_property = xfce_pointers_helper_set_property; ++ ++ g_object_class_install_property (gobject_class, ++ PROP_XSETTINGS_HELPER, ++ g_param_spec_object ("xsettings-helper", ++ "xsettings-helper", ++ "xsettings-helper", ++ G_TYPE_OBJECT, ++ G_PARAM_CONSTRUCT_ONLY | ++ G_PARAM_WRITABLE)); + } + + +@@ -116,6 +141,15 @@ xfce_pointers_helper_class_init (XfcePointersHelperClass *klass) + static void + xfce_pointers_helper_init (XfcePointersHelper *helper) + { ++ /* All initialisation is done at xfce_pointers_helper_constructed */ ++} ++ ++ ++ ++static void ++xfce_pointers_helper_constructed (GObject *object) ++{ ++ XfcePointersHelper *helper = XFCE_POINTERS_HELPER (object); + XExtensionVersion *version = NULL; + Display *xdisplay; + #ifdef DEVICE_HOTPLUGGING +@@ -181,6 +215,27 @@ xfce_pointers_helper_init (XfcePointersHelper *helper) + + + static void ++xfce_pointers_helper_set_property (GObject *object, ++ guint prop_id, ++ const GValue *value, ++ GParamSpec *pspec) ++{ ++ XfcePointersHelper *helper = XFCE_POINTERS_HELPER (object); ++ ++ switch (prop_id) ++ { ++ case PROP_XSETTINGS_HELPER: ++ helper->xsettings_helper = g_value_get_object (value); ++ break; ++ default: ++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); ++ break; ++ } ++} ++ ++ ++ ++static void + xfce_pointers_helper_finalize (GObject *object) + { + xfce_pointers_helper_syndaemon_stop (XFCE_POINTERS_HELPER (object)); +-- +1.7.6.5 + diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0004-XfceXSettingsHelper-gets-a-property-touchscreen-poin.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0004-XfceXSettingsHelper-gets-a-property-touchscreen-poin.patch new file mode 100644 index 000000000..cacb5c3a1 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0004-XfceXSettingsHelper-gets-a-property-touchscreen-poin.patch @@ -0,0 +1,249 @@ +From 878fe1287a4c73f67dd2b51d1d7c450097aeffa7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 20 Dec 2012 16:49:18 +0100 +Subject: [PATCH 4/5] XfceXSettingsHelper gets a property + "touchscreen-pointer" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When this property is set, it overrides overrides cursor theme to +"xfce-invisible" and sets /Gtk/TouchscreenMode. + +Signed-off-by: Andreas Müller +Upstream-Status: Submitted [1] +[1] https://bugzilla.xfce.org/show_bug.cgi?id=9474 +--- + xfsettingsd/xsettings.c | 122 ++++++++++++++++++++++++++++++++++++++++++++- + xfsettingsd/xsettings.xml | 1 + + 2 files changed, 122 insertions(+), 1 deletions(-) + +diff --git a/xfsettingsd/xsettings.c b/xfsettingsd/xsettings.c +index 7657465..76bcea1 100644 +--- a/xfsettingsd/xsettings.c ++++ b/xfsettingsd/xsettings.c +@@ -73,6 +73,15 @@ typedef struct _XfceXSettingsNotify XfceXSettingsNotify; + + + ++/* Property identifiers */ ++enum ++{ ++ PROP_0, ++ PROP_TOUCHSCREEN_POINTER, ++}; ++ ++ ++ + static void xfce_xsettings_helper_finalize (GObject *object); + static void xfce_xsettings_helper_fc_free (XfceXSettingsHelper *helper); + static gboolean xfce_xsettings_helper_fc_init (gpointer data); +@@ -86,6 +95,10 @@ static void xfce_xsettings_helper_load (XfceXSettingsHelper *helper) + static void xfce_xsettings_helper_screen_free (XfceXSettingsScreen *screen); + static void xfce_xsettings_helper_notify_xft (XfceXSettingsHelper *helper); + static void xfce_xsettings_helper_notify (XfceXSettingsHelper *helper); ++static void xfce_xsettings_helper_set_property (GObject *object, ++ guint prop_id, ++ const GValue *value, ++ GParamSpec *pspec); + + + +@@ -120,6 +133,13 @@ struct _XfceXSettingsHelper + GPtrArray *fc_monitors; + guint fc_notify_timeout_id; + guint fc_init_id; ++ ++ /* keeper for touchscreen cursor theme / last set */ ++ GValue *touchscreen_cursor_value; ++ GValue *lastset_cursor_value; ++ ++ /* properties */ ++ gboolean touchscreen_pointer; + }; + + struct _XfceXSetting +@@ -157,6 +177,16 @@ xfce_xsettings_helper_class_init (XfceXSettingsHelperClass *klass) + + gobject_class = G_OBJECT_CLASS (klass); + gobject_class->finalize = xfce_xsettings_helper_finalize; ++ gobject_class->set_property = xfce_xsettings_helper_set_property; ++ ++ g_object_class_install_property (gobject_class, ++ PROP_TOUCHSCREEN_POINTER, ++ g_param_spec_boolean ("touchscreen-pointer", ++ "touchscreen-pointer", ++ "touchscreen-pointer", ++ FALSE, ++ G_PARAM_WRITABLE | ++ G_PARAM_STATIC_STRINGS)); + } + + +@@ -169,6 +199,13 @@ xfce_xsettings_helper_init (XfceXSettingsHelper *helper) + helper->settings = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, xfce_xsettings_helper_setting_free); + ++ helper->lastset_cursor_value = g_new0 (GValue, 1); ++ g_value_init(helper->lastset_cursor_value, G_TYPE_STRING); ++ g_value_set_string (helper->lastset_cursor_value, "default"); ++ helper->touchscreen_cursor_value = g_new0 (GValue, 1); ++ g_value_init(helper->touchscreen_cursor_value, G_TYPE_STRING); ++ g_value_set_string (helper->touchscreen_cursor_value, "xfce-invisible"); ++ + xfce_xsettings_helper_load (helper); + + g_signal_connect (G_OBJECT (helper->channel), "property-changed", +@@ -202,6 +239,9 @@ xfce_xsettings_helper_finalize (GObject *object) + + g_hash_table_destroy (helper->settings); + ++ g_free (helper->lastset_cursor_value); ++ g_free (helper->touchscreen_cursor_value); ++ + (*G_OBJECT_CLASS (xfce_xsettings_helper_parent_class)->finalize) (object); + } + +@@ -387,6 +427,61 @@ xfce_xsettings_helper_notify_xft_idle (gpointer data) + + + ++static void ++xfce_xsettings_helper_set_property (GObject *object, ++ guint prop_id, ++ const GValue *value, ++ GParamSpec *pspec) ++{ ++ gboolean touchscreen_pointer; ++ XfceXSetting *setting_theme, *setting_touchscreen; ++ XfceXSettingsHelper *helper = XFCE_XSETTINGS_HELPER (object); ++ GtkSettings *gtk_settings; ++ GValue bool_val = { 0, }; ++ ++ switch (prop_id) ++ { ++ case PROP_TOUCHSCREEN_POINTER: ++ touchscreen_pointer = g_value_get_boolean (value); ++ if (helper->touchscreen_pointer != touchscreen_pointer) ++ { ++ helper->touchscreen_pointer = touchscreen_pointer; ++ /* Update touchscreen-mode */ ++ xfconf_channel_set_bool (helper->channel, "/Gtk/TouchscreenMode", touchscreen_pointer); ++ /* Update cursor */ ++ setting_theme = g_hash_table_lookup (helper->settings, "/Gtk/CursorThemeName"); ++ if (G_LIKELY (setting_theme != NULL)) ++ { ++ /* update the serial */ ++ setting_theme->last_change_serial = helper->serial; ++ /* update value */ ++ g_value_reset (setting_theme->value); ++ g_value_copy (touchscreen_pointer ? ++ helper->touchscreen_cursor_value : ++ helper->lastset_cursor_value, ++ setting_theme->value); ++ } ++ else ++ g_critical("Setting not found for /Gtk/CursorThemeName"); ++ ++ if (G_LIKELY (setting_touchscreen != NULL || setting_theme != NULL)) ++ { ++ /* schedule xsettings update */ ++ if (helper->notify_idle_id == 0) ++ helper->notify_idle_id = g_idle_add (xfce_xsettings_helper_notify_idle, helper); ++ if (helper->notify_xft_idle_id == 0) ++ helper->notify_xft_idle_id = g_idle_add (xfce_xsettings_helper_notify_xft_idle, helper); ++ } ++ } ++ break; ++ default: ++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); ++ break; ++ } ++} ++ ++ ++ + static gboolean + xfce_xsettings_helper_prop_valid (const gchar *prop_name, + const GValue *value) +@@ -413,6 +508,28 @@ xfce_xsettings_helper_prop_valid (const gchar *prop_name, + + + ++static void ++xfce_xsettings_helper_check_cursor (const gchar *prop_name, ++ GValue *value, ++ XfceXSettingsHelper *helper) ++{ ++ if (g_strcmp0 (prop_name, "/Gtk/CursorThemeName") == 0) ++ { ++ /* Keep last cursor theme set */ ++ g_value_reset (helper->lastset_cursor_value); ++ g_value_copy (value, helper->lastset_cursor_value); ++ ++ /* invisible replacement required ? */ ++ if (helper->touchscreen_pointer) ++ { ++ g_value_reset (value); ++ g_value_copy (helper->touchscreen_cursor_value, value); ++ } ++ } ++} ++ ++ ++ + static gboolean + xfce_xsettings_helper_prop_load (gchar *prop_name, + GValue *value, +@@ -426,6 +543,7 @@ xfce_xsettings_helper_prop_load (gchar *prop_name, + + setting = g_slice_new0 (XfceXSetting); + setting->value = value; ++ xfce_xsettings_helper_check_cursor (prop_name, setting->value, helper); + setting->last_change_serial = helper->serial; + + xfsettings_dbg_filtered (XFSD_DEBUG_XSETTINGS, "prop \"%s\" loaded (type=%s)", +@@ -462,6 +580,7 @@ xfce_xsettings_helper_prop_changed (XfconfChannel *channel, + * it first */ + g_value_reset (setting->value); + g_value_copy (value, setting->value); ++ xfce_xsettings_helper_check_cursor (prop_name, setting->value, helper); + + /* update the serial */ + setting->last_change_serial = helper->serial; +@@ -475,6 +594,7 @@ xfce_xsettings_helper_prop_changed (XfconfChannel *channel, + + g_value_init (setting->value, G_VALUE_TYPE (value)); + g_value_copy (value, setting->value); ++ xfce_xsettings_helper_check_cursor (prop_name, setting->value, helper); + + g_hash_table_insert (helper->settings, g_strdup (prop_name), setting); + } +@@ -649,6 +769,7 @@ xfce_xsettings_helper_notify_xft (XfceXSettingsHelper *helper) + XfceXSetting *setting; + guint i; + GValue bool_val = { 0, }; ++ + const gchar *props[][2] = + { + /* { xfconf name}, { xft name } */ +@@ -700,7 +821,6 @@ xfce_xsettings_helper_notify_xft (XfceXSettingsHelper *helper) + PropModeReplace, + (guchar *) resource->str, + resource->len); +- + XCloseDisplay (xdisplay); + + if (gdk_error_trap_pop () != 0) +--- a/xfsettingsd/xsettings.xml ++++ b/xfsettingsd/xsettings.xml +@@ -36,5 +36,6 @@ + + + ++ + + +-- +1.7.6.5 + diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0005-pointers-detect-a-change-of-pointer-device-used-and-.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0005-pointers-detect-a-change-of-pointer-device-used-and-.patch new file mode 100644 index 000000000..3c9b3dad9 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0005-pointers-detect-a-change-of-pointer-device-used-and-.patch @@ -0,0 +1,589 @@ +From 78353322ce1070ee1fd7bb5367e2c4dd43928f42 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 20 Dec 2012 16:58:19 +0100 +Subject: [PATCH 5/5] pointers: detect a change of pointer-device used and set + "touchscreen-pointer" as found in xfconf +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +To detect pointer device in use the DevicePresence-, DeviceMotionNotify- and +DeviceButtonPress-events are handled. Tests showed that by repopenning and +closing the pointer devices (e.g when another setting was modified), the events +stopped working. Therefore all pointer devices are opened only once and managed +in a hash table. + +Signed-off-by: Andreas Müller +Upstream-Status: Submitted [1] +[1] https://bugzilla.xfce.org/show_bug.cgi?id=9474 +--- + xfsettingsd/pointers.c | 342 ++++++++++++++++++++++++++++++++----------------- + 1 file changed, 225 insertions(+), 117 deletions(-) + +diff --git a/xfsettingsd/pointers.c b/xfsettingsd/pointers.c +index cfa56e2..41c8bba 100644 +--- a/xfsettingsd/pointers.c ++++ b/xfsettingsd/pointers.c +@@ -66,11 +66,9 @@ static void xfce_pointers_helper_channel_property_changed (XfconfCha + const gchar *property_name, + const GValue *value, + XfcePointersHelper *helper); +-#ifdef DEVICE_HOTPLUGGING + static GdkFilterReturn xfce_pointers_helper_event_filter (GdkXEvent *xevent, + GdkEvent *gdk_event, + gpointer user_data); +-#endif + static void xfce_pointers_helper_set_property (GObject *object, + guint prop_id, + const GValue *value, +@@ -96,8 +94,11 @@ struct _XfcePointersHelper + GPid syndaemon_pid; + #endif + ++ GHashTable *pointer_devices; ++ XID last_pointer_active; ++ gint device_motion_event_type; ++ gint device_button_press_event_type; + #ifdef DEVICE_HOTPLUGGING +- /* device presence event type */ + gint device_presence_event_type; + #endif + }; +@@ -117,6 +118,15 @@ G_DEFINE_TYPE (XfcePointersHelper, xfce_pointers_helper, G_TYPE_OBJECT); + + + ++typedef struct ++{ ++ XDevice *device; ++ gchar* name; ++} ++XfcePointerDeviceData; ++ ++ ++ + static void + xfce_pointers_helper_class_init (XfcePointersHelperClass *klass) + { +@@ -147,6 +157,18 @@ xfce_pointers_helper_init (XfcePointersHelper *helper) + + + static void ++xfce_pointers_device_close (gpointer data) ++{ ++ XfcePointerDeviceData *device_data = data; ++ ++ XCloseDevice (GDK_DISPLAY (), device_data->device); ++ g_free (device_data->name); ++ g_free (device_data); ++} ++ ++ ++ ++static void + xfce_pointers_helper_constructed (GObject *object) + { + XfcePointersHelper *helper = XFCE_POINTERS_HELPER (object); +@@ -185,6 +207,10 @@ xfce_pointers_helper_constructed (GObject *object) + helper->channel = xfconf_channel_get ("pointers"); + + /* restore the pointer devices */ ++ helper->pointer_devices = g_hash_table_new_full (g_int_hash, ++ g_int_equal, ++ g_free, ++ xfce_pointers_device_close); + xfce_pointers_helper_restore_devices (helper, NULL); + + /* monitor the channel */ +@@ -194,21 +220,20 @@ xfce_pointers_helper_constructed (GObject *object) + /* launch syndaemon if required */ + xfce_pointers_helper_syndaemon_check (helper); + +-#ifdef DEVICE_HOTPLUGGING + if (G_LIKELY (xdisplay != NULL)) + { ++#ifdef DEVICE_HOTPLUGGING + /* monitor device changes */ + gdk_error_trap_push (); + DevicePresence (xdisplay, helper->device_presence_event_type, event_class); + XSelectExtensionEvent (xdisplay, RootWindow (xdisplay, DefaultScreen (xdisplay)), &event_class, 1); + + /* add an event filter */ +- if (gdk_error_trap_pop () == 0) +- gdk_window_add_filter (NULL, xfce_pointers_helper_event_filter, helper); +- else ++ if (gdk_error_trap_pop () != 0) + g_warning ("Failed to create device filter"); +- } + #endif ++ gdk_window_add_filter (NULL, xfce_pointers_helper_event_filter, helper); ++ } + } + } + +@@ -238,7 +263,10 @@ xfce_pointers_helper_set_property (GObject *object, + static void + xfce_pointers_helper_finalize (GObject *object) + { +- xfce_pointers_helper_syndaemon_stop (XFCE_POINTERS_HELPER (object)); ++ XfcePointersHelper* helper = XFCE_POINTERS_HELPER (object); ++ ++ xfce_pointers_helper_syndaemon_stop (helper); ++ g_hash_table_destroy (helper->pointer_devices); + + (*G_OBJECT_CLASS (xfce_pointers_helper_parent_class)->finalize) (object); + } +@@ -267,19 +295,19 @@ static void + xfce_pointers_helper_syndaemon_check (XfcePointersHelper *helper) + { + #ifdef DEVICE_PROPERTIES +- Display *xdisplay = GDK_DISPLAY (); +- XDeviceInfo *device_list; +- XDevice *device; +- gint n, ndevices; +- Atom touchpad_type; +- Atom touchpad_off_prop; +- Atom *props; +- gint i, nprops; +- gboolean have_synaptics = FALSE; +- gdouble disable_duration; +- gchar disable_duration_string[64]; +- gchar *args[] = { "syndaemon", "-i", disable_duration_string, "-K", "-R", NULL }; +- GError *error = NULL; ++ Display *xdisplay = GDK_DISPLAY (); ++ XDeviceInfo *device_list; ++ XfcePointerDeviceData *device_data; ++ gint n, ndevices; ++ Atom touchpad_type; ++ Atom touchpad_off_prop; ++ Atom *props; ++ gint i, nprops; ++ gboolean have_synaptics = FALSE; ++ gdouble disable_duration; ++ gchar disable_duration_string[64]; ++ gchar *args[] = { "syndaemon", "-i", disable_duration_string, "-K", "-R", NULL }; ++ GError *error = NULL; + + /* only stop a running daemon */ + if (!xfconf_channel_get_bool (helper->channel, "/DisableTouchpadWhileTyping", FALSE)) +@@ -299,17 +327,16 @@ xfce_pointers_helper_syndaemon_check (XfcePointersHelper *helper) + if (device_list[n].type != touchpad_type) + continue; + +- gdk_error_trap_push (); +- device = XOpenDevice (xdisplay, device_list[n].id); +- if (gdk_error_trap_pop () != 0 || device == NULL) ++ device_data = g_hash_table_lookup (helper->pointer_devices, &device_list[n].id); ++ if (device_data == NULL) + { +- g_critical ("Unable to open device %s", device_list[n].name); ++ g_critical ("xfce_pointers_helper_syndaemon_check: Unable to find device %s / ID %i in hash table", device_list[n].name, device_list[n].id); + break; + } + + /* look for the Synaptics Off property */ + gdk_error_trap_push (); +- props = XListDeviceProperties (xdisplay, device, &nprops); ++ props = XListDeviceProperties (xdisplay, device_data->device, &nprops); + if (gdk_error_trap_pop () == 0 + && props != NULL) + { +@@ -319,8 +346,6 @@ xfce_pointers_helper_syndaemon_check (XfcePointersHelper *helper) + XFree (props); + } + +- XCloseDevice (xdisplay, device); +- + if (have_synaptics) + break; + } +@@ -847,24 +872,56 @@ xfce_pointers_helper_change_properties (gpointer key, + + + static void ++xfce_pointers_helper_change_current_device (XfcePointersHelper *helper, ++ XID *xid) ++{ ++ XfcePointerDeviceData *device_data; ++ gchar* prop; ++ GValue bool_val = { 0, }; ++ ++ helper->last_pointer_active = *xid; ++ device_data = g_hash_table_lookup (helper->pointer_devices, xid); ++ if (device_data == NULL) ++ { ++ g_critical ("Unable to find device ID %i in hash table", *xid); ++ return; ++ } ++ if (G_LIKELY (G_IS_OBJECT (helper->xsettings_helper))) ++ { ++ prop = g_strconcat ("/", device_data->name, "/TouchscreenPointer", NULL); ++ g_value_init (&bool_val, G_TYPE_BOOLEAN); ++ g_value_set_boolean (&bool_val, ++ xfconf_channel_get_bool (helper->channel, prop, FALSE)); ++ g_object_set_property (helper->xsettings_helper, "touchscreen-pointer", &bool_val); ++ g_value_unset (&bool_val); ++ g_free (prop); ++ } ++ else ++ g_critical ("xsettings_helper was not properly set"); ++} ++ ++ ++static void + xfce_pointers_helper_restore_devices (XfcePointersHelper *helper, + XID *xid) + { +- Display *xdisplay = GDK_DISPLAY (); +- XDeviceInfo *device_list, *device_info; +- gint n, ndevices; +- XDevice *device; +- gchar *device_name; +- gchar prop[256]; +- gboolean right_handed; +- gboolean reverse_scrolling; +- gint threshold; +- gdouble acceleration; ++ Display *xdisplay = GDK_DISPLAY (); ++ XDeviceInfo *device_list, *device_info; ++ gint n, ndevices; ++ XDevice *device; ++ XfcePointerDeviceData *device_data; ++ gchar *device_name; ++ gchar prop[256]; ++ gboolean right_handed; ++ gboolean reverse_scrolling; ++ gint threshold; ++ gdouble acceleration; ++ XEventClass event_classes[2]; + #ifdef DEVICE_PROPERTIES +- GHashTable *props; +- XfcePointerData pointer_data; ++ GHashTable *props; ++ XfcePointerData pointer_data; + #endif +- const gchar *mode; ++ const gchar *mode; + + gdk_error_trap_push (); + device_list = XListInputDevices (xdisplay, &ndevices); +@@ -874,86 +931,110 @@ xfce_pointers_helper_restore_devices (XfcePointersHelper *helper, + return; + } + ++ device_data = NULL; + for (n = 0; n < ndevices; n++) + { +- /* filter the pointer devices */ ++ /* filter the physical pointer devices */ + device_info = &device_list[n]; + if (device_info->use != IsXExtensionPointer +- || device_info->name == NULL) ++ || device_info->name == NULL ++ || g_str_has_prefix (device_info->name, "Virtual core XTEST")) + continue; + + /* filter out the device if one is set */ + if (xid != NULL && device_info->id != *xid) + continue; + +- /* open the device */ +- gdk_error_trap_push (); +- device = XOpenDevice (xdisplay, device_info->id); +- if (gdk_error_trap_pop () != 0 || device == NULL) ++ device_data = g_hash_table_lookup (helper->pointer_devices, &device_info->id); ++ if (device_data == NULL) + { +- g_critical ("Unable to open device %s", device_info->name); +- continue; +- } ++ /* open the device and insert to hash */ ++ gdk_error_trap_push (); ++ device = XOpenDevice (xdisplay, device_info->id); ++ if (G_UNLIKELY(gdk_error_trap_pop () != 0 || device == NULL)) ++ { ++ g_critical ("Unable to open device %s / ID: %i", device_info->name, device_info->id); ++ continue; ++ } + +- /* create a valid xfconf property name for the device */ +- device_name = xfce_pointers_helper_device_xfconf_name (device_info->name); ++ /* create a valid xfconf property name for the device */ ++ device_name = xfce_pointers_helper_device_xfconf_name (device_info->name); + +- /* read buttonmap properties */ +- g_snprintf (prop, sizeof (prop), "/%s/RightHanded", device_name); +- right_handed = xfconf_channel_get_bool (helper->channel, prop, -1); ++ /* add device to our list */ ++ device_data = g_new (XfcePointerDeviceData, 1); ++ device_data->device = device; ++ device_data->name = device_name; ++ g_hash_table_insert (helper->pointer_devices, g_memdup (&device_info->id, sizeof(device_info->id)), device_data); + +- g_snprintf (prop, sizeof (prop), "/%s/ReverseScrolling", device_name); +- reverse_scrolling = xfconf_channel_get_bool (helper->channel, prop, -1); ++ /* catch motion event / button-press for new device */ ++ gdk_error_trap_push (); ++ DeviceMotionNotify (device, helper->device_motion_event_type, event_classes[0]); ++ DeviceButtonPress (device, helper->device_button_press_event_type, event_classes[1]); ++ XSelectExtensionEvent (xdisplay, RootWindow (xdisplay, DefaultScreen (xdisplay)), event_classes, 2); ++ if (G_UNLIKELY (gdk_error_trap_pop () != 0)) ++ g_critical ("Unable to register DeviceButtonPress/DeviceMotionNotify for %i", device_info->id); + +- if (right_handed != -1 || reverse_scrolling != -1) +- { +- xfce_pointers_helper_change_button_mapping (device_info, device, xdisplay, ++ ++ /* read buttonmap properties */ ++ g_snprintf (prop, sizeof (prop), "/%s/RightHanded", device_name); ++ right_handed = xfconf_channel_get_bool (helper->channel, prop, -1); ++ ++ g_snprintf (prop, sizeof (prop), "/%s/ReverseScrolling", device_name); ++ reverse_scrolling = xfconf_channel_get_bool (helper->channel, prop, -1); ++ ++ if (right_handed != -1 || reverse_scrolling != -1) ++ { ++ xfce_pointers_helper_change_button_mapping (device_info, device, xdisplay, + right_handed, reverse_scrolling); +- } ++ } + +- /* read feedback settings */ +- g_snprintf (prop, sizeof (prop), "/%s/Threshold", device_name); +- threshold = xfconf_channel_get_int (helper->channel, prop, -1); ++ /* read feedback settings */ ++ g_snprintf (prop, sizeof (prop), "/%s/Threshold", device_name); ++ threshold = xfconf_channel_get_int (helper->channel, prop, -1); + +- g_snprintf (prop, sizeof (prop), "/%s/Acceleration", device_name); +- acceleration = xfconf_channel_get_double (helper->channel, prop, -1.00); ++ g_snprintf (prop, sizeof (prop), "/%s/Acceleration", device_name); ++ acceleration = xfconf_channel_get_double (helper->channel, prop, -1.00); + +- if (threshold != -1 || acceleration != -1.00) +- { +- xfce_pointers_helper_change_feedback (device_info, device, xdisplay, +- threshold, acceleration); +- } ++ if (threshold != -1 || acceleration != -1.00) ++ { ++ xfce_pointers_helper_change_feedback (device_info, device, xdisplay, ++ threshold, acceleration); ++ } + +- /* read mode settings */ +- g_snprintf (prop, sizeof (prop), "/%s/Mode", device_name); +- mode = xfconf_channel_get_string (helper->channel, prop, NULL); ++ /* read mode settings */ ++ g_snprintf (prop, sizeof (prop), "/%s/Mode", device_name); ++ mode = xfconf_channel_get_string (helper->channel, prop, NULL); + +- if (mode != NULL) +- xfce_pointers_helper_change_mode (device_info, device, xdisplay, mode); ++ if (mode != NULL) ++ xfce_pointers_helper_change_mode (device_info, device, xdisplay, mode); + + #ifdef DEVICE_PROPERTIES +- /* set device properties */ +- g_snprintf (prop, sizeof (prop), "/%s/Properties", device_name); +- props = xfconf_channel_get_properties (helper->channel, prop); ++ /* set device properties */ ++ g_snprintf (prop, sizeof (prop), "/%s/Properties", device_name); ++ props = xfconf_channel_get_properties (helper->channel, prop); + +- if (props != NULL) +- { +- pointer_data.xdisplay = xdisplay; +- pointer_data.device = device; +- pointer_data.device_info = device_info; +- pointer_data.prop_name_len = strlen (prop) + 1; ++ if (props != NULL) ++ { ++ pointer_data.xdisplay = xdisplay; ++ pointer_data.device = device; ++ pointer_data.device_info = device_info; ++ pointer_data.prop_name_len = strlen (prop) + 1; + +- g_hash_table_foreach (props, xfce_pointers_helper_change_properties, &pointer_data); ++ g_hash_table_foreach (props, xfce_pointers_helper_change_properties, &pointer_data); + +- g_hash_table_destroy (props); +- } ++ g_hash_table_destroy (props); ++ } + #endif +- +- g_free (device_name); +- XCloseDevice (xdisplay, device); ++ } + } +- + XFreeDeviceList (device_list); ++ if (G_LIKELY (device_data != NULL)) ++ { ++ if (helper->last_pointer_active != device_data->device->device_id) ++ xfce_pointers_helper_change_current_device (helper, &device_data->device->device_id); ++ } ++ else ++ g_critical("no device selected in xfce_pointers_helper_restore_devices"); + } + + +@@ -964,12 +1045,12 @@ xfce_pointers_helper_channel_property_changed (XfconfChannel *channel, + const GValue *value, + XfcePointersHelper *helper) + { +- Display *xdisplay = GDK_DISPLAY (); +- XDeviceInfo *device_list, *device_info; +- XDevice *device; +- gint n, ndevices; +- gchar **names; +- gchar *device_name; ++ Display *xdisplay = GDK_DISPLAY (); ++ XDeviceInfo *device_list, *device_info; ++ XfcePointerDeviceData *device_data; ++ gint n, ndevices; ++ gchar **names; ++ gchar *device_name; + + if (G_UNLIKELY (property_name == NULL)) + return; +@@ -1000,63 +1081,72 @@ xfce_pointers_helper_channel_property_changed (XfconfChannel *channel, + /* filter the pointer devices */ + device_info = &device_list[n]; + if (device_info->use != IsXExtensionPointer +- || device_info->name == NULL) ++ || device_info->name == NULL ++ || g_str_has_prefix (device_info->name, "Virtual core XTEST")) + continue; + + /* search the device name */ + device_name = xfce_pointers_helper_device_xfconf_name (device_info->name); + if (strcmp (names[0], device_name) == 0) + { +- /* open the device */ +- gdk_error_trap_push (); +- device = XOpenDevice (xdisplay, device_info->id); +- if (gdk_error_trap_pop () != 0 || device == NULL) ++ /* find the device */ ++ device_data = g_hash_table_lookup (helper->pointer_devices, &device_info->id); ++ if (device_data == NULL) + { +- g_critical ("Unable to open device %s", device_info->name); ++ g_critical ("xfce_pointers_helper_channel_property_changed: Unable to find device %s / ID %i in hash table", device_info->name, device_info->id); + continue; + } + + /* check the property that requires updating */ + if (strcmp (names[1], "RightHanded") == 0) + { +- xfce_pointers_helper_change_button_mapping (device_info, device, xdisplay, ++ xfce_pointers_helper_change_button_mapping (device_info, device_data->device, xdisplay, + g_value_get_boolean (value), -1); + } + else if (strcmp (names[1], "ReverseScrolling") == 0) + { +- xfce_pointers_helper_change_button_mapping (device_info, device, xdisplay, ++ xfce_pointers_helper_change_button_mapping (device_info, device_data->device, xdisplay, + -1, g_value_get_boolean (value)); + } + else if (strcmp (names[1], "Threshold") == 0) + { +- xfce_pointers_helper_change_feedback (device_info, device, xdisplay, ++ xfce_pointers_helper_change_feedback (device_info, device_data->device, xdisplay, + g_value_get_int (value), -2.00); + } + else if (strcmp (names[1], "Acceleration") == 0) + { +- xfce_pointers_helper_change_feedback (device_info, device, xdisplay, ++ xfce_pointers_helper_change_feedback (device_info, device_data->device, xdisplay, + -2, g_value_get_double (value)); + } + #ifdef DEVICE_PROPERTIES + else if (strcmp (names[1], "Properties") == 0) + { +- xfce_pointers_helper_change_property (device_info, device, xdisplay, ++ xfce_pointers_helper_change_property (device_info, device_data->device, xdisplay, + names[2], value); + } + #endif + else if (strcmp (names[1], "Mode") == 0) + { +- xfce_pointers_helper_change_mode (device_info, device, xdisplay, ++ xfce_pointers_helper_change_mode (device_info, device_data->device, xdisplay, + g_value_get_string (value)); + } ++ else if (strcmp (names[1], "TouchscreenPointer") == 0) ++ { ++ /* only hide if the current device's property was changed */ ++ if (device_info->id == helper->last_pointer_active) ++ { ++ if (G_LIKELY (G_IS_OBJECT (helper->xsettings_helper))) ++ g_object_set_property (helper->xsettings_helper, "touchscreen-pointer", value); ++ else ++ g_critical ("xsettings_helper was not properly set"); ++ } ++ } + else + { + g_warning ("Unknown property %s set for device %s", + property_name, device_info->name); + } + +- XCloseDevice (xdisplay, device); +- + /* stop searching */ + n = ndevices; + } +@@ -1072,26 +1162,44 @@ xfce_pointers_helper_channel_property_changed (XfconfChannel *channel, + + + +-#ifdef DEVICE_HOTPLUGGING + static GdkFilterReturn + xfce_pointers_helper_event_filter (GdkXEvent *xevent, + GdkEvent *gdk_event, + gpointer user_data) + { ++ XDevicePresenceNotifyEvent *dpn_event; + XEvent *event = xevent; +- XDevicePresenceNotifyEvent *dpn_event = xevent; + XfcePointersHelper *helper = XFCE_POINTERS_HELPER (user_data); + +- if (event->type == helper->device_presence_event_type) ++ /* Comparison for device changed is done here redundantly to prevent call ++ * on every mouse move. ++ */ ++ if (event->type == helper->device_motion_event_type ++ && helper->last_pointer_active != ((XDeviceMotionEvent*)xevent)->deviceid) ++ xfce_pointers_helper_change_current_device (helper, &((XDeviceMotionEvent*)xevent)->deviceid); ++ else if (event->type == helper->device_button_press_event_type ++ && helper->last_pointer_active != ((XDeviceButtonEvent*)xevent)->deviceid) ++ xfce_pointers_helper_change_current_device (helper, &((XDeviceButtonEvent*)xevent)->deviceid); ++ ++#ifdef DEVICE_HOTPLUGGING ++ /* handle device add/remove */ ++ else if (event->type == helper->device_presence_event_type) + { ++ dpn_event = xevent; + /* restore device settings */ + if (dpn_event->devchange == DeviceAdded) + xfce_pointers_helper_restore_devices (helper, &dpn_event->deviceid); ++ else if(dpn_event->devchange == DeviceRemoved) ++ /* we could try to find a remaining pointer to set that as active ++ * one but that might not fit and as soon as the user works with ++ * another pointer we are changing to correct one. ++ */ ++ g_hash_table_remove (helper->pointer_devices, &dpn_event->deviceid); + + /* check if we need to launch syndaemon */ + xfce_pointers_helper_syndaemon_check (helper); + } ++#endif + + return GDK_FILTER_CONTINUE; + } +-#endif +-- +1.8.3.1 + diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/invisible b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/invisible new file mode 100644 index 000000000..ef4d9aadb Binary files /dev/null and b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/invisible differ diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/wait b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/wait new file mode 100644 index 000000000..8b9ac7e20 Binary files /dev/null and b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/wait differ diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb new file mode 100644 index 000000000..290ec3de5 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb @@ -0,0 +1,47 @@ +SUMMARY = "Xfce4 settings" +SECTION = "x11/wm" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "exo exo-native garcon gtk+ libxfce4util libxfce4ui xfconf dbus-glib libxi virtual/libx11 xrandr libnotify libxcursor libxklavier upower" + +inherit xfce xfce-git + +SRC_URI = " git://gitorious.org/xfce/xfce4-settings.git;protocol=git;branch=for-oe \ + 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" +S = "${WORKDIR}/git" +PV = "4.11.0+git${SRCPV}" + +EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" + +PACKAGECONFIG ??= " \ + ${@base_contains('DISTRO_FEATURES','systemd','datetime-setter','',d)} \ + ${@base_contains('DISTRO_FEATURES','alsa','sound-setter', base_contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \ +" +PACKAGECONFIG[datetime-setter] = "--enable-datetime-settings, --disable-datetime-settings,, tzdata" +PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" +PACKAGECONFIG[sound-setter] = "--enable-sound-settings, --disable-sound-settings, libcanberra, libcanberra-gtk2 sound-theme-freedesktop" + +FILES_${PN} += " \ + ${libdir}/xfce4 \ + ${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)}" diff --git a/meta-xfce/recipes-xfce/xfconf/files/0001-Simplify-checks.patch b/meta-xfce/recipes-xfce/xfconf/files/0001-Simplify-checks.patch new file mode 100644 index 000000000..ef68f7acd --- /dev/null +++ b/meta-xfce/recipes-xfce/xfconf/files/0001-Simplify-checks.patch @@ -0,0 +1,112 @@ +From 233f7d3a9b0f98b794548433cead77633aab5f7d Mon Sep 17 00:00:00 2001 +From: Nick Schermer +Date: Sun, 6 Jan 2013 12:46:47 +0100 +Subject: [PATCH] Simplify checks. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: backport [1] + +[1] http://git.xfce.org/xfce/xfconf/commit/?id=233f7d3a9b0f98b794548433cead77633aab5f7d + +Signed-off-by: Andreas Müller +--- + tests/Makefile.am | 1 - + tests/Makefile.inc | 9 +-------- + tests/test-template.sh.in | 49 ----------------------------------------------- + 3 files changed, 1 insertion(+), 58 deletions(-) + delete mode 100644 tests/test-template.sh.in + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 57165d9..57ba7e8 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -13,5 +13,4 @@ clean-local: + + EXTRA_DIST = \ + $(test_scripts) \ +- test-template.sh.in \ + tests-common.h +diff --git a/tests/Makefile.inc b/tests/Makefile.inc +index 2ed3431..7a5a715 100644 +--- a/tests/Makefile.inc ++++ b/tests/Makefile.inc +@@ -13,9 +13,7 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +-check_SCRIPTS = $(addsuffix .sh,$(check_PROGRAMS)) +- +-TESTS = $(check_SCRIPTS) ++TESTS = $(check_PROGRAMS) + TESTS_ENVIRONMENT = XDG_CONFIG_HOME="$(top_builddir)/tests/test-xdg_config_home" XFCONFD="$(top_builddir)/xfconfd/xfconfd" + + AM_CFLAGS = \ +@@ -27,8 +25,3 @@ AM_CFLAGS = \ + LIBS = \ + $(top_builddir)/xfconf/libxfconf-$(LIBXFCONF_VERSION_API).la + +-%.sh: $(top_srcdir)/tests/test-template.sh.in Makefile +- sed -e 's/@TEST_NAME@/$@/; s/\.sh//;' <$(top_srcdir)/tests/test-template.sh.in >$@ +- chmod 755 $@ +- +-CLEANFILES = $(check_SCRIPTS) +diff --git a/tests/test-template.sh.in b/tests/test-template.sh.in +deleted file mode 100644 +index 2e638a8..0000000 +--- a/tests/test-template.sh.in ++++ /dev/null +@@ -1,49 +0,0 @@ +-#!/bin/sh +- +-cleanup() { +- if [ "$XFCONFD_PID" ]; then +- kill -TERM $XFCONFD_PID 2>/dev/null +- sleep 1 +- kill -KILL $XFCONFD_PID 2>/dev/null +- fi +- +- kill -TERM $DBUS_SESSION_BUS_PID 2>/dev/null +- sleep 1 +- kill -KILL $DBUS_SESSION_BUS_PID 2>/dev/null +-} +- +-die() { +- [ "$1" ] && echo "$1" >&2 +- cleanup +- exit 1 +-} +- +-# some buildbots have problems with the tests (dbus not +-# working properly without an X11 server). +-if [ -n "$XFCONF_SKIP_TESTS" ]; then +- echo "Warning: Tests disabled, skipping @TEST_NAME@" >&2 +- exit 0 +-fi +- +-unset DBUS_SESSION_BUS_ADDRESS +-unset DBUS_SESSION_BUS_PID +-unset XFCONFD_PID +- +-eval `dbus-launch --sh-syntax` +-export DBUS_SESSION_BUS_ADDRESS +-export DBUS_SESSION_BUS_PID +- +-[ "$DBUS_SESSION_BUS_PID" ] || die "DBus failed to start" +- +-trap "die Interrupted" INT +- +-eval `$XFCONFD --daemon 2>/dev/null` || die "Failed to start xfconfd" +- +-export XDG_CONFIG_HOME # make sure it's exported from the makefile +-export XDG_CONFIG_DIRS="" +- +-./@TEST_NAME@ || die "Test Failed" +- +-cleanup +- +-exit 0 +-- +1.8.3.1 + diff --git a/meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb b/meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb new file mode 100644 index 000000000..30d0de377 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "Xfce configuration daemon and utilities" +SECTION = "x11/wm" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" +DEPENDS = "dbus-glib libxfce4util perl intltool-native xfce4-dev-tools-native" + +inherit xfce gtk-doc + +EXTRA_OECONF += "PERL=${STAGING_DIR_TARGET}/usr/bin/perl" + +SRC_URI += "file://0001-Simplify-checks.patch" +SRC_URI[md5sum] = "4ed48150a03fb5f42b455494307b7f28" +SRC_URI[sha256sum] = "175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576" + +FILES_${PN} += "${libdir}/xfce4/xfconf/xfconfd \ + ${datadir}/dbus-1/services/org.xfce.Xfconf.service" diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.10.2.bb b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.10.2.bb new file mode 100644 index 000000000..93b08545c --- /dev/null +++ b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.10.2.bb @@ -0,0 +1,15 @@ +SUMMARY = "Xfce4 Desktop Manager" +SECTION = "x11/base" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "glib-2.0 gtk+ libxfce4util libxfce4ui libwnck xfconf dbus-glib thunar garcon exo" + +inherit xfce + +SRC_URI[md5sum] = "54a84ce63046c279fc3ec3f436d2f1b0" +SRC_URI[sha256sum] = "49a6e0be513e307e896f7e5929825babec9bbcd4b2e73552f9d27647a4db797d" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" + +FILES_${PN} += "${datadir}/backgrounds" diff --git a/meta-xfce/recipes-xfce/xfwm4/files/0001-don-t-block-display-events-when-time-is-set-backward.patch b/meta-xfce/recipes-xfce/xfwm4/files/0001-don-t-block-display-events-when-time-is-set-backward.patch new file mode 100644 index 000000000..08fd76bb2 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfwm4/files/0001-don-t-block-display-events-when-time-is-set-backward.patch @@ -0,0 +1,33 @@ +From e87977696f03b0c9f72884f8e3e3ec3248dfd80a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 18 Jun 2013 12:46:42 +0200 +Subject: [PATCH] don't block display events when time is set backwards +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Submitted [1] + +[1] https://bugzilla.xfce.org/show_bug.cgi?id=10184 + +Signed-off-by: Andreas Müller +--- + src/display.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/display.c b/src/display.c +index 00318d5..651bc7a 100644 +--- a/src/display.c ++++ b/src/display.c +@@ -733,7 +733,7 @@ myDisplayUpdateCurrentTime (DisplayInfo *display, XEvent *ev) + break; + } + +- if ((timestamp != (guint32) CurrentTime) && TIMESTAMP_IS_BEFORE(display->current_time, timestamp)) ++ if ((timestamp != (guint32) CurrentTime) /*&& TIMESTAMP_IS_BEFORE(display->current_time, timestamp)*/) + { + display->current_time = timestamp; + } +-- +1.7.6.5 + diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb new file mode 100644 index 000000000..f8cd4b24f --- /dev/null +++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb @@ -0,0 +1,36 @@ +DESCRIPTION="Xfce4 Window Manager" +SECTION = "x11/wm" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" +DEPENDS = "virtual/libx11 libxpm gtk+ libxfce4util libxfce4ui xfconf libwnck dbus-glib startup-notification exo-native" + +inherit xfce xfce-git update-alternatives + +SRC_URI = " \ + git://git.xfce.org/xfce/xfwm4;protocol=git \ + file://0001-don-t-block-display-events-when-time-is-set-backward.patch \ +" + +SRCREV = "bce3062d0879ab8504c446f99ad57c9fd76c5097" +S = "${WORKDIR}/git" +PV = "4.10.1+git${SRCPV}" + +EXTRA_OECONF += "--enable-maintainer-mode" + +python populate_packages_prepend () { + themedir = d.expand('${datadir}/themes') + do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) +} + +PACKAGES_DYNAMIC += "^xfwm4-theme-.*" + +ALTERNATIVE_${PN} = "x-window-manager" +ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/xfwm4" +ALTERNATIVE_PRIORITY[x-window-manager] = "30" + +RDEPENDS_${PN} = "xfwm4-theme-default" +FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \ + ${datadir}/xfwm4/defaults \ +" +FILES_${PN}-dbg += "${libexecdir}/xfce4/xfwm4/.debug/*" + -- cgit v1.2.3-54-g00ecf