diff options
Diffstat (limited to 'meta-xfce/recipes-xfce')
34 files changed, 308 insertions, 420 deletions
diff --git a/meta-xfce/recipes-xfce/exo/exo/configure.patch b/meta-xfce/recipes-xfce/exo/exo/configure.patch deleted file mode 100644 index 89cc1f3874..0000000000 --- a/meta-xfce/recipes-xfce/exo/exo/configure.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 13a74582ffd7f81dbd66a7296fc76007718e9d4d Mon Sep 17 00:00:00 2001 -From: Andreas Mueller <schnitzeltony@gmx.de> -Date: Mon, 1 Aug 2011 17:16:29 +0200 - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> - ---- - configure.ac | 34 ++++++++++++++++++---------------- - 1 file changed, 18 insertions(+), 16 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0de5ceb..3f92d1b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -143,22 +143,24 @@ AC_FUNC_MMAP() - dnl *************************************** - dnl *** Check for strftime() extensions *** - dnl *************************************** --AC_TRY_RUN([ -- #include <string.h> -- #include <time.h> -- 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 <string.h> -+dnl #include <time.h> -+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 index 348e147cf9..c5e7a097f0 100644 --- 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 @@ -10,17 +10,20 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +Rebase for xfce4 4.18.0. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> --- Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 226e79d..62ad18d 100644 +index 513ac36..c395272 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -9,8 +9,7 @@ SUBDIRS = \ +@@ -6,8 +6,7 @@ SUBDIRS = \ + exo-open \ docs \ - icons \ pixmaps \ - po \ - tests 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 deleted file mode 100644 index 8c950299f7..0000000000 --- a/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch +++ /dev/null @@ -1,90 +0,0 @@ -From e710d8d4a3e3480416826c70d56ea3d2598a77e4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Sat, 4 May 2019 14:50:11 +0200 -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 [embedded specific] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> - ---- - Makefile.am | 10 +--------- - configure.ac | 20 -------------------- - 2 files changed, 1 insertion(+), 29 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 62ad18d..8934f1f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,15 +1,7 @@ - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - - SUBDIRS = \ -- exo \ -- exo-csource \ -- exo-desktop-item-edit \ -- exo-helper \ -- exo-open \ -- docs \ -- icons \ -- pixmaps \ -- po -+ exo-csource - - distclean-local: - rm -rf *.cache *~ -diff --git a/configure.ac b/configure.ac -index 4e4eb5e..237184c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -120,15 +120,6 @@ AC_PROG_CC() - AM_PROG_CC_C_O() - AC_PROG_INSTALL() - IT_PROG_INTLTOOL([intltool_minimum_version], [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 *** -@@ -175,12 +166,6 @@ dnl *********************************** - dnl *** Check for required packages *** - dnl *********************************** - XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0]) --XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0]) --XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.22.0]) --XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0]) --XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0]) --XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0]) --XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features]) - - dnl *********************************************************** - dnl *** Optional support for a GTK+2 version of the library *** -@@ -190,11 +175,6 @@ XDT_CHECK_OPTIONAL_PACKAGE([GTK2], - [GTK+ 2 support]) - AM_CONDITIONAL([ENABLE_GTK2_LIBRARY], [test "x$GTK2_FOUND" = "xyes"]) - --dnl ********************* --dnl *** Check for X11 *** --dnl ********************* --XDT_CHECK_LIBX11_REQUIRE() -- - dnl ************************* - dnl *** Check for gtk-doc *** - dnl ************************* --- -2.20.1 - diff --git a/meta-xfce/recipes-xfce/exo/exo_4.16.1.bb b/meta-xfce/recipes-xfce/exo/exo_4.19.0.bb index a49b18c725..48044240a8 100644 --- a/meta-xfce/recipes-xfce/exo/exo_4.16.1.bb +++ b/meta-xfce/recipes-xfce/exo/exo_4.19.0.bb @@ -1,24 +1,25 @@ DESCRIPTION = "Application library for the Xfce desktop environment" SECTION = "x11" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "gtk+3 libxfce4ui virtual/libx11 liburi-perl-native cairo" +DEPENDS = "gtk+3 libxfce4ui liburi-perl-native cairo" inherit xfce perlnative gtk-doc features_check mime-xdg -REQUIRED_DISTRO_FEATURES = "x11" +# xfce4 depends on libwnck3, gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG. +# cairo would at least needed to be built with xlib. +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" # SRC_URI must follow inherited one SRC_URI += " \ file://exo-no-tests-0.8.patch \ - file://configure.patch \ " -SRC_URI[sha256sum] = "528dac256315ffc2a4a53b3b421979327962121989886e3cf920aeff9912b53b" +SRC_URI[sha256sum] = "a0124108c197efcc576a6deeface381416dc7137b6a7e7dfa3060fad62509fb7" # 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} += " \ +FILES:${PN} += " \ ${datadir}/xfce4/ \ ${libdir}/xfce4/exo* \ " diff --git a/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb b/meta-xfce/recipes-xfce/garcon/garcon_4.19.0.bb index 3e596323d6..321f645b01 100644 --- a/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb +++ b/meta-xfce/recipes-xfce/garcon/garcon_4.19.0.bb @@ -1,20 +1,22 @@ DESCRIPTION = "Xfce Menu Library" SECTION = "x11/libs" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only & GFDL-1.1-no-invariants-only" LIC_FILES_CHKSUM = "file://COPYING;md5=04a01abcbdabffae1ca26335a293276b" DEPENDS = "xfce4-dev-tools-native libxfce4ui intltool-native" inherit xfce gtk-doc gobject-introspection features_check -REQUIRED_DISTRO_FEATURES = "x11" +# xfce4 depends on libwnck3, gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG. +# cairo would at least needed to be built with xlib. +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch" -SRC_URI[sha256sum] = "84914927a2c1fda167f67af26a6640630a744a22940df508aa6c752cdbd3d21d" +SRC_URI[sha256sum] = "e692f0d02294984c6b787e810a187c753a16f06ca87c68c0bb3de364ea3f6b0c" EXTRA_OECONF = "--disable-gtk-doc" -do_compile_prepend() { +do_compile:prepend() { export GIR_EXTRA_LIBS_PATH="${B}/garcon/.libs" } -FILES_${PN} += "${datadir}/desktop-directories" +FILES:${PN} += "${datadir}/desktop-directories" diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch index 616142761e..53ba873746 100644 --- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch +++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch @@ -11,15 +11,15 @@ Upstream-Status: Pending Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- - libxfce4kbd-private/xfce4-keyboard-shortcuts.xml | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + libxfce4kbd-private/xfce4-keyboard-shortcuts.xml | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml -index 723a10d..e6502f3 100644 +index 32901e3..8189c4c 100644 --- a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml +++ b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml -@@ -75,4 +75,8 @@ - <property name="<Super>KP_Next" type="string" value="tile_down_right_key"/> +@@ -96,4 +96,8 @@ + <property name="<Super>KP_Next" type="string" value="tile_down_right_key"/> </property> </property> + <property name="providers" type="array"> diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch deleted file mode 100644 index cd6ca32d00..0000000000 --- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch +++ /dev/null @@ -1,44 +0,0 @@ -From fb7bd8511d55cf0d24f6f93768f51773cf434a59 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Fri, 8 Jan 2021 21:59:45 +0100 -Subject: [PATCH] Remove GTK2 leftovers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It seems that these cause install performed twice causing natsy races - -see [1] and search for 'TOPDIR/build/tmpfs/hosttools/install -c -m 644 -../../libxfce4ui-4.16.0/libxfce4ui/libxfce4ui.h' - -[1] https://errors.yoctoproject.org/Errors/Details/540832/ - -Upstream-Status: Submitted [https://gitlab.xfce.org/xfce/libxfce4ui/-/merge_requests/29] - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - libxfce4ui/Makefile.am | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/libxfce4ui/Makefile.am b/libxfce4ui/Makefile.am -index 935eece..bc5afac 100644 ---- a/libxfce4ui/Makefile.am -+++ b/libxfce4ui/Makefile.am -@@ -51,15 +51,6 @@ libxfce4ui_sources = \ - xfce-filename-input.c \ - xfce-titled-dialog.c - --libxfce4ui_includedir = \ -- $(includedir)/xfce4/libxfce4ui-$(LIBXFCE4UI_VERSION_API)/libxfce4ui -- --libxfce4ui_include_HEADERS = \ -- $(libxfce4ui_headers) -- -- -- -- - ## - ## GTK+ 3 support library - ## --- -2.26.2 - diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb deleted file mode 100644 index 6fbf1cf258..0000000000 --- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Xfce4 Widget library and X Window System interaction" -SECTION = "x11/libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" -DEPENDS = "intltool-native perl-native gtk+3 libice libsm libxfce4util xfce4-dev-tools xfconf virtual/libx11" - -inherit xfce gtk-doc gobject-introspection features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -# TODO: Check if 0001-... can go -SRC_URI += " \ - file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \ - file://0002-Remove-GTK2-leftovers.patch \ -" -SRC_URI[sha256sum] = "8b06c9e94f4be88a9d87c47592411b6cbc32073e7af9cbd64c7b2924ec90ceaa" - -EXTRA_OECONF += "--with-vendor-info=${DISTRO}" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[gladeui2] = "--enable-gladeui2,--disable-gladeui2,glade" -PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" - -PACKAGES += "${PN}-glade" -FILES_${PN}-glade = " \ - ${libdir}/glade \ - ${datadir}/glade \ -" diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.19.3.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.19.3.bb new file mode 100644 index 0000000000..e53d01d00c --- /dev/null +++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.19.3.bb @@ -0,0 +1,31 @@ +SUMMARY = "Xfce4 Widget library and X Window System interaction" +SECTION = "x11/libs" +LICENSE = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4cf66a4984120007c9881cc871cf49db" +DEPENDS = "intltool-native perl-native gtk+3 libxfce4util xfce4-dev-tools xfconf" + +inherit xfce gtk-doc gobject-introspection features_check + +# xfce4 depends on libwnck3. gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG. +# cairo would at least needed to be built with xlib. +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +# TODO: Check if 0001-... can go +SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch" +SRC_URI[sha256sum] = "16815eef494ba9bac9c854e95c205c0bc5568c8022c31604348f9edadb02f227" + +EXTRA_OECONF += "--with-vendor-info=${DISTRO}" +EXTRA_OECONF += "--disable-vala" + +PACKAGECONFIG ??= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl','x11', "", d)} \ +" +PACKAGECONFIG[gladeui2] = "--enable-gladeui2,--disable-gladeui2,glade" +PACKAGECONFIG[x11] = "--enable-startup-notification,--disable-startup-notification,libepoxy libice libsm startup-notification" + + +PACKAGES += "${PN}-glade" +FILES:${PN}-glade = " \ + ${libdir}/glade \ + ${datadir}/glade \ +" diff --git a/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb deleted file mode 100644 index 1a0b7183ee..0000000000 --- a/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -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 gobject-introspection - -SRC_URI[sha256sum] = "60598d745d1fc81ff5ad3cecc3a8d1b85990dd22023e7743f55abd87d8b55b83" diff --git a/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.19.2.bb b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.19.2.bb new file mode 100644 index 0000000000..b54501cac2 --- /dev/null +++ b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.19.2.bb @@ -0,0 +1,9 @@ +SUMMARY = "Basic utility library for Xfce4" +SECTION = "x11/libs" +LICENSE = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4cf66a4984120007c9881cc871cf49db" +DEPENDS = "intltool-native xfce4-dev-tools-native glib-2.0" + +inherit xfce gtk-doc gobject-introspection vala + +SRC_URI[sha256sum] = "d4c7eb021d1c9408190bcfb92c7ce26f51e994674ac3c3b8a119270c1e900ac4" diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb index 70ef909ef9..c4b7b34cec 100644 --- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb @@ -1,12 +1,14 @@ SUMMARY = "All packages required for a base installation of XFCE" SECTION = "x11/wm" -PR = "r5" + +# librsvg-gtk gets debian renamed to librsvg-2-gtk +PACKAGE_ARCH = "${TUNE_PKGARCH}" inherit packagegroup features_check REQUIRED_DISTRO_FEATURES = "x11" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ xfwm4 \ xfce4-session \ xfconf \ diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb index 7f1c172616..f2e04f7932 100644 --- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb @@ -1,19 +1,18 @@ SUMMARY = "All packages for full XFCE installation" SECTION = "x11/wm" -PR = "r10" inherit packagegroup features_check REQUIRED_DISTRO_FEATURES = "x11" # mandatory -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ packagegroup-xfce-base \ " # nice to have -RRECOMMENDS_${PN} = " \ +RRECOMMENDS:${PN} = " \ xfwm4-theme-daloa \ xfwm4-theme-kokodi \ xfwm4-theme-moheli \ @@ -50,7 +49,7 @@ RRECOMMENDS_${PN} = " \ xfce4-verve-plugin \ \ ${@bb.utils.contains('DISTRO_FEATURES','polkit','xfce-polkit','',d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth", "blueman", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth gobject-introspection", "blueman", "", d)} \ \ thunar-media-tags-plugin \ thunar-archive-plugin \ @@ -63,6 +62,6 @@ RRECOMMENDS_${PN} = " \ xfce4-taskmanager \ gigolo \ mousepad \ - catfish \ - xfce4-panel-profiles \ + ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "catfish", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "xfce4-panel-profiles", "", d)} \ " diff --git a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb deleted file mode 100644 index 138796e6c4..0000000000 --- a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Automatic management of removable drives and media for thunar" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "exo libnotify libgudev" - -inherit xfce features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[sha256sum] = "d2c0e719b242b7fd3db70bc6678a2df1abf2cfaa899b775a1591a5efa08a547d" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" - -RDEPENDS_${PN} = "eject" diff --git a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.18.0.bb b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.18.0.bb new file mode 100644 index 0000000000..a136ba0545 --- /dev/null +++ b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.18.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "Automatic management of removable drives and media for thunar" +SECTION = "x11" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "exo libnotify libgudev" + +inherit xfce features_check perlnative + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[sha256sum] = "93b75c7ffbe246a21f4190295acc148e184be8df397e431b258d0d676e87fc65" + +PACKAGECONFIG ??= "notify" +PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" + +RDEPENDS:${PN} = "eject" diff --git a/meta-xfce/recipes-xfce/thunar/thunar_4.16.6.bb b/meta-xfce/recipes-xfce/thunar/thunar_4.16.6.bb deleted file mode 100644 index 128043d19b..0000000000 --- a/meta-xfce/recipes-xfce/thunar/thunar_4.16.6.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "File manager for the Xfce Desktop Environment" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "exo gdk-pixbuf libxfce4ui libsm startup-notification libnotify xfce4-panel udev" - -inherit xfce gobject-introspection features_check mime-xdg - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[sha256sum] = "cb531d3fe67196a43ca04979ef271ece7858bbc80c15b0ee4323c1252a1a02b7" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre" - -FILES_${PN} += " \ - ${libdir}/thunarx-3/* \ - ${libdir}/xfce4/panel/plugins/* \ - ${libdir}/Thunar/[Tt]hunar* \ - ${systemd_user_unitdir} \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${datadir}/polkit-1 \ - ${datadir}/Thunar \ - ${datadir}/xfce4/panel/plugins/* \ -" - -RRECOMMENDS_${PN} = "gvfs gvfsd-trash" diff --git a/meta-xfce/recipes-xfce/thunar/thunar_4.19.0.bb b/meta-xfce/recipes-xfce/thunar/thunar_4.19.0.bb new file mode 100644 index 0000000000..e4d8b7b4de --- /dev/null +++ b/meta-xfce/recipes-xfce/thunar/thunar_4.19.0.bb @@ -0,0 +1,35 @@ +SUMMARY = "File manager for the Xfce Desktop Environment" +SECTION = "x11" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "libxml-parser-perl-native exo gdk-pixbuf libxfce4ui libnotify xfce4-panel udev" + +inherit xfce gobject-introspection features_check mime-xdg perlnative gtk-doc + +# xfce4 depends on libwnck3, gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG. +# cairo would at least needed to be built with xlib. +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +SRC_URI[sha256sum] = "684f1422c4d92b00db477ecaa2a0ed38ce688e2a567e5d70b7cf66fc6dd6fd18" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG[pcre] = "--enable-pcre2,--disable-pcre2,libpcre2" +PACKAGECONFIG[x11] = ",,libsm startup-notification" + +FILES:${PN} += " \ + ${libdir}/thunarx-3/* \ + ${libdir}/xfce4/panel/plugins/* \ + ${libdir}/Thunar/[Tt]hunar* \ + ${systemd_user_unitdir} \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/polkit-1 \ + ${datadir}/Thunar \ + ${datadir}/xfce4/panel/plugins/* \ +" + +RRECOMMENDS:${PN} = " \ + gvfs \ + gvfsd-trash \ + ${@bb.utils.contains('DISTRO_FEATURES', 'dbus', 'tumbler', '', d)} \ +" diff --git a/meta-xfce/recipes-xfce/tumbler/tumbler_4.16.0.bb b/meta-xfce/recipes-xfce/tumbler/tumbler_4.18.0.bb index fcc39fd7d8..0472d4885f 100644 --- a/meta-xfce/recipes-xfce/tumbler/tumbler_4.16.0.bb +++ b/meta-xfce/recipes-xfce/tumbler/tumbler_4.18.0.bb @@ -1,30 +1,31 @@ DESCRIPTION = "Thumbnail service implementing the thumbnail management D-Bus specification" SECTION = "x11/libs" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "freetype gdk-pixbuf poppler curl xfce4-dev-tools-native libxml2 libgsf" +DEPENDS = "freetype gdk-pixbuf poppler curl xfce4-dev-tools-native libxml2 libgsf libxfce4util" -inherit xfce gtk-doc +inherit xfce gtk-doc systemd -SRC_URI[sha256sum] = "9b0b7fed0c64041733d490b1b307297984629d0dd85369749617a8766850af66" +SRC_URI[sha256sum] = "4087f3af4ef31271d3f315421a2f1fe67e4fda7ad60bbab1f073627914dfcf00" -INSANE_SKIP_${PN} = "dev-so" +INSANE_SKIP:${PN} = "dev-so" PACKAGECONFIG ??= "" PACKAGECONFIG[gstreamer-thumbnailer] = "--enable-gstreamer-thumbnailer,--disable-gstreamer-thumbnailer,gstreamer1.0 gstreamer1.0-plugins-base" -do_install_append() { +do_install:append() { # Makefile seems to race on creation of symlink. So ensure creation here # until fixed properly ln -sf tumbler-xdg-cache.so ${D}${libdir}/tumbler-1/plugins/cache/tumbler-cache-plugin.so } -FILES_${PN} += "${datadir}/dbus-1/services \ +FILES:${PN} += "${datadir}/dbus-1/services \ ${libdir}/tumbler-1/tumblerd \ ${libdir}/tumbler-1/plugins/*.so \ ${libdir}/tumbler-1/plugins/cache/*.so \ + ${systemd_user_unitdir}/tumblerd.service \ " -FILES_${PN}-dev += "${libdir}/tumbler-1/plugins/*.la \ +FILES:${PN}-dev += "${libdir}/tumbler-1/plugins/*.la \ ${libdir}/tumbler-1/plugins/cache/*.la \ " diff --git a/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.1.bb b/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.1.bb deleted file mode 100644 index 4b5523895f..0000000000 --- a/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Xfce4 Application Finder" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "glib-2.0 gtk+3 libxfce4util libxfce4ui garcon xfconf" - -inherit xfce features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[sha256sum] = "bfe3e9bd92695014ee74a2fbb7f5fd1b4c29cf043c4a11598b8958324c81e7ec" - -FILES_${PN} += "${datadir}/metainfo" diff --git a/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.19.1.bb b/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.19.1.bb new file mode 100644 index 0000000000..0fea41c773 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.19.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Xfce4 Application Finder" +SECTION = "x11" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "glib-2.0 gtk+3 libxfce4util libxfce4ui garcon xfconf" + +inherit xfce features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[sha256sum] = "d8bd2a1dd9d193eb25e8e5e68b1beae3578a46d1c5eeee30bec7dabbf4330648" + +FILES:${PN} += "${datadir}/metainfo" diff --git a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools/0001-m4macros-Check-for-a-function-provided-by-libX11-in-.patch b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools/0001-m4macros-Check-for-a-function-provided-by-libX11-in-.patch new file mode 100644 index 0000000000..43b1eb505a --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools/0001-m4macros-Check-for-a-function-provided-by-libX11-in-.patch @@ -0,0 +1,35 @@ +From 8f58e1b5c15fc3b6f775207971d078c058d9eb7b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 1 Sep 2022 08:21:56 -0700 +Subject: [PATCH] m4macros: Check for a function provided by libX11 in + AC_CHECK_LIB + +checking for main is not ideal, since its not a function from libX11 +moreover with newer versions of autoconf this will start to fail [1], so +change this to use XFree API which is provided by libX11 and seems more +relevant to check here. + +[1] https://lists.gnu.org/archive/html/autoconf-patches/2022-08/msg00018.html + +Upstream-Status: Submitted [https://gitlab.xfce.org/xfce/xfce4-dev-tools/-/issues/57] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + m4macros/xdt-depends.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4macros/xdt-depends.m4 b/m4macros/xdt-depends.m4 +index 3c07c90..ce1b272 100644 +--- a/m4macros/xdt-depends.m4 ++++ b/m4macros/xdt-depends.m4 +@@ -213,7 +213,7 @@ AC_DEFUN([XDT_CHECK_LIBX11], + + LIBX11_CFLAGS= LIBX11_LDFLAGS= LIBX11_LIBS= + if test x"$no_x" != x"yes"; then +- AC_CHECK_LIB([X11], [main], ++ AC_CHECK_LIB([X11], [XFree], + [ + AC_DEFINE([HAVE_LIBX11], [1], [Define if libX11 is available]) + LIBX11_CFLAGS="$X_CFLAGS" +-- +2.37.3 + diff --git a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.16.0.bb b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.16.0.bb deleted file mode 100644 index 143a0a5e7a..0000000000 --- a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.16.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -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" -DEPENDS_append_class-target = " ${BPN}-native" - -inherit autotools pkgconfig - -BBCLASSEXTEND = "native" - -SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:4]}/${BPN}-${PV}.tar.bz2" -SRC_URI_append_class-target = " file://0001-Run-native-xdt-csource-on-tests.patch" -SRC_URI[sha256sum] = "f50b3070e66f3ebdf331744dd1ec5e1af5de333965d491e15ce05545e8eb4f04" - -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-dev-tools/xfce4-dev-tools_4.18.0.bb b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.18.0.bb new file mode 100644 index 0000000000..6ca18b8b33 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.18.0.bb @@ -0,0 +1,27 @@ +SUMMARY = "Xfce4 development tools" +HOMEPAGE = "http://www.xfce.org" +SECTION = "x11/libs" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "glib-2.0" +DEPENDS:append:class-target = " ${BPN}-native" + +SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:4]}/${BPN}-${PV}.tar.bz2 \ + file://0001-m4macros-Check-for-a-function-provided-by-libX11-in-.patch \ + " +SRC_URI:append:class-target = " file://0001-Run-native-xdt-csource-on-tests.patch" +SRC_URI[sha256sum] = "eedb4fc955f0e3459c46864ff98579295db2b900743e0ff69cad5970ba76be37" + +inherit autotools pkgconfig + +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" + +BBCLASSEXTEND = "native" diff --git a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch b/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch index 1adb14552d..154f72d186 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch +++ b/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch @@ -13,15 +13,19 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Pending Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> + +Rebase for xfce4-panel 4.18.3. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> --- plugins/windowmenu/windowmenu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c -index f47e993e..061d6544 100644 +index be7dea4..2f432b0 100644 --- a/plugins/windowmenu/windowmenu.c +++ b/plugins/windowmenu/windowmenu.c -@@ -251,7 +251,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin) +@@ -262,7 +262,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin) g_signal_connect (G_OBJECT (plugin->button), "toggled", G_CALLBACK (window_menu_plugin_menu), plugin); @@ -29,17 +33,15 @@ index f47e993e..061d6544 100644 + plugin->icon = gtk_image_new_from_icon_name (NULL, GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (plugin->button), plugin->icon); gtk_widget_show (plugin->icon); - } -@@ -640,7 +640,7 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, + +@@ -695,19 +695,19 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, /* skip 'fake' windows */ type = wnck_window_get_window_type (window); if (type == WNCK_WINDOW_DESKTOP || type == WNCK_WINDOW_DOCK) - goto show_desktop_icon; + goto show_no_icon; - /* get the window icon and set the tooltip */ - gtk_widget_set_tooltip_text (GTK_WIDGET (icon), -@@ -660,12 +660,12 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, + window_menu_plugin_set_icon (plugin, window); } else { @@ -47,6 +49,7 @@ index f47e993e..061d6544 100644 + show_no_icon: /* desktop is shown right now */ + icon_size = xfce_panel_plugin_get_icon_size (XFCE_PANEL_PLUGIN (plugin)); - gtk_image_set_from_icon_name (GTK_IMAGE (icon), "user-desktop", icon_size); + gtk_image_set_from_icon_name (GTK_IMAGE (icon), NULL, icon_size); gtk_image_set_pixel_size (GTK_IMAGE (icon), icon_size); diff --git a/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch b/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch index b06e26e91d..66a33c722a 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch +++ b/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch @@ -9,15 +9,19 @@ so use lxdm to replace dm-tool Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +Rebase for xfce4-panel 4.18.3. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> --- plugins/actions/actions.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c -index 474798e..63eb41d 100644 +index e1f1fa7..440f430 100644 --- a/plugins/actions/actions.c +++ b/plugins/actions/actions.c -@@ -905,12 +905,12 @@ actions_plugin_actions_allowed (void) +@@ -977,12 +977,12 @@ actions_plugin_actions_allowed (void) GError *error = NULL; /* check for commands we use */ @@ -32,7 +36,7 @@ index 474798e..63eb41d 100644 g_free (path); path = g_find_program_in_path ("gdmflexiserver"); if (path != NULL) -@@ -1027,9 +1027,9 @@ actions_plugin_action_activate (GtkWidget *widget, +@@ -1099,9 +1099,9 @@ actions_plugin_action_activate (GtkWidget *widget, break; case ACTION_TYPE_SWITCH_USER: diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.2.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.3.bb index 7e54022ffd..7e70754431 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.2.bb +++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.3.bb @@ -1,23 +1,27 @@ SUMMARY = "Xfce4 Panel" SECTION = "x11" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" DEPENDS = "garcon exo gtk+3 cairo virtual/libx11 libxml2 libwnck3 vala-native" -inherit xfce gtk-doc gobject-introspection features_check remove-libtool mime-xdg +inherit xfce gtk-doc gobject-introspection features_check mime-xdg -REQUIRED_DISTRO_FEATURES = "x11" +# xfce4 depends on libwnck3, gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG. +# cairo would at least needed to be built with xlib. +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI[sha256sum] = "8634166e6f14318daec363f7e2371d49b98986f9bce313a7dd1554f30b48b5cf" SRC_URI += " \ file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ file://0002-use-lxdm-to-replace-dm-tool.patch \ " +SRC_URI[sha256sum] = "4ae0b8615c9811194bbda0172a63567ed7fdb5519ea48f7a4637f4e6e5365e1b" -python populate_packages_prepend() { +EXTRA_OECONF += "--disable-vala" + +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, + do_split_packages(d, plugin_dir, r'^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-*', @@ -29,12 +33,12 @@ PACKAGES_DYNAMIC += "^${PN}-plugin-.*" PACKAGES =+ "${PN}-gtk3" -FILES_${PN} += "${libdir}/xfce4/panel/migrate \ +FILES:${PN} += "${libdir}/xfce4/panel/migrate \ ${libdir}/xfce4/panel/wrapper-1.0" -FILES_${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la" +FILES:${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la" -FILES_${PN}-gtk3 = " \ +FILES:${PN}-gtk3 = " \ ${libdir}/libxfce4panel-2.0${SOLIBS} \ ${libdir}/xfce4/panel/wrapper-2.0 \ " diff --git a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.16.0.bb b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.18.1.bb index 7a778bdfc8..f7f72356d8 100644 --- a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.16.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.18.1.bb @@ -2,7 +2,7 @@ SUMMARY = "Power manager for the Xfce desktop environment" HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-power-manager" SECTION = "x11" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" inherit xfce features_check @@ -11,7 +11,7 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "libnotify libxrandr virtual/libx11 libxext xfce4-panel upower libxscrnsaver" -SRC_URI[sha256sum] = "eb9c587c01b502fa45a32e7fc2aba98fa6d8391475133883654f77e562c43bf3" +SRC_URI[sha256sum] = "6b08b10c4cb7516377dbd32c6cc2296a9faf47022c555f11e75b38fde14aff03" EXTRA_OECONF = " \ --enable-network-manager \ @@ -23,20 +23,20 @@ PACKAGECONFIG[polkit] = "--enable-polkit, --disable-polkit, polkit" PACKAGES += "xfce4-powermanager-plugin" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/polkit-1 \ ${datadir}/metainfo \ " -FILES_xfce4-powermanager-plugin = " \ +FILES:xfce4-powermanager-plugin = " \ ${libdir}/xfce4 \ ${datadir}/xfce4 \ " -RDEPENDS_xfce4-powermanager-plugin = "${PN}" -RDEPENDS_${PN} = "networkmanager ${@bb.utils.contains('DISTRO_FEATURES','systemd','','consolekit',d)}" +RDEPENDS:xfce4-powermanager-plugin = "${PN}" +RDEPENDS:${PN} = "networkmanager ${@bb.utils.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" +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_4.16.0.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.18.2.bb index 4f6bde2a9c..4021243e41 100644 --- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.18.2.bb @@ -1,25 +1,25 @@ SUMMARY = "xfce4-session is a session manager for Xfce 4 Desktop Environment" SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "libwnck3 libsm libxfce4ui virtual/libx11" inherit xfce update-alternatives features_check +SRC_URI += "file://0001-configure.in-hard-code-path-to-iceauth.patch" +SRC_URI[sha256sum] = "01ff7fe8d4c2091adefc2925c6b7bb93152ba0732e95c9b9e64d8207fdbdeb8a" + REQUIRED_DISTRO_FEATURES = "x11" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}" PACKAGECONFIG[polkit] = "--enable-polkit, --disable-polkit, polkit" -SRC_URI += "file://0001-configure.in-hard-code-path-to-iceauth.patch" -SRC_URI[sha256sum] = "22f273f212481d71e0b5618c62710cd85f69aea74f5ea5c0093f7918b07d17b7" - -ALTERNATIVE_${PN} = "x-session-manager" +ALTERNATIVE:${PN} = "x-session-manager" ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/xfce4-session" ALTERNATIVE_PRIORITY_${PN} = "150" -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/xfce4/*/*/*.so \ ${libdir}/xfce4/session/*-*-* \ ${datadir}/xsessions \ @@ -27,7 +27,7 @@ FILES_${PN} += " \ ${datadir}/polkit-1 \ " -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ dbus-x11 \ iceauth \ netbase \ diff --git a/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch b/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch index 0463d2ebdb..3a4c00913f 100644 --- a/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch +++ b/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch @@ -6,7 +6,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstram status: Inappropriate [configuration] +Upstream-Status: Inappropriate [configuration] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> @@ -22,11 +22,11 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml -index 65ba1ee..9efb3cd 100644 +index d8fe2ac..0f5246b 100644 --- a/xfsettingsd/xsettings.xml +++ b/xfsettingsd/xsettings.xml -@@ -1,8 +1,8 @@ - <?xml version="1.0" encoding="UTF-8"?> +@@ -6,8 +6,8 @@ + <channel name="xsettings" version="1.0"> <property name="Net" type="empty"> - <property name="ThemeName" type="empty"/> diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.0.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.2.bb index 47de8c571e..0a182273bb 100644 --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.2.bb @@ -1,7 +1,7 @@ SUMMARY = "Xfce4 settings" SECTION = "x11/wm" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "exo garcon libxi virtual/libx11 xrandr libxcursor libxklavier upower" inherit xfce features_check mime-xdg @@ -9,22 +9,23 @@ inherit xfce features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += "file://0001-xsettings.xml-Set-default-themes.patch" -SRC_URI[sha256sum] = "67a1404fc754c675c6431e22a8fe0e5d79644fdfadbfe25a4523d68e1442ddc2" +SRC_URI[sha256sum] = "4661361087faae57efb49741ffcf90bf9078760e163bbdef63b924083bdc4f22" EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" PACKAGECONFIG ??= " \ + notify \ ${@bb.utils.contains('DISTRO_FEATURES','alsa','sound-setter', bb.utils.contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \ " PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" PACKAGECONFIG[sound-setter] = "--enable-sound-settings, --disable-sound-settings, libcanberra, libcanberra-gtk2 sound-theme-freedesktop" -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/xfce4 \ ${datadir}/xfce4 \ " -RRECOMMENDS_${PN} += "adwaita-icon-theme" -RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}" -RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}" -RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','xfce4-datetime-setter','',d)}" +RRECOMMENDS:${PN} += "adwaita-icon-theme" +RRECOMMENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}" +RRECOMMENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}" +RRECOMMENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','xfce4-datetime-setter','',d)}" diff --git a/meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb b/meta-xfce/recipes-xfce/xfconf/xfconf_4.18.0.bb index 9b341bb273..f5c598b8df 100644 --- a/meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb +++ b/meta-xfce/recipes-xfce/xfconf/xfconf_4.18.0.bb @@ -1,19 +1,19 @@ SUMMARY = "Xfce configuration daemon and utilities" SECTION = "x11/wm" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" DEPENDS = "libxfce4util perl intltool-native xfce4-dev-tools-native" -inherit xfce gtk-doc gobject-introspection bash-completion +inherit xfce gtk-doc gobject-introspection bash-completion vala EXTRA_OECONF += "PERL=${STAGING_DIR_TARGET}/usr/bin/perl" -SRC_URI[sha256sum] = "652a119007c67d9ba6c0bc7a740c923d33f32d03dc76dfc7ba682584e72a5425" +SRC_URI[sha256sum] = "2e8c50160bf800a807aea094fc9dad81f9f361f42db56607508ed5b4855d2906" -FILES_${PN} += "${libdir}/xfce4/xfconf/xfconfd \ +FILES:${PN} += "${libdir}/xfce4/xfconf/xfconfd \ ${libdir}/gio/modules/libxfconfgsettingsbackend.so \ ${datadir}/dbus-1/services/org.xfce.Xfconf.service" -FILES_${PN}-dev += "${libdir}/gio/modules/libxfconfgsettingsbackend.la" +FILES:${PN}-dev += "${libdir}/gio/modules/libxfconfgsettingsbackend.la" PACKAGECONFIG[gsettings-backend] = "--enable-gsettings-backend,--disable-gsettings-backend," diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb deleted file mode 100644 index e8b2b72b67..0000000000 --- a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Xfce4 Desktop Manager" -SECTION = "x11/base" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "libxfce4ui libwnck thunar garcon exo" - -inherit xfce features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[sha256sum] = "934ba5affecff21e62d9fac1dd50c50cd94b3a807fefa5f5bff59f3d6f155bae" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" - -FILES_${PN} += "${datadir}/backgrounds" diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.18.1.bb b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.18.1.bb new file mode 100644 index 0000000000..f4d5fef8e4 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.18.1.bb @@ -0,0 +1,28 @@ +SUMMARY = "Xfce4 Desktop Manager" +SECTION = "x11/base" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = " \ + cairo \ + exo \ + garcon \ + glib-2.0 \ + gtk+3 \ + intltool \ + libwnck3 \ + libxfce4ui \ + libxfce4util \ + thunar \ + xfconf \ +" + +inherit xfce features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[sha256sum] = "ef9268190c25877e22a9ff5aa31cc8ede120239cb0dfca080c174e7eed4ff756" + +PACKAGECONFIG ??= "notify" +PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" + +FILES:${PN} += "${datadir}/backgrounds" diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.18.0.bb index 2cbfdadd5f..839f1c8704 100644 --- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb +++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.18.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Xfce4 Window Manager" SECTION = "x11/wm" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" DEPENDS = "virtual/libx11 libxfce4ui libwnck3 libxinerama" @@ -8,7 +8,7 @@ inherit xfce update-alternatives features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[sha256sum] = "b5b24ca04bd73c642db0a4b4df81d262381d758f01b51108257d48b391b8718c" +SRC_URI[sha256sum] = "92cd1b889bb25cb4bc06c1c6736c238d96e79c1e706b9f77fad0a89d6e5fc13f" PACKAGECONFIG ?= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'epoxy', '', d)} \ @@ -20,18 +20,18 @@ PACKAGECONFIG[epoxy] = "--enable-epoxy,--disable-epoxy,libepoxy" PACKAGECONFIG[xpresent] = "--enable-xpresent,--disable-xpresent,libxpresent" PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" -python populate_packages_prepend () { +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:${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 \ +RDEPENDS:${PN} = "xfwm4-theme-default" +FILES:${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \ ${datadir}/xfwm4/defaults \ " |