python3-pystemd: Regenerate .c sources using newer cython
PATCH 1/7 python3-pystemd: Regenerate .c sources using newer cython
python 3.11 has moved the header "longintrepr.h" into a sub-folder [1] the pre-generated .c files are generated using older cython, therefore in order to compile it with python 3.11 regenerate them with OE's own native cython
[1] https://bugs.python.org/issue35134
--- .../recipes-devtools/python/python3-pystemd_0.10.0.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
meta-python/recipes-devtools/python/python3-pystemd_0.10.0.bb +5 -1
@@ -4,10 +4,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" SRC_URI[sha256sum] = "d74a814bfda01085db1a8ad90be3cb27daf23a51ab6b03e7e29ec811fa2ae859" -DEPENDS = "systemd" +DEPENDS = "systemd python3-cython-native" RDEPENDS:${PN} += "python3-xml python3-pprint" REQUIRED_DISTRO_FEATURES = "systemd" inherit pypi setuptools3 features_check pkgconfig +do_configure:prepend() { + rm -rf ${S}/pystemd/*.c +} + BBCLASSEXTEND = "native"
Signature · 1 line
2.38.1
PATCH 2/7 libreport: Inherit python3targetconfig
So it uses cross python3-config tool instead of native
--- meta-oe/recipes-extended/libreport/libreport_2.10.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-extended/libreport/libreport_2.10.0.bb +1 -1
@@ -26,7 +26,7 @@ S = "${WORKDIR}/git" inherit features_check REQUIRED_DISTRO_FEATURES = "systemd" -inherit gettext autotools python3native pkgconfig +inherit gettext autotools python3native python3targetconfig pkgconfig PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','x11','gtk','',d)}" PACKAGECONFIG[gtk] = "--with-gtk, --without-gtk, gtk+3,"
Signature · 1 line
2.38.1
PATCH 3/7 uw-imap: Disable parallelism
In reply to Khem RajIt fails on highcore machines
e.g.
| make[1]: *** [Makefile:697: rebuild] Error 1 | make[1]: *** Waiting for unfinished jobs.... | make[2]: *** No rule to make target '../c-client/osdep.h', needed by 'ipop2d.o'. Stop. | make[2]: *** Waiting for unfinished jobs....
--- meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +2 -0
@@ -50,3 +50,5 @@ RCONFLICTS:${PN} = "libc-client" ALLOW_EMPTY:${PN} = "1" +PARALLEL_MAKE = "" +
Signature · 1 line
2.38.1
PATCH 4/7 gtk4: remove recipe
In reply to Khem RajFrom: Markus Volk <[email protected]>
It has been moved to oe-core
--- meta-gnome/recipes-gnome/gtk4/gtk4_4.6.7.bb | 142 -------------------- 1 file changed, 142 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gtk4/gtk4_4.6.7.bb
meta-gnome/recipes-gnome/gtk4/gtk4_4.6.7.bb deleted +0 -142
@@ -1,142 +0,0 @@ -SUMMARY = "Multi-platform toolkit for creating GUIs" -DESCRIPTION = "GTK is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ -set of widgets, GTK is suitable for projects ranging from small one-off projects to complete application suites." -HOMEPAGE = "http://www.gtk.org" -BUGTRACKER = "https://bugzilla.gnome.org/" -SECTION = "libs" - -DEPENDS = " \ - sassc-native \ - glib-2.0 \ - libepoxy \ - graphene \ - cairo \ - pango \ - atk \ - jpeg \ - libpng \ - librsvg \ - tiff \ - gdk-pixbuf-native gdk-pixbuf \ -" - -LICENSE = "LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-or-later" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ - file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ - file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ - file://tests/testgtk.c;endline=25;md5=49d06770681b8322466b52ed19d29fb2 \ -" - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -UPSTREAM_CHECK_REGEX = "gtk-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz" - -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk/${MAJ_VER}/gtk-${PV}.tar.xz" -SRC_URI[sha256sum] = "effd2e7c4b5e2a5c7fad43e0f24adea68baa4092abb0b752caff278e6bb010e8" - -S = "${WORKDIR}/gtk-${PV}" - -inherit meson gettext pkgconfig gtk-doc update-alternatives gsettings features_check gobject-introspection - -# TBD: nativesdk -# gobject-introspection.bbclass pins introspection off for nativesk. As long as -# we do not remove this wisdom or hack gtk4, it is not possible to build -# nativesdk-gtk4 -BBCLASSEXTEND = "native" - -GSETTINGS_PACKAGE:class-native = "" - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -REQUIRED_DISTRO_FEATURES = "opengl" - -GIR_MESON_ENABLE_FLAG = 'enabled' -GIR_MESON_DISABLE_FLAG = 'disabled' -GTKDOC_MESON_OPTION = 'gtk_doc' - -EXTRA_OEMESON = " -Dbuild-tests=false" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" -PACKAGECONFIG:class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG:class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" - -PACKAGECONFIG[x11] = "-Dx11-backend=true,-Dx11-backend=false,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes xinerama" -PACKAGECONFIG[wayland] = "-Dwayland-backend=true,-Dwayland-backend=false,wayland wayland-protocols libxkbcommon virtual/egl virtual/libgles2 wayland-native" -PACKAGECONFIG[cups] = "-Dprint-cups=enabled,-Dprint-cups=disabled,cups" -PACKAGECONFIG[colord] = "-Dcolord=enabled,-Dcolord=disabled,colord" -# gtk4 wants gstreamer-player-1.0 -> gstreamer1.0-plugins-bad -PACKAGECONFIG[gstreamer] = "-Dmedia-gstreamer=enabled,-Dmedia-gstreamer=disabled,gstreamer1.0-plugins-bad" -PACKAGECONFIG[tracker] = "-Dtracker=enabled,-Dtracker=disabled,tracker" - - -do_compile:prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" -} - - -PACKAGES =+ "${PN}-demo" -LIBV = "4.0.0" - -FILES:${PN}-demo = " \ - ${datadir}/applications/org.gtk.Demo4.desktop \ - ${datadir}/applications/org.gtk.IconBrowser4.desktop \ - ${datadir}/applications/org.gtk.WidgetFactory4.desktop \ - ${datadir}/icons/hicolor/*/apps/org.gtk.Demo4*.* \ - ${datadir}/icons/hicolor/*/apps/org.gtk.IconBrowser4*.* \ - ${datadir}/icons/hicolor/*/apps/org.gtk.WidgetFactory4*.* \ - ${bindir}/gtk4-demo \ - ${bindir}/gtk4-demo-application \ - ${bindir}/gtk4-icon-browser \ - ${bindir}/gtk4-widget-factory \ -" - -FILES:${PN}:append = " \ - ${datadir}/glib-2.0/schemas/ \ - ${datadir}/gtk-4.0/emoji/ \ - ${datadir}/metainfo/ \ - ${datadir}/icons/hicolor/*/apps/org.gtk.PrintEditor4*.* \ - ${libdir}/gtk-4.0/${LIBV}/printbackends \ - ${bindir}/gtk4-update-icon-cache \ - ${bindir}/gtk4-launch \ -" - -FILES:${PN}-dev += " \ - ${datadir}/gtk-4.0/gtk4builder.rng \ - ${datadir}/gtk-4.0/include \ - ${datadir}/gtk-4.0/valgrind \ - ${datadir}/gettext/its \ - ${bindir}/gtk4-builder-tool \ - ${bindir}/gtk4-encode-symbolic-svg \ - ${bindir}/gtk4-query-settings \ -" - -GTKBASE_RRECOMMENDS ?= " \ - liberation-fonts \ - gdk-pixbuf-loader-png \ - gdk-pixbuf-loader-jpeg \ - gdk-pixbuf-loader-gif \ - gdk-pixbuf-loader-xpm \ - shared-mime-info \ - adwaita-icon-theme-symbolic \ -" - -GTKBASE_RRECOMMENDS:class-native ?= "" - -GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" - -RRECOMMENDS:${PN} = "${GTKBASE_RRECOMMENDS}" -RRECOMMENDS:${PN}:libc-glibc = "${GTKGLIBC_RRECOMMENDS}" -RDEPENDS:${PN}-dev += "${@bb.utils.contains("PACKAGECONFIG", "wayland", "wayland-protocols", "", d)}" - -PACKAGES_DYNAMIC += "^gtk4-printbackend-.*" -python populate_packages:prepend () { - import os.path - - gtk_libdir = d.expand('${libdir}/gtk-3.0/${LIBV}') - printmodules_root = os.path.join(gtk_libdir, 'printbackends'); - - do_split_packages(d, printmodules_root, r'^libprintbackend-(.*)\.so$', 'gtk4-printbackend-%s', 'GTK printbackend module for %s') - - if (d.getVar('DEBIAN_NAMES')): - d.setVar(d.expand('PKG:${PN}'), '${MLPREFIX}libgtk-4.0') -}
Signature · 1 line
2.38.1
PATCH 5/7 gnome-calendar: Upgrade to 43.1
In reply to Khem RajCan be built with soup3
---
.../{gnome-calendar_42.0.bb => gnome-calendar_43.1.bb} | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
rename meta-gnome/recipes-gnome/gnome-calendar/{gnome-calendar_42.0.bb => gnome-calendar_43.1.bb} (82%)meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_43.1.bb renamed from meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_42.0.bb +3 -2
@@ -9,11 +9,12 @@ DEPENDS = " \ libical \ gsettings-desktop-schemas \ evolution-data-server \ - libsoup-2.4 \ + libsoup \ libdazzle \ libadwaita \ libgweather4 \ geoclue \ + geocode-glib \ " GNOMEBASEBUILDCLASS = "meson"
@@ -22,7 +23,7 @@ inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-versi REQUIRED_DISTRO_FEATURES = "x11 opengl" -SRC_URI[archive.sha256sum] = "b63f73f55032fc1390442f94cdf6b3cab9c91c774ddd2e5c61ecfec9d2c5e9aa" +SRC_URI[archive.sha256sum] = "afa5fc66e2f691553cc7d517db2363cff2d62cd1b5df455e5f4f7133139d21f2" FILES:${PN} += " \ ${datadir}/gnome-shell \
Signature · 1 line
2.38.1
PATCH 6/7 gnome-photos: Upgrade to 43.0
In reply to Khem RajAdd missing dependency on libportal
---
.../{gnome-photos_42.0.bb => gnome-photos_43.0.bb} | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
rename meta-gnome/recipes-gnome/gnome-photos/{gnome-photos_42.0.bb => gnome-photos_43.0.bb} (89%)meta-gnome/recipes-gnome/gnome-photos/gnome-photos_43.0.bb renamed from meta-gnome/recipes-gnome/gnome-photos/gnome-photos_42.0.bb +2 -1
@@ -19,6 +19,7 @@ DEPENDS = " \ gfbgraph \ tracker \ libhandy \ + libportal \ " GNOMEBASEBUILDCLASS = "meson"
@@ -30,7 +31,7 @@ def gnome_verdir(v): REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.sha256sum] = "25cb281425199dec7b045f13f32f8f96034cb0cb8b94d96f9dffaf4f5be68551" +SRC_URI[archive.sha256sum] = "c7ac7458d533f29d955011c74b76224d79ea31bcc12e9d6d0ce7b6c3704d08e1" do_install:append() { # make gnome-photos available on all desktops
Signature · 1 line
2.38.1
PATCH 7/7 libgweather: Remove 40.0
In reply to Khem RajIts not used by anything in gnome layer, moreover this helps drop soup2 dependency
--- .../libgweather/libgweather_40.0.bb | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/libgweather/libgweather_40.0.bb
meta-gnome/recipes-gnome/libgweather/libgweather_40.0.bb deleted +0 -24
@@ -1,24 +0,0 @@ -SUMMARY = "A library to access weather information from online services" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings gobject-introspection gettext gtk-doc vala features_check upstream-version-is-even - -SRC_URI[archive.sha256sum] = "ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6" - -# 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 \ -"
Signature · 1 line
2.38.1