[oe-core][PATCH 1/4] libxmlb: import recipe from meta-oe

[oe-core][PATCH 1/4] libxmlb: import recipe from meta-oe

[Markus Volk]

appstream has a dependency on it

- add a patch to fix a reproducibility and runtime issue with ptest
  ptest completes without error

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...xb-selftest.c-hardcode-G_TEST_SRCDIR.patch | 35 +++++++++++++++++++
 meta/recipes-gnome/libxmlb/libxmlb/run-ptest  |  3 ++
 meta/recipes-gnome/libxmlb/libxmlb_0.3.14.bb  | 25 +++++++++++++
 3 files changed, 63 insertions(+)
 create mode 100644 meta/recipes-gnome/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch
 create mode 100644 meta/recipes-gnome/libxmlb/libxmlb/run-ptest
 create mode 100644 meta/recipes-gnome/libxmlb/libxmlb_0.3.14.bb

diff --git a/meta/recipes-gnome/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch b/meta/recipes-gnome/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch
new file mode 100644
index 0000000000..da8ce68df9
--- /dev/null
+++ b/meta/recipes-gnome/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch
@@ -0,0 +1,35 @@
+From dc208bafc57c1ccaa0ca260f99c8b4c976271ebc Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Sat, 16 Sep 2023 14:02:57 +0200
+Subject: [PATCH] xb-self-test.c: hardcode G_TEST_SRCDIR
+
+This avoids:
+ libxmlb-0.3.14-r0 do_package_qa: QA Issue: File
+ /usr/libexec/installed-tests/libxmlb/xb-self-test in package libxmlb-ptest
+ contains reference to TMPDIR [buildpaths]
+
+and also fixes the runtime for the ptest.
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ src/xb-self-test.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/xb-self-test.c b/src/xb-self-test.c
+index 47d9728..8b3dd0e 100644
+--- a/src/xb-self-test.c
++++ b/src/xb-self-test.c
+@@ -2870,7 +2870,7 @@ xb_speed_func(void)
+ int
+ main(int argc, char **argv)
+ {
+-	g_setenv("G_TEST_SRCDIR", SRCDIR, FALSE);
++	g_setenv("G_TEST_SRCDIR", "/usr/libexec/installed-tests/libxmlb", FALSE);
+ 
+ 	g_test_init(&argc, &argv, NULL);
+ 
+-- 
+2.41.0
+
diff --git a/meta/recipes-gnome/libxmlb/libxmlb/run-ptest b/meta/recipes-gnome/libxmlb/libxmlb/run-ptest
new file mode 100644
index 0000000000..6d0bb95d3a
--- /dev/null
+++ b/meta/recipes-gnome/libxmlb/libxmlb/run-ptest
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+gnome-desktop-testing-runner libxmlb
diff --git a/meta/recipes-gnome/libxmlb/libxmlb_0.3.14.bb b/meta/recipes-gnome/libxmlb/libxmlb_0.3.14.bb
new file mode 100644
index 0000000000..1d3b0de29a
--- /dev/null
+++ b/meta/recipes-gnome/libxmlb/libxmlb_0.3.14.bb
@@ -0,0 +1,25 @@
+SUMMARY = "A library to help create and query binary XML blobs"
+HOMEPAGE = "https://github.com/hughsie/libxmlb"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742"
+
+SRC_URI = " \
+	git://github.com/hughsie/libxmlb.git;branch=main;protocol=https \
+	file://0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch \
+	file://run-ptest \
+"
+SRCREV = "aa577b276adc66564f5777f9a522ca3bf0bfa65e"
+S = "${WORKDIR}/git"
+
+DEPENDS = "glib-2.0 xz zstd"
+
+inherit gobject-introspection gtk-doc meson ptest-gnome lib_package pkgconfig
+
+PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
+PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false"
+
+GTKDOC_MESON_OPTION = "gtkdoc"
+
+FILES:${PN} += "${datadir}"
+
+BBCLASSEXTEND = "native"
-- 
2.41.0

[oe-core][PATCH 2/4] appstream: import recipe from meta-oe

[Markus Volk]

libadwaita 1.4.0 has a dependency on it

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...-meson-do-not-rely-on-an-exe-wrapper.patch | 36 +++++++++++++++
 .../0001-remove-hardcoded-path.patch          | 31 +++++++++++++
 .../appstream/appstream_0.16.3.bb             | 45 +++++++++++++++++++
 3 files changed, 112 insertions(+)
 create mode 100644 meta/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch
 create mode 100644 meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch
 create mode 100644 meta/recipes-support/appstream/appstream_0.16.3.bb

diff --git a/meta/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch b/meta/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch
new file mode 100644
index 0000000000..d4f2951e7a
--- /dev/null
+++ b/meta/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch
@@ -0,0 +1,36 @@
+From 79bf322768990b28c29a9d907edcca52ff48e0b8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
+Date: Wed, 26 Jul 2023 23:21:10 +0400
+Subject: meson: do not rely on an exe wrapper
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
+
+Upstream-Status: Backport [https://github.com/ximion/appstream/commit/79bf322768990b28c29a9d907edcca52ff48e0b8]
+---
+ data/meson.build | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/data/meson.build b/data/meson.build
+index aea0cb25..ec0e434f 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -7,6 +7,13 @@ install_data('its/metainfo.its',
+ install_data('its/metainfo.loc',
+               install_dir: join_paths(get_option('datadir'), 'gettext', 'its'))
+ 
++# Do not rely on an exe wrapper for rel-info, use the system one in that case
++if meson.is_cross_build()
++    dependency('appstream', version: '>=' + as_version, native: true,
++               not_found_message: 'Native appstream required for cross-building')
++    ascli_exe = find_program('appstreamcli')
++endif
++
+ # NOTE: We do not translate the release notes on purpose here.
+ # If you do want to give translators a chance to translate them,
+ # ascli news-to-metainfo needs to produce a temporary file to translate
+-- 
+2.41.0
+
diff --git a/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch b/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch
new file mode 100644
index 0000000000..9cbfaca82f
--- /dev/null
+++ b/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch
@@ -0,0 +1,31 @@
+From 6ab00a4279823829a9b82dc9e4d055da4de88c6e Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Mon, 12 Dec 2022 15:42:42 +0100
+Subject: [PATCH] remove hardcoded path
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+
+Dont include hardcoded path. This fixes:
+| cc1: error: include location "/usr/include" is unsafe for cross-compilation [-Werror=poison-system-directories]
+
+Upstream-Status: Inappropriate [oe-specific]
+---
+ meson.build       | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index fd0e3373..2f273ada 100644
+--- a/meson.build
++++ b/meson.build
+@@ -124,7 +124,7 @@ if get_option ('gir')
+     dependency('gobject-introspection-1.0', version: '>=1.56')
+ endif
+ 
+-stemmer_inc_dirs = include_directories(['/usr/include'])
++stemmer_inc_dirs = include_directories([''])
+ if get_option('stemming')
+     stemmer_lib = cc.find_library('stemmer', required: true)
+     if not cc.has_header('libstemmer.h')
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/appstream/appstream_0.16.3.bb b/meta/recipes-support/appstream/appstream_0.16.3.bb
new file mode 100644
index 0000000000..bde679e256
--- /dev/null
+++ b/meta/recipes-support/appstream/appstream_0.16.3.bb
@@ -0,0 +1,45 @@
+SUMMARY = "AppStream is a collaborative effort for making machine-readable software metadata easily available."
+HOMEPAGE = "https://github.com/ximion/appstream"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=435ed639f84d4585d93824e7da3d85da"
+
+DEPENDS = " \
+    appstream-native \
+    curl-native \
+    curl \
+    docbook-xml-dtd4-native \
+    gperf-native \
+    glib-2.0 \
+    libyaml \
+    libxml2 \
+    libxmlb \
+    libxslt-native \
+    itstool-native \
+    docbook-xsl-stylesheets-native \
+    python3-pygments-native \
+"
+
+inherit meson gobject-introspection gettext gtk-doc pkgconfig vala
+
+GIR_MESON_OPTION = "gir"
+GTKDOC_MESON_OPTION = "apidocs"
+
+SRC_URI = " \
+	https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz \
+	file://0001-remove-hardcoded-path.patch \
+	file://0001-meson-do-not-rely-on-an-exe-wrapper.patch \
+"
+SRC_URI[sha256sum] = "081c917646e94d7221c9e4aae54dacda95a27c607fa93cd8e6344a2b318b98b1"
+
+S = "${WORKDIR}/AppStream-${PV}"
+
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+
+PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
+PACKAGECONFIG[stemming] = "-Dstemming=true,-Dstemming=false,libstemmer"
+
+FILES:${PN} += "${datadir}"
+
+EXTRA_OEMESON += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)}"
+
+BBCLASSEXTEND = "native"
-- 
2.41.0

[oe-core][PATCH 3/4] libadwaita: upgrade 1.3.4 -> 1.4.0

[Markus Volk]

- add dependency on appstream
- build vapi dependent on GI_DATA_ENABLED

=============
Version 1.4.0
=============

- AdwBreakpointBin
  - Clarify minimum size warnings
- AdwExpanderRow
  - Improve accessible roles
- AdwPreferencesGroup
  - Set described-by on the listbox
- Docs
  - Fix a property name in breakpoint migration guide
- Stylesheet
  - Fix toolbar view styles within sidebars
  - Fix .navigation-sidebar:disabled style when used with GtkListView
- Build system fixes
- Translation updates
  - Catalan
  - Danish
  - Dutch
  - Esperanto
  - Italian
  - Occitan
  - Spanish
  - Swedish

==============
Version 1.4.rc
==============

- AdwAboutWindow
  - Accessibility fixes
  - Add a minimum size
- AdwExpanderRow
  - Accessibility fixes
- AdwHeaderBar
  - Fix missing title fallback for back button tooltip and history menu
  - Set "Back" as an accessible label for the back button
  - Clarify docs around :show-back-button
- AdwNavigationView
  - Warn when a navigation page is missing a title
- AdwStyleManager
  - Fix over-releasing a string on macOS
- AdwTabButton
  - Set the correct gettext domain
- AdwTabOverview
  - Set the correct gettext domain
  - Fix reordered thumbnail being drawn below others
- AdwToastOverlay
  - Set the correct gettext domain
- Build
  - Update pkg-config description field
- Demo
  - Update screenshot in appdata
  - Correctly dismiss the last toast in the dialogs demo
  - Add missing navigation page titles
- Stylesheet
  - Fix filename entry margins in file chooser
  - Fix menubutton.card corners
  - Fix button.card focus ring transition
  - Avoid background overdraw in GtkColumnView
- Translation updates
  - Basque
  - Chinese (China)
  - Czech
  - Finnish
  - Galician
  - German
  - Indonesian
  - Kazakh
  - Korean
  - Lithuanian
  - Persian
  - Polish
  - Romanian
  - Spanish
  - Turkish

================
Version 1.4.beta
================

- Build
  - Depend on GLib 2.76.0
  - Fix build on Windows
  - Add a GTK subproject
- AdwBreakpointBin
  - Mention the correct widget in exceeded size warnings
  - Fix width-for-height and height-for-width sizing
- AdwComboRow
  - Recreate default factory on expression changes
- AdwEnumListModel
  - Better invalid value for find_position()
- AdwHeaderBar
  - Fix spacing when there are no start/end children
  - Fix a memory leak
  - Fix GtkCenterBox:shrink-center-last usage
- AdwLeaflet
  - Fix back/forward mouse button handling
- AdwMessageDialog
  - Fix shadow style
- AdwNavigationView
  - Pop the current page when pressing Escape
  - Make AdwNavigationPage:child-view private
  - Fix back/forward mouse button handling
  - Clarify docs
- AdwPreferencesWindow
  - Fix a memory leak
- AdwTabOverview
  - Cull invisible thumbnails
  - Fix a crash when opening overview before it's mpped
- AdwTabView
  - Fix thumbnail regressions from 1.4.alpha
- AdwToastOverlay
  - Fix width-for-height and height-for-width sizing
- AdwToolbarView
  - Add ADW_TOOLBAR_RAISED_BORDER style
  - Fix width-for-height and height-for-width sizing
  - Clarify docs
- AdwViewStack
  - Add AdwViewStackPages:selected-page
- AdwViewSwitcherBar
  - Fix disabling reveal animation when using breakpoints
  - Make sure the height doesn't change with large text
- Demo
  - Fix view switcher demo minimum height
  - Set input hints and purpose in the entries
- Docs
  - Assorted screenshot tool fixes
  - Fix a deprecation warning in the screenshot tool
- Stylesheet
  - Make button.osd focus rings blue for better visibility
  - Fix .card buttons within .osd
  - Fix button transitions in high contrast mode
  - Fix single-item menu height
  - Modernize GtkFileDialog, GtkAppChooserDialog and GtkAssistant styles
- Translation updates
  - Belarusian
  - Friulian
  - Georgian
  - Hebrew
  - Hungarian
  - Persian
  - Portuguese
  - Russian
  - Slovenian
  - Ukrainian

=================
Version 1.4.alpha
=================

- Build
  - Depend on GTK 4.11.3
  - Depend on libappstream
  - Add Vala metadata file
  - Fix gnome.compile_resources() on MSBuild
  - Fix doc include path
  - Make metainfo build reproducible
- Add AdwBreakpoint and AdwBreakpointBin
- Add AdwNavigationView
- Add AdwNavigationSplitView
- Add AdwOverlaySplitView
- Add AdwSpinRow
- Add AdwSwitchRow
- Add AdwToolbarView
- Deprecate AdwFlap, AdwLeaflet, AdwSqueezer and AdwViewSwitcherTitle
- AdwAboutWindow
  - Add new_from_appdata()
  - Add a missing Since annotation
  - Fix accessible role on the application icon
- AdwActionRow
  - Fix an inaccuracy in docs
- AdwAvatar
  - Fix a memory leak
- AdwBanner
  - Allow to ellipsize the button
  - Clarify title placement in docs
  - Add a backdrop style
- AdwButtonContent
  - Add :can-shrink
- AdwCarousel
  - Fix allocation
  - Fix scrolling to a recently inserted item
- AdwClamp/AdwClampLayout/AdwClampScrollable
  - Add :unit, default to the sp unit instead of px
  - Deprecate clamp child  style classes
- AdwComboRow
  - Add :enable-search
  - Fix accessible role on the dropdown arrow
- AdwExpanderRow
  - Deprecate add_action(), replace it with add_suffix()
- AdwFlap
  - Add a missing setter annotation for :fold-policy
  - Correctly measure separator
  - Avoid notify emissions in dispose()
- AdwEntryRow
  - Fix baseline with new GTK
  - Fix accessibility
- AdwHeaderBar
  - Add :show-title property
  - Show page title instead of window title inside AdwNavigationPage
  - Show back buttons inside AdwNavigationView, add :show-back-button
  - Hide redundant window buttons inside AdwNavigationSplitView and
    AdwOverlaySplitView
  - Ellipsize title before start/end children
- AdwMessageDialog
  - Allow to ellipsize the buttons
  - Be more responsive on parent state changes
  - Fix criticals when using choose() with hide-on-close=true
- AdwPasswordEntryRow
  - Say password instead of text in the ui
- AdwPreferencesPage
  - Add :description
- AdwPreferencesWindow
  - Deprecate present_subpage(), close_subpage() and :can-navigate-back,
    replace with push_subpage() and pop_subpage() using AdwNavigationView
  - Move search button to the left
  - Add placeholder to the search entry
  - Fix markup handling when searching
- AdwSplitButton
  - Add :can-shrink
- AdwStatusPage
  - Clarify docs
- AdwStyleManager
  - Stop reading GNOME-specific color-scheme setting via settings portal
  - Only use GSettings with ADW_DISABLE_PORTAL=1
  - Fix get_for_display() annotation
- AdwSwipeTracker
  - Add overshoot properties
  - Fix swipe area handling
- AdwTabBar
  - Add :extra-drag-preferred-action
  - Fix dropping data onto tabs/thumbnails
  - Fix accessibility
  - Fix clipped labels
  - Correctly unparent context menu
- AdwTabOverview
  - Rework thumbnails, reducing the number of glitches with
    WebKitWebView, and gaining antialiasing in process
  - Fix the transition curve
  - Add :extra-drag-preferred-action
  - Add a translator comment for "%u tabs"
  - Fix dropping data onto tabs/thumbnails
  - Fix clipped labels
  - Correctly unparent context menu
- AdwTabView
  - Allow Ctrl+Page Up/Down to wrap around
- AdwToast
  - Add :use-markup
  - Allow to ellipsize toast buttons
- AdwViewSwitcher
  - Ellipsize labels in wide mode
  - Set correct accessible role for icons
- AdwViewSwitcherBar
  - Modernize style
- AdwWindow/AdwApplicationWindow
  - Add API for using breakpoints, matching AdwBreakpointBin
- AdwWindowTitle
  - Fix initial title visibility
- Demo
  - Drop leaflet and flap demos
  - Fix a critical when trying to set a non-image file as avatar
  - Add tooltip to the main menu button
  - Open primary menu with F10
  - Make sure dialogs can be closed with Esc
- Docs
  - Add a breakpoint migration guide
  - Rewrite the adaptive layouts page using the new widgetry
  - Update examples everywhere
  - Fix success/error color values
  - List thumbnail colors on the named colors page
  - Consistently mention since/deprecated since versions for named
    colors and style classes
  - Drop alpha migration guide
  - Adjust heading levels so that document outline consistently works
  - Crop screenshots more precisely
  - Don't show marshal functions in docs
- Tests
  - Add a few manual tests, intended to be ran from Builder
- Stylesheet
  - Make header bars white in light variant
  - Use shadow instead of a border for GtkWindow:titlebar
  - Revert menubar style changes from 1.3
  - Use a shadow for undershoot styles
  - Add .undershoot-top/bottom/start/end style classes
  - Add @popover_shade_color, use for undershoots and transition shadows
    within popovers
  - Move toolbar padding to toolbars instead of buttons/entries/etc.
    Applications may need to adapt if they were relying on the previous
    padding.
  - Add .property style class for list rows
  - Deprecate headerbar.flat
  - Remove non-overlay scrollbar background
  - Remove outline on scrollbar troughs
  - Use flat header bars for GtkShortcutsWindow, GtkAboutDialog,
    GtkColorDialog, GtkPrintUnixDialog and GtkPageSetupUnixDialog
  - Adapt styles for GTK 4.11.x additions
  - Improve selected list/grid item contrast
  - Fix click areas in file chooser rows and grid items
  - Fix file chooser grid dimensions
  - Fix button.card checked state
  - Fix link hover color
- Warn when trying to add a child that already has a parent
- Fix GTK deprecation warnings
- Translation updates
  - Basque
  - Brazilian Portuguese
  - British English
  - Bulgarian
  - Catalan
  - Chinese (Taiwan)
  - Dutch
  - Finnish
  - French
  - Friulian
  - German
  - Hebrew
  - Hungarian
  - Italian
  - Lithuanian
  - Persian
  - Polish
  - Portuguese
  - Russian
  - Slovak
  - Swedish
  - Turkish

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../libadwaita/{libadwaita_1.3.4.bb => libadwaita_1.4.0.bb}  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
 rename meta/recipes-gnome/libadwaita/{libadwaita_1.3.4.bb => libadwaita_1.4.0.bb} (74%)

diff --git a/meta/recipes-gnome/libadwaita/libadwaita_1.3.4.bb b/meta/recipes-gnome/libadwaita/libadwaita_1.4.0.bb
similarity index 74%
rename from meta/recipes-gnome/libadwaita/libadwaita_1.3.4.bb
rename to meta/recipes-gnome/libadwaita/libadwaita_1.4.0.bb
index 2abc8d9f2f..d8aa2cd697 100644
--- a/meta/recipes-gnome/libadwaita/libadwaita_1.3.4.bb
+++ b/meta/recipes-gnome/libadwaita/libadwaita_1.4.0.bb
@@ -7,11 +7,12 @@ GNOMEBASEBUILDCLASS = "meson"
 
 DEPENDS = " \
     gtk4 \
+    appstream \
 "
 
 inherit gnomebase gobject-introspection gi-docgen vala features_check
 
-SRC_URI[archive.sha256sum] = "801ccaf3a760213b59ebb9b8185327df225049544aee68a1340b165710acb1bd"
+SRC_URI[archive.sha256sum] = "e51a098a54d43568218fc48fcf52e80e36f469b3ce912d8ce9c308a37e9f47c2"
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 REQUIRED_DISTRO_FEATURES = "opengl"
@@ -23,3 +24,5 @@ GTKDOC_MESON_OPTION = 'gtk_doc'
 PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false"
 
 FILES:${PN} += "${datadir}/metainfo"
+
+EXTRA_OEMESON += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)}"
-- 
2.41.0

