WIP: component/slapos: build with python3.9

component/firewalld/buildout.cfg

@@ -10,7 +10,9 @@ extends =
   ../gnu-config/buildout.cfg
   ../intltool/buildout.cfg
   ../libtool/buildout.cfg
+  ../meson/buildout.cfg
   ../nftables/buildout.cfg
+  ../ninja/buildout.cfg
   ../python-slip/buildout.cfg
 
 [firewalld]
@@ -66,14 +68,13 @@ environment =
 
 [gobject-introspection]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/gobject-introspection-1.50.0.tar.xz
-md5sum = 5af8d724f25d0c9cfbe6df41b77e5dc0
-pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess build-aux/
-configure-options =
-  --disable-static
+url = https://download.gnome.org/core/41/41.8/sources/gobject-introspection-1.70.0.tar.xz
+md5sum = 940ea2d6b92efabc457b9c54ce2ff398
+configure-command = ${meson:location}/bin/meson builddir --libdir=lib -Dprefix=@@LOCATION@@ -Ddoctool=disabled
+make-binary = ninja -C builddir
 
 environment =
-  PATH=${pkgconfig:location}/bin:${gettext:location}/bin:${glib:location}/bin:${xz-utils:location}/bin:${flex:location}/bin:${bison:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:${gettext:location}/bin:${glib:location}/bin:${xz-utils:location}/bin:${flex:location}/bin:${bison:location}/bin:${ninja:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${glib:pkg_config_depends}
   CPPFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
   LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi -L${zlib:location}/lib/ -Wl,-rpath=${zlib:location}/lib/

component/meson/buildout.cfg

@@ -8,8 +8,8 @@ parts =
 recipe = slapos.recipe.cmmi
 shared = true
 url = https://github.com/mesonbuild/meson/releases/download/${:version}/meson-${:version}.tar.gz
-version = 0.62.1
-md5sum = 2f5301d0e7fd5544ab0004393ba44cbe
+version = 0.64.1
+md5sum = 9f260adfcbc66ed2e15047c6eb98e503
 configure-command = true
 make-binary = true
 post-install =

component/slapos/buildout.cfg

@@ -19,10 +19,6 @@ parts =
   py
   firewalld-patch
 
-# Force python3.7 for a while to be compatible with more SR
-[python3]
-<= python3.7
-
 [environment]
 # Note: For now original PATH is appended to the end, as not all tools are
 #       provided by SlapOS

component/slapos/obs.cfg

@@ -85,8 +85,8 @@ pre-configure =
   sed -i 's#/opt/slapos/parts/dbus/lib/libdbus-1.la#${dbus:location}/lib/libdbus-1.la#' ${dbus-glib:location}/lib/libdbus-glib-1.la
 environment +=
   LD_LIBRARY_PATH=${dbus:location}/lib
-  PYTHON_INCLUDES=-I${python:location}/include/python${python:version}m
-  PYTHON_LIBS=-L${python:location}/lib -lpython${python:version}m -lpthread -ldl -lutil -lm
+  PYTHON_INCLUDES=-I${python:location}/include/python${python:version}
+  PYTHON_LIBS=-L${python:location}/lib -lpython${python:version} -lpthread -ldl -lutil -lm
 post-install =
   sed -i 's#${dbus:location}/lib/libdbus-1.la#/opt/slapos/parts/dbus/lib/libdbus-1.la#' ${dbus-glib:location}/lib/libdbus-glib-1.la