diff options
Diffstat (limited to 'meta-openembedded/meta-xfce')
17 files changed, 144 insertions, 26 deletions
diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch new file mode 100644 index 000000000..f726064e2 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch @@ -0,0 +1,60 @@ +It adds '-I$includedir' to CPPFLAGS and adds '-L$libdir' to LDFLAGS in +configure.ac which causes 'configure-unsafe' QA error. Don't add them for cross +compile to avoid the QA issues. + +Upstream-Status: Inappropriate [cross compile specific] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +diff --git a/configure.ac b/configure.ac +index f0ec537..05c393d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -230,9 +230,9 @@ dnl --------------------------------------------------------------------------- + # + AC_DEFUN([AC_CHECK_X_HEADER], [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi ++# if test \! -z "$includedir" ; then ++# CPPFLAGS="$CPPFLAGS -I$includedir" ++# fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + AC_CHECK_HEADER([$1],[$2],[$3],[$4]) + CPPFLAGS="$ac_save_CPPFLAGS"]) +@@ -241,9 +241,9 @@ AC_DEFUN([AC_CHECK_X_HEADER], [ + # + AC_DEFUN([AC_TRY_X_COMPILE], [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi ++# if test \! -z "$includedir" ; then ++# CPPFLAGS="$CPPFLAGS -I$includedir" ++# fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + AC_TRY_COMPILE([$1], [$2], [$3], [$4]) + CPPFLAGS="$ac_save_CPPFLAGS"]) +@@ -257,15 +257,15 @@ AC_DEFUN([AC_CHECK_X_LIB], [ + ac_save_LDFLAGS="$LDFLAGS" + # ac_save_LIBS="$LIBS" + +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi ++# if test \! -z "$includedir" ; then ++# CPPFLAGS="$CPPFLAGS -I$includedir" ++# fi + # note: $X_CFLAGS includes $x_includes + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + +- if test \! -z "$libdir" ; then +- LDFLAGS="$LDFLAGS -L$libdir" +- fi ++# if test \! -z "$libdir" ; then ++# LDFLAGS="$LDFLAGS -L$libdir" ++# fi + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $ALL_X_LIBS" + diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.4.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.4.bb new file mode 100644 index 000000000..fb2be6609 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.4.bb @@ -0,0 +1,19 @@ +SUMMARY = "Xfce screensaver Application" +DESCRIPTION = "Xfce screensaver is a screen saver and locker that aims to have simple, sane, secure defaults and be well integrated with the desktop." +HOMEPAGE = "https://git.xfce.org/apps/xfce4-screensaver/about/" +SECTION = "x11/application" + +LICENSE = "GPLv2+ & LGPLv2+ " +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ + " + +DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf" + +inherit xfce-app + +SRC_URI_append = " file://fix-cross-compile.patch" +SRC_URI[md5sum] = "18a619849f85c24d784c7fa27279ca4b" +SRC_URI[sha256sum] = "ed04ae32034b8e13a78495ca2bd7789a20ec7f67891ab9e92826a944371eabef" + +FILES_${PN} += "${datadir}/dbus-1 ${datadir}/desktop-directories" diff --git a/meta-openembedded/meta-xfce/recipes-graphics/lxdm/lxdm/gdmflexiserver b/meta-openembedded/meta-xfce/recipes-graphics/lxdm/lxdm/gdmflexiserver new file mode 100644 index 000000000..4be65c0c8 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-graphics/lxdm/lxdm/gdmflexiserver @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/sbin/lxdm -c USER_SWITCH diff --git a/meta-openembedded/meta-xfce/recipes-graphics/lxdm/lxdm_%.bbappend b/meta-openembedded/meta-xfce/recipes-graphics/lxdm/lxdm_%.bbappend new file mode 100644 index 000000000..4a799a98a --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-graphics/lxdm/lxdm_%.bbappend @@ -0,0 +1,7 @@ +FILESEXTRAPATHS_append := "${THISDIR}/${BPN}:" + +SRC_URI += "file://gdmflexiserver" + +do_install_append () { + install -D -m 0755 ${WORKDIR}/gdmflexiserver ${D}${bindir}/gdmflexiserver +} diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.4.bb b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.5.bb index df4b25c52..2bea5f0f6 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.4.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.5.bb @@ -11,8 +11,8 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += " \ file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \ " -SRC_URI[md5sum] = "b407cdab73ebd5c33c90db6bdb3ec5ff" -SRC_URI[sha256sum] = "d63fcdb8e5acb6f0d26075ea17d320dbfbec2058567cd67cb99824c7402a1f79" +SRC_URI[md5sum] = "692520f2a2cccaaafb0357c3dcbb015b" +SRC_URI[sha256sum] = "3c38b065796a1cb2c2f2e9a28edaa6b37a3728c1c0b7a4297af9ecd82a8ab66d" EXTRA_OECONF += "--with-vendor-info=${DISTRO}" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.13.2.bb b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.13.3.bb index 21cc1dbfc..89a385989 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.13.2.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.13.3.bb @@ -6,5 +6,5 @@ DEPENDS = "intltool-native xfce4-dev-tools-native glib-2.0" inherit xfce gtk-doc gobject-introspection -SRC_URI[md5sum] = "e3e8b9dd7e12028d3e642345b85d6ef1" -SRC_URI[sha256sum] = "c58275ff650080369e742695862c811cb78402c85f243ea0b5aec186027be361" +SRC_URI[md5sum] = "f39185afe5f612bd2c9b3dfbaf50b4d2" +SRC_URI[sha256sum] = "724b523a4a9ec8cada727950ab2173be30f256fa332a891ccd28b46f4b91b67e" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb index b412c2726..62b89fd47 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb @@ -62,6 +62,7 @@ RRECOMMENDS_${PN} = " \ thunar-archive-plugin \ \ xfce4-appfinder \ + xfce4-screensaver \ xfce4-screenshooter \ xfce4-power-manager \ ristretto \ diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.2.bb index 712453a39..3139625ac 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.2.bb @@ -8,8 +8,8 @@ inherit xfce distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "4992a18f422918c33b562d6e66045754" -SRC_URI[sha256sum] = "cd87291a427e8a561c566dca3aa7e93b56fdce4caefc755dde0f59198f6db359" +SRC_URI[md5sum] = "af216d5b60820e7cd39aae1b5ad869a3" +SRC_URI[sha256sum] = "b944b4299b73d2ca79184922dfea49782e4849f5960e209def71ac700a92ff27" PACKAGECONFIG ??= "" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.8.4.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.8.6.bb index 57667102c..4375ce065 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.8.4.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.8.6.bb @@ -9,8 +9,8 @@ inherit xfce gobject-introspection distro_features_check REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:3]}/Thunar-${PV}.tar.bz2" -SRC_URI[md5sum] = "6a5d0f4ddcc653c4791e555f0dc63828" -SRC_URI[sha256sum] = "c2bf51da8ddec8f642d67818184ada2ca6e143151e6a45563991db73387a93b0" +SRC_URI[md5sum] = "3cb40548d7c642176eab8b97a5ba6d29" +SRC_URI[sha256sum] = "c0e5fb828e3d036941dfeb7ed7f9f2b17b729fc044c2bf7c4218c1c91b38ef2a" S = "${WORKDIR}/Thunar-${PV}/" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.2.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.3.bb index e9f6e28b4..309559646 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.2.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.3.bb @@ -8,7 +8,7 @@ inherit xfce distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "8b4c2ab413748fcd0cc51444418d5af3" -SRC_URI[sha256sum] = "fd774acbcab08dbb88bcbf28eecf73ec9f55b13e1f2058021b63f703c4989d97" +SRC_URI[md5sum] = "c2069a14c85c8a3e537b2d4c552d36d2" +SRC_URI[sha256sum] = "d738082a5fb01e42ea6333803012fd80258061f444afbbbd7b05a0f620a32ba6" FILES_${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.4.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.5.bb index 18e054c9d..a4b200a7e 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.4.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.5.bb @@ -8,8 +8,8 @@ inherit xfce gtk-doc gobject-introspection distro_features_check gtk-icon-cache REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "c0f132fed2110d37f351aadc9e80a034" -SRC_URI[sha256sum] = "36ffd26ef7f5867c01ba310475b4358ff0e588cfd5599a266f0037a6c20052a1" +SRC_URI[md5sum] = "376e360fb87095edaea7df8ca34fe6a7" +SRC_URI[sha256sum] = "0d05b6dd8c91c154a364a3e31583c5f423c33e26d44d43cc409165f7d578ca15" SRC_URI += " \ file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ " diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.2.bb index 1cdcb4160..0a44b1f5d 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.2.bb @@ -12,8 +12,8 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "gtk+3 glib-2.0 dbus-glib xfconf libxfce4ui libxfce4util libnotify \ libxrandr virtual/libx11 libxext xfce4-panel upower libxscrnsaver" -SRC_URI[md5sum] = "17f0e6464ad6b3bc6a657f595bf91430" -SRC_URI[sha256sum] = "1ea825452343b895566068018b6d5078608f8f46ce8075ba6bbb4b848f48656b" +SRC_URI[md5sum] = "2a49be4eca78fb519984db5aae38e4ab" +SRC_URI[sha256sum] = "66ac34b33a2021b5af04c0181dfab6e6ee2bfab0ae07ed4527ca4552a66e1c01" EXTRA_OECONF = " \ --enable-network-manager \ @@ -27,7 +27,7 @@ PACKAGES += "xfce4-powermanager-plugin" FILES_${PN} += " \ ${datadir}/polkit-1 \ - ${datadir}/appdata \ + ${datadir}/metainfo \ " FILES_xfce4-powermanager-plugin = " \ diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.2.bb index 3b9525fff..dc44c4b0b 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.2.bb @@ -2,8 +2,19 @@ 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+ libwnck3 dbus dbus-glib xfconf polkit" -RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth upower" + +DEPENDS = " \ + dbus \ + dbus-glib \ + gtk+ \ + libwnck3 \ + libsm \ + libxfce4ui \ + libxfce4util \ + polkit \ + virtual/libx11 \ + xfconf \ +" inherit xfce update-alternatives distro_features_check @@ -12,8 +23,8 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += " \ file://0001-configure.in-hard-code-path-to-iceauth.patch \ " -SRC_URI[md5sum] = "a47988a2c871a411c19e3af1eefe591e" -SRC_URI[sha256sum] = "c789f0f8234e06f5266f0c6ccdbdcc3c085e8d9eea06a0eafe8f7cfc4fe23af4" +SRC_URI[md5sum] = "1306b6166f47cdf6e0c61259abbb621f" +SRC_URI[sha256sum] = "c0be0c7e602c962d0e8fca63bd86165e60313d07bfb72cf2c3f99ab53e2a22a1" ALTERNATIVE_${PN} = "x-session-manager" ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/xfce4-session" @@ -26,3 +37,12 @@ FILES_${PN} += " \ ${datadir}/themes/Default/balou/* \ ${datadir}/polkit-1 \ " + +RDEPENDS_${PN} = " \ + dbus-x11 \ + iceauth \ + netbase \ + upower \ + xinit \ + xrdb \ +" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch index 67df05a79..0463d2ebd 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch @@ -9,6 +9,14 @@ Content-Transfer-Encoding: 8bit Upstram status: Inappropriate [configuration] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> + +Theme Xfce doesn't work as expected. For example, no layout in start +menu and applications' menu bar. And GtkColorButton is blank in config +tab page from xfce4-terminal -> Edit -> Preference -> Colors. + +So use Adwaita as default theme instead. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> --- xfsettingsd/xsettings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -23,7 +31,7 @@ index 65ba1ee..9efb3cd 100644 <property name="Net" type="empty"> - <property name="ThemeName" type="empty"/> - <property name="IconThemeName" type="empty"/> -+ <property name="ThemeName" type="string" value="Xfce"/> ++ <property name="ThemeName" type="string" value="Adwaita"/> + <property name="IconThemeName" type="string" value="Adwaita"/> <property name="DoubleClickTime" type="int" value="400"/> <property name="DoubleClickDistance" type="int" value="5"/> diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.13.6.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.13.7.bb index ded3c44e5..9f08f74ed 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.13.6.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.13.7.bb @@ -8,8 +8,8 @@ inherit xfce gtk-doc EXTRA_OECONF += "PERL=${STAGING_DIR_TARGET}/usr/bin/perl" -SRC_URI[md5sum] = "da19df12dbc494c8a4da3974e376d639" -SRC_URI[sha256sum] = "d1a3d442dae188b5a7380b5815377e5488578cdafb03ae363e9426e3b01185df" +SRC_URI[md5sum] = "ea4c070c4ed8387e6435b56d0e871559" +SRC_URI[sha256sum] = "5deb13fc48a4116f5ebdee5c21d0fd3deb85bec2f69602beb3c3adb4f85e5bde" FILES_${PN} += "${libdir}/xfce4/xfconf/xfconfd \ ${libdir}/gio/modules/libxfconfgsettingsbackend.so \ diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.13.3.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.13.4.bb index 2c70a9c31..f02a6bffe 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.13.3.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.13.4.bb @@ -8,8 +8,8 @@ inherit xfce distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "f08944f1b69ce1c6e1fbb9d7f4cb1da7" -SRC_URI[sha256sum] = "80f7f28ef17638fe1cf4481db694731c208785a56b6c840005202f9c2db238f5" +SRC_URI[md5sum] = "d1174af12148141a07b62cc051c43c84" +SRC_URI[sha256sum] = "f4f7fa5162512971c25066eb04ef78f0d075656da79b6f7425ffb619a5119ca0" PACKAGECONFIG ??= "" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.13.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.13.2.bb index 64ad9f64e..6075977f2 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.13.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.13.2.bb @@ -8,8 +8,8 @@ inherit xfce update-alternatives distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "1a78bcc2100c03f6fea0dbce0ca813cf" -SRC_URI[sha256sum] = "75ebc20d313cff4905e76fc320254c30461dbfa985461b8e75dca04770cedf12" +SRC_URI[md5sum] = "aee4a8375beeae09715e77479610ff02" +SRC_URI[sha256sum] = "7be8a63e92077e42e6cc064a1dfdae608ab99fdc730adbd5200802dbdd86d5a9" PACKAGECONFIG ?= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'epoxy', '', d)} \ |