[meta-gnome][PATCH 1/5] amtk: Add missing dep on python3-pygments-native

[meta-gnome][PATCH 1/5] amtk: Add missing dep on python3-pygments-native

[Khem Raj]

Fixes
  File "TOPDIR/build/tmp/work/mips32r2-yoe-linux/amtk/5.6.1-r0/recipe-sysroot-native/usr/share/gtk-doc/python/gtkdoc/highlight.py", line 27, in <module>
    from pygments import highlight
ModuleNotFoundError: No module named 'pygments'

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb b/meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb
index 8cb2fa79b5..fbc8f38454 100644
--- a/meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb
+++ b/meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb
@@ -8,6 +8,7 @@ DEPENDS = " \
     gtk-doc-native \
     libxslt-native \
     docbook-xsl-stylesheets-native \
+    python3-pygments-native \
 "
 
 GNOMEBASEBUILDCLASS = "meson"
-- 
2.38.1

[meta-oe][PATCH 2/5] surf: Depend on gcr-3

[Khem Raj]

It has been renamed in oe-core

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-graphics/surf/surf_2.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-graphics/surf/surf_2.1.bb b/meta-oe/recipes-graphics/surf/surf_2.1.bb
index 45ae79305a..1f55848a79 100644
--- a/meta-oe/recipes-graphics/surf/surf_2.1.bb
+++ b/meta-oe/recipes-graphics/surf/surf_2.1.bb
@@ -5,7 +5,7 @@ SECTION = "x11/graphics"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2a6f86d002ae9ae1eb1ccc466289f146"
 
-DEPENDS = "webkitgtk gtk+3 glib-2.0 gcr"
+DEPENDS = "webkitgtk gtk+3 glib-2.0 gcr-3"
 
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
 
-- 
2.38.1

[meta-oe][PATCH 3/5] fontforge: Inherit python3targetconfig

[Khem Raj]

It currently ends up using native python3-config which adds native paths
to compiler includes which is not what we want.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-graphics/fontforge/fontforge_20220308.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-graphics/fontforge/fontforge_20220308.bb b/meta-oe/recipes-graphics/fontforge/fontforge_20220308.bb
index c53f2db01b..ddb4443baa 100644
--- a/meta-oe/recipes-graphics/fontforge/fontforge_20220308.bb
+++ b/meta-oe/recipes-graphics/fontforge/fontforge_20220308.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \
 DEPENDS = "python3 glib-2.0 pango giflib tiff libxml2 jpeg libtool uthash gettext-native libspiro"
 DEPENDS:append:class-target = " libxi"
 
-inherit cmake pkgconfig python3native features_check gettext gtk-icon-cache mime mime-xdg
+inherit cmake pkgconfig python3native python3targetconfig features_check gettext gtk-icon-cache mime mime-xdg
 
 REQUIRED_DISTRO_FEATURES:append:class-target = " x11"
 
-- 
2.38.1

[meta-gnome][PATCH 4/5] tepl: Add missing dep on python3-pygments-native

[Khem Raj]

Fixes
  File "TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/tepl/6.2.0-r0/recipe-sysroot-native/usr/share/gtk-doc/python/gtkdoc/highlight.py", line 27, in <module>
    from pygments import highlight
ModuleNotFoundError: No module named 'pygments'

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-gnome/recipes-gnome/tepl/tepl_6.2.0.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-gnome/recipes-gnome/tepl/tepl_6.2.0.bb b/meta-gnome/recipes-gnome/tepl/tepl_6.2.0.bb
index 8173b6d314..0eeb345cd4 100644
--- a/meta-gnome/recipes-gnome/tepl/tepl_6.2.0.bb
+++ b/meta-gnome/recipes-gnome/tepl/tepl_6.2.0.bb
@@ -13,6 +13,7 @@ DEPENDS = " \
     gtk-doc-native \
     libxslt-native \
     docbook-xsl-stylesheets-native \
+    python3-pygments-native \
 "
 
 inherit meson gobject-introspection gettext features_check pkgconfig
-- 
2.38.1

[meta-oe][PATCH 5/5] alsa-oss: Remove recipe

[Khem Raj]

This is not used anywhere in meta-openembedded and will have to be fixed
when enanbling LFS and time64_t.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../packagegroups/packagegroup-meta-oe.bb     |  3 ---
 .../recipes-multimedia/alsa/alsa-oss_1.1.8.bb | 22 -------------------
 2 files changed, 25 deletions(-)
 delete mode 100644 meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb

diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index a5a033cae4..7166b67423 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -657,7 +657,6 @@ RDEPENDS:packagegroup-meta-oe-kernel:remove:riscv64 = "crash makedumpfile oprofi
 RDEPENDS:packagegroup-meta-oe-kernel:remove:riscv32 = "crash makedumpfile oprofile"
 
 RDEPENDS:packagegroup-meta-oe-multimedia ="\
-    alsa-oss \
     ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "faad2", "", d)} \
     dirsplit \
     genisoimage \
@@ -691,8 +690,6 @@ RDEPENDS:packagegroup-meta-oe-multimedia ="\
     libopusenc \
 "
 
-RDEPENDS:packagegroup-meta-oe-multimedia:remove:libc-musl = "alsa-oss"
-
 RDEPENDS:packagegroup-meta-oe-navigation ="\
     geos \
     ${@bb.utils.contains("DISTRO_FEATURES", "bluz4", "gpsd-machine-conf gpsd", "", d)} \
diff --git a/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb b/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb
deleted file mode 100644
index 4c38df4027..0000000000
--- a/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "Alsa OSS Compatibility Package"
-SECTION = "libs/multimedia"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ed055b4eff93da784176a01582e6ec1a"
-DEPENDS = "alsa-lib"
-
-SRC_URI = "https://www.alsa-project.org/files/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \
-"
-SRC_URI[md5sum] = "9ec4bb783fdce19032aace086d65d874"
-SRC_URI[sha256sum] = "64adcef5927e848d2e024e64c4bf85b6f395964d9974ec61905ae4cb8d35d68e"
-
-inherit autotools
-
-LEAD_SONAME = "libaoss.so.0"
-
-do_configure:prepend () {
-    touch NEWS README AUTHORS ChangeLog
-    sed -i "s/libaoss.so/${LEAD_SONAME}/" ${S}/alsa/aoss.in
-}
-
-# http://errors.yoctoproject.org/Errors/Details/186961/
-COMPATIBLE_HOST:libc-musl = 'null'
-- 
2.38.1