diff options
Diffstat (limited to 'meta-openembedded')
100 files changed, 466 insertions, 632 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.34.bb b/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.36.bb index ea852ce3a0..fff7d25d8d 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.34.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.36.bb @@ -2,7 +2,7 @@ SUMMARY = "NetworkManager GUI library" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "glib-2.0 gtk+3 networkmanager" +DEPENDS = "glib-2.0 gtk+3 gtk4 networkmanager" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gtk-doc gettext vala features_check @@ -10,13 +10,16 @@ inherit gnomebase gobject-introspection gtk-doc gettext vala features_check REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG','gcr','x11','',d)}" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI[archive.sha256sum] = "f5e2e738e0fca7f2a549079290b2d8017511d485a83220c36df380a3b4753304" +SRC_URI[archive.sha256sum] = "d99415f4cdff642230019ec5cdd2b1fbf1ec550a8ae865219f75482a642b7b7a" PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info" PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr" PACKAGECONFIG[iso_codes] = "-Diso_codes=true,-Diso_codes=false,iso-codes,iso-codes" PACKAGECONFIG[mobile_broadband_provider_info] = "-Dmobile_broadband_provider_info=true,-Dmobile_broadband_provider_info=false,mobile-broadband-provider-info,mobile-broadband-provider-info" +# for gnome-control-center >= 42 +EXTRA_OEMESON = "-Dlibnma_gtk4=true" + # go introspection is not supported for mipsn32/riscv32, but vapi needs it # EXTRA_OEMESON:append:mipsarchn32 = " -Dvapi=false" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-Remove-incorrect-args-for-i18n.merge_file.patch b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-Remove-incorrect-args-for-i18n.merge_file.patch deleted file mode 100644 index 68447bec8b..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-Remove-incorrect-args-for-i18n.merge_file.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b525a64d26bcba4e3a74f09c580429625d8a2104 Mon Sep 17 00:00:00 2001 -From: r-value <i@rvalue.moe> -Date: Wed, 17 Nov 2021 18:22:45 +0800 -Subject: [PATCH] Remove incorrect args for i18n.merge_file - -`i18n.merge_file` has been ignoring positional arguments for -a time and explicitly rejects with error since meson 0.60.0 - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - backend/meson.build | 1 - - data/meson.build | 1 - - meson.build | 1 - - 3 files changed, 3 deletions(-) - -diff --git a/backend/meson.build b/backend/meson.build -index 14629f2..2f972a8 100644 ---- a/backend/meson.build -+++ b/backend/meson.build -@@ -53,7 +53,6 @@ foreach backend, backend_mime_types: backends - ) - - i18n.merge_file( -- appstream, - input: appstream_in, - output: appstream, - po_dir: po_dir, -diff --git a/data/meson.build b/data/meson.build -index 8a308b8..afc3020 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -15,7 +15,6 @@ foreach desktop: desktops - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/meson.build b/meson.build -index 07fb8ec..0bb5d0f 100644 ---- a/meson.build -+++ b/meson.build -@@ -498,7 +498,6 @@ install_headers( - appdata = ev_namespace + '.appdata.xml' - - i18n.merge_file( -- appdata, - input: appdata + '.in', - output: appdata, - po_dir: po_dir, diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_41.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_42.1.bb index 6b3479c264..2e22f2e703 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_41.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_42.1.bb @@ -24,8 +24,7 @@ inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection g def gnome_verdir(v): return oe.utils.trim_version(v, 1) -SRC_URI += " file://0001-Remove-incorrect-args-for-i18n.merge_file.patch" -SRC_URI[archive.sha256sum] = "ff245240f230922bec32a4d7b0a1d91b247a83d13484f99b74035d51eb232130" +SRC_URI[archive.sha256sum] = "b24767bb3d5103b4e35b0e15cf033dbe2488f88700cdd882d22a43adeec2e80a" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb index f6b719392d..48cf6f76bc 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb @@ -21,7 +21,6 @@ SRC_URI += " \ LKSTRFTIME = "HAVE_LKSTRFTIME=ON" LKSTRFTIME:libc-musl = "HAVE_LKSTRFTIME=OFF" -GI_DATA_ENABLED="False" EXTRA_OECMAKE = " \ -DSYSCONF_INSTALL_DIR=${sysconfdir} \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc index bcbe20d752..81b02914d2 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc @@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ inherit gnomebase upstream-version-is-even -SRC_URI[archive.sha256sum] = "8c437af75edbef196034f7913f505c3f68acc18515a6eed20f3ef52452785898" -PV = "3.43.1" +SRC_URI[archive.sha256sum] = "0d8881b5c51e1b91761b1945db264a46aabf54a73eea1ca8f448b207815d582e" +PV = "3.44.0" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.42.0.bb index cce7f211f7..f77400564e 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.42.0.bb @@ -9,11 +9,12 @@ DEPENDS = " \ gtk+3 \ libarchive \ libnotify \ + libhandy \ " inherit gnomebase gsettings itstool gnome-help gettext upstream-version-is-even mime-xdg -SRC_URI[archive.sha256sum] = "4a2886a3966200fb0a9cbba4e2b79f8dad9d26556498aacdaed71775590b3c0d" +SRC_URI[archive.sha256sum] = "1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'packagekit', '', d)}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_42.0.bb index 94ffdc28eb..00fb56b2b1 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_41.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_42.0.bb @@ -8,6 +8,7 @@ DEPENDS = " \ accountsservice \ libcanberra \ libpam \ + libgudev \ " REQUIRED_DISTRO_FEATURES = "x11 systemd pam polkit gobject-introspection-data" @@ -17,7 +18,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection gettext systemd useradd itstool gnome-help features_check -SRC_URI[archive.sha256sum] = "5738c4293a9f5a80d4a6e9e06f4d0df3e9f313ca7b61bfb4d8afaba983e200dc" +SRC_URI[archive.sha256sum] = "a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855" EXTRA_OEMESON = " \ -Dplymouth=disabled \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_42.0.bb index adba8ab2f9..5bb5525d53 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_41.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_42.0.bb @@ -21,7 +21,7 @@ inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc val def gnome_verdir(v): return oe.utils.trim_version(v, 1) -SRC_URI[archive.sha256sum] = "7a9b18b158808d1892989165f3706c4f1a282979079ab7458a79d3c24ad4deb5" +SRC_URI[archive.sha256sum] = "a87991f42961eb4f6abcdbaabb784760c23aeaeefae6363d3e21a61e9c458437" # gobject-introspection is mandatory and cannot be configured # x11 is needed for tepl and gtksourceview4 diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph/0001-Update-rest-requirement-to-rest-1.0.patch b/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph/0001-Update-rest-requirement-to-rest-1.0.patch index c24a9e569f..21c623ea5b 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph/0001-Update-rest-requirement-to-rest-1.0.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph/0001-Update-rest-requirement-to-rest-1.0.patch @@ -13,25 +13,11 @@ Upstream-Status: Submitted Signed-off-by: Tim Orling <ticotimo@gmail.com> --- - .dir-locals.el | 2 +- configure.ac | 2 +- gfbgraph/Makefile.am | 2 +- libgfbgraph.pc.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/.dir-locals.el b/.dir-locals.el -index 77abbf0..d39cdf2 100644 ---- a/.dir-locals.el -+++ b/.dir-locals.el -@@ -3,7 +3,7 @@ - "/usr/include/json-glib-1.0" - "/usr/include/goa-1.0" - "/usr/lib64/goa-1.0/include" -- "/usr/include/rest-0.7" -+ "/usr/include/rest-1.0" - "/usr/include/dbus-1.0" - "/usr/lib64/dbus-1.0/include" - "/usr/include/gio-unix-2.0/" diff --git a/configure.ac b/configure.ac index fd1231f..9b49f3f 100644 --- a/configure.ac diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb index 2b36003635..f3b54e7d05 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb @@ -16,8 +16,7 @@ inherit gnomebase gtk-doc gobject-introspection pkgconfig features_check REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += " file://0001-Update-rest-requirement-to-rest-1.0.patch" -SRC_URI[archive.md5sum] = "c38af63e49f8fe8baad99537956b69ba" -SRC_URI[archive.sha256sum] = "6065391f35e7335588cc6b0cc4c1abbce7341488573a654551264cb9793b9379" +SRC_URI[archive.sha256sum] = "9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3" do_install:append() { # they install all the autotools files (NEWS AUTHORS..) to /usr/doc which diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth4_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth4_42.0.bb new file mode 100644 index 0000000000..3fe2c35ef4 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth4_42.0.bb @@ -0,0 +1,36 @@ +SUMMARY = "GNOME bluetooth manager" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ + file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ +" + +SECTION = "x11/gnome" + +DEPENDS = " \ + udev \ + libnotify \ + libcanberra \ + bluez5 \ + upower \ + gtk4 \ + gsound \ + libadwaita \ +" + +GNOMEBN = "gnome-bluetooth" +S = "${WORKDIR}/${GNOMEBN}-${PV}" + +GNOMEBASEBUILDCLASS = "meson" +GTKDOC_MESON_OPTION = "gtk_doc" +GTKIC_VERSION = "4" + +inherit features_check gnomebase gtk-icon-cache gtk-doc gobject-introspection + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.sha256sum] = "3d1e2720673bc9a242619dc5d231fd6e776c18a49da29f43cdc433055adb0170" + +RDEPENDS:${PN} += "bluez5" + +FILES:${PN} += "${datadir}/gnome-bluetooth-3.0" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_41.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_42.0.bb index 607f52afeb..80cc38c615 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_41.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_42.0.bb @@ -6,12 +6,12 @@ SECTION = "x11/gnome" DEPENDS = " \ yelp-tools-native \ - gtk+3 \ + gtk4 \ libsoup-2.4 \ libgee \ libmpc \ - gtksourceview4 \ - libhandy \ + gtksourceview5 \ + libadwaita \ " GIR_MESON_OPTION = 'disable-introspection' @@ -19,6 +19,7 @@ GIR_MESON_ENABLE_FLAG = 'false' GIR_MESON_DISABLE_FLAG = 'true' GNOMEBASEBUILDCLASS = "meson" +GTKIC_VERSION = '4' inherit gnomebase gobject-introspection gnome-help vala gtk-icon-cache gettext features_check @@ -27,7 +28,7 @@ def gnome_verdir(v): REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.sha256sum] = "0267614afdb25d38b78411b42ebab7bc50c1b6340cc49bb68c0e432d7ddf8a34" +SRC_URI[archive.sha256sum] = "a535a14ebea58e691a4b5a085256aed060a2c3f07384ac3a3d01832332a27e4a" FILES:${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-meson.build-fix-meson-0.61-builds.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-meson.build-fix-meson-0.61-builds.patch deleted file mode 100644 index 8ec980bb12..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-meson.build-fix-meson-0.61-builds.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 7060aa63abbb64e7c6cbacc167d5f939d2a77e41 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Fri, 21 Jan 2022 21:18:39 +0100 -Subject: [PATCH] meson.build: fix meson 0.61 builds - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/198] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - data/appdata/meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/data/appdata/meson.build b/data/appdata/meson.build -index b5ee6540..200c3507 100644 ---- a/data/appdata/meson.build -+++ b/data/appdata/meson.build -@@ -1,7 +1,6 @@ - appdata_conf = configuration_data() - appdata_conf.set('appid', application_id) - appdata = i18n.merge_file( -- 'appdata', - input: configure_file( - input: files('org.gnome.Calendar.appdata.xml.in.in'), - output: 'org.gnome.Calendar.appdata.xml.in', diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_42.0.bb index c97bf0bec8..7b32be611d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_42.0.bb @@ -5,14 +5,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" SECTION = "x11/gnome" DEPENDS = " \ - gtk+3 \ + gtk4 \ libical \ gsettings-desktop-schemas \ evolution-data-server \ libsoup-2.4 \ libdazzle \ - libhandy \ - libgweather \ + libadwaita \ + libgweather4 \ geoclue \ " @@ -22,8 +22,7 @@ inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-versi REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI += " file://0001-meson.build-fix-meson-0.61-builds.patch" -SRC_URI[archive.sha256sum] = "956b2f190322651c67fe667223896f8aa5acf33b70ada5a3b05a5361bda6611a" +SRC_URI[archive.sha256sum] = "b63f73f55032fc1390442f94cdf6b3cab9c91c774ddd2e5c61ecfec9d2c5e9aa" FILES:${PN} += " \ ${datadir}/gnome-shell \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.14.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.14.2.bb new file mode 100644 index 0000000000..c672422992 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.14.2.bb @@ -0,0 +1,22 @@ +SUMMARY = "A light and fast file manager" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +DEPENDS = " \ + glib-2.0-native \ + gtk+ \ +" + +inherit gnomebase itstool gettext gnome-help features_check +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" + +SRC_URI[archive.sha256sum] = "1378efd24f8af18a09031d83d918f9662a3f5eba5a6f9df9fc55870f2e6f0ee9" + +PACKAGECONFIG ??= "exiv2 taglib libgsf poppler" +PACKAGECONFIG[exiv2] = "--with-exiv2,--without-exiv2,exiv2" +PACKAGECONFIG[taglib] = "--with-taglib,--without-taglib,taglib" +PACKAGECONFIG[libgsf] = "--with-libgsf,--without-libgsf,libgsf" +PACKAGECONFIG[poppler] = "--with-poppler,--without-poppler,poppler" + +FILES:${PN} += "${datadir}/metainfo" +FILES:${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch index 99cf45830e..8ae1d82b6a 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch @@ -18,10 +18,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/meson.build b/meson.build -index cceefe0..df3fdd9 100644 +index 1dc8a73..87d72fe 100644 --- a/meson.build +++ b/meson.build -@@ -59,12 +59,7 @@ udev_dep = dependency('libudev', required: get_option('udev')) +@@ -65,12 +65,7 @@ udev_dep = dependency('libudev', required: get_option('udev')) host_os = host_machine.system() host_cpu = host_machine.cpu() supported_os = ['linux'] @@ -32,9 +32,9 @@ index cceefe0..df3fdd9 100644 - seccomp_dep = dependency('', required: false) -endif +seccomp_dep = dependency('', required: false) - fontconfig_cache_path = fontconfig_dep.get_pkgconfig_variable('cachedir') - xkb_base = xkb_config_dep.get_pkgconfig_variable('xkb_base') + fontconfig_cache_path = fontconfig_dep.get_variable(pkgconfig: 'cachedir') + xkb_base = xkb_config_dep.get_variable(pkgconfig: 'xkb_base') -- -2.31.1 +2.34.1 diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_42.0.bb index 6bf2ab3986..aae927a70b 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_42.0.bb @@ -16,13 +16,22 @@ REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" GIR_MESON_OPTION = "" -SRC_URI[archive.sha256sum] = "34329eefdacad2332a6adbae538c8da6e52235c7775a908b7c32040a0753ec6a" +SRC_URI[archive.sha256sum] = "f3caa293a5e86f6ccad18f817273db1c67061e680d79d839aa8a7528e5bb26d6" SRC_URI += " \ file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \ " -DEPENDS += "gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" +DEPENDS += " \ + gsettings-desktop-schemas \ + virtual/libx11 \ + gtk+3 \ + gtk4 \ + startup-notification \ + xkeyboard-config \ + iso-codes \ + udev \ +" GTKDOC_MESON_OPTION = "gtk_doc" EXTRA_OEMESON = "-Ddesktop_docs=false" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-Fix-meson-build-with-meson-0.60.0.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-Fix-meson-build-with-meson-0.60.0.patch deleted file mode 100644 index f32e120c1d..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-Fix-meson-build-with-meson-0.60.0.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9c5ce6836498fdb057a7f865f516ce28609f542a Mon Sep 17 00:00:00 2001 -From: r-value <i@rvalue.moe> -Date: Thu, 30 Dec 2021 17:14:47 +0800 -Subject: [PATCH] Fix meson build with meson 0.60.0+ - -`i18n.merge_file` has been ignoring positional arguments for a time -and explicitly rejects with error since meson 0.60.0 - -Upstrean-Status: Backport -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - data/meson.build | 2 +- - src/meson.build | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index bfc9caa..8e42134 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -1,6 +1,6 @@ - appdatadir = join_paths(datadir, 'metainfo') - appdata_file = 'org.gnome.font-viewer.appdata.xml' --merged_appdata = i18n.merge_file(appdata_file, -+merged_appdata = i18n.merge_file( - input: appdata_file + '.in', - output: appdata_file, - po_dir: '../po', -diff --git a/src/meson.build b/src/meson.build -index f863d45..826c59b 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -39,7 +39,7 @@ desktop_file = 'org.gnome.font-viewer.desktop' - desktop_conf = configuration_data() - desktop_conf.set('VERSION', meson.project_version()) - desktop_conf.set('APPLICATION_ID', application_id) --i18n.merge_file(desktop_file, -+i18n.merge_file( - input: configure_file(input: desktop_file + '.in.in', - output: desktop_file + '.in', - configuration: desktop_conf), diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_42.0.bb index 2e2927f1c7..c14e57c7c0 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_42.0.bb @@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SECTION = "x11/gnome" DEPENDS = " \ - gtk+3 \ + gtk4 \ gnome-desktop \ - libhandy \ + libadwaita \ " GNOMEBASEBUILDCLASS = "meson" @@ -16,8 +16,7 @@ inherit gnomebase gtk-icon-cache gettext features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI += " file://0001-Fix-meson-build-with-meson-0.60.0.patch" -SRC_URI[archive.sha256sum] = "5dd410331be070e4e034397f2754980e073851d50a2119f2fbf96adc6fe2e876" +SRC_URI[archive.sha256sum] = "cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc" FILES:${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_42.0.bb new file mode 100644 index 0000000000..01504b1cb7 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_42.0.bb @@ -0,0 +1,27 @@ +SUMMARY = "A simple text editor" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + desktop-file-utils-native \ + libadwaita \ + gtk4 \ + gtksourceview5 \ + enchant2 \ +" + +GTKIC_VERSION = "4" + +inherit gnomebase gtk-icon-cache itstool gnome-help mime-xdg features_check + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "opengl" + +SRC_URI[archive.sha256sum] = "0e32140ee1c13428563bcd5f784e61ee22ffd1ad27d8c02283b4358a81dfab50" + +FILES:${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/dbus-1 \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb new file mode 100644 index 0000000000..acfb97655a --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb @@ -0,0 +1,31 @@ +SUMMARY = "A library to access weather information from online services" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +GNOMEBASEBUILDCLASS = "meson" +GNOMEBN = "libgweather" +S = "${WORKDIR}/${GNOMEBN}-${PV}" + +inherit gnomebase gsettings gobject-introspection gettext gtk-doc vala features_check upstream-version-is-even + +SRC_URI[archive.sha256sum] = "440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +GIR_MESON_OPTION = "" + +GTKDOC_MESON_OPTION = "gtk_doc" + +DEPENDS = " \ + geocode-glib \ + gtk+3 \ + json-glib \ + libsoup-2.4 \ + python3-pygobject-native \ +" + +FILES:${PN} += " \ + ${datadir}/libgweather-4 \ + ${libdir}/libgweather-4 \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_42.0.bb index 13dada4438..a5da8590ff 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_41.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_42.0.bb @@ -16,7 +16,7 @@ DEPENDS += " \ yelp-xsl \ " -SRC_URI[archive.sha256sum] = "37f1acc02bcbe68a31b86e07c129a839bd3276e656dc89eb7fc0a92746eff272" +SRC_URI[archive.sha256sum] = "2cd43063ffa7262df15dd8d379aa3ea3999d42661f07563f4802daa1149f7df4" RDEPENDS:${PN} += "python3-core yelp-xsl" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_41.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_42.0.bb index 50cc8fc3a7..54a6aa6163 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_41.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_42.0.bb @@ -10,7 +10,7 @@ inherit gnomebase gettext itstool DEPENDS += "libxml2" -SRC_URI[archive.sha256sum] = "0d6db37ac2ef812483e0104703f1fa9cf032e9e0956a5f1c3afbcc23791f8a54" +SRC_URI[archive.sha256sum] = "29b273cc0bd16efb6e983443803f1e9fdc03511e5c4ff6348fd30a604d4dc846" RDEPENDS:${PN}:append:class-target = " libxml2 itstool" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_42.1.bb index 01427b157d..ab8b9c37ba 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_41.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_42.1.bb @@ -9,7 +9,7 @@ inherit gnomebase itstool autotools-brokensep gsettings gettext gtk-doc features # for webkitgtk REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.sha256sum] = "b00bf033f02dd79b6d3f255031c71df8d6ed38e552c870b8f391a374724c43c5" +SRC_URI[archive.sha256sum] = "25b1146ab8549888a5a8da067f63b470b0f0f800b6ae889cacd114d01d713b41" DEPENDS += " \ libxml2-native \ @@ -18,6 +18,7 @@ DEPENDS += " \ appstream-glib \ libxslt \ sqlite3 \ + libhandy \ webkitgtk \ yelp-xsl \ " diff --git a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.42.0.bb index ea1db575e4..ba2d4594a8 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.41.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.42.0.bb @@ -14,7 +14,7 @@ DEPENDS = " \ REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.sha256sum] = "19b676c3510e22badfcc3204062d432ba537402f5e0ae26128c0d90c954037e1" +SRC_URI[archive.sha256sum] = "c24c7fe6bb43163ced8adf232d583b2e013d3ba6c28deb5fcf807985e3deb5ef" SRC_URI += "file://0001-Harcode-shebang-to-avoid-pointing-to-build-system-s-.patch" PACKAGECONFIG[libnotify] = "-Dlibnotify=true,-Dlibnotify=false,libnotify" diff --git a/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice/0001-Fix-build-with-meson-0.60.patch b/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice/0001-Fix-build-with-meson-0.60.patch deleted file mode 100644 index 98b483d53e..0000000000 --- a/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice/0001-Fix-build-with-meson-0.60.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bedec82615ca6858c3e9494650a5bbf33c710ebb Mon Sep 17 00:00:00 2001 -From: Luca Boccassi <bluca@debian.org> -Date: Sun, 31 Oct 2021 12:29:14 +0000 -Subject: [PATCH] Fix build with meson 0.60 - -Positional parameters to merge_file() were never allowed and always -ignored, so just drop it. -See: https://github.com/mesonbuild/meson/issues/9441 - -Fixes #97 - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - data/meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/data/meson.build b/data/meson.build -index 4987937..ed0e2c4 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -29,7 +29,6 @@ configure_file( - policy = act_namespace.to_lower() + '.policy' - - i18n.merge_file( -- policy, - input: policy + '.in', - output: policy, - po_dir: po_dir, diff --git a/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch b/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch index 429192cd0d..99bd09a6c3 100644 --- a/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch +++ b/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch @@ -4,19 +4,20 @@ Date: Sun, 8 Dec 2019 23:42:00 +0100 Subject: [PATCH] musl: Hack to fix configure --- - meson.build | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) + meson.build | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build -index 4465a26..726c9fe 100644 +index 075776f..dfd7421 100644 --- a/meson.build +++ b/meson.build -@@ -82,8 +82,14 @@ if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURC - elif cc.has_header_symbol('paths.h', '_PATH_WTMPX') +@@ -101,9 +101,14 @@ elif cc.has_header_symbol('paths.h', '_PATH_WTMPX') + config_h.set('PATH_WTMP', '_PATH_WTMPX') else -- assert(run_command('test', '-e', '/var/log/utx.log').returncode() == 0, 'Do not know which filename to watch for wtmp changes') -- config_h.set_quoted('PATH_WTMP', '/var/log/utx.log') +- path_wtmp = '/var/log/utx.log' +- assert(run_command('test', '-e', path_wtmp).returncode() == 0, 'Do not know which filename to watch for wtmp changes') +- config_h.set_quoted('PATH_WTMP', path_wtmp) + # musl: This is just a build fix hack. + # As usual they know better, consider all other projects crap and offer zero + # alternatives: So wtmp is a dead stub only [1] (= /dev/null/wtmp - taken @@ -28,3 +29,6 @@ index 4465a26..726c9fe 100644 endif # compiler flags +-- +2.34.1 + diff --git a/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice_0.6.55.bb b/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice_22.08.8.bb index 551ff5dc9d..439958c7d2 100644 --- a/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice_0.6.55.bb +++ b/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice_22.08.8.bb @@ -8,24 +8,21 @@ DEPENDS = " \ polkit \ " -inherit meson gobject-introspection gtk-doc features_check systemd +inherit meson gobject-introspection gtk-doc features_check systemd vala REQUIRED_DISTRO_FEATURES = "polkit" -SRC_URI = "https://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ - file://0001-Fix-build-with-meson-0.60.patch \ - " +SRC_URI = "https://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" SRC_URI:append:libc-musl = " \ file://0001-musl-Hack-to-fix-build.patch \ file://0002-musl-add-missing-fgetspent_r.patch \ " -SRC_URI[md5sum] = "6e4c6fbd490260cfe17de2e76f5d803a" -SRC_URI[sha256sum] = "ff2b2419a7e06bd9cb335ffe391c7409b49a0f0130b890bd54692a3986699c9b" +SRC_URI[sha256sum] = "909997a76919fe7dc138a9a01cea70bd622d5a932dbc9fb13010113023a7a391" GTKDOC_MESON_OPTION = "gtk_doc" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false -Dsystemdsystemunitdir='no', systemd" +PACKAGECONFIG[systemd] = ", -Dsystemdsystemunitdir='no', systemd" SYSTEMD_SERVICE:${PN} = "accounts-daemon.service" diff --git a/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb b/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.0.bb index e9c79e28b2..0e86d781ce 100644 --- a/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb +++ b/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.0.bb @@ -6,13 +6,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" inherit meson gobject-introspection gettext gtk-doc features_check DEPENDS = " \ - gtk+3 \ colord \ " SRC_URI = "http://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "66d048803c8b89e5e63da4b461484933" -SRC_URI[sha256sum] = "2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717" +SRC_URI[sha256sum] = "b9466656d66d9a6ffbc2dd04fa91c8f6af516bf9efaacb69744eec0f56f3c1d0" + +PACKAGECONFIG ??= "gtk3 gtk4" +PACKAGECONFIG[gtk3] = "-Dgtk3=true, -Dgtk3=false, gtk+3" +PACKAGECONFIG[gtk4] = "-Dgtk4=true, -Dgtk4=false, gtk4" EXTRA_OEMESON = "-Dman=false" GIR_MESON_OPTION = "" diff --git a/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb b/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb index 481dd727d0..7151f93267 100644 --- a/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb +++ b/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb @@ -15,10 +15,12 @@ RDEPENDS:${PN} = " \ ghex \ gnome-calculator \ gnome-calendar \ + gnome-commander \ gnome-font-viewer \ gnome-photos \ gnome-screenshot \ gnome-terminal \ + gnome-text-editor \ gthumb \ libwnck3 \ nautilus \ diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch new file mode 100644 index 0000000000..bd768d00d2 --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch @@ -0,0 +1,35 @@ +From ff5e1a662ba93ba79e2aeaaaec48a2a8ec4b4701 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Thu, 31 Mar 2022 22:22:44 +0800 +Subject: [PATCH] Guard against __GLIBC_PREREQ for musl libc + +Upstream-Status: Pending + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + src/install/util.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/install/util.c b/src/install/util.c +index 5721de89..784aec48 100644 +--- a/src/install/util.c ++++ b/src/install/util.c +@@ -27,6 +27,7 @@ + + #include "util.h" + ++#if defined(__GLIBC__) + #if __GLIBC_PREREQ(2, 30) == 0 + #include <sys/syscall.h> + #ifndef SYS_gettid +@@ -35,6 +36,7 @@ + + #define gettid() ((pid_t) syscall(SYS_gettid)) + #endif /*__GLIBC_PREREQ */ ++#endif /*__GLIBC__*/ + + size_t page_size(void) + { +-- +2.25.1 + diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_055.bb b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_056.bb index a8fc5462f7..7b89006103 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_055.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_056.bb @@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" PE = "1" -SRCREV = "86bf2533d77762e823ad7a3e06a574522c1a90e3" +SRCREV = "631d5f72a223288aa1f48bb8e8d0313e75947400" SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git;protocol=http;branch=master \ file://0001-util.h-include-sys-reg.h-when-libc-glibc.patch \ + file://0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch \ " DEPENDS += "kmod" @@ -36,6 +37,7 @@ PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/ EXTRA_OEMAKE += 'libdir=${prefix}/lib LDLIBS="${LDLIBS}"' +CFLAGS:append = " -fPIC" LDLIBS:append:libc-musl = " -lfts" do_configure() { diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc index 218a51fc48..14d09e5f0b 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc @@ -4,9 +4,9 @@ SECTION = "libs/multimedia" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" -SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=master;protocol=https" -SRCREV = "6c807bdd37748411801e93c48fcd5789d5a6a278" +SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=2.2.x;protocol=https" +SRCREV = "8b00644751578ba67b709a827cbe5133d849d339" S = "${WORKDIR}/git" -PV = "2.2.4" +PV = "2.2.6" inherit cmake pkgconfig lib_package diff --git a/meta-openembedded/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch b/meta-openembedded/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch deleted file mode 100644 index 0cb6943ccb..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f1b35cbf5b9b42b031e9b119e4c802b5f744468c Mon Sep 17 00:00:00 2001 -From: Christophe Giboudeaux <krop@users.noreply.github.com> -Date: Wed, 10 Feb 2021 12:42:45 +0000 -Subject: [PATCH] [core] Fix build with GCC 11. (#1806) - -The 'limits' header must be included explicitly. ---- -Upstream-Status: Backport [https://github.com/haivision/srt/commit/f1b35cbf5b9b42b031e9b119e4c802b5f744468c] - srtcore/sync.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/srtcore/sync.h b/srtcore/sync.h -index 59c125a7..9f01ca91 100644 ---- a/srtcore/sync.h -+++ b/srtcore/sync.h -@@ -15,6 +15,7 @@ - //#define ENABLE_CXX17 - - #include <cstdlib> -+#include <limits> - #ifdef ENABLE_STDCXX_SYNC - #include <chrono> - #include <thread> --- -2.30.1 - diff --git a/meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.2.bb b/meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.4.bb index 5b5c1f24d9..d6cf36dfbe 100644 --- a/meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.4.bb @@ -6,10 +6,9 @@ HOMEPAGE = "https://github.com/Haivision/srt" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad" -SRCREV = "50b7af06f3a0a456c172b4cb3aceafa8a5cc0036" +SRCREV = "8b32f3734ff6af7cc7b0fef272591cb80a2d1aae" SRC_URI = "git://github.com/Haivision/srt;protocol=https;branch=master \ file://0001-don-t-install-srt-ffplay.patch \ - file://0001-core-Fix-build-with-GCC-11.-1806.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch new file mode 100644 index 0000000000..a52821915e --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch @@ -0,0 +1,49 @@ +From 37f24a9bd62f0a8f3e37eaddd33f2f0c9d3aaa0a Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Fri, 1 Apr 2022 23:12:17 -0700 +Subject: [PATCH] meson: add pythoninstalldir option + +In case of cross build, using host python to determine the python +site-packages directory for target is not feasible, add a new option +pythoninstalldir to fix the issue. + +Upstream-Status: Submitted [https://github.com/blueman-project/blueman/pull/1699] + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + meson.build | 7 ++++++- + meson_options.txt | 1 + + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index bc990cd..a37aacd 100644 +--- a/meson.build ++++ b/meson.build +@@ -26,7 +26,12 @@ pkgdatadir = join_paths([prefix, get_option('datadir'), package_name]) + bindir = join_paths([prefix, get_option('bindir')]) + libexecdir = join_paths([prefix, get_option('libexecdir')]) + schemadir = join_paths([datadir, 'glib-2.0', 'schemas']) +-pythondir = join_paths([prefix, python.sysconfig_path('purelib')]) ++pythoninstalldir = get_option('pythoninstalldir') ++if pythoninstalldir != '' ++ pythondir = join_paths([prefix, pythoninstalldir]) ++else ++ pythondir = join_paths([prefix, python.sysconfig_path('purelib')]) ++endif + + if get_option('policykit') + have_polkit = 'True' +diff --git a/meson_options.txt b/meson_options.txt +index b3e939f..96acbbc 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -5,5 +5,6 @@ option('pulseaudio', type: 'boolean', value: true, description: 'Enable PulseAud + option('appindicator', type: 'boolean', value: true, description: 'Enable Libappindicator support') + option('systemdsystemunitdir', type: 'string', description: 'Path to systemd system unit dir relative to ${prefix}') + option('systemduserunitdir', type: 'string', description: 'Path to systemd user unit dir relative to ${prefix}') ++option('pythoninstalldir', type: 'string', description: 'Path to python site-packages dir relative to ${prefix}') + option('sendto-plugins', type: 'array', choices: ['Caja', 'Nemo', 'Nautilus'], value: ['Caja', 'Nemo', 'Nautilus'], description: 'Install sendto plugins for various filemanagers') + option('thunar-sendto', type: 'boolean', value: true, description: 'Install Thunar sendto plugin') +-- +2.33.0 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.4.bb b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.4.bb index ea06ee67f7..d5aeceeb42 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.4.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.4.bb @@ -10,10 +10,11 @@ SRC_URI = " \ https://github.com/blueman-project/blueman/releases/download/${PV}/blueman-${PV}.tar.xz \ file://0001-Search-for-cython3.patch \ file://0002-fix-fail-to-enable-bluetooth.patch \ + file://0001-meson-add-pythoninstalldir-option.patch \ " SRC_URI[sha256sum] = "55d639feeda0b43b18a659e65985213a54b47dcb1348f3b4effb5238db242602" -EXTRA_OEMESON = "-Druntime_deps_check=false -Dappindicator=false" +EXTRA_OEMESON = "-Druntime_deps_check=false -Dappindicator=false -Dpythoninstalldir=${@noprefix('PYTHON_SITEPACKAGES_DIR', d)}" SYSTEMD_SERVICE:${PN} = "${BPN}-mechanism.service" SYSTEMD_AUTO_ENABLE:${PN} = "disable" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb index dc6e4b5e16..3da397f5c7 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb @@ -340,3 +340,8 @@ RDEPENDS:${PN}-test = "\ " ALLOW_EMPTY:${PN}-test = "1" + +# Patch for CVE-2018-1050 is applied in version 4.5.15, 4.6.13, 4.7.5. +# Patch for CVE-2018-1057 is applied in version 4.3.13, 4.4.16. +CVE_CHECK_IGNORE += "CVE-2018-1050" +CVE_CHECK_IGNORE += "CVE-2018-1057" diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/init b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/init index 51c95dfedd..43c286f9c7 100644 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/init +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/init @@ -16,7 +16,7 @@ fi DNSMASQ_CONF="/etc/dnsmasq.conf" test "/etc/dnsmasq.d/*" != '/etc/dnsmasq.d/*' && DNSMASQ_CONF="${DNSMASQ_CONF} /etc/dnsmasq.d/*" -test -z "${PIDFILE}" && PIFILE="/run/dnsmasq.pid" +test -z "${PIDFILE}" && PIDFILE="/run/dnsmasq.pid" if [ -z "$IGNORE_RESOLVCONF" ] then diff --git a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb index a3e090fbd5..1c3545f960 100644 --- a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb @@ -17,9 +17,9 @@ for better management of and seamless user interactions with guests.\ " SECTION = "vmware-tools" -LICENSE = "LGPL-2.0-only & GPL-2.0-only & BSD & CDDL-1.0" +LICENSE = "LGPL-2.0-only & GPL-2.0-only & BSD-2-Clause & CDDL-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=559317809c5444fb39ceaf6ac45c43ac" -LICENSE:modules/freebsd/vmblock = "BSD" +LICENSE:modules/freebsd/vmblock = "BSD-2-Clause" LICENSE:modules/freebsd/vmmemctl = "GPL-2.0-only" LICENSE:modules/freebsd/vmxnet = "GPL-2.0-only" LICENSE:modules/linux = "GPL-2.0-only" diff --git a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.7.6.bb b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.7.6.bb index 53f1720b04..20dccc2356 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.7.6.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.7.6.bb @@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "glib-2.0 libxmlb json-glib sqlite3 libjcat gcab vala-native" +COMPATIBLE_HOST:libc-musl = 'null' + SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ file://run-ptest" SRC_URI[sha256sum] = "7ebe1514acb688d2649cecc392db929094da3f03cfc98a9c0faccabb084912fa" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/files/0001-fix-undefined-bswap32-and-bswap64-errors-for-MIPS-ma.patch b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/files/0001-fix-undefined-bswap32-and-bswap64-errors-for-MIPS-ma.patch deleted file mode 100644 index cff37fb5dc..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/files/0001-fix-undefined-bswap32-and-bswap64-errors-for-MIPS-ma.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 73fcf0b54f4c1fc07a2aa003dddaeb5a97177cce Mon Sep 17 00:00:00 2001 -From: Potin Lai <potin.lai@quantatw.com> -Date: Thu, 31 Mar 2022 08:44:31 +0800 -Subject: [PATCH 1/1] fix undefined bswap32 and bswap64 errors for MIPS machine - -Replace bswap32 and bswap64 with internal defined version (__bswap_X) - -Upstream Status: Submitted [libimobiledevice-devel@libimobiledevice.org] - -Signed-off-by: Potin Lai <potin.lai@quantatw.com> ---- - include/endianness.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/endianness.h b/include/endianness.h -index 099877a..88b63db 100644 ---- a/include/endianness.h -+++ b/include/endianness.h -@@ -113,8 +113,8 @@ - && !defined(__FLOAT_WORD_ORDER__)) \ - || (defined(__FLOAT_WORD_ORDER__) \ - && __FLOAT_WORD_ORDER__ == __ORDER_BIG_ENDIAN__) --#define float_bswap64(x) bswap64(x) --#define float_bswap32(x) bswap32(x) -+#define float_bswap64(x) __bswap_64(x) -+#define float_bswap32(x) __bswap_32(x) - #else - #define float_bswap64(x) (x) - #define float_bswap32(x) (x) --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb index d5d90ea137..6d872b9f81 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb @@ -10,11 +10,8 @@ DEPENDS = "libplist" PV = "1.0.0+git${SRCPV}" -SRCREV = "ecb0996fd2a3b0539153dd3ef901d137bf498ffe" -SRC_URI = "\ - git://github.com/libimobiledevice/libimobiledevice-glue;protocol=https;branch=master \ - file://0001-fix-undefined-bswap32-and-bswap64-errors-for-MIPS-ma.patch \ -" +SRCREV = "bc6c44b92091c9587a9bed0ed3f2c3248bfd13b3" +SRC_URI = "git://github.com/libimobiledevice/libimobiledevice-glue;protocol=https;branch=master" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.0.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb index d25a01cf34..872bc6afcb 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb @@ -20,7 +20,7 @@ RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler" # RDEPENDS:${PN}-dev += "${PN}-compiler" S = "${WORKDIR}/git" -SRCREV_grpc = "494b08ada4009ead0d0b70e44d354be72f9c283a" +SRCREV_grpc = "1c159689ceda2c408f7f9d97d96a264c9521b806" BRANCH = "v1.45.x" SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ file://0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/octave/octave_4.4.1.bb b/meta-openembedded/meta-oe/recipes-devtools/octave/octave_4.4.1.bb deleted file mode 100644 index 433175fb6f..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/octave/octave_4.4.1.bb +++ /dev/null @@ -1,40 +0,0 @@ -DESCRIPTION = "High-level language, primarily intended for numerical computations" -HOMEPAGE = "http://www.gnu.org/software/octave/" -SECTION = "math" - -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" - -DEPENDS = "gperf-native texinfo lapack pcre readline" - -inherit autotools pkgconfig texinfo gettext mime-xdg - -EXTRA_OECONF = "--disable-java --disable-docs" - -SRC_URI = "${GNU_MIRROR}/octave/${BPN}-${PV}.tar.gz \ - file://fix-blas-library-integer-size.patch \ -" - -SRC_URI[md5sum] = "b43bd5f4309a0c048c91af10cf8e8674" -SRC_URI[sha256sum] = "09fbd0f212f4ef21e53f1d9c41cf30ce3d7f9450fb44911601e21ed64c67ae97" - -do_compile:prepend() { - for folder in "liboctave/operators liboctave/numeric liboctave/array liboctave/util"; do - mkdir -p ${B}/${folder} - done -} - -PACKAGES =+ " octave-common liboctave liboctave-dev liboctave-dbg" - -FILES:${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${datadir}/${PN} \ - ${libdir}/${PN}/${PV}/oct ${libdir}/${PN}/${PV}/site \ - ${libdir}/${PN}/site ${datadir}/applications ${datadir}/metainfo" -FILES:${PN}-common = "${datadir}/icons" - -FILES:liboctave = "${libdir}/${PN}/${PV}/lib*${SOLIBS}" -FILES:liboctave-dev = "${libdir}/${PN}/${PV}/lib*${SOLIBSDEV}" -FILES:liboctave-dbg = "${libdir}/${PN}/${PV}/.debug" - -FILES:${PN}-dbg = "${bindir}/.debug ${libdir}/${PN}/${PV}/oct/${TARGET_SYS}/.debug" - -EXCLUDE_FROM_WORLD = "1" diff --git a/meta-openembedded/meta-oe/recipes-devtools/octave/octave_6.4.0.bb b/meta-openembedded/meta-oe/recipes-devtools/octave/octave_6.4.0.bb new file mode 100644 index 0000000000..a7ff84fad7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/octave/octave_6.4.0.bb @@ -0,0 +1,52 @@ +SUMMARY = "High-level language, primarily intended for numerical computations" +HOMEPAGE = "http://www.gnu.org/software/octave/" +SECTION = "math" + +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +# To build, add 'FORTRAN:forcevariable = ",fortran"' to your local.conf (or use +# meta-mortsgna as distro :) + +DEPENDS = " \ + gperf-native \ + libglu \ + lapack \ + fftw \ + curl \ + freetype \ + fontconfig \ + texinfo \ + pcre \ + readline \ + fltk \ + hdf5 \ + libsndfile1 \ +" + +inherit autotools pkgconfig texinfo gettext gtk-icon-cache mime-xdg features_check + +REQUIRED_DISTRO_FEATURES = "x11 opengl" + +SRC_URI = " \ + ${GNU_MIRROR}/octave/${BPN}-${PV}.tar.gz \ + file://fix-blas-library-integer-size.patch \ +" +SRC_URI[sha256sum] = "b48f33d4fceaf394cfbea73a8c850000936d83a41739a24f7568b5b0a7b39acd" + +EXTRA_OECONF = " \ + --disable-java \ + --disable-docs \ +" + +do_compile:prepend() { + for folder in "liboctave/operators liboctave/numeric liboctave/array liboctave/util"; do + mkdir -p ${B}/${folder} + done +} + +FILES:${PN} += "${datadir}/metainfo" +FILES:${PN}-dev += "${libdir}/${BPN}/${PV}/lib*${SOLIBSDEV}" + +# fortran is not enabled by default +EXCLUDE_FROM_WORLD = "1" diff --git a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.8.0.bb b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.8.0.bb index 23ac76a2d2..71072a5927 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.8.0.bb @@ -22,3 +22,6 @@ inherit cmake SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" SRC_URI[sha256sum] = "f0763bda24ba947e80430be787c4b068d8b6aa6027a26a19923f0acfa3dac97e" + +# Patch for CVE-2017-12858 is applied in version 1.2.0. +CVE_CHECK_IGNORE += "CVE-2017-12858" diff --git a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb index f9349b02ab..e821430406 100644 --- a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb @@ -10,10 +10,7 @@ LICENSE = "WXwindows" LIC_FILES_CHKSUM = "file://docs/licence.txt;md5=981f50a934828620b08f44d75db557c6" inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt', 'cmake_qt5', 'cmake', d)} -inherit features_check lib_package binconfig pkgconfig - -# All toolkit-configs except 'no_gui' require x11 explicitly (see toolkit.cmake) -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'no_gui', '', 'x11', d)}" +inherit lib_package binconfig pkgconfig DEPENDS += " \ jpeg \ @@ -22,7 +19,7 @@ DEPENDS += " \ " SRC_URI = " \ - git://github.com/wxWidgets/wxWidgets.git;branch=master;protocol=https \ + gitsm://github.com/wxWidgets/wxWidgets.git;branch=master;protocol=https \ file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \ file://fix-libdir-for-multilib.patch \ file://respect-DESTDIR-when-create-link.patch \ @@ -46,7 +43,11 @@ EXTRA_OECMAKE:append:libc-musl = " \ -DHAVE_LOCALE_T=OFF \ " -PACKAGECONFIG ?= "gtk ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" +# All toolkit-configs except 'no_gui' require x11 explicitly (see toolkit.cmake) +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', 'no_gui', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \ +" + PACKAGECONFIG:remove:class-native = "opengl" # Note on toolkit-PACKAGECONFIGs: select exactly one of 'no_gui' / 'gtk' / 'qt' diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.11.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.12.bb index c9da9f5a1e..050cb29824 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.11.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.12.bb @@ -1,12 +1,10 @@ require xorg-doc-common.inc PE = "1" -PR = "${INC_PR}.0" DEPENDS += "util-macros" LIC_FILES_CHKSUM = "file://COPYING;md5=c8c6c808cd3c797a07b24e443af1c449" -SRC_URI[md5sum] = "ee6dc0a8a693a908857af328b2462661" -SRC_URI[sha256sum] = "e71ce1df82dcc51eb14be6f42171dcc6bdd11ef46c0c605d6da8af12bd73b74c" +SRC_URI[sha256sum] = "65a9fdddedc17bd5e9c0b00d904960f03f047c3a62de5458989d493c29fec806" FILES:${PN} += " /usr/share/sgml/X11" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch deleted file mode 100644 index 1bdc5adbc1..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f8cb818ca96fc2a45a04448a51f25a277ec183db Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 15 Jan 2020 20:21:58 -0800 -Subject: [PATCH] example-clients: Use c++ compiler for jack_simdtests - -It uses c++ sources and runtime therefore its best to use c++ compiler -to build it so it can find the correct runtime, cross compiling with -clang fails - -x86_64-yoe-linux-ld: example-clients/simdtests.cpp.28.o: undefined reference to symbol '__cxa_call_unexpected@@CXXABI_1.3' - -Upstream-Status: Submitted [https://github.com/jackaudio/jack2/pull/536] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - example-clients/wscript | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - ---- a/example-clients/wscript -+++ b/example-clients/wscript -@@ -49,10 +49,15 @@ def build(bld): - else: - use = ['clientlib'] - -+ if example_program == 'jack_simdtests': -+ ftrs = 'cxx cxxprogram' -+ else: -+ ftrs = 'c cprogram' -+ - if bld.env['IS_MACOSX']: -- prog = bld(features='c cprogram', framework = ['Foundation']) -+ prog = bld(features = ftrs, framework = ['Foundation']) - else: -- prog = bld(features='c cprogram') -+ prog = bld(features = ftrs) - prog.includes = os_incdir + ['../common/jack', '../common'] - prog.source = example_program_source - prog.use = use diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.19.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.20.bb index 97b0edeed0..452f066559 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.19.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.20.bb @@ -14,10 +14,8 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "libsamplerate0 libsndfile1 readline" -SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https \ - file://0001-example-clients-Use-c-compiler-for-jack_simdtests.patch \ - " -SRCREV = "3e6ca6b734b69e2f5dfb85935068e15006fb5acf" +SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https" +SRCREV = "a2fe7ec2fdbd315f112c8035282d94a429451178" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.1.0.bb index bfd2d035fa..2b74ad845b 100644 --- a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.1.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=bb761279816b72be19d7ce646e4e2a14" DEPENDS = "libeigen glog" SRC_URI = "git://github.com/ceres-solver/ceres-solver.git;branch=master;protocol=https" -SRCREV = "399cda773035d99eaf1f4a129a666b3c4df9d1b1" +SRCREV = "f68321e7de8929fbcdb95dd42877531e64f72f66" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb index c0c4412c7d..5a8db08771 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb @@ -29,7 +29,7 @@ DEPENDS = "libdevmapper \ LICENSE = "GPL-2.0-only" -SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http;branch=master \ +SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=http;branch=master \ file://multipathd.oe \ file://multipath.conf.example \ file://0021-RH-fixup-udev-rules-for-redhat.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.03.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.04.0.bb index a0d8be6aff..9c9122160c 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.03.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.04.0.bb @@ -7,7 +7,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ " -SRC_URI[sha256sum] = "728c78ba94d75a55f6b6355d4fbdaa6f49934d9616be58e5e679a9cfd0980e1e" +SRC_URI[sha256sum] = "813fb4b90e7bda63df53205c548602bae728887a60f4048aae4dbd9b1927deff" DEPENDS = "fontconfig zlib cairo lcms glib-2.0" diff --git a/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.64.bb b/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.64.bb index 85deabde17..5765272ce8 100644 --- a/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.64.bb +++ b/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.64.bb @@ -21,7 +21,7 @@ inherit autotools-brokensep do_configure:prepend() { # To autoreconf we need the script in ${S}, we can't tell autotools to use # etc/ because then it can't find the Makefile.in - ln -s ${S}/etc/configure.ac ${S} + ln -sf ${S}/etc/configure.ac ${S} } PACKAGECONFIG ??= "gcrypt" diff --git a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.13.bb b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.13.bb deleted file mode 100644 index 55a7354820..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.13.bb +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION = "UPower is an abstraction for enumerating power devices, listening to device events and querying history and statistics. " -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08" - -DEPENDS = "intltool-native libusb1 libgudev glib-2.0 dbus-glib" - -SRC_URI = "git://gitlab.freedesktop.org/upower/upower.git;protocol=https;branch=master" -SRCREV = "0f6cc0a10be22d7ddd684e1cd851e4364a440494" -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_GITTAGREGEX = "UPOWER_(?P<pver>\d+(\_\d+)+)" - -inherit autotools pkgconfig gtk-doc gettext gobject-introspection systemd - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[idevice] = "--with-idevice,--without-idevice,libimobiledevice libplist" -PACKAGECONFIG[systemd] = "--with-systemdutildir=${systemd_unitdir} --with-systemdsystemunitdir=${systemd_system_unitdir}, \ - --without-systemdutildir --without-systemdsystemunitdir,systemd" - -EXTRA_OECONF = " --with-backend=linux" - -SYSTEMD_SERVICE:${PN} = "upower.service" -# don't start on boot by default - dbus does that on demand -SYSTEMD_AUTO_ENABLE = "disable" - -do_configure:prepend() { - touch ${S}/ABOUT-NLS - mkdir -p ${S}/build-aux - touch ${S}/build-aux/config.rpath - sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am - sed -i -e 's: doc : :g' ${S}/Makefile.am -} - -RDEPENDS:${PN} += "dbus" -RRECOMMENDS:${PN} += "pm-utils" -FILES:${PN} += "${datadir}/dbus-1/ \ - ${base_libdir}/udev/* \ -" diff --git a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.17.bb b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.17.bb new file mode 100644 index 0000000000..0572cc801b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.17.bb @@ -0,0 +1,44 @@ +SUMMARY = "UPower is an abstraction for enumerating power devices" +DESCRIPTION = "UPower is an abstraction for enumerating power devices, listening to device events and querying history and statistics." +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08" + +DEPENDS = " \ + intltool-native \ + libusb1 \ + libgudev \ + glib-2.0 \ + dbus-glib \ +" + +SRC_URI = "git://gitlab.freedesktop.org/upower/upower.git;protocol=https;branch=master" +SRCREV = "c889154ec8e3e2239db9260d48b2e198d72ba002" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_GITTAGREGEX = "UPOWER_(?P<pver>\d+(\_\d+)+)" + +GIR_MESON_ENABLE_FLAG = "enabled" +GIR_MESON_DISABLE_FLAG = "disabled" +GTKDOC_MESON_OPTION = "gtk-doc" + +inherit meson pkgconfig gtk-doc gettext gobject-introspection systemd + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[idevice] = "-Didevice=enabled,-Didevice=disabled,libimobiledevice libplist" +PACKAGECONFIG[systemd] = "-Dsystemdsystemunitdir=${systemd_system_unitdir},-Dsystemdsystemunitdir=no -Dudevrulesdir=${base_libdir}/udev/rules.d,systemd" + +EXTRA_OEMESON = " \ + -Dos_backend=linux \ + -Dman=false \ +" + +SYSTEMD_SERVICE:${PN} = "upower.service" +# don't start on boot by default - dbus does that on demand +SYSTEMD_AUTO_ENABLE = "disable" + +RDEPENDS:${PN} += "dbus" +RRECOMMENDS:${PN} += "pm-utils" +FILES:${PN} += " \ + ${datadir}/dbus-1/ \ + ${base_libdir}/udev/* \ +" diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.15.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.16.0.bb index 78cbba6b27..6eb896d1d2 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.15.0.bb +++ b/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.16.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Python bindings for the Apache Thrift RPC system" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515" -SRC_URI[sha256sum] = "87c8205a71cf8bbb111cb99b1f7495070fbc9cabb671669568854210da5b3e29" +SRC_URI[sha256sum] = "2b5b6488fcded21f9d312aa23c9ff6a0195d0f6ae26ddbd5ad9e3e25dfc14408" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.4.1.bb index 39d1618cb1..fbb89b8dd7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.4.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/ilanschnell/bitarray" LICENSE = "PSF-2.0" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d" -SRC_URI[sha256sum] = "f1203e902d51df31917d77eeba9c3fe78d032873a2ad78c737e26420f0080e58" +SRC_URI[sha256sum] = "faeca03f979e992cc76f7406af7eb9795cb111b8d8969c891a032bd7497c87da" inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.post2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.bb index 8eed99ee30..802eab2a07 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.post2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.bb @@ -11,4 +11,4 @@ RDEPENDS:${PN}:class-native = "" BBCLASSEXTEND = "native nativesdk" -SRC_URI[sha256sum] = "63157d7a00a273b59676b5be5aa817c75c37efc88478231f1a160f4cfb7f7878" +SRC_URI[sha256sum] = "f1c2b693cdcac2ded2823d363f8459ae785261e61c128d68464c8781dba0466b" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.1.2.bb index 76f7a8e652..a623fe104c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.0.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.1.2.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://click.pocoo.org/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=1fa98232fd645608937a0fdc82e999b8" -SRC_URI[sha256sum] = "8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb" +SRC_URI[sha256sum] = "479707fe14d9ec9a0757618b7a100a0ae4c4e236fac5b7f80ca68028141a1a72" inherit pypi setuptools3 ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.2.1.bb index f86f571938..b84b46164c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.2.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://cppy.readthedocs.io/en/latest/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=0bfb3e39b13587f0028f17baf0e42371" -SRC_URI[sha256sum] = "95e8862e4f826c3f2a6b7b658333b162f80cbe9f943aa0d0a7a6b2ef850aeffc" +SRC_URI[sha256sum] = "83b43bf17b1085ac15c5debdb42154f138b928234b21447358981f69d0d6fe1b" RDEPENDS:${PN} += "python3-setuptools python3-distutils" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.5.0.bb index ca324c9ae9..141411da0c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.5.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/gvalkov/python-evdev" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=18debddbb3f52c661a129724a883a8e2" -SRC_URI[sha256sum] = "8782740eb1a86b187334c07feb5127d3faa0b236e113206dfe3ae8f77fb1aaf1" +SRC_URI[sha256sum] = "5b33b174f7c84576e7dd6071e438bf5ad227da95efd4356a39fe4c8355412fe6" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.36.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.42.0.bb index 502ebad3f0..8fcf669952 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.36.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.42.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/googleapis/google-api-python-client" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "533c69e8ddce6630a2ce5b98348f6a58a23df49cb92040a0086315df979404af" +SRC_URI[sha256sum] = "7bf58b665b635d06adb47797a9a4f73482e739e02ed036cd960dc7c183361f67" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.44.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.45.0.bb index ffa009d7b7..ca55a7f091 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.44.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.45.0.bb @@ -13,7 +13,7 @@ SRC_URI:append:class-target = " file://ppc-boringssl-support.patch \ file://0001-absl-always-use-asm-sgidefs.h.patch \ file://abseil-ppc-fixes.patch;patchdir=third_party/abseil-cpp \ " -SRC_URI[sha256sum] = "4bae1c99896045d3062ab95478411c8d5a52cb84b91a1517312629fa6cfeb50e" +SRC_URI[sha256sum] = "ff2c8b965b0fc25cf281961aa46619c10900543effe3f806ef818231c40aaff3" RDEPENDS:${PN} = "${PYTHON_PN}-protobuf \ ${PYTHON_PN}-setuptools \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.2.bb index ef1d7cc07b..2e8c7e7802 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://github.com/mitsuhiko/itsdangerous" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=4cda9a0ebd516714f360b0e9418cfb37" -SRC_URI[sha256sum] = "7b7d3023cd35d9cb0c1fd91392f8c95c6fa02c59bf8ad64b8849be3401b95afb" +SRC_URI[sha256sum] = "5dbbc68b317e5e42f327f9021763545dc3fc3bfe22e6deb96aaf1fc38874156a" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_4.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_4.1.0.bb index f76f275036..c96e5c39ed 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_4.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_4.1.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/slashmili/python-jalali" LICENSE = "Python-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=c80be45b33471b4a23cf53d06a8172be" -SRC_URI[sha256sum] = "d35baea2ed213e4e87bb840c61637001540bd21e8e4454bd12352b06591ec08e" +SRC_URI[sha256sum] = "4a67a82ee57e35b5f6f9f7fbe6a0eda63f56ce1dd8af409b4c2a26a3340457db" PYPI_PACKAGE = "jdatetime" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.2.bb index ab1ad717b4..48ff7df52d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/nucleic/kiwi" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=f137eeae9cf8004d06830f6ab25b2d52" -SRC_URI[sha256sum] = "7508b01e211178a85d21f1f87029846b77b2404a4c68cbd14748d4d4142fa3b8" +SRC_URI[sha256sum] = "7f606d91b8a8816be476513a77fd30abe66227039bd6f8b406c348cb0247dcc9" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.4.2.bb index 4877194a5c..6d0f669d53 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.4.2.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://pandas.pydata.org/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=3f23c5c092b74d245d48eeef72bc3fd2" -SRC_URI[sha256sum] = "8db93ec98ac7cb5f8ac1420c10f5e3c43533153f253fe7fb6d891cf5aa2b80d2" +SRC_URI[sha256sum] = "92bc1fc585f1463ca827b45535957815b7deb218c549b7c18402c322c7549a12" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.19.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.20.0.bb index 85147544e7..5c4de4ac2b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.19.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.20.0.bb @@ -3,11 +3,11 @@ HOMEPAGE = "https://developers.google.com/protocol-buffers/" SECTION = "devel/python" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=19e8f490f9526b1de84f8d949cfcfd4e" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=53dbfa56f61b90215a9f8f0d527c043d" inherit pypi setuptools3 -SRC_URI[sha256sum] = "9df0c10adf3e83015ced42a9a7bd64e13d06c4cf45c340d2c63020ea04499d0a" +SRC_URI[sha256sum] = "71b2c3d1cd26ed1ec7c8196834143258b2ad7f444efff26fdc366c6f5e752702" # http://errors.yoctoproject.org/Errors/Details/184715/ # Can't find required file: ../src/google/protobuf/descriptor.proto diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_10.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_11.0.0.bb index 43ba3a9dd0..f556963731 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_10.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_11.0.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/balloob/pychromecast" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" -SRC_URI[sha256sum] = "4eb107446fdbed876f48c83202b6212b221286168a55c16b3eb8edf4200f10a1" +SRC_URI[sha256sum] = "151723b178110052b673b8765a120c85d16eae8c22d75575dceebe2be1eb1ef6" PYPI_PACKAGE = "PyChromecast" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-qface_2.0.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-qface_2.0.7.bb index 63453517ec..c42b91fcd4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-qface_2.0.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-qface_2.0.7.bb @@ -2,7 +2,7 @@ SUMMARY = "A generator framework based on a common modern IDL" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=eee61e10a40b0e3045ee5965bcd9a8b5" -SRC_URI[sha256sum] = "87ce8ce7123ae57d91ac903c6c330a99273e7f4665a0ab88e6a17f9c98143a68" +SRC_URI[sha256sum] = "fae48ba129c55da8445580eb711905c03911c4250761c0cd53c67e33495b0cee" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.2.1.bb index d4fc98817d..9370cbab67 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.2.1.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://github.com/andymccurdy/redis-py" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=51d9ad56299ab60ba7be65a621004f27" -SRC_URI[sha256sum] = "6758d01dec81af191b98a35cce3402675d115456584c39b500ab485a5e386bbb" +SRC_URI[sha256sum] = "fe45513881229dbee610620b9e0817b1f48c47ba635870320fd44a712204bbdd" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.32.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.34.bb index 93a49df53a..b99ed83f6f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.32.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.34.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sqlalchemy.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=f4001d1ca15b69d096fa1b4fd1bdce79" -SRC_URI[sha256sum] = "6fdd2dc5931daab778c2b65b03df6ae68376e028a3098eb624d0909d999885bc" +SRC_URI[sha256sum] = "623bac2d6bdca3f3e61cf1e1c466c5fb9f5cf08735736ee1111187b7a4108891" PYPI_PACKAGE = "SQLAlchemy" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-trafaret_2.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-trafaret_2.1.1.bb index 0b3d2427cd..97c56abde4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-trafaret_2.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-trafaret_2.1.1.bb @@ -3,8 +3,7 @@ SUMMARY = "Ultimate transformation library that supports validation, contexts an LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=21ecc7aa8f699874e706fc1354903437" -SRC_URI[sha256sum] = "72c342ede27fb34cd219b62855119380ae1c87006b6106be163c01159eb955ff" -SRC_URI[md5sum] = "228675376012fb27dd7f70ab685e7766" +SRC_URI[sha256sum] = "d9d00800318fbd343fdfb3353e947b2ebb5557159c844696c5ac24846f76d41c" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_4.0.0.bb index 4296ab2b33..08252e837b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.8.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_4.0.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://twine.readthedocs.io/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3d1106b253a8d50dd82a4202a045b4c" -SRC_URI[sha256sum] = "8efa52658e0ae770686a13b675569328f1fba9837e5de1867bfe5f46a9aefe19" +SRC_URI[sha256sum] = "817aa0c0bdc02a5ebe32051e168e23c71a0608334e624c793011f120dbbc05b7" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_4.2.bb index 1c910920e0..b9307f100f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_4.2.bb @@ -3,10 +3,11 @@ HOMEPAGE = "https://pypi.org/project/tzlocal/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=57e0bd61643d81d05683cdce65b11d10" -SRC_URI[sha256sum] = "0f28015ac68a5c067210400a9197fc5d36ba9bc3f8eaf1da3cbd59acdfed9e09" +SRC_URI[sha256sum] = "ee5842fa3a795f023514ac2d801c4a81d1743bbe642e3940143326b3a00addd7" inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += "\ ${PYTHON_PN}-pytz-deprecation-shim \ + ${PYTHON_PN}-datetime \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.2.bb index 166dd0355c..3f09d267de 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.2.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://github.com/websocket-client/websocket-client" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=b969e9612325987c823fc0737063ebc8" -SRC_URI[sha256sum] = "6278a75065395418283f887de7c3beafb3aa68dada5cacbe4b214e8d26da499b" +SRC_URI[sha256sum] = "50b21db0058f7a953d67cc0445be4b948d7fc196ecbeb8083d68d94628e4abf6" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.1.1.bb index ed7a509ad3..476a3a5964 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.0.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.1.1.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462" PYPI_PACKAGE = "Werkzeug" -SRC_URI[sha256sum] = "b863f8ff057c522164b6067c9e28b041161b4be5ba4d0daceeaa50a163822d3c" +SRC_URI[sha256sum] = "f8e89a20aeabbe8a893c24a461d3ee5dad2123b05cc6abd73ceed01d39c3ae74" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb index e61b00efa4..dcb373a1f3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb @@ -4,6 +4,10 @@ HOMEPAGE = "http://www.wxpython.org" LICENSE = "WXwindows" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fce1d18e2d633d41786c0a8dfbc80917" +inherit features_check + +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'no_gui', '', 'x11', d)}" + DEPENDS = "wxwidgets-native wxwidgets" PYPI_PACKAGE = "wxPython" diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyparted/files/setuptools.patch b/meta-openembedded/meta-python/recipes-extended/python-pyparted/files/setuptools.patch deleted file mode 100644 index 51fe8c7c56..0000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-pyparted/files/setuptools.patch +++ /dev/null @@ -1,82 +0,0 @@ -Upstream-Status: Submitted [https://github.com/dcantrell/pyparted/pull/85] -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From 3f5ca7eb6f57d8bcaa3b333497aba6e53d847450 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@arm.com> -Date: Fri, 14 Jan 2022 16:06:31 +0000 -Subject: [PATCH] setup.py: port to setuptools - -Python 3.10 has deprecated distutils[1], and it will be removed entirely -in Python 3.12. - -As the setuptools API is identical, moving to setuptools is trivial by -changing the import. - -Remove check_mod_version, a version specifier can be passed directly -to pkg-config. - -Remove unused imports. - -[1] https://docs.python.org/3/whatsnew/3.10.html#distutils-deprecated - -Signed-off-by: Ross Burton <ross.burton@arm.com> ---- - setup.py | 29 +++++++++-------------------- - 1 file changed, 9 insertions(+), 20 deletions(-) - -diff --git a/setup.py b/setup.py -index da71d9c..1e9e367 100644 ---- a/setup.py -+++ b/setup.py -@@ -25,12 +25,7 @@ import glob - import os - import platform - import sys --from distutils.ccompiler import new_compiler --from distutils.errors import CompileError --from distutils.errors import LinkError --from distutils.core import setup --from distutils.core import Extension --from distutils.version import LooseVersion -+from setuptools import setup, Extension - - pyparted_version = '3.11.7' - python_version = sys.version_info -@@ -45,19 +40,13 @@ if python_version < need_python_version: - # http://code.activestate.com/recipes/502261-python-distutils-pkg-config/ - def pkgconfig(*packages, **kwargs): - flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'} -- for token in subprocess.check_output(["pkg-config", "--libs", "--cflags"] + list(packages)).decode('utf-8').split(): -- -- kwargs.setdefault(flag_map.get(token[:2]), []).append(token[2:]) -- return kwargs -- --def check_mod_version(module, version): -- modversion = subprocess.check_output(["pkg-config", "--modversion", module]).decode('utf-8').split()[0] -- if not LooseVersion(modversion) >= LooseVersion(version): -- sys.stderr.write("*** Minimum required %s version: %s, found: %s\n" % (module, version, modversion,)) -- sys.exit(1) -- return -- --check_mod_version('libparted', need_libparted_version) -+ try: -+ for token in subprocess.check_output(["pkg-config", "--libs", "--cflags"] + list(packages), -+ universal_newlines=True).split(): -+ kwargs.setdefault(flag_map.get(token[:2]), []).append(token[2:]) -+ return kwargs -+ except subprocess.CalledProcessError as e: -+ sys.exit("Cannot find pkg-config dependencies:\n" + e.output) - - # This list is in the format necessary for the define_macros parameter - # for an Extension() module definition. See: -@@ -77,6 +66,6 @@ setup(name='pyparted', - ext_modules=[Extension('_ped', - sorted(glob.glob(os.path.join('src', '*.c'))), - define_macros=features, -- **pkgconfig('libparted', -+ **pkgconfig('libparted >= %s' % need_libparted_version, - include_dirs=['include'])) - ]) --- -2.25.1 - diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.7.bb b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.12.0.bb index 2cdf82365a..9dd362766d 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.7.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.12.0.bb @@ -9,10 +9,7 @@ LIC_FILES_CHKSUM = "\ file://src/_pedmodule.c;beginline=10;endline=22;md5=9e53304db812b80d0939e11bb69dcab2 \ " -SRC_URI += "file://setuptools.patch" - -SRC_URI[md5sum] = "69284f943982f54ded76960c92098a02" -SRC_URI[sha256sum] = "61cde7b096bccd69ddc75c85b17f8baed45c3687d404706d91403a319453b903" +SRC_URI[sha256sum] = "da985e116beb733371feb605b174db9eec8bd0eedffc8f739f8e603f51b521e7" inherit pkgconfig pypi setuptools3 diff --git a/meta-openembedded/meta-xfce/README b/meta-openembedded/meta-xfce/README index 1e9acc471d..3d6158628f 100644 --- a/meta-openembedded/meta-xfce/README +++ b/meta-openembedded/meta-xfce/README @@ -19,3 +19,4 @@ When sending single patches, please using something like: git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-xfce][PATCH' Layer maintainer: Kai Kang <kai.kang@windriver.com> +Layer maintainer: Andreas Müller <schnitzeltony@gmail.com> diff --git a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.8.bb b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.9.bb index 90a75bf5a3..1be015bfbb 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.8.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.9.bb @@ -1,13 +1,13 @@ SUMMARY = "A simple text editor for Xfce" SECTION = "x11/application" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gtk+3 gtksourceview4 xfconf xfce4-dev-tools-native" inherit xfce-app gsettings mime-xdg -SRC_URI[sha256sum] = "921ebbcfdfd5e2e56f31a5177a2d26f46c758cc972595017bca9e0a6a3c3a721" +SRC_URI[sha256sum] = "f108a8c167ec5727266ab67666f10dbd60e972d56ea03944302fdabb2167f473" PACKAGECONFIG ??= "" PACKAGECONFIG[spell] = "--enable-plugin-gspell,--disable-plugin-gspell,gspell" diff --git a/meta-openembedded/meta-xfce/recipes-apps/orage/orage/0001-drop-setting-is_utc-member-of-icaltimetype.patch b/meta-openembedded/meta-xfce/recipes-apps/orage/orage/0001-drop-setting-is_utc-member-of-icaltimetype.patch deleted file mode 100644 index 517de5f922..0000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/orage/orage/0001-drop-setting-is_utc-member-of-icaltimetype.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 5bdf11fe3638d279edcad911906f801751e024da Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 23 Jul 2019 14:22:08 -0700 -Subject: [PATCH] drop setting is_utc member of icaltimetype - -This seems to be gone in libical3 - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/ical-code.c | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/src/ical-code.c b/src/ical-code.c -index d583140..d8e5543 100644 ---- a/src/ical-code.c -+++ b/src/ical-code.c -@@ -129,7 +129,6 @@ static struct icaltimetype ical_get_current_local_time() - && (strcmp(g_par.local_timezone, "floating") != 0)) - ctime = icaltime_current_time_with_zone(local_icaltimezone); - else { / * use floating time * / -- ctime.is_utc = 0; - ctime.is_date = 0; - ctime.is_daylight = 0; - ctime.zone = NULL; -@@ -2579,7 +2578,6 @@ static struct icaltimetype count_first_alarm_time(xfical_period per - * when counting alarm time. */ - if (rel == ICAL_RELATED_START) { - per.stime.is_date = 0; -- per.stime.is_utc = 1; - per.stime.is_daylight = 0; - per.stime.zone = utc_icaltimezone; - per.stime.hour = 0; -@@ -2588,7 +2586,6 @@ static struct icaltimetype count_first_alarm_time(xfical_period per - } - else { - per.etime.is_date = 0; -- per.etime.is_utc = 1; - per.etime.is_daylight = 0; - per.etime.zone = utc_icaltimezone; - per.etime.hour = 0; -@@ -2613,7 +2610,6 @@ static struct icaltimetype count_next_alarm_time(struct icaltimetype start_time - /* HACK: convert to UTC time so that we can use time arithmetic - * when counting alarm time. */ - start_time.is_date = 0; -- start_time.is_utc = 1; - start_time.is_daylight = 0; - start_time.zone = utc_icaltimezone; - start_time.hour = 0; -@@ -2768,7 +2764,6 @@ static alarm_struct *process_alarm_trigger(icalcomponent *c - */ - if (icaltime_is_date(per.stime)) { - if (local_icaltimezone != utc_icaltimezone) { -- next_alarm_time.is_utc = 0; - next_alarm_time.is_daylight = 0; - next_alarm_time.zone = local_icaltimezone; - } -@@ -2850,7 +2845,6 @@ orage_message(120, P_N "Alarm rec loop next_start:%s next_alarm:%s per.stime:%s" - */ - if (icaltime_is_date(per.stime)) { - if (local_icaltimezone != utc_icaltimezone) { -- next_alarm_time.is_utc = 0; - next_alarm_time.is_daylight = 0; - next_alarm_time.zone = local_icaltimezone; - } -@@ -2944,7 +2938,6 @@ orage_message(120, P_N "*****After loop Alarm %s %s", icaltime_as_ical_string(ne - */ - if (icaltime_is_date(per.stime)) { - if (local_icaltimezone != utc_icaltimezone) { -- next_alarm_time.is_utc = 0; - next_alarm_time.is_daylight = 0; - next_alarm_time.zone = local_icaltimezone; - } --- -2.22.0 - diff --git a/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb b/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.16.0.bb index ed7f42024e..d10cdaac49 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.16.0.bb @@ -1,20 +1,20 @@ SUMMARY = "Xfce Calender" SECTION = "x11/application" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gtk+ xfce4-panel libical popt" inherit xfce-app mime-xdg -SRC_URI += "file://0001-drop-setting-is_utc-member-of-icaltimetype.patch" +SRC_URI[sha256sum] = "26111a3b6a2007c82f1e0a1e0591b774a0b132f3a7f1cde53d9be661b2f11700" -SRC_URI[md5sum] = "2b7f5d38cb5c6edbcc65d0f52a742e46" -SRC_URI[sha256sum] = "3cf9aa441ae83c8688865f82217025cdf3ebaa152cce4571777b8c2aa8dd9062" - -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "notify" PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" PACKAGES =+ "xfce4-orageclock-plugin" -FILES:${PN} += "${datadir}/dbus-1" +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ +" FILES:xfce4-orageclock-plugin = "${libdir}/xfce4/panel/plugins/*.so ${datadir}/xfce4/panel/plugins" FILES:${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la" diff --git a/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.12.1.bb b/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.12.2.bb index f2156a3e2a..66836422ed 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.12.1.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.12.2.bb @@ -10,6 +10,6 @@ inherit xfce-app mime-xdg RRECOMMENDS:${PN} += "tumbler" -SRC_URI[sha256sum] = "13853f9ca18466a8e4788e92c7bde3388a93e8340283568f5dee1a9396ffd7ee" +SRC_URI[sha256sum] = "0eee869922ec00a253dafa446c2aad2a2f98e07e1db7262e8337ce9ec2dad969" FILES:${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb b/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb index d8f0033b3e..ea7e8005ef 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb @@ -3,13 +3,13 @@ HOMEPAGE = "http://xarchiver.sourceforge.net" SECTION = "x11" LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gtk+3 glib-2.0 xfce4-dev-tools-native intltool-native" SRC_URI = "git://github.com/ib/xarchiver.git;branch=master;protocol=https" -SRCREV = "9ab958a4023b62b43972c55a3143ff0722bd88a6" -PV = "0.5.4.14" +SRCREV = "2f6c91e756678f0723305d8636e8e393c1eef32c" +PV = "0.5.4.17" S = "${WORKDIR}/git" inherit gettext pkgconfig autotools gtk-icon-cache features_check mime-xdg diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.2.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb index 2174d2af4f..6086608110 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.2.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb @@ -14,7 +14,7 @@ DEPENDS = " \ inherit xfce-app -SRC_URI[sha256sum] = "19ab84c6665c7819998f2269322d53f462c30963ce26042df23ae525e7d16545" +SRC_URI[sha256sum] = "56a9f895aed460042f2abe09bb1a899e29b7c7d5a76ecac63dead3ced990859f" # Avoid trouble with other desktops e.g KDE which also ships dbus service named # org.freedesktop.Notifications diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.9.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.10.bb index 78e0848177..bb44ec7829 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.9.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.10.bb @@ -3,11 +3,11 @@ HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-screenshooter" SECTION = "x11/application" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" -DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+3 glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11" +DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+3 glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11 libxml-parser-perl-native" -inherit xfce-app +inherit xfce-app perlnative -SRC_URI[sha256sum] = "33c8aeb53fbdb82dbd7d40bca77a8affbb4116ba0993cd59474b554558e5daa4" +SRC_URI[sha256sum] = "04b4178527f5b98cfe76ae427e95581067edf262a530639d332f6db9a68292d7" do_compile:prepend() { mkdir -p lib diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.10.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.0.bb index e9f2e40593..85b0812ed5 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.10.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.0.bb @@ -5,9 +5,11 @@ DEPENDS = "glib-2.0 gtk+3 vte libxfce4ui gtk-doc-native" inherit xfce-app -FILES:${PN} += "${datadir}/xfce4 \ - ${datadir}/gnome-control-center" +FILES:${PN} += " \ + ${datadir}/xfce4 \ + ${datadir}/gnome-control-center \ +" -SRC_URI[sha256sum] = "7a3337c198e01262a0412384823185753ac8a0345be1d6776a7e9bbbcbf33dc7" +SRC_URI[sha256sum] = "593b6a7bd9b18851e51854e075990109b7896a22713b5dd8b913b23f21db6576" RRECOMMENDS:${PN} += "vte-prompt" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.5.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.7.bb index f3d78c11df..c98fe4a5c3 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.5.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.7.bb @@ -5,4 +5,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1f6f1c0be32491a0c8d2915607a28f36" inherit xfce-panel-plugin -SRC_URI[sha256sum] = "f8bd728de2d33e7ab30c682716b1cac4776b9884ce48b03fd7c32c9b24b13498" +SRC_URI[sha256sum] = "5ad4fb6150f51917b2a8af65926c6e4e83340827835782a14844c6b88dbcc58c" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.5.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.6.bb index 583eacb2bc..a9ac08989e 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.5.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.6.bb @@ -5,4 +5,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=415654f59d8fa70fe4eac2c3f86c8f5e" inherit xfce-panel-plugin -SRC_URI[sha256sum] = "c2f6dbd7f83c79b63b83c98232c79d050e18640e82464b9ec8d3643a92c3a1b0" +SRC_URI[sha256sum] = "773246f57c1824a85468d4119c17aeb07170ed1ebace8fa406c7fbcf5b47af99" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.3.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.7.0.bb index 31eeefd6ac..25a57f3233 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.3.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.7.0.bb @@ -6,4 +6,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d3e627798d6a60bece47aa8b3532e1f1" inherit xfce-panel-plugin SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2" -SRC_URI[sha256sum] = "73b1ea2deb2403287337e8521d21345fb2f88445f9030732fa28f1bfa5d51c59" +SRC_URI[sha256sum] = "5909a65341a6af4d7ff3c7bb87aeac91c763f69b43ae9dc4a10668ac226fecc9" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.1.bb index e2075a6d32..e8e133035d 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.1.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.1.bb @@ -9,5 +9,5 @@ inherit xfce-panel-plugin SRC_URI[md5sum] = "bde92cbd08f129d517524784e5060816" SRC_URI[sha256sum] = "f211219f03c9260f624370e18c79e4176c9d35a8247158e77e5d811327610ab2" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "notify" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.3.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.3.bb index b2d61a1d22..5168efe1fe 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.3.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.3.bb @@ -11,7 +11,7 @@ DEPENDS += "dbus-glib pulseaudio" SRC_URI[md5sum] = "3d86032acb9364d47e0a144350c63e1a" SRC_URI[sha256sum] = "5a518237e2137341d8ca6584938950525e20c28a0177e30ecaea3ba8e7a2615b" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "libnotify" PACKAGECONFIG[libnotify] = "--enable-libnotify,--disable-libnotify,libnotify" RRECOMMENDS:${PN} = "pavucontrol" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.3.bb index 68f3f64295..13933b6cd9 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.2.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.3.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b94789bed9aec03b9656a9cc5398c706" inherit xfce-panel-plugin -SRC_URI[sha256sum] = "da90f12e6ae995bcd1c81be35479a7a9d32308c65ecd64e568ba8c9592d39fcb" +SRC_URI[sha256sum] = "171c0235f70c65f0ffee587e960d9da79b284855df22130239eac26272ec06c9" SRC_URI += "file://0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch" EXTRA_OECONF = " \ @@ -17,6 +17,7 @@ do_configure:prepend() { sed -i 's:LIBSENSORS_CFLAGS=.*:LIBSENSORS_CFLAGS=-I${STAGING_INCDIR}:g' ${S}/configure.ac } +PACKAGECONFIG ??= "libnotify" PACKAGECONFIG[libsensors] = "--enable-libsensors,--disable-libsensors, lmsensors" PACKAGECONFIG[hddtemp] = "--enable-hddtemp,--disable-hddtemp, hddtemp" PACKAGECONFIG[netcat] = "--enable-netcat,--disable-netcat, netcat" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb index e529bc80c9..4b72d3a790 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb @@ -10,7 +10,7 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[sha256sum] = "d2c0e719b242b7fd3db70bc6678a2df1abf2cfaa899b775a1591a5efa08a547d" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "notify" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" RDEPENDS:${PN} = "eject" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb index 83b624f120..aa4265f7b0 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb @@ -14,6 +14,7 @@ SRC_URI[sha256sum] = "4dd7cb420860535e687f673c0b5c0274e0d2fb67181281d4b85be9197d 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" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb index b0dc8e1762..4a1ece8bef 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb @@ -10,7 +10,7 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[sha256sum] = "934ba5affecff21e62d9fac1dd50c50cd94b3a807fefa5f5bff59f3d6f155bae" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "notify" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" FILES:${PN} += "${datadir}/backgrounds" |