summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-gnome/recipes-gnome/gnome-software
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2024-04-05 15:04:11 +0300
committerPatrick Williams <patrick@stwcx.xyz>2024-04-13 00:00:11 +0300
commit03514f1996efa799e50da744818ba331c2e893b6 (patch)
tree170526c40430aa0a3984afe0943972b499f9db97 /meta-openembedded/meta-gnome/recipes-gnome/gnome-software
parenta55b31efd47bad0a2eece9fad6acfbfb4950b83b (diff)
downloadopenbmc-03514f1996efa799e50da744818ba331c2e893b6.tar.xz
subtree updates
meta-security: 30e755c592..283a773f24: Armin Kuster (2): meta-security: Drop ${PYTHON_PN} openscap: update to tip to fix new build issue. Jeremy A. Puhlman (4): arpwatch: fix misspelling of PACKAGECONFIG aprwatch: Add path for sendmail Check for usrmerge before removing /usr/lib arpwatch: install man8 dir Kevin Hao (4): docs: dm-verity.txt: Fix a typo dm-verity: Adjust the image names according to the oe-core change dm-verity: Set the IMAGE_FSTYPES correctly when dm-verity is enabled dm-verity-image-initramfs: Set IMAGE_NAME_SUFFIX to empty Max Krummenacher (1): layer.conf: Update for the scarthgap release series Mingli Yu (1): python3-pyinotify: Make asyncore support optional for Python 3 poky: 7165c23237..110ee701b3: Alejandro Hernandez Samaniego (1): python3-manifest: Sync RDEPENDS with latest version Alexander Kanavin (11): meson: correct upstream version check (exclude pre-releases) cargo-c-native: convert from git fetcher to crate fetcher cargo-c-native: update 0.9.18 -> 0.9.30 man-pages: use env from coreutils-native sdk-manual: correctly describe separate build-sysroots tasks in direct sdk workflows dev/ref-manual: document conf-summary.txt together with conf-notes.txt dev-manual: improve descriptions of 'bitbake -S printdiff' wayland: fix upstream version check by asking gitlab directly python3: correct upstream version check bitbake: bitbake: improve descriptions of '-S printdiff' selftest/sstatetests: run CDN check twice, ignoring errors the first time Alexandre Truong (1): oeqa/selftest/devtool: fix test_devtool_add_git_style2 Anibal Limon (1): wic: bootimg-partition allow to set var to get boot files BELOUARGA Mohamed (1): ref-manual: add documentation of the variable SPDX_NAMESPACE_PREFIX Bartosz Golaszewski (1): linux-firmware: update to 20240312 Baruch Siach (1): oeqa/selftest/overlayfs: test read-only rootfs Bruce Ashfield (16): linux-yocto/6.6: cfg: generic arm64 linux-yocto/6.6: cfg: riscv XHCI linux-yocto/6.6: update to v6.6.21 linux-yocto/6.6: update CVE exclusions (6.6.21) linux-yocto/6.6: cfg: drop unsettable options linux-yocto/6.6: drm/tilcdc: Set preferred depth linux-yocto/6.6: update to v6.6.22 linux-yocto/6.6: update CVE exclusions (6.6.22) yocto-bsps: update to v6.6.21 linux-yocto/6.6: cfg: genericarm64 platform/peripheral support linux-yocto/6.6: cfg: genericarm64 configuration updates linux-yocto/6.6: nftables: ptest and cleanup tweaks linux-yocto/6.6: update to v6.6.23 linux-yocto/6.6: update CVE exclusions (6.6.23) linux-yocto-dev: bump to v6.9 lttng-modules: update to v2.13.12 Changqing Li (1): dnf: fix Exception handling for class ProcessLock Chen Qi (1): ovmf: set CVE_PRODUCT and CVE_VERSION Christian Taedcke (1): kernel-fitImage: only include valid compatible line Derek Erdmann (1): bitbake: fetch2/git: Install Git LFS in local repository config Enrico Jörns (3): cml1: remove needless check for write_taint attribute cml1: prompt location of updated .config after do_menuconfig() perf: fix TMPDIR contamination for recent mainline kernels Enrico Scholz (1): shadow: fix copydir operation with 'pseudo' Felix Moessbauer (1): bitbake: utils: better estimate number of available cpus Harish Sadineni (3): gcc: Oe-selftest failure analysis - fix for tcl errors gcc: Oe-selftest failure analysis - fix for vect-simd test failures binutils: gprofng - change use of bignum to use of bignint Jermain Horsman (1): bblayers/makesetup.py: Move git utility functions to oe.buildcfg module Joe Slater (1): systemd: enable mac based names in NamePolicy Jose Quaresma (5): go.bbclass: set GOPROXY elfutils: fix unused variable BUFFER_SIZE go: keep the patches in order go: upgrade 1.22.1 -> 1.22.2 sstatesig: fix netrc.NetrcParseError exception Joshua Watt (4): sstatesig: Set hash server credentials from bitbake variables bitbake: siggen: Add support for hashserve credentials sstatesig: Warn on bad .netrc bitbake: bitbake-hashclient: Warn on bad .netrc Jörg Sommer (1): autotools: update link in comment for cross compiling Kevin Hao (1): image-live.bbclass: Adjust the default value for INITRD_LIVE Khem Raj (13): systemd: Check for directory before chmod'ing it llvm: Update to 18.1.1 release elfutils: Fix build break with clang glibc: Update to tip of 2.39 branch pam: Fix build with musl piglit: Switch to upstreamed patch for musl fix qemuriscv: Fix kbd and mouse emulation for qemuriscv64 llvm: Upgrade to 18.1.2 bugfix release glibc: Repace aarch configure patch fix with a backport valgrind: Backport fixes from 3.22 branch tcl: Forward port skip logic for musl ptests readline: Apply patches from readline-8.2-patches mesa: Drop LLVM-17 patch Lee Chee Yang (1): migration-guides: add release notes for 4.0.17 Marcel Ziswiler (1): mesa: enable imagination powervr support Markus Volk (11): mesa: fix opencl-spirv build vala: merge bb and inc files vala: fix for gtk4 prior to 4.14 libsoup: enable vapi support gsettings-desktop-schemas: update 45.0 -> 46.0 libadwaita: update 1.4.4 -> 1.5.0 gtk4: update 4.12.5 -> 4.14.1 systemd: disable mdns feature in resolved for zeroconf webkitgtk: update 2.42.5 -> 2.44.0 gtk+3: disable wayland without opengl epiphany: update 45.3 -> 46.0 Martin Jansa (2): contributor-guide: be more specific about meta-* trees pixman: explicitly disable openmp in native builds Max Krummenacher (1): git: git-replacement-native: depend on ca-certificate Michael Opdenacker (8): manuals: add initial stylechecks with Vale profile-manual: usage.rst: formatting fixes manuals: use "manual page(s)" profile-manual: usage.rst: fix reference to bug report documentation: Makefile: remove releases.rst in "make clean" migration-guides: draft notes for upcoming release 5.0 manuals: add initial stylechecks with Vale profile-manual: usage.rst: further style improvements Oleh Matiusha (3): bash: improve reproducibility curl: improve reproducibility gmp: improve reproducibility Paul Barker (1): kernel: Fix check_oldest_kernel Peter A. Bigot (1): bitbake: lib/bb: support NO_COLOR Peter Kjellerstedt (1): util-linux: Set the license for util-linux-fcntl-lock to MIT Philippe Rivest (1): bitbake: bitbake: fetch2/git: Escape parentheses in git src name Quentin Schulz (1): u-boot: fix externalsrc not triggering do_configure on defconfig changes Randy MacLeod (1): gstreamer: upgrade 1.22.10 -> 1.22.11 Richard Purdie (10): poky: Update to prepare for scarthgap release layer.conf: Prepare for release, drop nanbield LAYERSERIES expat: Upgrade 2.6.1 -> 2.6.2 bash/flex: Ensure BUILD_FLAGS doesn't leak onto target uninative: Add pthread linking workaround poky-altcfg: Default to ipk packaging util-linux: Add missing MIT license util-linux: Add fcntl-lock run-postinsts: Add workaround for locking deadlock issue oeqa/sstatetests: Fix race issue Ross Burton (22): genericarm64.wks: reorder partitions genericarm64: clean up kernel modules and firmware linux-firmware: add support for deduplicating the firmware linux-firmware: set LICENSE field for -liquidui and -mellanox linux-firmware: remove pointless linux-firmware-gplv2-license package curl: improve run-ptest curl: increase test timeouts gstreamer1.0: improve test reliability linux-yocto: put COMPATIBLE_MACHINE first linux-yocto: implicitly track oe-core's kernel version for genericarm64 bitbake: fetch2: handle URIs with single-valued query parameters python3_pip517: just count wheels in the directory, not subdirectories python-*: don't set PYPI_ARCHIVE_NAME and S when PYPI_PACKAGE is sufficient tcl: improve run-ptest tcl: skip I/O channel 46.1 genericarm64: add qemuboot configuration classes/qemuboot: add depends on qemu-system-native and qemu-helper-native README.hardware.md: fix Markdown formatting README.hardware.md: add section on genericarm64 on qemu glib-2.0: skip a timing sensitive ptest openssl: fix crash on aarch64 if BTI is enabled but no Crypto instructions curl: fix quoting when disabling flaky tests Ryan Eatmon (1): perf: Fix QA error due to most recent kernel Sam Van Den Berge (1): shadow: don't install libattr.so.* when xattr not in DISTRO_FEATURES Sava Jakovljev (1): bitbake: bitbake-worker: Fix bug where umask 0 was not being applied to a task Simone Weiß (1): gnutls: upgrade 3.8.3 -> 3.8.4 Soumya Sambu (1): go: Upgrade 1.22.0 -> 1.22.1 Sourav Kumar Pramanik (1): libseccomp: Add back in PTESTS_SLOW list Sundeep KOKKONDA (1): rust: reproducibility issue fix with v1.75 Tim Orling (2): coreutils: drop obsolete liberror-perl RDEPENDS liberror-perl: move to meta-perl Timon Bergelt (1): populate_sdk_ext.bbclass: only overwirte lsb string if uninative is used Tom Hochstein (2): bmaptool: Add bmap-tools runtime alias for compatibility toolchain-shar-relocate.sh: Add check for missing command 'file' Trevor Woerner (1): bmaptool: update to latest Ulrich Ölmann (1): ref-manual: classes: update description of class 'image_types' Viswanath Kraleti (1): bitbake: fetch2: Fix misleading "no output" msg Wang Mingyu (1): libadwaita: upgrade 1.4.3 -> 1.4.4 William Lyu (1): openssh: Add a workaround for ICE on powerpc64le Xiangyu Chen (3): lttng-tools: skip kernel tests if no kernel modules present ltp: fix missing connectors tests in scenario_groups/default lttng-tools: fix rotation-destroy-flush test fails if no kernel module present Yang Xu (1): bitbake: bitbake-worker: Fix silent hang issue caused by unexpected stdout content Yannick Rodriguez (1): linux-firmware: Move Intel 9260 modules firmware. Yash Shinde (1): glibc: Skip 2 qemu tests that can hang in oe-selftest Yi Zhao (1): libtirpc: drop redundant PACKAGECONFIG Yoann Congal (6): cve-update-nvd2-native: Fix typo in comment cve-update-nvd2-native: Add an age threshold for incremental update cve-update-nvd2-native: Remove duplicated CVE_CHECK_DB_FILE definition cve-update-nvd2-native: nvd_request_next: Improve comment cve-update-nvd2-native: Fix CVE configuration update cve-update-nvd2-native: Remove rejected CVE from database Yogesh Tyagi (1): lttng-modules: fix v6.8+ build david d zuhn (1): bitbake: bitbake-worker: allow '=' in environment variable values lixiaoyong (3): kernel-module-split.bbclass: enhance objcopy command call for kernel compilation with llvm utils: enhance readelf command call with llvm oe/package: enhance objdump command call with llvm meta-raspberrypi: 92a9b7a012..d072cc8a48: Khem Raj (9): linux-raspberrypi: Add recipe for 6.6 LTS kernel bluez-firmware-rpidistro: Upgrade to 1.2-9+rpt3 release linux-firmware-rpidistro: Upgrade to bookworm/20230625-2+rpt2 raspberrypi-firmware: Fetch using git URI rpi-base: Add missing broadcom/ prefix to find DTB files rpi-default-versions: Switch default kernel to 6.6 linux-raspberrypi_6.6: Bump to 6.6.22 rpi-bootfiles: Resort to github APIs for tarballs raspberrypi-firmware: Revert to debian archive Martin Jansa (1): userland: fix installed-vs-shipped in multilib builds jdavidsson (1): rpi-base: Add hifiberry-dacplusadc overlay meta-arm: aba9250494..d9e18ce792: Abdellatif El Khlifi (1): arm-bsp/corstone1000: add documentation disclaimer Alexander Sverdlin (1): optee-ftpm: fix EARLY_TA_PATHS passed to optee-os Ali Can Ozaslan (4): arm-bsp/trusted-firmware-m: corstone1000: update to 2.0 arm-bsp/trusted-services: corstone1000: Client Id adjustments after TF-M 2.0 arm/trusted-firmware-m: Change GNU Arm compiler version for TF-M 2.0 arm-bsp/trusted-firmware-a: n1sdp: update to 2.10 Anusmita Dutta Mazumder (2): arm-bsp/n1sdp: Update scp-firmware version arm-bsp/n1sdp: Update EDK2 version Bence Balogh (2): arm-bsp/u-boot: corstone1000: fix SMCCC_ARCH_FEATURES detection in the PSCI driver arm-bsp/trusted-firmware-a: corstone1000: remove SMCCC_ARCH_FEATURES discovery workaround Delane Brandy (1): arm/trusted-firmware-a: fix mbedTLS version Drew Reed (2): kas: Corstone-1000 kas files updated bsp: Corstone-1000 userguide updates Emekcan Aras (2): arm-bsp/trusted-firmware-a: Upgrade Corstone1000 to TF-A v2.10 arm/trusted-services: Add recipe for block storage service Jon Mason (17): README: Add information about release process and mailing list arm/linux-yocto: remove unreferenced patch arm/optee: disable clang due to breakage arm-bsp/tf-a-tests: remove corstone1000 intermediate SHA arm-bsp/tfa-tests: move n1sdp patch to platform directory CI: update kas to 4.3.1 arm/edk2: update to 202402 arm/trusted-firmware-a: update to 2.10.2 arm/sbsa-acs: update to 7.1.4 arm/scp-firmware: update to v2.14.0 arm-toolchain/gcc-arm-none-eabi: remove 11.2 CI: reduce coverage of dev kernel arm/sbsa-acs: remove unreferenced patch arm-toolchain: correct UPSTREAM_CHECK Revert "arm/rmm: Add bitbake, include and patch file for RMM firmware" arm/sbsa-acs: use UPSTREAM_CHECK_URI for version checking arm: use UPSTREAM_CHECK_COMMITS for git versioned recipes Mathieu Poirier (1): arm/rmm: Add bitbake, include and patch file for RMM firmware Ross Burton (3): arm arm-bsp: enable patch-status warnings Add SECURITY.md CI: ignore netrc warnings caused by Kas meta-openembedded: a0237019f5..a6bcdca5b4: Bartosz Golaszewski (1): libgpiod: update to v2.1.1 Chad Rockey (1): cppzmq-dev expects /usr/lib/libzmq.a Changqing Li (1): postgresql: fix a runtime error Chen Qi (1): tcprelay: fix a minor cross compilation do_configure issue Christophe Chapuis (9): lvgl: fix typo in lv-conf.inc lvgl: install lv_conf.h lvgl: remove useless FILES include lvgl: cleanup sed instructions in lv-conf.inc lvgl: add more variables to lv-conf.inc lvgl: fix libdrm include lvgl: lv-conf.inc: generalize sed instructions lvgl: make libdrm include conditional lvgl: cleanup sed expression Dan McGregor (2): python3-pylint: Update to 3.1.0 python3-pylint: Fix ptest failures Derek Straka (1): python3-dbus: re-add recipe with latest patches and add ptest Etienne Cordonnier (1): uutils-coreutils: upgrade 0.0.24 -> 0.0.25 Fathi Boudra (1): python3-django: upgrade 4.2.10 -> 4.2.11 Guðni Már Gilbert (2): python3-ecdsa: remove python3-pbr python3-ecdsa: cleanup DEPENDS Jaeyoon Jung (1): lvgl: Set resolution prior to buffer Joe Slater (1): googletest: allow for shared libraries Jose Quaresma (1): ostree: Upgrade 2024.4 -> 2024.5 Jörg Sommer (3): sngrep: new recipe for ncurses SIP Messages flow viewer spandsp: new telephony DSP library bluez-tools: New recipe for bluez5 tools Kai Kang (2): Packages depends on libadwaita should require distro feature opengl thin-provisioning-tools: install binary to ${sbindir} Khem Raj (55): squid: Upgrade to 6.8 libosinfo: Fix build with libxml2 v2.12 xmlstarlet: Fix build with API breakage in libxml2 2.12 mariadb: Fix build with libxml2 2.12 ABI changes libmusicbrainz: Update to tip of trunk gnome-commander: Fix build with taglib 2.0 gnome-online-accounts: Fix build with libxml2 2.12 vlc: Upgrade to 3.0.20 netcf: Fix build with latest gnulib php: Upgrade to 8.2.16 vlc: Fix build on 32bit x86 libtinyxml2: Extend for nativesdk lvgl: Fix dev-elf build QA layer.conf: Update for the scarthgap release series dietsplash: Update and fix build with musl frr: Upgrade to latest on 9.1 stable frr: Fix build on newer musl layer.conf: Prepare for release, drop nanbield LAYERSERIES libcamera: Fix clang support patches plocate: Fix sys/stat.h and linux/stat.h conflicts with musl liburing: Upgrade to 2.5 openflow: Delete recipe for 1.0 openflow: Merge .inc into .bb openflow: Fix build with musl tracker-miners: Disable seccomp support on musl libcamera: Fix build on musl systems ipset: Update to 7.21 ot-daemon: Update to tip of trunk ot-br-posix: Update to latest wpantund: Update to latest xfsdump: Fix build with musl >= 1.2.5 xfstests: Fix build with musl >= 1.2.5 net-snmp: Fix build with musl rdma-core: Fix build with musl >= 1.2.5 ssmtp: Fix build with musl >= 1.2.5 autofs: Fix build with musl >= 1.2.5 lvm2: Fix build with musl 1.5.2+ sanlock: Fix build with musl >= 1.2.5 ndctl: Fix build issues seen with musl 1.2.5 sdbus-c++-libsystemd: Upgrade to 255.4 release of systemd sdbus-c++,sdbus-c++-tools: Upgrade to 1.5.0 release wtmpdb: Upgrade to 0.11.0 release uftrace: Fix build with musl >= 1.2.5 fio: Upgrade to 3.36+git i2cdev: Include libgen.h on musl directfb: Fix build with musl >= 1.2.5 iwd: Upgrade to 2.16 minifi-cpp: Fix libsodium build on aarch64/clang multipath-tools: Fix build with musl >= 1.2.5 aer-inject: Fix build with latest musl aer-inject: Replace hardcoded /usr with ${prefix} microsoft-gsl: Disable disabled-macro-expansion warning as error on clang/musl meta-python-image-ptest: Use 2G RAM for some demanding tests python3-pydbus: Add bash dependency for ptests highway,libjxl: Remove -mfp16-format=ieee when using clang compiler Leon Anavi (7): python3-anyio: Upgrade 4.2.0 -> 4.3.0 python3-httpx: Upgrade 0.26.0 -> 0.27.0 python3-multidict: Upgrade 6.0.4 -> 6.0.5 python3-croniter: Upgrade 2.0.1 -> 2.0.3 python3-paho-mqtt: Upgrade 1.6.1 -> 2.0.0 python3-typeguard: Upgrade 4.1.5 -> 4.2.1 python3-cachetools: Upgrade 5.3.2 -> 5.3.3 Marek Vasut (14): lvgl: Drop dialog-lvgl lvgl: Upgrade to LVGL 9 series lvgl: Rename lv-drivers.inc to lv-conf.inc lvgl: Add SDL2 fullscreen mode configuration option lvgl: Configure assertions based on DEBUG_BUILD lvgl: Default to XRGB8888 DRM framebuffer lvgl: Build shared library lvgl: Replace sed patching with real patches lvgl: Generate proper shared libraries with version suffix lvgl: Reinstate demo configuration settings lvgl: Update to 9.1.0 lvgl: Drop superfluous ALLOW_EMPTY lvgl: Drop unnecessary PV append lvgl: Deduplicate PACKAGECONFIG into lv-conf Markus Volk (66): mozjs-115: fix reproducibility issue webp-pixbuf-loader: update 0.2.5 -> 0.2.7 gnome-control-center: fix reproducibility issue gnome-disk-utility: fix reproducibility issue gnome-settings-daemon: fix reproducibility issue gnome-terminal: fix reproducibility issue libvncserver: fix reproducibility issue editorconfig-core-c: fix reproducibility issue crossguid: fix reproducibility issue waylandpp: fix reproducibility issue polkit: remove unneeded workaround gtk-vnc: fix reproducibility issue pipewire: update 1.0.3 -> 1.0.4 mutter: remove zenity from rdepends mutter: update 45.4 -> 46.0 gnome-shell: update 45.4 -> 46.0 gnome-settings-daemon: update 45.0 -> 46.0 gnome-software: update 45.3 -> 46.0 evince: update 45.0 -> 46.0 gnome-online-accounts: update 3.48.0 -> 3.50.0 evolution-data-server: build with webkitgtk4 folks: update 0.15.7 -> 0.15.8 gnome-control-center: update 45.3 -> 46.0 xdg-desktop-portal-gnome: update 45.1 -> 46.0 tracker: update 3.6.0 -> 3.7.0 tracker-miners: update 3.6.2 -> 3.7.0 freerdp3: add recipe wireplumber: update 0.4.17 -> 0.5.0 tecle: update 45.0 -> 46.0 gnome-calculator: update 45.0.2 -> 46.0 gnome-session: update 45.0 -> 46.0 gnome-remote-desktop: update 45.1 -> 46.0 gnome-calendar: update 45.1 -> 46.0 libgweather4: update 4.4.0 -> 4.4.2 gtksourceview5: update 5.10.0 -> 5.12.0 gnome-control-center: use gcr4 variant libcloudproviders: update 0.3.5 -> 0.3.6 gnome-themes-extra: build with gtk+3 gtk4mm: add recipe gnome-system-monitor: update 45.0.1 -> 46.0 gnome-boxes: update 45.0 -> 46.0 eog: update 45.2 -> 45.3 gparted: update 1.5.0 -> 1.6.0 libgtop: update 2.41.1 -> 2.41.3 gnome-bluetooth: update 42.8 -> 46.0 gnome-text-editor: update 45.1 -> 46.0 gnome-chess: update 43.2 -> 46.0 gnome-disk-utility: update 45.0 -> 46.0 gnome-shell-extensions: update 45.2 -> 46.0 msgraph: add recipe gvfs: update 1.52.2 -> 1.54.0 tracker-miners: drop buildpath from tracker-miner-fs-3 evolution-data-server: disable tests and examples tracker-miners: fix reproducibility issue for landlock file-roller: update 43.1 -> 44.0 apache2: preset mpm=prefork by default gnome-user-share: add recipe gnome-control-center: update 46.0 -> 46.0.1 gdm: update 45.0.1 -> 46.0 gnome-user-share: remove hardcoded paths ghex: update 45.1 -> 46.0 libjxl: add recipe gnome-backgrounds: add runtime depenency for libjxl highway: add recipe webkitgtk3: update 2.42.5 -> 2.44.0 gnome-control-center: restore Upstream-Status line Martin Jansa (5): unionfs-fuse, dropwatch, postgresql, yasm, multipath-tools, python3-pybind11: add missing Upstream-Status recipes: Drop remaining PR values from recipes freerdp3: disable shadow without x11 xfstests: upgrade to v2024.03.03 gtkmm4: add x11 to REQUIRED_DISTRO_FEATURES Maxin John (7): tracker: remove unused patch openal-soft: remove unused patches libio-pty-perl: remove unsed patch opengl-es-cts: remove unused patch emacs: remove unused patch webkitgtk3: remove unused patch python3-eth-utils: remove unused patches Michael Heimpold (1): ser2net: add a systemd service file Mingli Yu (4): gosu: Upgrade to 1.17 googletest: Pass -fPIC to CFLAGS re2: Upgrade 2023.03.01 -> 2024.03.01 nss: Upgrade 3.74 -> 3.98 Ola x Nilsson (2): abseil-cpp: Split so-files into separate packages abseil-cpp: Split so-files into separate packages Peter Kjellerstedt (3): abseil-cpp: A little clean-up libnice: Disable the examples and the tests abseil-cpp: A little clean-up Peter Marko (5): jwt-cpp: fix cmake file install path soci: fix buildpaths warning libcpr: add new recipe python3-grpcio: cleanup dependencies microsoft-gsl: add new recipe including ptest Petr Gotthard (2): libmbim: Revert back to the latest stable 1.30.0 libqmi: Revert back to the latest stable 1.34.0 Randy MacLeod (2): rsyslog: update from 8.2306.0 to 8.2402.0 nftables: Add DESCRIPTION and HOMEPAGE Richard Purdie (2): imagemagick/lcms/fftw: Allow nativesdk versions to exist buildtools-imagemagick: Add new recipe Robert P. J. Day (1): fmt: remove unnecessary "inherit ptest" directive Robert Yang (6): yaffs2-utils: Upgrade to 20221209 xfsprogs: 6.5.0 -> 6.6.0 gnulib: 2018-12-18 -> 202401 thin-provisioning-tools: 1.0.9 -> 1.0.12 gperftools: 2.10 -> 2.15 freeradius: 3.0.26 -> 3.2.3 Ross Burton (1): python3-pydantic-core: just set PYPI_PACKAGE Sam Van Den Berge (1): python3-aiohttp: add missing dependencies Samuli Piippo (1): geoclue: enable demo agent Thomas Roos (1): usrsctp: upgrade to latest version Tim Orling (1): liberror-perl: move recipe from oe-core Tomasz Żyjewski (1): python: python-libusb1: add recipe Wang Mingyu (124): bats: upgrade 1.10.0 -> 1.11.0 c-ares: upgrade 1.26.0 -> 1.27.0 ctags: upgrade 6.1.20240114.0 -> 6.1.20240225.0 dbus-cxx: upgrade 2.5.0 -> 2.5.1 ddrescue: upgrade 1.27 -> 1.28 fetchmail: upgrade 6.4.37 -> 6.4.38 libtalloc: upgrade 2.4.1 -> 2.4.2 libtdb: upgrade 1.4.9 -> 1.4.10 neatvnc: upgrade 0.7.2 -> 0.8.0 ostree: upgrade 2024.3 -> 2024.4 python3-astroid: upgrade 3.0.3 -> 3.1.0 python3-cbor2: upgrade 5.6.1 -> 5.6.2 python3-dnspython: upgrade 2.6.0 -> 2.6.1 python3-eventlet: upgrade 0.35.1 -> 0.35.2 python3-gcovr: upgrade 7.0 -> 7.2 python3-google-api-core: upgrade 2.16.2 -> 2.17.1 python3-google-api-python-client: upgrade 2.118.0 -> 2.120.0 python3-grpcio(-tools): upgrade 1.60.1 -> 1.62.0 python3-ipython: upgrade 8.21.0 -> 8.22.1 python3-pdm: upgrade 2.12.3 -> 2.12.4 python3-pymisp: upgrade 2.4.185 -> 2.4.186 python3-scrypt: upgrade 0.8.20 -> 0.8.24 python3-sentry-sdk: upgrade 1.40.4 -> 1.40.6 smarty: upgrade 4.3.4 -> 4.4.1 stunnel: upgrade 5.69 -> 5.72 abseil-cpp: upgrade 20230802.1 -> 20240116.1 dnf-plugin-tui: upgrade 1.3 -> 1.4 boost-sml: upgrade 1.1.9 -> 1.1.11 ctags: upgrade 6.1.20240225.0 -> 6.1.20240310.0 dialog: upgrade 1.3-20240101 -> 1.3-20240307 flatbuffers: upgrade 23.5.26 -> 24.3.7 gjs: upgrade 1.78.4 -> 1.80.0 hwdata: upgrade 0.379 -> 0.380 iceauth: upgrade 1.0.9 -> 1.0.10 libdnet: upgrade 1.17.0 -> 1.18.0 libopus: upgrade 1.4 -> 1.5.1 libreport: upgrade 2.17.11 -> 2.17.15 libxaw: upgrade 1.0.15 -> 1.0.16 mcelog: upgrade 196 -> 197 networkd-dispatcher: upgrade 2.1 -> 2.2.4 openlldp: upgrade 1.1.0 -> 1.1.1 opensc: upgrade 0.24.0 -> 0.25.0 pcsc-lite: upgrade 2.0.1 -> 2.0.3 python3-a2wsgi: upgrade 1.10.2 -> 1.10.4 python3-apiflask: upgrade 2.1.0 -> 2.1.1 python3-argcomplete: upgrade 3.2.2 -> 3.2.3 python3-bandit: upgrade 1.7.7 -> 1.7.8 python3-blivet: upgrade 3.8.2 -> 3.9.1 python3-blivetgui: upgrade 2.4.2 -> 2.5.0 python3-django: upgrade 5.0.2 -> 5.0.3 python3-elementpath: upgrade 4.3.0 -> 4.4.0 python3-eth-abi: upgrade 5.0.0 -> 5.0.1 python3-eth-rlp: upgrade 1.0.1 -> 2.0.0 python3-flask-migrate: upgrade 4.0.5 -> 4.0.7 python3-google-api-python-client: upgrade 2.120.0 -> 2.122.0 python3-google-auth: upgrade 2.28.1 -> 2.28.2 python3-googleapis-common-protos: upgrade 1.62.0 -> 1.63.0 python3-grpcio-tools: upgrade 1.62.0 -> 1.62.1 python3-grpcio: upgrade 1.62.0 -> 1.62.1 python3-ipython: upgrade 8.22.1 -> 8.22.2 python3-mypy: upgrade 1.8.0 -> 1.9.0 python3-pydantic: upgrade 2.6.3 -> 2.6.4 python3-pymisp: upgrade 2.4.186 -> 2.4.187 python3-pymodbus: upgrade 3.6.4 -> 3.6.6 python3-pyperf: upgrade 2.6.2 -> 2.6.3 python3-pytest-lazy-fixtures: upgrade 1.0.5 -> 1.0.6 python3-pytest-timeout: upgrade 2.2.0 -> 2.3.1 python3-requests-oauthlib: upgrade 1.3.1 -> 1.4.0 python3-sentry-sdk: upgrade 1.40.6 -> 1.42.0 python3-tox: upgrade 4.13.0 -> 4.14.1 python3-traitlets: upgrade 5.14.1 -> 5.14.2 python3-types-psutil: upgrade 5.9.5.20240205 -> 5.9.5.20240316 python3-types-python-dateutil: upgrade 2.8.19.20240106 -> 2.9.0.20240316 tcsh: upgrade 6.24.10 -> 6.24.11 thingsboard-gateway: upgrade 3.4.4 -> 3.4.5 xmessage: upgrade 1.0.6 -> 1.0.7 xrefresh: upgrade 1.0.7 -> 1.1.0 gjs: upgrade 1.80.0 -> 1.80.2 gnome-backgrounds: upgrade 45.0 -> 46.0 gnome-font-viewer: upgrade 45.0 -> 46.0 libblockdev: upgrade 3.1.0 -> 3.1.1 libdeflate: upgrade 1.19 -> 1.20 libmbim: upgrade 1.30.0 -> 1.31.2 libqmi: upgrade 1.34.0 -> 1.35.2 libtommath: upgrade 1.2.1 -> 1.3.0 mcelog: upgrade 197 -> 198 metacity: upgrade 3.50.0 -> 3.52.0 python3-asgiref: upgrade 3.7.2 -> 3.8.1 python3-blivet: upgrade 3.9.1 -> 3.9.2 python3-cassandra-driver: upgrade 3.29.0 -> 3.29.1 python3-djangorestframework: upgrade 3.14.0 -> 3.15.1 python3-eth-rlp: upgrade 2.0.0 -> 2.1.0 python3-eventlet: upgrade 0.35.2 -> 0.36.1 python3-filelock: upgrade 3.13.1 -> 3.13.3 python3-flask-marshmallow: upgrade 1.2.0 -> 1.2.1 python3-flatbuffers: upgrade 24.3.7 -> 24.3.25 python3-google-api-core: upgrade 2.17.1 -> 2.18.0 python3-google-api-python-client: upgrade 2.122.0 -> 2.124.0 python3-google-auth: upgrade 2.28.2 -> 2.29.0 python3-graphviz: upgrade 0.20.1 -> 0.20.3 python3-gspread: upgrade 6.0.2 -> 6.1.0 python3-jdatetime: upgrade 4.1.1 -> 5.0.0 python3-pdm: upgrade 2.12.4 -> 2.13.2 python3-pyasn1-modules: upgrade 0.3.0 -> 0.4.0 python3-pymisp: upgrade 2.4.187 -> 2.4.188 python3-pytest-asyncio: upgrade 0.23.5 -> 0.23.6 python3-pytest-cov: upgrade 4.1.0 -> 5.0.0 python3-pytest-lazy-fixtures: upgrade 1.0.6 -> 1.0.7 python3-pywbem: upgrade 1.6.2 -> 1.6.3 python3-pywbemtools: upgrade 1.2.0 -> 1.2.1 python3-pyzstd: upgrade 0.15.9 -> 0.15.10 python3-requests-oauthlib: upgrade 1.4.0 -> 2.0.0 python3-sentry-sdk: upgrade 1.42.0 -> 1.44.0 python3-socketio: upgrade 5.11.1 -> 5.11.2 python3-thrift: upgrade 0.16.0 -> 0.20.0 python3-tox: upgrade 4.14.1 -> 4.14.2 python3-web3: upgrade 6.15.1 -> 6.16.0 st: upgrade 0.9 -> 0.9.1 thingsboard-gateway: upgrade 3.4.5 -> 3.4.6 thrift: upgrade 0.19.0 -> 0.20.0 tracker-miners: upgrade 3.7.0 -> 3.7.1 tracker: upgrade 3.7.0 -> 3.7.1 wireshark: upgrade 4.2.3 -> 4.2.4 wolfssl: upgrade 5.6.6 -> 5.7.0 William Lyu (3): nftables: Fix ptest output format issues nftables: Fix ShellCheck violations in ptest wrapper script "run-ptest" nftables: Fix failed ptest testcases Yi Zhao (13): netplan: upgrade 0.106 -> 1.0 networkmanager: 1.44.0 -> 1.46.0 postfix: upgrade 3.8.5 -> 3.8.6 net-snmp: upgrade 5.9.3 -> 5.9.4 cryptsetup: upgrade 2.7.0 -> 2.7.1 samba: upgrade 4.19.4 -> 4.19.5 civetweb: remove buildpaths from civetweb-targets.cmake minifi-cpp: upgrade 0.7.0 -> 0.15.0 openvpn: upgrade 2.6.9 -> 2.6.10 rocksdb: upgrade 7.9.2 -> 9.0.0 audit: upgrade 4.0 -> 4.0.1 netplan: add missing config directory strongswan: upgrade 5.9.13 -> 5.9.14 alperak (15): python3-icecream: add recipe python3-invoke: add recipe python3-traitlets: add ptest and update runtime dependencies python3-google-auth-oauthlib: add ptest python3-tomli-w: added recipe which is also include ptest python3-pytest-localserver: added recipe which is also include ptest python3-responses: add recipe python3-google-auth: add ptest and update runtime dependencies remove obsolete PIP_INSTALL_PACKAGE and PIP_INSTALL_DIST_PATH python3-a2wsgi: added recipe which is also include ptest python3-httptools: added recipe which is also include ptest python3-wsproto: Add recipe python3-portalocker: enable ptest python3-validators: upgrade 0.22.0 > 0.24.0 and enable ptest python3-pydbus: Drop ${PYTHON_PN} chenheyun (1): aer-inject:add new recipe Change-Id: I3cf0e5c87ecdfa18c35d318cb64c0e6559348618 Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'meta-openembedded/meta-gnome/recipes-gnome/gnome-software')
-rw-r--r--meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software/0655f358ed0e8455e12d9634f60bc4dbaee434e3.patch504
-rw-r--r--meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software/e431ab003f3fabf616b6eb7dc93f8967bc9473e5.patch31
-rw-r--r--meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software_46.0.bb (renamed from meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software_45.3.bb)6
3 files changed, 1 insertions, 540 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software/0655f358ed0e8455e12d9634f60bc4dbaee434e3.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software/0655f358ed0e8455e12d9634f60bc4dbaee434e3.patch
deleted file mode 100644
index 5e051be15a..0000000000
--- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software/0655f358ed0e8455e12d9634f60bc4dbaee434e3.patch
+++ /dev/null
@@ -1,504 +0,0 @@
-From 0655f358ed0e8455e12d9634f60bc4dbaee434e3 Mon Sep 17 00:00:00 2001
-From: Matthias Klumpp <matthias@tenstral.net>
-Date: Sun, 8 Oct 2023 20:22:44 +0200
-Subject: [PATCH] Adjust to build with AppStream 1.0 as well as 0.16.x
-
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-software/-/commit/0655f358ed0e8455e12d9634f60bc4dbaee434e3]
----
- lib/gs-app.c | 4 ++
- lib/gs-appstream.c | 61 +++++++++++++++++++-----
- lib/gs-utils.c | 8 ++--
- meson.build | 22 +--------
- plugins/core/gs-plugin-appstream.c | 8 ----
- plugins/fwupd/gs-fwupd-app.c | 8 ++++
- plugins/fwupd/gs-plugin-fwupd.c | 4 ++
- src/gs-hardware-support-context-dialog.c | 6 +++
- src/gs-repos-dialog.c | 4 ++
- src/gs-screenshot-carousel.c | 4 +-
- src/gs-screenshot-image.c | 41 ++++++++++++----
- src/gs-screenshot-image.h | 7 +++
- subprojects/appstream.wrap | 2 +-
- 13 files changed, 122 insertions(+), 57 deletions(-)
-
-diff --git a/lib/gs-app.c b/lib/gs-app.c
-index 2308de504d..ea348f8c01 100644
---- a/lib/gs-app.c
-+++ b/lib/gs-app.c
-@@ -609,7 +609,11 @@ gs_app_to_string_append (GsApp *app, GString *str)
- AsScreenshot *ss = g_ptr_array_index (priv->screenshots, i);
- g_autofree gchar *key = NULL;
- tmp = as_screenshot_get_caption (ss);
-+#if AS_CHECK_VERSION(1, 0, 0)
-+ im = as_screenshot_get_image (ss, 0, 0, 1);
-+#else
- im = as_screenshot_get_image (ss, 0, 0);
-+#endif
- if (im == NULL)
- continue;
- key = g_strdup_printf ("screenshot-%02u", i);
-diff --git a/lib/gs-appstream.c b/lib/gs-appstream.c
-index deca176dcf..6504d6f25e 100644
---- a/lib/gs-appstream.c
-+++ b/lib/gs-appstream.c
-@@ -1011,8 +1011,11 @@ gs_appstream_refine_app_relation (GsApp *app,
- as_relation_set_item_kind (relation, AS_RELATION_ITEM_KIND_CONTROL);
- as_relation_set_value_control_kind (relation, as_control_kind_from_string (xb_node_get_text (child)));
- } else if (g_str_equal (item_kind, "display_length")) {
-- AsDisplayLengthKind display_length_kind;
- const gchar *compare;
-+ const gchar *side;
-+#if !AS_CHECK_VERSION(1, 0, 0)
-+ AsDisplayLengthKind display_length_kind;
-+#endif
-
- /* https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-relations-display_length */
- as_relation_set_item_kind (relation, AS_RELATION_ITEM_KIND_DISPLAY_LENGTH);
-@@ -1020,15 +1023,21 @@ gs_appstream_refine_app_relation (GsApp *app,
- compare = xb_node_get_attr (child, "compare");
- as_relation_set_compare (relation, (compare != NULL) ? as_relation_compare_from_string (compare) : AS_RELATION_COMPARE_GE);
-
-+#if AS_CHECK_VERSION(1, 0, 0)
-+ side = xb_node_get_attr (child, "side");
-+ as_relation_set_display_side_kind (relation, (side != NULL) ? as_display_side_kind_from_string (side) : AS_DISPLAY_SIDE_KIND_SHORTEST);
-+ as_relation_set_value_px (relation, xb_node_get_text_as_uint (child));
-+#else
- display_length_kind = as_display_length_kind_from_string (xb_node_get_text (child));
- if (display_length_kind != AS_DISPLAY_LENGTH_KIND_UNKNOWN) {
- /* Ignore the `side` attribute */
- as_relation_set_value_display_length_kind (relation, display_length_kind);
- } else {
-- const gchar *side = xb_node_get_attr (child, "side");
-+ side = xb_node_get_attr (child, "side");
- as_relation_set_display_side_kind (relation, (side != NULL) ? as_display_side_kind_from_string (side) : AS_DISPLAY_SIDE_KIND_SHORTEST);
- as_relation_set_value_px (relation, xb_node_get_text_as_uint (child));
- }
-+#endif
- } else {
- g_debug ("Relation type ‘%s’ not currently supported for %s; ignoring",
- item_kind, gs_app_get_id (app));
-@@ -1472,7 +1481,7 @@ gs_appstream_refine_app (GsPlugin *plugin,
- }
-
- typedef struct {
-- AsSearchTokenMatch match_value;
-+ guint16 match_value;
- XbQuery *query;
- } GsAppstreamSearchHelper;
-
-@@ -1522,7 +1531,7 @@ gs_appstream_silo_search_component (GPtrArray *array, XbNode *component, const g
- }
-
- typedef struct {
-- AsSearchTokenMatch match_value;
-+ guint16 match_value;
- const gchar *xpath;
- } Query;
-
-@@ -1539,6 +1548,11 @@ gs_appstream_do_search (GsPlugin *plugin,
- g_autoptr(GPtrArray) array = g_ptr_array_new_with_free_func ((GDestroyNotify) gs_appstream_search_helper_free);
- g_autoptr(GPtrArray) components = NULL;
- g_autoptr(GTimer) timer = g_timer_new ();
-+#if AS_CHECK_VERSION(1, 0, 0)
-+ const guint16 component_id_weight = as_utils_get_tag_search_weight ("id");
-+#else
-+ const guint16 component_id_weight = AS_SEARCH_TOKEN_MATCH_ID;
-+#endif
-
- g_return_val_if_fail (GS_IS_PLUGIN (plugin), FALSE);
- g_return_val_if_fail (XB_IS_SILO (silo), FALSE);
-@@ -1585,7 +1599,7 @@ gs_appstream_do_search (GsPlugin *plugin,
- * Drop the ID token from it as it’s the highest
- * numeric value but isn’t visible to the user in the
- * UI, which leads to confusing results ordering. */
-- gs_app_set_match_value (app, match_value & (~AS_SEARCH_TOKEN_MATCH_ID));
-+ gs_app_set_match_value (app, match_value & (~component_id_weight));
- gs_app_list_add (list, app);
-
- if (gs_app_get_kind (app) == AS_COMPONENT_KIND_ADDON) {
-@@ -1624,18 +1638,32 @@ gs_appstream_search (GsPlugin *plugin,
- GCancellable *cancellable,
- GError **error)
- {
-+#if AS_CHECK_VERSION(1, 0, 0)
-+ guint16 pkgname_weight = as_utils_get_tag_search_weight ("pkgname");
-+ guint16 name_weight = as_utils_get_tag_search_weight ("name");
-+ guint16 id_weight = as_utils_get_tag_search_weight ("id");
- const Query queries[] = {
-- #ifdef HAVE_AS_SEARCH_TOKEN_MATCH_MEDIATYPE
-- { AS_SEARCH_TOKEN_MATCH_MEDIATYPE, "mimetypes/mimetype[text()~=stem(?)]" },
-- #else
-- { AS_SEARCH_TOKEN_MATCH_MIMETYPE, "mimetypes/mimetype[text()~=stem(?)]" },
-- #endif
-+ { as_utils_get_tag_search_weight ("mediatype"), "provides/mediatype[text()~=stem(?)]" },
- /* Search once with a tokenize-and-casefold operator (`~=`) to support casefolded
- * full-text search, then again using substring matching (`contains()`), to
- * support prefix matching. Only do the prefix matches on a few fields, and at a
- * lower priority, otherwise things will get confusing.
-- *
-+ *
- * See https://gitlab.gnome.org/GNOME/gnome-software/-/issues/2277 */
-+ { pkgname_weight, "pkgname[text()~=stem(?)]" },
-+ { pkgname_weight / 2, "pkgname[contains(text(),stem(?))]" },
-+ { as_utils_get_tag_search_weight ("summary"), "summary[text()~=stem(?)]" },
-+ { name_weight, "name[text()~=stem(?)]" },
-+ { name_weight / 2, "name[contains(text(),stem(?))]" },
-+ { as_utils_get_tag_search_weight ("keyword"), "keywords/keyword[text()~=stem(?)]" },
-+ { id_weight, "id[text()~=stem(?)]" },
-+ { id_weight, "launchable[text()~=stem(?)]" },
-+ { as_utils_get_tag_search_weight ("origin"), "../components[@origin~=stem(?)]" },
-+ { 0, NULL }
-+ };
-+#else
-+ const Query queries[] = {
-+ { AS_SEARCH_TOKEN_MATCH_MEDIATYPE, "mimetypes/mimetype[text()~=stem(?)]" },
- { AS_SEARCH_TOKEN_MATCH_PKGNAME, "pkgname[text()~=stem(?)]" },
- { AS_SEARCH_TOKEN_MATCH_PKGNAME / 2, "pkgname[contains(text(),stem(?))]" },
- { AS_SEARCH_TOKEN_MATCH_SUMMARY, "summary[text()~=stem(?)]" },
-@@ -1647,6 +1675,7 @@ gs_appstream_search (GsPlugin *plugin,
- { AS_SEARCH_TOKEN_MATCH_ORIGIN, "../components[@origin~=stem(?)]" },
- { AS_SEARCH_TOKEN_MATCH_NONE, NULL }
- };
-+#endif
-
- return gs_appstream_do_search (plugin, silo, values, queries, list, cancellable, error);
- }
-@@ -1659,11 +1688,21 @@ gs_appstream_search_developer_apps (GsPlugin *plugin,
- GCancellable *cancellable,
- GError **error)
- {
-+#if AS_CHECK_VERSION(1, 0, 0)
-+ const Query queries[] = {
-+ { as_utils_get_tag_search_weight ("pkgname"), "developer/name[text()~=stem(?)]" },
-+ { as_utils_get_tag_search_weight ("summary"), "project_group[text()~=stem(?)]" },
-+ /* for legacy support */
-+ { as_utils_get_tag_search_weight ("pkgname"), "developer_name[text()~=stem(?)]" },
-+ { 0, NULL }
-+ };
-+#else
- const Query queries[] = {
- { AS_SEARCH_TOKEN_MATCH_PKGNAME, "developer_name[text()~=stem(?)]" },
- { AS_SEARCH_TOKEN_MATCH_SUMMARY, "project_group[text()~=stem(?)]" },
- { AS_SEARCH_TOKEN_MATCH_NONE, NULL }
- };
-+#endif
-
- return gs_appstream_do_search (plugin, silo, values, queries, list, cancellable, error);
- }
-diff --git a/lib/gs-utils.c b/lib/gs-utils.c
-index cf9073025f..19e6ebd046 100644
---- a/lib/gs-utils.c
-+++ b/lib/gs-utils.c
-@@ -1694,9 +1694,9 @@ gs_utils_gstring_replace (GString *str,
- const gchar *find,
- const gchar *replace)
- {
-- #ifdef HAVE_AS_GSTRING_REPLACE_WITH_FOUR_ARGS
-+#if AS_CHECK_VERSION(1, 0, 0)
- as_gstring_replace (str, find, replace, 0);
-- #else
-- as_gstring_replace (str, find, replace);
-- #endif
-+#else
-+ as_gstring_replace2 (str, find, replace, 0);
-+#endif
- }
-diff --git a/meson.build b/meson.build
-index bc19669dd5..8c82464cdb 100644
---- a/meson.build
-+++ b/meson.build
-@@ -113,7 +113,7 @@ add_project_arguments('-D_GNU_SOURCE', language : 'c')
- conf.set('HAVE_LINUX_UNISTD_H', cc.has_header('linux/unistd.h'))
-
- appstream = dependency('appstream',
-- version : '>= 0.14.0',
-+ version : '>= 0.16.4',
- fallback : ['appstream', 'appstream_dep'],
- default_options : [
- 'docs=false',
-@@ -121,26 +121,6 @@ appstream = dependency('appstream',
- 'install-docs=false'
- ]
- )
--if appstream.type_name() == 'internal'
--else
-- if meson.get_compiler('c').has_header_symbol('appstream.h', 'AS_SEARCH_TOKEN_MATCH_MEDIATYPE', dependencies: appstream)
-- conf.set('HAVE_AS_SEARCH_TOKEN_MATCH_MEDIATYPE', '1')
-- endif
-- if meson.get_compiler('c').has_header_symbol('appstream.h', 'AS_FORMAT_STYLE_CATALOG', dependencies: appstream)
-- conf.set('HAVE_AS_FORMAT_STYLE_CATALOG', '1')
-- endif
-- if meson.get_compiler('c').has_function('as_metadata_components_to_catalog', prefix: '#include <appstream.h>', dependencies: appstream)
-- conf.set('HAVE_AS_METADATA_COMPONENTS_TO_CATALOG', '1')
-- endif
-- if meson.get_compiler('c').links('''#include <appstream.h>
-- int main (void)
-- {
-- as_gstring_replace (NULL, "a", "b", 0);
-- return 0;
-- }''', name: 'as_gstring_replace() has four arguments', dependencies: appstream)
-- conf.set('HAVE_AS_GSTRING_REPLACE_WITH_FOUR_ARGS', '1')
-- endif
--endif
-
- gdk_pixbuf = dependency('gdk-pixbuf-2.0', version : '>= 2.32.0')
- libxmlb = dependency('xmlb', version : '>= 0.1.7', fallback : ['libxmlb', 'libxmlb_dep'])
-diff --git a/plugins/core/gs-plugin-appstream.c b/plugins/core/gs-plugin-appstream.c
-index cf9f3022b1..ef3226a591 100644
---- a/plugins/core/gs-plugin-appstream.c
-+++ b/plugins/core/gs-plugin-appstream.c
-@@ -414,11 +414,7 @@ gs_plugin_appstream_load_dep11_cb (XbBuilderSource *self,
- if (bytes == NULL)
- return NULL;
-
-- #ifdef HAVE_AS_FORMAT_STYLE_CATALOG
- as_metadata_set_format_style (mdata, AS_FORMAT_STYLE_CATALOG);
-- #else
-- as_metadata_set_format_style (mdata, AS_FORMAT_STYLE_COLLECTION);
-- #endif
- as_metadata_parse_bytes (mdata,
- bytes,
- AS_FORMAT_KIND_YAML,
-@@ -428,11 +424,7 @@ gs_plugin_appstream_load_dep11_cb (XbBuilderSource *self,
- return NULL;
- }
-
-- #ifdef HAVE_AS_METADATA_COMPONENTS_TO_CATALOG
- xml = as_metadata_components_to_catalog (mdata, AS_FORMAT_KIND_XML, &tmp_error);
-- #else
-- xml = as_metadata_components_to_collection (mdata, AS_FORMAT_KIND_XML, &tmp_error);
-- #endif
- if (xml == NULL) {
- // This API currently returns NULL if there is nothing to serialize, so we
- // have to test if this is an error or not.
-diff --git a/plugins/fwupd/gs-fwupd-app.c b/plugins/fwupd/gs-fwupd-app.c
-index 6dcda6ee92..5d3254da59 100644
---- a/plugins/fwupd/gs-fwupd-app.c
-+++ b/plugins/fwupd/gs-fwupd-app.c
-@@ -164,7 +164,11 @@ gs_fwupd_app_set_from_device (GsApp *app,
- gs_app_set_install_date (app, fwupd_device_get_created (dev));
- if (fwupd_device_get_description (dev) != NULL) {
- g_autofree gchar *tmp = NULL;
-+#if AS_CHECK_VERSION(1, 0, 0)
-+ tmp = as_markup_convert (fwupd_device_get_description (dev), AS_MARKUP_KIND_TEXT, NULL);
-+#else
- tmp = as_markup_convert_simple (fwupd_device_get_description (dev), NULL);
-+#endif
- if (tmp != NULL)
- gs_app_set_description (app, GS_APP_QUALITY_NORMAL, tmp);
- }
-@@ -402,7 +406,11 @@ gs_fwupd_app_set_from_release (GsApp *app, FwupdRelease *rel)
- }
- if (fwupd_release_get_description (rel) != NULL) {
- g_autofree gchar *tmp = NULL;
-+#if AS_CHECK_VERSION(1, 0, 0)
-+ tmp = as_markup_convert (fwupd_release_get_description (rel), AS_MARKUP_KIND_TEXT, NULL);
-+#else
- tmp = as_markup_convert_simple (fwupd_release_get_description (rel), NULL);
-+#endif
- if (tmp != NULL)
- gs_app_set_update_details_text (app, tmp);
- }
-diff --git a/plugins/fwupd/gs-plugin-fwupd.c b/plugins/fwupd/gs-plugin-fwupd.c
-index d8c0cd2dd4..a9b05028a0 100644
---- a/plugins/fwupd/gs-plugin-fwupd.c
-+++ b/plugins/fwupd/gs-plugin-fwupd.c
-@@ -727,7 +727,11 @@ gs_plugin_add_updates (GsPlugin *plugin,
- g_autofree gchar *desc = NULL;
- if (fwupd_release_get_description (rel) == NULL)
- continue;
-+#if AS_CHECK_VERSION(1, 0, 0)
-+ desc = as_markup_convert (fwupd_release_get_description (rel), AS_MARKUP_KIND_TEXT, NULL);
-+#else
- desc = as_markup_convert_simple (fwupd_release_get_description (rel), NULL);
-+#endif
- if (desc == NULL)
- continue;
- g_string_append_printf (update_desc,
-diff --git a/src/gs-hardware-support-context-dialog.c b/src/gs-hardware-support-context-dialog.c
-index 0e48c8c266..14653401de 100644
---- a/src/gs-hardware-support-context-dialog.c
-+++ b/src/gs-hardware-support-context-dialog.c
-@@ -461,6 +461,7 @@ gs_hardware_support_context_dialog_get_display_support (GdkMonitor *monitor,
- AsRelationCompare comparator = as_relation_get_compare (relation);
- Range current_display_comparand, relation_comparand;
-
-+#if !AS_CHECK_VERSION(1, 0, 0)
- /* From https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-requires-recommends-display_length */
- Range display_lengths[] = {
- [AS_DISPLAY_LENGTH_KIND_XSMALL] = { 0, 360 },
-@@ -469,6 +470,7 @@ gs_hardware_support_context_dialog_get_display_support (GdkMonitor *monitor,
- [AS_DISPLAY_LENGTH_KIND_LARGE] = { 1024, 3840 },
- [AS_DISPLAY_LENGTH_KIND_XLARGE] = { 3840, G_MAXUINT },
- };
-+#endif
-
- any_display_relations_set = TRUE;
-
-@@ -485,11 +487,14 @@ gs_hardware_support_context_dialog_get_display_support (GdkMonitor *monitor,
- case AS_DISPLAY_SIDE_KIND_LAST:
- default:
- current_display_comparand.min = current_display_comparand.max = MAX (current_screen_size.width, current_screen_size.height);
-+#if !AS_CHECK_VERSION(1, 0, 0)
- relation_comparand.min = display_lengths[as_relation_get_value_display_length_kind (relation)].min;
- relation_comparand.max = display_lengths[as_relation_get_value_display_length_kind (relation)].max;
-+#endif
- break;
- }
-
-+#if !AS_CHECK_VERSION(1, 0, 0)
- if (evaluate_display_comparison (display_lengths[AS_DISPLAY_LENGTH_KIND_SMALL], comparator, relation_comparand)) {
- *mobile_relation_kind_out = max_relation_kind (*mobile_relation_kind_out, as_relation_get_kind (relation));
- *mobile_match_out = TRUE;
-@@ -499,6 +504,7 @@ gs_hardware_support_context_dialog_get_display_support (GdkMonitor *monitor,
- *desktop_relation_kind_out = max_relation_kind (*desktop_relation_kind_out, as_relation_get_kind (relation));
- *desktop_match_out = TRUE;
- }
-+#endif
-
- if (evaluate_display_comparison (current_display_comparand, comparator, relation_comparand)) {
- *current_relation_kind_out = max_relation_kind (*current_relation_kind_out, as_relation_get_kind (relation));
-diff --git a/src/gs-repos-dialog.c b/src/gs-repos-dialog.c
-index c41c4944a1..7dac0416d9 100644
---- a/src/gs-repos-dialog.c
-+++ b/src/gs-repos-dialog.c
-@@ -154,7 +154,11 @@ enable_repo (GsReposDialog *dialog,
- g_autoptr(GError) error = NULL;
-
- /* convert from AppStream markup */
-+#if AS_CHECK_VERSION(1, 0, 0)
-+ message = as_markup_convert (gs_app_get_agreement (repo), AS_MARKUP_KIND_TEXT, &error);
-+#else
- message = as_markup_convert_simple (gs_app_get_agreement (repo), &error);
-+#endif
- if (message == NULL) {
- /* failed, so just try and show the original markup */
- message = g_strdup (gs_app_get_agreement (repo));
-diff --git a/src/gs-screenshot-carousel.c b/src/gs-screenshot-carousel.c
-index 04bbf86a1e..d269af6605 100644
---- a/src/gs-screenshot-carousel.c
-+++ b/src/gs-screenshot-carousel.c
-@@ -141,8 +141,8 @@ gs_screenshot_carousel_load_screenshots (GsScreenshotCarousel *self, GsApp *app,
- gtk_widget_set_can_focus (gtk_widget_get_first_child (ssimg), FALSE);
- gs_screenshot_image_set_screenshot (GS_SCREENSHOT_IMAGE (ssimg), ss);
- gs_screenshot_image_set_size (GS_SCREENSHOT_IMAGE (ssimg),
-- AS_IMAGE_NORMAL_WIDTH,
-- AS_IMAGE_NORMAL_HEIGHT);
-+ GS_IMAGE_NORMAL_WIDTH,
-+ GS_IMAGE_NORMAL_HEIGHT);
- gtk_widget_add_css_class (ssimg, "screenshot-image-main");
- gs_screenshot_image_load_async (GS_SCREENSHOT_IMAGE (ssimg), cancellable);
-
-diff --git a/src/gs-screenshot-image.c b/src/gs-screenshot-image.c
-index 93dba68f96..6b4db03d06 100644
---- a/src/gs-screenshot-image.c
-+++ b/src/gs-screenshot-image.c
-@@ -293,13 +293,13 @@ gs_screenshot_image_save_downloaded_img (GsScreenshotImage *ssimg,
- if (images->len > 1)
- return TRUE;
-
-- if (width == AS_IMAGE_THUMBNAIL_WIDTH &&
-- height == AS_IMAGE_THUMBNAIL_HEIGHT) {
-- width = AS_IMAGE_NORMAL_WIDTH;
-- height = AS_IMAGE_NORMAL_HEIGHT;
-+ if (width == GS_IMAGE_THUMBNAIL_WIDTH &&
-+ height == GS_IMAGE_THUMBNAIL_HEIGHT) {
-+ width = GS_IMAGE_NORMAL_WIDTH;
-+ height = GS_IMAGE_NORMAL_HEIGHT;
- } else {
-- width = AS_IMAGE_THUMBNAIL_WIDTH;
-- height = AS_IMAGE_THUMBNAIL_HEIGHT;
-+ width = GS_IMAGE_THUMBNAIL_WIDTH;
-+ height = GS_IMAGE_THUMBNAIL_HEIGHT;
- }
-
- width *= ssimg->scale;
-@@ -591,16 +591,30 @@ gs_screenshot_image_get_url (GsScreenshotImage *ssimg)
- } else if (as_screenshot_get_media_kind (ssimg->screenshot) == AS_SCREENSHOT_MEDIA_KIND_IMAGE) {
- AsImage *im;
-
-+#if AS_CHECK_VERSION(1, 0, 0)
-+ im = as_screenshot_get_image (ssimg->screenshot,
-+ ssimg->width,
-+ ssimg->height,
-+ ssimg->scale);
-+#else
- im = as_screenshot_get_image (ssimg->screenshot,
- ssimg->width * ssimg->scale,
- ssimg->height * ssimg->scale);
-+#endif
-
- /* if we've failed to load a HiDPI image, fallback to LoDPI */
- if (im == NULL && ssimg->scale > 1) {
- ssimg->scale = 1;
-+#if AS_CHECK_VERSION(1, 0, 0)
-+ im = as_screenshot_get_image (ssimg->screenshot,
-+ ssimg->width,
-+ ssimg->height,
-+ 1);
-+#else
- im = as_screenshot_get_image (ssimg->screenshot,
- ssimg->width,
- ssimg->height);
-+#endif
- }
-
- if (im)
-@@ -707,15 +721,22 @@ gs_screenshot_image_load_async (GsScreenshotImage *ssimg,
- * smaller version of it straight away */
- if (!ssimg->showing_image &&
- as_screenshot_get_media_kind (ssimg->screenshot) == AS_SCREENSHOT_MEDIA_KIND_IMAGE &&
-- ssimg->width > AS_IMAGE_THUMBNAIL_WIDTH &&
-- ssimg->height > AS_IMAGE_THUMBNAIL_HEIGHT) {
-+ ssimg->width > GS_IMAGE_THUMBNAIL_WIDTH &&
-+ ssimg->height > GS_IMAGE_THUMBNAIL_HEIGHT) {
- const gchar *url_thumb;
- g_autofree gchar *basename_thumb = NULL;
- g_autofree gchar *cache_kind_thumb = NULL;
- AsImage *im;
-+#if AS_CHECK_VERSION(1, 0, 0)
- im = as_screenshot_get_image (ssimg->screenshot,
-- AS_IMAGE_THUMBNAIL_WIDTH * ssimg->scale,
-- AS_IMAGE_THUMBNAIL_HEIGHT * ssimg->scale);
-+ GS_IMAGE_THUMBNAIL_WIDTH,
-+ GS_IMAGE_THUMBNAIL_HEIGHT,
-+ ssimg->scale);
-+#else
-+ im = as_screenshot_get_image (ssimg->screenshot,
-+ GS_IMAGE_THUMBNAIL_WIDTH * ssimg->scale,
-+ GS_IMAGE_THUMBNAIL_HEIGHT * ssimg->scale);
-+#endif
- url_thumb = as_image_get_url (im);
- basename_thumb = gs_screenshot_get_cachefn_for_url (url_thumb);
- cache_kind_thumb = g_build_filename ("screenshots", "112x63", NULL);
-diff --git a/src/gs-screenshot-image.h b/src/gs-screenshot-image.h
-index 1f6cf81ce6..6e45f5d20a 100644
---- a/src/gs-screenshot-image.h
-+++ b/src/gs-screenshot-image.h
-@@ -21,6 +21,13 @@ G_BEGIN_DECLS
-
- G_DECLARE_FINAL_TYPE (GsScreenshotImage, gs_screenshot_image, GS, SCREENSHOT_IMAGE, GtkWidget)
-
-+#define GS_IMAGE_LARGE_HEIGHT 423
-+#define GS_IMAGE_LARGE_WIDTH 752
-+#define GS_IMAGE_NORMAL_HEIGHT 351
-+#define GS_IMAGE_NORMAL_WIDTH 624
-+#define GS_IMAGE_THUMBNAIL_HEIGHT 63
-+#define GS_IMAGE_THUMBNAIL_WIDTH 112
-+
- GtkWidget *gs_screenshot_image_new (SoupSession *session);
-
- AsScreenshot *gs_screenshot_image_get_screenshot (GsScreenshotImage *ssimg);
-diff --git a/subprojects/appstream.wrap b/subprojects/appstream.wrap
-index 6f0beb0cbc..b9a9c7dbe5 100644
---- a/subprojects/appstream.wrap
-+++ b/subprojects/appstream.wrap
-@@ -1,5 +1,5 @@
- [wrap-git]
- directory = appstream
- url = https://github.com/ximion/appstream.git
--revision = v0.14.1
-+revision = v0.16.4
- depth = 1
---
-GitLab
-
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software/e431ab003f3fabf616b6eb7dc93f8967bc9473e5.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software/e431ab003f3fabf616b6eb7dc93f8967bc9473e5.patch
deleted file mode 100644
index b7bddc3243..0000000000
--- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software/e431ab003f3fabf616b6eb7dc93f8967bc9473e5.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e431ab003f3fabf616b6eb7dc93f8967bc9473e5 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Wed, 22 Nov 2023 09:44:40 +0100
-Subject: [PATCH] gs-appstream: Remove use of AS_PROVIDED_KIND_PYTHON_2
-
-It's dropped in appstream 1.0.0 and it's not used anywhere in the gnome-software
-code, thus just remove it, rather than have it only for pre-1.0.0 appstream version.
-
-Closes https://gitlab.gnome.org/GNOME/gnome-software/-/issues/2388
-
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-software/-/commit/e431ab003f3fabf616b6eb7dc93f8967bc9473e5]
----
- lib/gs-appstream.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/lib/gs-appstream.c b/lib/gs-appstream.c
-index 6504d6f25..4fd7f5334 100644
---- a/lib/gs-appstream.c
-+++ b/lib/gs-appstream.c
-@@ -587,8 +587,6 @@ gs_appstream_refine_add_provides (GsApp *app, XbNode *component, GError **error)
- kind = AS_PROVIDED_KIND_FIRMWARE_RUNTIME;
- else if (g_strcmp0 (fw_type, "flashed") == 0)
- kind = AS_PROVIDED_KIND_FIRMWARE_FLASHED;
-- } else if (g_strcmp0 (element_name, "python2") == 0) {
-- kind = AS_PROVIDED_KIND_PYTHON_2;
- } else if (g_strcmp0 (element_name, "python3") == 0) {
- kind = AS_PROVIDED_KIND_PYTHON;
- } else if (g_strcmp0 (element_name, "dbus") == 0) {
---
-GitLab
-
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software_45.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software_46.0.bb
index 4beb79f1b9..40a7141fca 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software_45.3.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software_46.0.bb
@@ -28,11 +28,7 @@ RDEPENDS:${PN} = "iso-codes"
EXTRA_OEMESON += "-Dtests=false -Dsoup2=false"
-SRC_URI += " \
- file://0655f358ed0e8455e12d9634f60bc4dbaee434e3.patch \
- file://e431ab003f3fabf616b6eb7dc93f8967bc9473e5.patch \
-"
-SRC_URI[archive.sha256sum] = "d6b9245b22237da7bd1739dd28c23cc8f3835f99fa10c1037d9dd7635335251c"
+SRC_URI[archive.sha256sum] = "11893002bbb54082896683707bc3991ae55a2f3040811a760e3a92c96544f86e"
PACKAGECONFIG ?= "flatpak"
PACKAGECONFIG[flatpak] = "-Dflatpak=true,-Dflatpak=false,flatpak ostree"