[oe-core][PATCH 4/4] maintainers.inc: add missing entries for appstream and libxmlb

[Markus Volk]

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 meta/conf/distro/include/maintainers.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 3619588ae6..4caf137b5d 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -38,6 +38,7 @@ RECIPE_MAINTAINER:pn-alsa-tools = "Michael Opdenacker <michael.opdenacker@bootli
 RECIPE_MAINTAINER:pn-alsa-topology-conf = "Michael Opdenacker <michael.opdenacker@bootlin.com>"
 RECIPE_MAINTAINER:pn-alsa-ucm-conf = "Michael Opdenacker <michael.opdenacker@bootlin.com>"
 RECIPE_MAINTAINER:pn-alsa-utils = "Michael Opdenacker <michael.opdenacker@bootlin.com>"
+RECIPE_MAINTAINER:pn-appstream = "Markus Volk <f_l_k@t-online.de>"
 RECIPE_MAINTAINER:pn-apr = "Hongxu Jia <hongxu.jia@windriver.com>"
 RECIPE_MAINTAINER:pn-apr-util = "Hongxu Jia <hongxu.jia@windriver.com>"
 RECIPE_MAINTAINER:pn-apt = "Unassigned <unassigned@yoctoproject.org>"
@@ -447,6 +448,7 @@ RECIPE_MAINTAINER:pn-libxml-sax-base-perl = "Tim Orling <tim.orling@konsulko.com
 RECIPE_MAINTAINER:pn-libxml-sax-perl = "Tim Orling <tim.orling@konsulko.com>"
 RECIPE_MAINTAINER:pn-libxml-simple-perl = "Tim Orling <tim.orling@konsulko.com>"
 RECIPE_MAINTAINER:pn-libxml2 = "Hongxu Jia <hongxu.jia@windriver.com>"
