From c61dc077bbd81260e4f167fa2251643ba0ba6974 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 29 Jul 2021 17:04:53 +0200 Subject: Convert to new override syntax This is the result of automated script (0.9.1) conversion: oe-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Martin Jansa --- meta-xfce/recipes-xfce/exo/exo_4.16.1.bb | 2 +- meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb | 4 ++-- meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb | 2 +- .../recipes-xfce/packagegroups/packagegroup-xfce-base.bb | 2 +- .../packagegroups/packagegroup-xfce-extended.bb | 4 ++-- .../recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb | 2 +- meta-xfce/recipes-xfce/thunar/thunar_4.16.8.bb | 4 ++-- meta-xfce/recipes-xfce/tumbler/tumbler_4.16.0.bb | 8 ++++---- .../recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.1.bb | 2 +- .../recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.16.0.bb | 10 +++++----- meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb | 8 ++++---- .../xfce4-power-manager/xfce4-power-manager_4.16.0.bb | 14 +++++++------- .../recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb | 6 +++--- .../recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb | 10 +++++----- meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb | 4 ++-- meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb | 2 +- meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb | 8 ++++---- 17 files changed, 46 insertions(+), 46 deletions(-) (limited to 'meta-xfce/recipes-xfce') diff --git a/meta-xfce/recipes-xfce/exo/exo_4.16.1.bb b/meta-xfce/recipes-xfce/exo/exo_4.16.1.bb index a49b18c72..4b31af890 100644 --- a/meta-xfce/recipes-xfce/exo/exo_4.16.1.bb +++ b/meta-xfce/recipes-xfce/exo/exo_4.16.1.bb @@ -18,7 +18,7 @@ SRC_URI[sha256sum] = "528dac256315ffc2a4a53b3b421979327962121989886e3cf920aeff99 # 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.16.1.bb index 3e596323d..65db34500 100644 --- a/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb +++ b/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb @@ -13,8 +13,8 @@ SRC_URI[sha256sum] = "84914927a2c1fda167f67af26a6640630a744a22940df508aa6c752cdb 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_4.16.0.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb index 6fbf1cf25..7b46c2a76 100644 --- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb +++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb @@ -22,7 +22,7 @@ PACKAGECONFIG[gladeui2] = "--enable-gladeui2,--disable-gladeui2,glade" PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" PACKAGES += "${PN}-glade" -FILES_${PN}-glade = " \ +FILES:${PN}-glade = " \ ${libdir}/glade \ ${datadir}/glade \ " diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb index 70ef909ef..9545ad1a8 100644 --- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb @@ -6,7 +6,7 @@ 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 7f1c17261..64f886311 100644 --- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb @@ -8,12 +8,12 @@ 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 \ 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 index 138796e6c..5c669a5e9 100644 --- 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 @@ -13,4 +13,4 @@ SRC_URI[sha256sum] = "d2c0e719b242b7fd3db70bc6678a2df1abf2cfaa899b775a1591a5efa0 PACKAGECONFIG ??= "" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" -RDEPENDS_${PN} = "eject" +RDEPENDS:${PN} = "eject" diff --git a/meta-xfce/recipes-xfce/thunar/thunar_4.16.8.bb b/meta-xfce/recipes-xfce/thunar/thunar_4.16.8.bb index bdc357f76..41963b996 100644 --- a/meta-xfce/recipes-xfce/thunar/thunar_4.16.8.bb +++ b/meta-xfce/recipes-xfce/thunar/thunar_4.16.8.bb @@ -13,7 +13,7 @@ SRC_URI[sha256sum] = "038ca228d220cd0ba1b7b76465d8a51f2433ad1f74648d1d291daa0a24 PACKAGECONFIG ??= "" PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre" -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/thunarx-3/* \ ${libdir}/xfce4/panel/plugins/* \ ${libdir}/Thunar/[Tt]hunar* \ @@ -25,4 +25,4 @@ FILES_${PN} += " \ ${datadir}/xfce4/panel/plugins/* \ " -RRECOMMENDS_${PN} = "gvfs gvfsd-trash" +RRECOMMENDS:${PN} = "gvfs gvfsd-trash" diff --git a/meta-xfce/recipes-xfce/tumbler/tumbler_4.16.0.bb b/meta-xfce/recipes-xfce/tumbler/tumbler_4.16.0.bb index fcc39fd7d..c5ab85dd0 100644 --- a/meta-xfce/recipes-xfce/tumbler/tumbler_4.16.0.bb +++ b/meta-xfce/recipes-xfce/tumbler/tumbler_4.16.0.bb @@ -8,23 +8,23 @@ inherit xfce gtk-doc SRC_URI[sha256sum] = "9b0b7fed0c64041733d490b1b307297984629d0dd85369749617a8766850af66" -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 \ " -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 index 4b5523895..89385b056 100644 --- 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 @@ -10,4 +10,4 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[sha256sum] = "bfe3e9bd92695014ee74a2fbb7f5fd1b4c29cf043c4a11598b8958324c81e7ec" -FILES_${PN} += "${datadir}/metainfo" +FILES:${PN} += "${datadir}/metainfo" 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 index 143a0a5e7..7162311e5 100644 --- 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 @@ -5,21 +5,21 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" DEPENDS = "glib-2.0" -DEPENDS_append_class-target = " ${BPN}-native" +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:append:class-target = " file://0001-Run-native-xdt-csource-on-tests.patch" SRC_URI[sha256sum] = "f50b3070e66f3ebdf331744dd1ec5e1af5de333965d491e15ce05545e8eb4f04" -do_install_append() { +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" +FILES:${PN} += "${datadir}/xfce4/dev-tools/m4macros/*.m4" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb index d478e0ffa..c9e65400d 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb +++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb @@ -14,7 +14,7 @@ SRC_URI += " \ file://0002-use-lxdm-to-replace-dm-tool.patch \ " -python populate_packages_prepend() { +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, @@ -29,12 +29,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.16.0.bb index 7a778bdfc..a79d8015b 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.16.0.bb @@ -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.16.0.bb index 4f6bde2a9..fee634ed4 100644 --- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb @@ -15,11 +15,11 @@ 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/xfce4-settings_4.16.2.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb index bf853bfed..aff57a578 100644 --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb @@ -19,12 +19,12 @@ PACKAGECONFIG ??= " \ 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.16.0.bb index 9b341bb27..5214b2ea7 100644 --- a/meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb +++ b/meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb @@ -10,10 +10,10 @@ EXTRA_OECONF += "PERL=${STAGING_DIR_TARGET}/usr/bin/perl" SRC_URI[sha256sum] = "652a119007c67d9ba6c0bc7a740c923d33f32d03dc76dfc7ba682584e72a5425" -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 index e8b2b72b6..713635041 100644 --- a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb +++ b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb @@ -13,4 +13,4 @@ SRC_URI[sha256sum] = "934ba5affecff21e62d9fac1dd50c50cd94b3a807fefa5f5bff59f3d6f PACKAGECONFIG ??= "" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" -FILES_${PN} += "${datadir}/backgrounds" +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.16.1.bb index 2cbfdadd5..f4a78f1ad 100644 --- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb +++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb @@ -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 \ " -- cgit v1.2.3-54-g00ecf