classed/xfce: Make download tarball extention type configurable
PATCH v2 1/6 classed/xfce: Make download tarball extention type configurable
Default is still tar.bz2, but there is now option to use tar.xz which is some of new xfce component releases are only xz compressed tarballs.
--- meta-xfce/classes/xfce-app.bbclass | 2 +- meta-xfce/classes/xfce-panel-plugin.bbclass | 2 +- meta-xfce/classes/xfce.bbclass | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-)
meta-xfce/classes/xfce-app.bbclass +1 -1
@@ -2,5 +2,5 @@ inherit xfce features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2" +SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.${XFCE_COMPRESS_TYPE}"
meta-xfce/classes/xfce-panel-plugin.bbclass +1 -1
@@ -4,7 +4,7 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "libxfce4ui libxfce4util xfce4-panel" -SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2" +SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.${XFCE_COMPRESS_TYPE}" FILES:${PN} += "${datadir}/xfce4/panel-plugins/" FILES:${PN} += "${datadir}/xfce4/panel/plugins/"
meta-xfce/classes/xfce.bbclass +2 -1
@@ -4,7 +4,8 @@ def xfce_verdir(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" +XFCE_COMPRESS_TYPE ?= "bz2" +SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.${XFCE_COMPRESS_TYPE}" inherit autotools gettext gtk-icon-cache pkgconfig
PATCH v2 2/6 xfce4-clipman-plugin: Upgrade to 1.7.0
Add dependency on wayland and glib-2.0 native versions, needed for configuring the plugins
--- .../clipman/xfce4-clipman-plugin_1.6.7.bb | 16 -------------- .../clipman/xfce4-clipman-plugin_1.7.0.bb | 21 +++++++++++++++++++ 2 files changed, 21 insertions(+), 16 deletions(-) delete mode 100644 meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.6.7.bb create mode 100644 meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.7.0.bb
meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.6.7.bb deleted +0 -16
@@ -1,16 +0,0 @@ -SUMMARY = "Clipman is a clipboard manager for Xfce" -HOMEPAGE = "https://docs.xfce.org/panel-plugins/xfce4-clipman-plugin/start" -SECTION = "x11/application" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -inherit xfce-panel-plugin - -DEPENDS += "xfconf xorgproto libxtst" - -SRC_URI[sha256sum] = "9bae27808a50e959e0912b7202ea5d651ed7401a6fc227f811d9bdaf2e44178c" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[qrencode] = "--enable-libqrencode,--disable-libqrencode,qrencode" - -FILES:${PN} += "${datadir}/metainfo"
meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.7.0.bb new file +21 -0
@@ -0,0 +1,21 @@ +SUMMARY = "Clipman is a clipboard manager for Xfce" +HOMEPAGE = "https://docs.xfce.org/panel-plugins/xfce4-clipman-plugin/start" +SECTION = "x11/application" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +inherit xfce-panel-plugin + +DEPENDS += "xfconf xorgproto libxtst glib-2.0-native" + +XFCE_COMPRESS_TYPE = "xz" +SRC_URI[sha256sum] = "903302c3070a951d44ee17a84fa3cf21d36c6787678af8fbfc79e469fd00cb46" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" +PACKAGECONFIG[qrencode] = "--enable-libqrencode,--disable-libqrencode,qrencode" +PACKAGECONFIG[wayland] = "--enable-wayland, --disable-wayland, wayland-native wayland" + +EXTRA_OECONF += "WAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner \ + GLIB_COMPILE_RESOURCES=${STAGING_BINDIR_NATIVE}/glib-compile-resources" + +FILES:${PN} += "${datadir}/metainfo"
PATCH v2 3/6 classed/xfce: Add XFCEBASEBUILDCLASS
In reply to Khem RajDefault to autotools to keep the present defaults working, it allows building xfce components with meson, many of newer releases of xfce components are using meson
--- meta-xfce/classes/xfce.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta-xfce/classes/xfce.bbclass +4 -1
@@ -7,7 +7,10 @@ HOMEPAGE = "http://www.xfce.org" XFCE_COMPRESS_TYPE ?= "bz2" SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.${XFCE_COMPRESS_TYPE}" -inherit autotools gettext gtk-icon-cache pkgconfig +inherit gettext gtk-icon-cache pkgconfig + +XFCEBASEBUILDCLASS ??= "autotools" +inherit_defer ${XFCEBASEBUILDCLASS} DEPENDS += "intltool-native"
PATCH v2 4/6 xfce4-clipman-plugin: Use meson for building this recipe
In reply to Khem Rajautotools is still supported upstream but meson is preferred starting with 1.7 release
--- .../clipman/xfce4-clipman-plugin_1.7.0.bb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.7.0.bb +7 -5
@@ -8,14 +8,16 @@ inherit xfce-panel-plugin DEPENDS += "xfconf xorgproto libxtst glib-2.0-native" +XFCEBASEBUILDCLASS = "meson" XFCE_COMPRESS_TYPE = "xz" SRC_URI[sha256sum] = "903302c3070a951d44ee17a84fa3cf21d36c6787678af8fbfc79e469fd00cb46" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" -PACKAGECONFIG[qrencode] = "--enable-libqrencode,--disable-libqrencode,qrencode" -PACKAGECONFIG[wayland] = "--enable-wayland, --disable-wayland, wayland-native wayland" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'ptest', d)} \ +" -EXTRA_OECONF += "WAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner \ - GLIB_COMPILE_RESOURCES=${STAGING_BINDIR_NATIVE}/glib-compile-resources" +PACKAGECONFIG[ptest] = "-Dtests=true,-Dtests=false," +PACKAGECONFIG[qrencode] = "-Dqrencode=enabled,-Dqrencode=disabled,qrencode" +PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland-native wayland" FILES:${PN} += "${datadir}/metainfo"
PATCH v2 5/6 catfish: Upgrade to 4.20.1
In reply to Khem RajUse meson for building
Add missing buildtime dependencies needed for this version
---
.../catfish/{catfish_4.18.0.bb => catfish_4.20.1.bb} | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
rename meta-xfce/recipes-apps/catfish/{catfish_4.18.0.bb => catfish_4.20.1.bb} (73%)meta-xfce/recipes-apps/catfish/catfish_4.20.1.bb renamed from meta-xfce/recipes-apps/catfish/catfish_4.18.0.bb +9 -2
@@ -5,11 +5,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" inherit xfce-app python_setuptools_build_meta gtk-icon-cache mime-xdg features_check +XFCE_COMPRESS_TYPE = "xz" +XFCEBASEBUILDCLASS = "meson" + REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -DEPENDS += "python3-distutils-extra-native" +DEPENDS += "python3-distutils-extra-native \ + python3-dbus-native \ + python3-pygobject-native \ + python3-pexpect-native \ + xfconf" -SRC_URI[sha256sum] = "fdae9b73cc754a50716bb04b958aa31dbd7e94047068b7207f2ae313a7d58b99" +SRC_URI[sha256sum] = "fe00d45b163cf86b4c85ebdd23a73d53aa55bc97ba3f691a248ec403d4ade62b" FILES:${PN} += "${datadir}/metainfo"
PATCH v2 6/6 xfce4-whiskermenu-plugin: Upgrade to 2.10.1 release
In reply to Khem RajUse meson for building
---
...nu-plugin_2.7.1.bb => xfce4-whiskermenu-plugin_2.10.0.bb} | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
rename meta-xfce/recipes-panel-plugins/whiskermenu/{xfce4-whiskermenu-plugin_2.7.1.bb => xfce4-whiskermenu-plugin_2.10.0.bb} (63%)meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.10.0.bb renamed from meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.7.1.bb +4 -1
@@ -3,6 +3,9 @@ HOMEPAGE = "http://gottcode.org/xfce4-whiskermenu-plugin/" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +XFCE_COMPRESS_TYPE = "xz" +XFCEBASEBUILDCLASS = "meson" + inherit xfce-panel-plugin cmake -SRC_URI[sha256sum] = "04ae0c1764a0d5ec70f18a760d998a2109bb6724f048554d7d6999d9072ca63e" +SRC_URI[sha256sum] = "c2efb3782816d44d421dcbee2900b9513bdb2469b695b776641f495601f33a10"