+RECIPE_MAINTAINER:pn-libxmlb = "Markus Volk <f_l_k@t-online.de>"
 RECIPE_MAINTAINER:pn-libxmu = "Unassigned <unassigned@yoctoproject.org>"
 RECIPE_MAINTAINER:pn-libxpm = "Unassigned <unassigned@yoctoproject.org>"
 RECIPE_MAINTAINER:pn-libxrandr = "Unassigned <unassigned@yoctoproject.org>"
-- 
2.41.0

Re: [oe-core][PATCH 1/4] libxmlb: import recipe from meta-oe

[Richard Purdie]

On Sun, 2023-09-17 at 20:28 +0200, Markus Volk wrote:
> appstream has a dependency on it
> 
> - add a patch to fix a reproducibility and runtime issue with ptest
>   ptest completes without error
> 
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
>  ...xb-selftest.c-hardcode-G_TEST_SRCDIR.patch | 35 +++++++++++++++++++
>  meta/recipes-gnome/libxmlb/libxmlb/run-ptest  |  3 ++
>  meta/recipes-gnome/libxmlb/libxmlb_0.3.14.bb  | 25 +++++++++++++
>  3 files changed, 63 insertions(+)
>  create mode 100644 meta/recipes-gnome/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch
>  create mode 100644 meta/recipes-gnome/libxmlb/libxmlb/run-ptest
>  create mode 100644 meta/recipes-gnome/libxmlb/libxmlb_0.3.14.bb
> 
> diff --git a/meta/recipes-gnome/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch b/meta/recipes-gnome/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch
> new file mode 100644
> index 0000000000..da8ce68df9
> --- /dev/null
> +++ b/meta/recipes-gnome/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch
> @@ -0,0 +1,35 @@
> +From dc208bafc57c1ccaa0ca260f99c8b4c976271ebc Mon Sep 17 00:00:00 2001
> +From: Markus Volk <f_l_k@t-online.de>
> +Date: Sat, 16 Sep 2023 14:02:57 +0200
> +Subject: [PATCH] xb-self-test.c: hardcode G_TEST_SRCDIR
> +
> +This avoids:
> + libxmlb-0.3.14-r0 do_package_qa: QA Issue: File
> + /usr/libexec/installed-tests/libxmlb/xb-self-test in package libxmlb-ptest
> + contains reference to TMPDIR [buildpaths]
> +
> +and also fixes the runtime for the ptest.
> +
> +Upstream-Status: Inappropriate [oe-specific]
> +
> +Signed-off-by: Markus Volk <f_l_k@t-online.de>
> +---
> + src/xb-self-test.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/xb-self-test.c b/src/xb-self-test.c
> +index 47d9728..8b3dd0e 100644
> +--- a/src/xb-self-test.c
> ++++ b/src/xb-self-test.c
> +@@ -2870,7 +2870,7 @@ xb_speed_func(void)
> + int
> + main(int argc, char **argv)
> + {
> +-	g_setenv("G_TEST_SRCDIR", SRCDIR, FALSE);
> ++	g_setenv("G_TEST_SRCDIR", "/usr/libexec/installed-tests/libxmlb", FALSE);
> + 
> + 	g_test_init(&argc, &argv, NULL);
> + 
> +-- 
> +2.41.0
> +
> diff --git a/meta/recipes-gnome/libxmlb/libxmlb/run-ptest b/meta/recipes-gnome/libxmlb/libxmlb/run-ptest
> new file mode 100644
> index 0000000000..6d0bb95d3a
> --- /dev/null
> +++ b/meta/recipes-gnome/libxmlb/libxmlb/run-ptest
> @@ -0,0 +1,3 @@
> +#! /bin/sh
> +
> +gnome-desktop-testing-runner libxmlb
> diff --git a/meta/recipes-gnome/libxmlb/libxmlb_0.3.14.bb b/meta/recipes-gnome/libxmlb/libxmlb_0.3.14.bb
> new file mode 100644
> index 0000000000..1d3b0de29a
> --- /dev/null
> +++ b/meta/recipes-gnome/libxmlb/libxmlb_0.3.14.bb
> @@ -0,0 +1,25 @@
> +SUMMARY = "A library to help create and query binary XML blobs"
> +HOMEPAGE = "https://github.com/hughsie/libxmlb"
> +LICENSE = "LGPL-2.1-only"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742"
> +
> +SRC_URI = " \
> +	git://github.com/hughsie/libxmlb.git;branch=main;protocol=https \
> +	file://0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch \
> +	file://run-ptest \
> +"
> +SRCREV = "aa577b276adc66564f5777f9a522ca3bf0bfa65e"
> +S = "${WORKDIR}/git"
> +
> +DEPENDS = "glib-2.0 xz zstd"
> +
> +inherit gobject-introspection gtk-doc meson ptest-gnome lib_package pkgconfig
> +
> +PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
> +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false"
> +
> +GTKDOC_MESON_OPTION = "gtkdoc"
> +
> +FILES:${PN} += "${datadir}"
> +
> +BBCLASSEXTEND = "native"

https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/7823/steps/11/logs/warnings

(and I suspect warnings from other targets will follow)

Cheers,

Richard

Re: [oe-core][PATCH 1/4] libxmlb: import recipe from meta-oe

[Markus Volk]

[-- Attachment #1: Type: text/plain, Size: 303 bytes --]

On Mon, Sep 18 2023 at 12:24:40 PM +01:00:00, Richard Purdie 
<richard.purdie@linuxfoundation.org> wrote:
> (and I suspect warnings from other targets will follow)

yes, I noticed that too. However, I couldn't decide where it had to be 
entered and whether at all. That's why I left this question open


[-- Attachment #2: Type: text/html, Size: 469 bytes --]

Re: [oe-core][PATCH 1/4] libxmlb: import recipe from meta-oe

[Alexander Kanavin]

You need to first check (with kvm) how long the tests are taking (and
that they pass, obviously), then add to one of the lists in
ptest-packagelists.inc.

Alex

On Mon, 18 Sept 2023 at 13:29, Markus Volk <f_l_k@t-online.de> wrote:
>
> On Mon, Sep 18 2023 at 12:24:40 PM +01:00:00, Richard Purdie <richard.purdie@linuxfoundation.org> wrote:
>
> (and I suspect warnings from other targets will follow)
>
>
> yes, I noticed that too. However, I couldn't decide where it had to be entered and whether at all. That's why I left this question open
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#187824): https://lists.openembedded.org/g/openembedded-core/message/187824
> Mute This Topic: https://lists.openembedded.org/mt/101419208/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [oe-core][PATCH 1/4] libxmlb: import recipe from meta-oe

[Markus Volk]

[-- Attachment #1: Type: text/plain, Size: 433 bytes --]

On Mon, Sep 18 2023 at 01:33:56 PM +02:00:00, Alexander Kanavin 
<alex.kanavin@gmail.com> wrote:
> You need to first check (with kvm) how long the tests are taking (and
> that they pass, obviously), then add to one of the lists in
> ptest-packagelists.inc.

I did that already to check if the test is working at all. It took a 
few minutes. Didn't focus on that but I guess its been about 1-2 
Minutes.
That is a fast one, I guess?


[-- Attachment #2: Type: text/html, Size: 605 bytes --]

Re: [oe-core][PATCH 1/4] libxmlb: import recipe from meta-oe

[Markus Volk]

[-- Attachment #1: Type: text/plain, Size: 503 bytes --]

On Mon, Sep 18 2023 at 01:40:25 PM +02:00:00, Markus Volk 
<f_l_k@t-online.de> wrote:
> I did that already to check if the test is working at all. It took a 
> few minutes. Didn't focus on that but I guess its been about 1-2 
> Minutes.
> That is a fast one, I guess?

Tested this again with core-image-sato and runqemu script
Without compiling at the same time, it's also much quicker.
total=1; passed=1; skipped=0; failed=0
DURATION: 14

But I don't have a clue as to when a ptest is considered slow


[-- Attachment #2: Type: text/html, Size: 673 bytes --]

Re: [oe-core][PATCH 1/4] libxmlb: import recipe from meta-oe

[Alexander Kanavin]

The criteria is written in the file where ptests are separated into
fast and slow.

Alex

On Mon, 18 Sept 2023 at 14:39, Markus Volk <f_l_k@t-online.de> wrote:
>
> On Mon, Sep 18 2023 at 01:40:25 PM +02:00:00, Markus Volk <f_l_k@t-online.de> wrote:
>
> I did that already to check if the test is working at all. It took a few minutes. Didn't focus on that but I guess its been about 1-2 Minutes.
> That is a fast one, I guess?
>
>
> Tested this again with core-image-sato and runqemu script
> Without compiling at the same time, it's also much quicker.
> total=1; passed=1; skipped=0; failed=0
> DURATION: 14
>
> But I don't have a clue as to when a ptest is considered slow

Re: [oe-core][PATCH 1/4] libxmlb: import recipe from meta-oe

[Markus Volk]

[-- Attachment #1: Type: text/plain, Size: 266 bytes --]

On Mon, Sep 18 2023 at 02:44:00 PM +02:00:00, Alexander Kanavin 
<alex.kanavin@gmail.com> wrote:
> The criteria is written in the file where ptests are separated into
> fast and slow.

Well documented. You just have to open your eyes ;)
Thanks. I'll send an update


[-- Attachment #2: Type: text/html, Size: 441 bytes --]