public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [flatpaks/flatpak-runtime] f45: Update to FD.o 23.08 / GNOME 45
@ 2026-09-11 14:42 Yaakov Selkowitz
0 siblings, 0 replies; only message in thread
From: Yaakov Selkowitz @ 2026-09-11 14:42 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : flatpaks/flatpak-runtime
Branch : f45
Commit : d74366f3b71690f253e0e52bde5068cbc028741b
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date : 2026-03-02T20:29:46-05:00
Stats : +209/-108 in 8 file(s)
URL : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/d74366f3b71690f253e0e52bde5068cbc028741b?branch=f45
Log:
Update to FD.o 23.08 / GNOME 45
The major change in these versions is the addition of perl to
org.gnome.Platform (not just Sdk), but that was by accident and should
be fixed upstream. Also, gtksourceview4 was removed upstream, but this
keeps it in for F39; in F40 this should be removed from the runtime, and
will need to be built in /app for a number of flatpaks.
These versions require a lot more filtering for unwanted components,
including system services such as avahi and systemd.
Many libraries are now in sync with F39 versions, but their renames are
commented out (rather than removed) to make it easier to restore the
overrides when they go out of sync again in the future.
Upstream has switched from libappstream-glib's appstream-compose command
to appstreamcli-compose (from the appstream-compose subpackage). Since
Fedora's tooling still uses the former, it is forced to remain for now,
but the tooling will likely need to be updated in a future version.
Whenever that happens, rpm (or at a minimum, lua-libs) will need to
remain to avoid the koji buildroot dependency issue.
---
diff --git a/README.md b/README.md
index dc23a12..42280d8 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,10 @@ It also holds scripts and data files used to maintain and update the Fedora Flat
*Prequisites*: you need to have the following "upstream" runtimes installed:
-* `org.freedesktop.Platform/x86_64/22.08`
-* `org.freedesktop.Sdk/x86_64/22.08`
-* `org.gnome.Platform/x86_64/44`
-* `org.gnome.Sdk/x86_64/44`
+* `org.freedesktop.Platform/x86_64/23.08`
+* `org.freedesktop.Sdk/x86_64/23.08`
+* `org.gnome.Platform/x86_64/45`
+* `org.gnome.Sdk/x86_64/45`
You also need `python3-jinja2` and possibly a few other Python
packages installed.
diff --git a/container-sdk.in.yaml b/container-sdk.in.yaml
index 711766a..0e12659 100644
--- a/container-sdk.in.yaml
+++ b/container-sdk.in.yaml
@@ -12,6 +12,7 @@ flatpak:
--env=PATH=/app/sbin:/app/bin:/usr/sbin:/usr/bin
--env=PINENTRY_BINARY=/usr/bin/pinentry-gnome3
--env=XDG_DATA_DIRS=/app/share:/usr/share:/usr/share/runtime/share:/run/host/user-share:/run/host/share
+ --env=GPROFNG_SYSCONFDIR=/etc
--extension=org.freedesktop.Platform.GL=version=1.4
--extension=org.freedesktop.Platform.GL=directory=lib64/GL
--extension=org.freedesktop.Platform.GL=subdirectories=true
@@ -48,3 +49,8 @@ flatpak:
touch -d @0 /usr/share/fonts /usr/share/fonts/*
fc-cache -rs
+
+ # workaround for binutils-gprofng packaging issue (binutils#50)
+ if test -f /usr/etc/gprofng.rc; then mv -f /usr/etc/gprofng.rc /etc/; fi
+
+ packages: []
diff --git a/container-sdk.yaml b/container-sdk.yaml
index 5b756dd..f31496a 100644
--- a/container-sdk.yaml
+++ b/container-sdk.yaml
@@ -9,10 +9,10 @@ flatpak:
--env=GI_TYPELIB_PATH=/app/lib64/girepository-1.0 --env=GST_PLUGIN_SYSTEM_PATH=/app/lib64/gstreamer-1.0:/usr/lib64/gstreamer-1.0
--env=LD_LIBRARY_PATH=/app/lib64 --env=PATH=/app/sbin:/app/bin:/usr/sbin:/usr/bin
--env=PINENTRY_BINARY=/usr/bin/pinentry-gnome3 --env=XDG_DATA_DIRS=/app/share:/usr/share:/usr/share/runtime/share:/run/host/user-share:/run/host/share
- --extension=org.freedesktop.Platform.GL=version=1.4 --extension=org.freedesktop.Platform.GL=directory=lib64/GL
- --extension=org.freedesktop.Platform.GL=subdirectories=true --extension=org.freedesktop.Platform.GL=no-autodownload=true
- --extension=org.freedesktop.Platform.GL=autodelete=false --extension=org.freedesktop.Platform.GL=add-ld-path=lib
- --extension=org.freedesktop.Platform.GL=merge-dirs=vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors;lib/dri;lib/d3d;vulkan/explicit_layer.d;vulkan/implicit_layer.d
+ --env=GPROFNG_SYSCONFDIR=/etc --extension=org.freedesktop.Platform.GL=version=1.4
+ --extension=org.freedesktop.Platform.GL=directory=lib64/GL --extension=org.freedesktop.Platform.GL=subdirectories=true
+ --extension=org.freedesktop.Platform.GL=no-autodownload=true --extension=org.freedesktop.Platform.GL=autodelete=false
+ --extension=org.freedesktop.Platform.GL=add-ld-path=lib --extension=org.freedesktop.Platform.GL=merge-dirs=vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors;lib/dri;lib/d3d;vulkan/explicit_layer.d;vulkan/implicit_layer.d
--extension=org.freedesktop.Platform.GL=download-if=active-gl-driver --extension=org.freedesktop.Platform.GL=enable-if=active-gl-driver
--extension=org.freedesktop.Platform.GL=autoprune-unless=active-gl-driver
cleanup-commands: |
@@ -36,6 +36,9 @@ flatpak:
touch -d @0 /usr/share/fonts /usr/share/fonts/*
fc-cache -rs
+
+ # workaround for binutils-gprofng packaging issue (binutils#50)
+ if test -f /usr/etc/gprofng.rc; then mv -f /usr/etc/gprofng.rc /etc/; fi
packages:
- abattis-cantarell-vf-fonts
- acl
@@ -60,6 +63,8 @@ flatpak:
- annobin-plugin-gcc
- ansible-srpm-macros
- appstream
+ - appstream-compose
+ - appstream-compose-devel
- appstream-data
- appstream-devel
- aspell
@@ -80,17 +85,23 @@ flatpak:
- avahi
- avahi-devel
- avahi-glib
+ - avahi-glib-devel
- avahi-libs
- avif-pixbuf-loader
- basesystem
- bash
- bash-devel
- - bc
- binutils
- binutils-devel
- binutils-gold
+ - name: binutils-gprofng
+ platforms:
+ only:
+ - aarch64
+ - x86_64
- bison
- bluez-libs
+ - bluez-libs-devel
- bomtool
- boost-regex
- brotli
@@ -145,6 +156,7 @@ flatpak:
- dbus-common
- dbus-devel
- dbus-libs
+ - dbus-python-devel
- dbus-tools
- debugedit
- default-fonts-core-sans
@@ -233,7 +245,6 @@ flatpak:
- frei0r-plugins
- fribidi
- fribidi-devel
- - fuse-devel
- fuse-libs
- game-music-emu
- gavl
@@ -413,6 +424,7 @@ flatpak:
- hunspell-en
- hunspell-en-GB
- hunspell-en-US
+ - hunspell-eo
- hunspell-es
- hunspell-es-AR
- hunspell-es-BO
@@ -437,6 +449,7 @@ flatpak:
- hunspell-es-UY
- hunspell-es-VE
- hunspell-et
+ - hunspell-fa
- hunspell-filesystem
- hunspell-fr
- hunspell-gd
@@ -449,6 +462,7 @@ flatpak:
- hunspell-id
- hunspell-is
- hunspell-it
+ - hunspell-ko
- hunspell-lt
- hunspell-lv
- hunspell-nb
@@ -476,6 +490,7 @@ flatpak:
- hwdata
- hyphen
- hyphen-af
+ - hyphen-be
- hyphen-bg
- hyphen-ca
- hyphen-cs
@@ -484,6 +499,7 @@ flatpak:
- hyphen-devel
- hyphen-el
- hyphen-en
+ - hyphen-eo
- hyphen-es
- hyphen-et
- hyphen-fr
@@ -534,6 +550,7 @@ flatpak:
- jq
- jq-devel
- json-c
+ - json-c-devel
- json-glib
- json-glib-devel
- jsoncpp
@@ -609,6 +626,7 @@ flatpak:
- libcap-ng
- libcap-ng-devel
- libcbor
+ - libcbor-devel
- libcdio
- libcdio-paranoia
- libchromaprint
@@ -626,7 +644,9 @@ flatpak:
- libdb
- libdc1394
- libdecor
+ - libdecor-devel
- libdex
+ - libdex-devel
- libdovi
- libdrm
- libdrm-devel
@@ -654,6 +674,7 @@ flatpak:
- libffi
- libffi-devel
- libfido2
+ - libfido2-devel
- libfl-devel
- libfl2
- libgcab1
@@ -683,6 +704,11 @@ flatpak:
- libgusb
- libhandy
- libhandy-devel
+ - name: libhwasan
+ platforms:
+ only:
+ - aarch64
+ - x86_64
- libICE
- libICE-devel
- libicu
@@ -758,6 +784,7 @@ flatpak:
- libpsl
- libpsl-devel
- libpwquality
+ - libpwquality-devel
- name: libquadmath
platforms:
only:
@@ -815,7 +842,6 @@ flatpak:
- libswresample-free-devel
- libswscale-free
- libswscale-free-devel
- - libsysprof
- libtalloc
- libtasn1
- libtasn1-devel
@@ -833,6 +859,7 @@ flatpak:
- libtool-ltdl
- libtool-ltdl-devel
- libtraceevent
+ - libtraceevent-devel
- libtracker-sparql
- libtsan
- libubsan
@@ -842,6 +869,7 @@ flatpak:
- libunwind
- libunwind-devel
- liburing
+ - liburing-devel
- libusb1
- libutempter
- libuuid
@@ -925,6 +953,7 @@ flatpak:
- libxml2
- libxml2-devel
- libxmlb
+ - libxmlb-devel
- libXpm
- libXpm-devel
- libXrandr
@@ -946,6 +975,7 @@ flatpak:
- libXxf86vm
- libXxf86vm-devel
- libyaml
+ - libyaml-devel
- libzstd
- libzstd-devel
- lilv-libs
@@ -1083,6 +1113,7 @@ flatpak:
- p11-kit-trust
- package-notes-srpm-macros
- pam
+ - pam-devel
- pam-libs
- pango
- pango-devel
@@ -1091,10 +1122,6 @@ flatpak:
- pciutils-devel
- pciutils-libs
- pcre
- - pcre-cpp
- - pcre-devel
- - pcre-utf16
- - pcre-utf32
- pcre2
- pcre2-devel
- pcre2-syntax
@@ -1106,6 +1133,7 @@ flatpak:
- perl-Archive-Tar
- perl-Archive-Zip
- perl-Attribute-Handlers
+ - perl-Authen-SASL
- perl-autodie
- perl-AutoLoader
- perl-AutoSplit
@@ -1144,6 +1172,7 @@ flatpak:
- perl-Devel-Size
- perl-diagnostics
- perl-Digest
+ - perl-Digest-HMAC
- perl-Digest-MD5
- perl-Digest-SHA
- perl-Digest-SHA1
@@ -1194,6 +1223,7 @@ flatpak:
- perl-Getopt-Long
- perl-Getopt-Std
- perl-Git
+ - perl-GSSAPI
- perl-Hash-Util
- perl-Hash-Util-FieldHash
- perl-HTTP-Tiny
@@ -1354,6 +1384,7 @@ flatpak:
- poppler-data
- poppler-glib
- popt
+ - popt-devel
- procps-ng
- procps-ng-devel
- protobuf-c
@@ -1389,6 +1420,7 @@ flatpak:
- python3-markupsafe
- python3-packaging
- python3-pip
+ - python3-pwquality
- python3-pygments
- python3-pyparsing
- python3-pyqt5-sip
@@ -1400,6 +1432,8 @@ flatpak:
- python3-wheel
- qadwaitadecorations-qt5
- qadwaitadecorations-qt6
+ - qrencode-devel
+ - qrencode-libs
- qt-settings
- qt5-qtbase
- qt5-qtbase-common
@@ -1480,6 +1514,8 @@ flatpak:
- setup
- sgml-common
- shadow-utils
+ - shadow-utils-subid
+ - shadow-utils-subid-devel
- shared-mime-info
- slang
- slang-devel
@@ -1494,9 +1530,6 @@ flatpak:
- speex-devel
- speexdsp
- speexdsp-devel
- - spirv-headers-devel
- - spirv-tools
- - spirv-tools-devel
- spirv-tools-libs
- sqlite
- sqlite-devel
@@ -1520,6 +1553,8 @@ flatpak:
- tesseract-tessdata-doc
- texinfo
- tpm2-tss
+ - tpm2-tss-devel
+ - tpm2-tss-fapi
- tracker-devel
- tslib
- turbojpeg
@@ -1601,11 +1636,13 @@ flatpak:
- xkeyboard-config
- xkeyboard-config-devel
- xml-common
+ - xmltoman
- xorg-x11-proto-devel
- xorg-x11-util-macros
- xorg-x11-xtrans-devel
- xprop
- xvidcore
+ - xxhash-devel
- xxhash-libs
- xz
- xz-devel
diff --git a/container.yaml b/container.yaml
index 04c4901..d9d4fb6 100644
--- a/container.yaml
+++ b/container.yaml
@@ -54,6 +54,7 @@ flatpak:
- alsa-plugins-vdownmix
- alternatives
- appstream
+ - appstream-compose
- appstream-data
- aspell
- at-spi2-atk
@@ -247,6 +248,7 @@ flatpak:
- hunspell-en
- hunspell-en-GB
- hunspell-en-US
+ - hunspell-eo
- hunspell-es
- hunspell-es-AR
- hunspell-es-BO
@@ -271,6 +273,7 @@ flatpak:
- hunspell-es-UY
- hunspell-es-VE
- hunspell-et
+ - hunspell-fa
- hunspell-filesystem
- hunspell-fr
- hunspell-gd
@@ -283,6 +286,7 @@ flatpak:
- hunspell-id
- hunspell-is
- hunspell-it
+ - hunspell-ko
- hunspell-lt
- hunspell-lv
- hunspell-nb
@@ -310,6 +314,7 @@ flatpak:
- hwdata
- hyphen
- hyphen-af
+ - hyphen-be
- hyphen-bg
- hyphen-ca
- hyphen-cs
@@ -317,6 +322,7 @@ flatpak:
- hyphen-de
- hyphen-el
- hyphen-en
+ - hyphen-eo
- hyphen-es
- hyphen-et
- hyphen-fr
@@ -412,6 +418,7 @@ flatpak:
- libdb
- libdc1394
- libdecor
+ - libdex
- libdovi
- libdrm
- libdvbv5
@@ -448,6 +455,11 @@ flatpak:
- libgudev
- libgusb
- libhandy
+ - name: libhwasan
+ platforms:
+ only:
+ - aarch64
+ - x86_64
- libICE
- libicu
- libidn2
@@ -540,6 +552,7 @@ flatpak:
- libudfread
- libunistring
- libunwind
+ - liburing
- libusb1
- libutempter
- libuuid
@@ -688,7 +701,6 @@ flatpak:
- pciutils
- pciutils-libs
- pcre
- - pcre-cpp
- pcre2
- pcre2-syntax
- pcre2-utf16
@@ -730,6 +742,7 @@ flatpak:
- python3-markdown
- python3-markupsafe
- python3-packaging
+ - python3-pwquality
- python3-pyqt5-sip
- python3-pyqt6-base
- python3-pyqt6-sip
@@ -738,6 +751,7 @@ flatpak:
- python3-six
- qadwaitadecorations-qt5
- qadwaitadecorations-qt6
+ - qrencode-libs
- qt-settings
- qt5-qtbase
- qt5-qtbase-common
@@ -811,6 +825,7 @@ flatpak:
- tesseract-langpack-eng
- tesseract-tessdata-doc
- tpm2-tss
+ - tpm2-tss-fapi
- tslib
- turbojpeg
- twolame-libs
@@ -825,7 +840,6 @@ flatpak:
- vid.stab
- vo-amrwbenc
- vulkan-loader
- - vulkan-validation-layers
- wavpack
- webkit2gtk4.0
- webkit2gtk4.1
@@ -853,6 +867,7 @@ flatpak:
- xml-common
- xprop
- xvidcore
+ - xxhash-libs
- xz
- xz-libs
- xz-lzma-compat
diff --git a/package-notes.txt b/package-notes.txt
index 8602862..489c337 100644
--- a/package-notes.txt
+++ b/package-notes.txt
@@ -24,7 +24,6 @@ cmake-filesystem: E: avoid problems with cmake autorequires; the prefix=/usr is
colord-libs:
coreutils-common: W: no bins/libs
crypto-policies: W: data files
-cups-client: EB: added to 23.08 runtime
desktop-file-utils: xdg-utils
double-conversion: EB: required by qt5-qtbase-gui and qt6-qtbase-gui
elfutils-default-yama-scope: provides default-yama-scope required by elfutils in Fedora
@@ -37,6 +36,7 @@ fedora-repos
filesystem: W: data files
flatpak-xdg-utils: EB: flatpak versions of xdg-email and xdg-open
fonts-filesystem: W: data files
+fuse-libs: E: for compatibility; REMOVE in F40
gc: FD: make
gcr: E: pull in regular gcr in addition to gcr3
glib-networking: W: no bins/libs
@@ -54,6 +54,8 @@ gstreamer1-plugins-good-qt6: EB: supplements "gstreamer1-plugins-good and qt6-qt
gstreamer1-plugins-ugly-free: E: in base but not runtime
gsm
gtk2-immodules: EB: input method module
+gtksourceview4: E: for compatibility; REMOVE in F40
+gtksourceview4-devel: E_SDK: for compatibility; REMOVE in F40
guile22: make
hicolor-icon-theme: W: data files
hunspell-es: EB: community runtime missing some subpackages
@@ -69,6 +71,7 @@ keyutils-libs:
kmod-libs: FD: pciutils
krb5-workstation: F: should exclude binaries
libX11-common: W: data files
+libappstream-glib: EB: for /usr/bin/appstream-compose still used by Fedora tools (where appstream-compose package provides 'appstreamcli compose')
libasyncns
libcanberra-gtk3: EB: dropped in upstream GNOME 3.38 runtime, but a large number of Fedora flatpaks still depend on it
libcap-ng: W: libaudit dependency
diff --git a/tools/generate-files.sh b/tools/generate-files.sh
index 54955da..6f337ef 100755
--- a/tools/generate-files.sh
+++ b/tools/generate-files.sh
@@ -6,11 +6,11 @@ base=$(basename $out)
case $base in
freedesktop-*)
ns=org.freedesktop
- version=22.08
+ version=23.08
;;
gnome-*)
ns=org.gnome
- version=44
+ version=45
;;
*)
echo 1>&2 "Can't identify runtime for $base"
diff --git a/tools/resolve-files.py b/tools/resolve-files.py
index d9ebef8..d6d437a 100755
--- a/tools/resolve-files.py
+++ b/tools/resolve-files.py
@@ -81,6 +81,9 @@ bin_ignore = [
'gss-client', 'gss-server', 'krb5-send-pr', 'sim_client', 'sim_server',
'uuclient', 'uuserver',
+ # Debian login/passwd/util-linux
+ 'expiry', 'faillog', 'logoutd', 'mkfs.bfs',
+
# OpenEmbedded uses Debian's ca-certificates, Fedora is different
'update-ca-certificates',
@@ -105,7 +108,7 @@ bin_rename = {
'bzfless': 'bzless',
# clang
- 'clang-10': 'clang',
+ 'clang-16': 'clang',
# cups-client
'lpr': 'lpr.cups',
@@ -116,6 +119,9 @@ bin_rename = {
'gtk-query-immodules-2.0': 'gtk-query-immodules-2.0-64',
'gtk-query-immodules-3.0': 'gtk-query-immodules-3.0-64',
+ # glslang
+ 'glslang': 'glslangValidator',
+
# libselinux-utils
'getconlist': 'selinuxconlist',
'getdefaultcon': 'selinuxdefcon',
@@ -126,17 +132,13 @@ bin_rename = {
'opj_dump': 'opj2_dump',
# perl
- 'perl5.36.0': 'perl',
- 'perl5.36.1': 'perl',
-
- # procps-ng
- 'pwait': 'pidwait',
+ 'perl5.38.0': 'perl',
# vala
- 'vala-0.52': 'vala-0.56',
- 'vala-gen-introspect-0.52': 'vala-gen-introspect-0.56',
- 'valac-0.52': 'valac-0.56',
- 'vapigen-0.52': 'vapigen-0.56',
+# 'vala-0.56': 'vala-0.56',
+# 'vala-gen-introspect-0.56': 'vala-gen-introspect-0.56',
+# 'valac-0.56': 'valac-0.56',
+# 'vapigen-0.56': 'vapigen-0.56',
}
rename.update({'/usr/bin/' + k: '/usr/bin/' + v for k, v in bin_rename.items()})
@@ -149,17 +151,20 @@ lib_ignore = [
'libapparmor.so', 'libapparmor.so.1',
# binutils internal libraries
- 'libbfd-2.38.so', 'libopcodes-2.38.so',
+ 'libbfd-2.41.so', 'libopcodes-2.41.so',
# Trimmed from gettext(-devel)
'libgettextlib.so', 'libgettextsrc.so', 'libtextstyle.so', 'libtextstyle.so.0',
+ # binutils-gprofng private libraries
+ 'libgprofng.so', 'libgprofng.so.0',
+
# Part of glibc
'libc_malloc_debug.so', 'libssp.so.0',
# glslang is built as static libraries only
- 'libHLSL.so', 'libSPIRV.so', 'libSPVRemapper.so', 'libglslang-default-resource-limits.so',
- 'libglslang.so.11', 'libglslang.so',
+ 'libHLSL.so.12', 'libHLSL.so', 'libSPIRV.so.12', 'libSPIRV.so',
+ 'libSPVRemapper.so.12', 'libSPVRemapper.so', 'libglslang.so.12', 'libglslang.so',
# Disabled in libunwind
'libunwind-ptrace.so', 'libunwind-ptrace.so.0',
@@ -168,56 +173,48 @@ lib_ignore = [
ignore.update('/usr/lib64/' + x for x in lib_ignore)
lib_rename = {
+ # Older in Fedora
+ 'libabigail.so.3': 'libabigail.so.2',
+ 'libsframe.so.1': 'libsframe.so.0',
+ 'libtiff.so.6': 'libtiff.so.5',
+ 'libtiffxx.so.6': 'libtiffxx.so.5',
+
# Newer in Fedora
- 'libaom.so.2': 'libaom.so.3',
- 'libasan.so.6': 'libasan.so.8',
- 'libavcodec.so.59': 'libavcodec.so.60',
- 'libavdevice.so.59': 'libavdevice.so.60',
- 'libavfilter.so.8': 'libavfilter.so.9',
- 'libavformat.so.59': 'libavformat.so.60',
- 'libavutil.so.57': 'libavutil.so.58',
- 'libclang-cpp.so.10': 'libclang-cpp.so.14',
- 'libclang.so.10': 'libclang.so.14',
- 'libdav1d.so.5': 'libdav1d.so.6',
- 'libffi.so.7': 'libffi.so.8',
- 'libFLAC++.so.6': 'libFLAC++.so.10',
- 'libFLAC.so.8': 'libFLAC.so.12',
- 'libgettextlib-0.21.so': 'libgettextlib-0.22.so',
- 'libgettextsrc-0.21.so': 'libgettextsrc-0.22.so',
- 'libgnutlsxx.so.28': 'libgnutlsxx.so.30',
- 'libjavascriptcoregtk-5.0.so': 'libjavascriptcoregtk-6.0.so',
- 'libjavascriptcoregtk-5.0.so.0': 'libjavascriptcoregtk-6.0.so.1',
- 'libkadm5clnt_mit.so.11': 'libkadm5clnt_mit.so.12',
- 'libkadm5srv_mit.so.11': 'libkadm5srv_mit.so.12',
- 'libkdb5.so.9': 'libkdb5.so.10',
- 'libLLVM-10.so': 'libLLVM-14.so',
- 'libLTO.so.10': 'libLTO.so.14',
- 'libmozjs-102.so': 'libmozjs-115.so',
+# 'libaom.so.3': 'libaom.so.3',
+# 'libasan.so.8': 'libasan.so.8',
+# 'libavcodec.so.60': 'libavcodec.so.60',
+# 'libavdevice.so.60': 'libavdevice.so.60',
+# 'libavfilter.so.9': 'libavfilter.so.9',
+# 'libavformat.so.60': 'libavformat.so.60',
+# 'libavutil.so.58': 'libavutil.so.58',
+ 'libclang-cpp.so.16': 'libclang-cpp.so.17',
+ 'libclang.so.16': 'libclang.so.17',
+# 'libdav1d.so.6': 'libdav1d.so.6',
+# 'libffi.so.8': 'libffi.so.8',
+# 'libFLAC++.so.10': 'libFLAC++.so.10',
+# 'libFLAC.so.12': 'libFLAC.so.12',
+# 'libgettextlib-0.22.so': 'libgettextlib-0.22.so',
+# 'libgettextsrc-0.22.so': 'libgettextsrc-0.22.so',
+# 'libgnutlsxx.so.30': 'libgnutlsxx.so.30',
+# 'libkadm5clnt_mit.so.12': 'libkadm5clnt_mit.so.12',
+# 'libkadm5srv_mit.so.12': 'libkadm5srv_mit.so.12',
+# 'libkdb5.so.10': 'libkdb5.so.10',
+ 'libLLVM-16.so': 'libLLVM-17.so',
+ 'libLTO.so.16': 'libLTO.so.17',
+# 'libmozjs-115.so': 'libmozjs-115.so',
'libonig.so.4': 'libonig.so.5',
- 'libopenh264.so.5': 'libopenh264.so.7',
'libopenh264.so.6': 'libopenh264.so.7',
- 'libpcre2-posix.so.2': 'libpcre2-posix.so.3',
- 'libprocps.so': 'libproc2.so',
- 'libprocps.so.8': 'libproc2.so.0',
- 'libpython3.10.so.1.0': 'libpython3.12.so.1.0',
- 'libpython3.10.so': 'libpython3.12.so',
+# 'libpcre2-posix.so.3': 'libpcre2-posix.so.3',
'libpython3.11.so.1.0': 'libpython3.12.so.1.0',
'libpython3.11.so': 'libpython3.12.so',
- 'libRemarks.so.10': 'libRemarks.so.14',
- 'libsepol.so.1': 'libsepol.so.2',
- 'libsysprof-4.so': 'libsysprof-6.so.6',
- 'libsysprof-memory-4.so': 'libsysprof-memory-6.so',
- 'libsysprof-speedtrack-4.so': 'libsysprof-speedtrack-6.so',
- 'libswscale.so.6': 'libswscale.so.7',
- 'libtinfow.so': 'libtinfo.so',
- 'libtinfow.so.6': 'libtinfo.so.6',
- 'libunistring.so.2': 'libunistring.so.5',
- 'libvala-0.52.so': 'libvala-0.56.so',
- 'libvala-0.52.so.0': 'libvala-0.56.so.0',
+ 'libRemarks.so.16': 'libRemarks.so.17',
+# 'libsepol.so.2': 'libsepol.so.2',
+# 'libswscale.so.7': 'libswscale.so.7',
+# 'libunistring.so.5': 'libunistring.so.5',
+# 'libvala-0.56.so': 'libvala-0.56.so',
+# 'libvala-0.56.so.0': 'libvala-0.56.so.0',
'libverto.so.0': 'libverto.so.1',
- 'libvpx.so.7': 'libvpx.so.8',
- 'libwebkit2gtk-5.0.so': 'libwebkitgtk-6.0.so',
- 'libwebkit2gtk-5.0.so.0': 'libwebkitgtk-6.0.so.4',
+# 'libvpx.so.8': 'libvpx.so.8',
'libwget.so.1': 'libwget.so.2',
# Replaced by libxcrypt in Fedora
@@ -226,7 +223,13 @@ lib_rename = {
# Compat symlink in gcr
'libgcr-3.so.1': 'libgcr-ui-3.so.1',
+ # ncurses is built with a single tinfo library for both narrow and wide
+ 'libtinfow.so': 'libtinfo.so',
+ 'libtinfow.so.6': 'libtinfo.so.6',
+
# named differently when built with autotools vs cmake
+ 'libSDL2_image-2.0.so': 'libSDL2_image.so',
+ 'libSDL2_mixer-2.0.so': 'libSDL2_mixer.so',
'libSDL2_net-2.0.so': 'libSDL2_net.so',
# Fedora arch-handling
@@ -236,27 +239,18 @@ rename.update({'/usr/lib64/' + k: '/usr/lib64/' + v for k, v in lib_rename.items
gcc_libs = [
'libasan.so', 'libatomic.so', 'libgcc_s.so', 'libgfortran.so', 'libgomp.so',
- 'libitm.so', 'liblsan.so', 'libobjc.so', 'libquadmath.so', 'libstdc++.so',
- 'libtsan.so', 'libubsan.so'
+ 'libhwasan.so', 'libitm.so', 'liblsan.so', 'libobjc.so', 'libquadmath.so',
+ 'libstdc++.so', 'libtsan.so', 'libubsan.so'
]
rename.update({'/usr/lib64/' + x: '/usr/lib/gcc/x86_64-redhat-linux/13/' + x for x in gcc_libs})
-for old in ['libasm-0.187.so', 'libdw-0.187.so', 'libelf-0.187.so', 'libdebuginfod-0.187.so']:
- rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('-0.187', '-0.190')
-
-# Fedora has newer glibc
-for old in ['ld-2.33.so', 'libBrokenLocale-2.33.so', 'libanl-2.33.so', 'libc-2.33.so',
- 'libdl-2.33.so', 'libm-2.33.so',
- 'libmvec-2.33.so', 'libnsl-2.33.so', 'libnss_compat-2.33.so',
- 'libnss_db-2.33.so', 'libnss_dns-2.33.so', 'libnss_files-2.33.so',
- 'libnss_hesiod-2.33.so', 'libpthread-2.33.so', 'libresolv-2.33.so',
- 'librt-2.33.so', 'libutil-2.33.so']:
- rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('-2.33', '')
+for old in ['libasm-0.189.so', 'libdw-0.189.so', 'libelf-0.189.so', 'libdebuginfod-0.189.so']:
+ rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('-0.189', '-0.189')
-# Fedora has newer icu
-for old in ['libicudata.so.71', 'libicui18n.so.71', 'libicuio.so.71', 'libicutest.so.71',
- 'libicutu.so.71', 'libicuuc.so.71']:
- rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('so.71', 'so.73')
+# Fedora may have newer icu
+for old in ['libicudata.so.73', 'libicui18n.so.73', 'libicuio.so.73', 'libicutest.so.73',
+ 'libicutu.so.73', 'libicuuc.so.73']:
+ rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('so.73', 'so.73')
include_rename = {
'asoundlib.h': 'alsa/asoundlib.h',
@@ -314,14 +308,11 @@ ignore.update('/usr/lib64/pkgconfig/' + x for x in pc_ignore)
ignore.update('/usr/share/pkgconfig/' + x for x in pc_ignore)
pc_rename = {
- 'libvala-0.52.pc': 'libvala-0.56.pc',
- 'libprocps.pc': 'libproc2.pc',
- 'mozjs-102.pc': 'mozjs-115.pc',
- 'python-3.10.pc': 'python-3.12.pc',
+# 'libvala-0.56.pc': 'libvala-0.56.pc',
+# 'mozjs-115.pc': 'mozjs-115.pc',
'python-3.11.pc': 'python-3.12.pc',
- 'python-3.10-embed.pc': 'python-3.12-embed.pc',
'python-3.11-embed.pc': 'python-3.12-embed.pc',
- 'vapigen-0.52.pc': 'vapigen-0.56.pc',
+# 'vapigen-0.56.pc': 'vapigen-0.56.pc',
}
rename.update({'/usr/lib64/pkgconfig/' + k: '/usr/lib64/pkgconfig/' + v for k, v in pc_rename.items()})
rename.update({'/usr/share/pkgconfig/' + k: '/usr/share/pkgconfig/' + v for k, v in pc_rename.items()})
@@ -417,10 +408,9 @@ rename_patterns = [
(r'^/usr/include/c\+\+/[\d\.]*/(.*)', r'/usr/include/c++/13/\1'),
(r'^/usr/include/(libav.*)', r'/usr/include/ffmpeg/\1'),
(r'^/usr/include/(libsw.*)', r'/usr/include/ffmpeg/\1'),
- (r'^/usr/include/mozjs-102/(.*)', r'/usr/include/mozjs-115/\1'),
+# (r'^/usr/include/mozjs-115/(.*)', r'/usr/include/mozjs-115/\1'),
(r'^/usr/include/nss/(.*)', r'/usr/include/nss3/\1'),
(r'^/usr/include/(proxy.h)', r'/usr/include/libproxy/\1'),
- (r'^/usr/include/python3.10/(.*)', r'/usr/include/python3.12/\1'),
(r'^/usr/include/python3.11/(.*)', r'/usr/include/python3.12/\1'),
(r'^/usr/include/ruby-[\d\.]*/ruby/(.*)', r'/usr/include/ruby/\1'),
(r'^/usr/include/ruby-[\d\.]*/x86_64-linux/ruby/(.*)', r'/usr/include/ruby/\1'),
@@ -434,8 +424,7 @@ rename_patterns = [
(r'^/usr/lib64/perl5/[\d.]+/(.*)', r'/usr/lib64/perl5/\1'),
(r'^/usr/lib64/pkgconfig/(.*proto.pc)', r'/usr/share/pkgconfig/\1'),
(r'^/usr/lib64/pkgconfig/ruby-[\d\.]*.pc', r'/usr/lib64/pkgconfig/ruby.pc'),
- (r'^/usr/lib64/python3.10/(.*).cpython-310-(.*)', r'/usr/lib64/python3.12/\1.cpython-312-\2'),
- (r'^/usr/lib64/python3.10/(.*)', r'/usr/lib64/python3.12/\1'),
+ (r'^/usr/lib64/python3.11/(site-packages/_dbus.*).cpython-311-.*', r'/usr/lib64/python3.12/\1.so'),
(r'^/usr/lib64/python3.11/(.*).cpython-311-(.*)', r'/usr/lib64/python3.12/\1.cpython-312-\2'),
(r'^/usr/lib64/python3.11/(.*)', r'/usr/lib64/python3.12/\1'),
(r'^/usr/lib64/(v4l[12].*.so)', r'/usr/lib64/libv4l/\1'),
@@ -460,20 +449,56 @@ global_package_ignore_patterns = [
'^fcitx-.*$',
# Should be installed on the host instead
+ '^arptables-legacy$',
'^audispd-plugins$',
'^audit$',
+ '^avahi$',
+ '^avahi-autoipd$',
+ '^avahi-dnsconfd$',
+ '^avahi-gobject.*',
+ '^avahi-ui.*',
+ '^cryptsetup.*$',
+ "^cups-ipptool$",
+ "^cups-printerapp$",
'^dbus-daemon$',
'^dbus-x11$',
+ '^device-mapper.*$',
+ '^ebtables-legacy$',
'^fuse$',
+ '^ibus$',
+ '^ibus-setup$',
+ '^integritysetup$',
+ '^iptables.*$',
'^jack-audio-connection-kit$',
+ '^kbd$',
+ '^kbd-legacy$',
+ '^kbd-misc$',
+ '^kmod$',
+ '^kmod-devel$',
'^krb5-server$',
+ '^libaio.*',
+ '^libdaemon.*',
+ '^libmnl.*',
+ '^libnftnl.*',
+ '^lvm2.*$',
'^nscd$',
+ '^openresolv$',
+ '^passwd$',
'^pipewire$',
+ '^pipewire-pulse$',
'^pulseaudio$',
+ '^shadow-utils-subid$',
+ '^systemd$',
+ '^systemd-container$',
+ '^systemd-networkd$',
+ '^systemd-resolved$',
+ '^systemd-standalone-repart$',
+ '^systemd-udev$',
'^tracker$',
'^uuidd$',
'^v4l-utils$',
'^v4l-utils-devel-tools$',
+ '^veritysetup$',
'^xdg-desktop-portal$',
'^xdg-desktop-portal-devel$',
@@ -481,9 +506,12 @@ global_package_ignore_patterns = [
# if any of these need to be made available in SDK for compatibility,
# move them to platform_package_ignore_patterns[] below
"^aom$",
+ '^avahi-tools$',
+ '^avahi-ui-tools$',
"^bsd(cat|cpio|tar|unzip)$", # libarchive
"^cyrus-sasl$",
"^dav1d$",
+ '^fido2-tools$',
'^gcab$',
'^giflib-utils$',
'^gitk$',
@@ -503,11 +531,15 @@ global_package_ignore_patterns = [
'^pcre2-tools$',
'^pipewire-utils$',
'^pulseaudio-utils$',
+ '^qrencode$',
+ '^qv4l2$', # requires qt5
'^speex-tools$',
'^texinfo-tex$', # requires texlive
+ '^xxhash$',
# file conflicts
r'^openssl1\.1-devel$', # conflicts with openssl-devel from openssl 3.0
+ '^golang-github-cespare-xxhash$', # conflicts with xxhash
'^golang-github-google-martian$', # conflicts with libproxy-bin
'^golang-github-xo-terminfo$', # conflicts on /usr/bin/infocmp with ncurses
'^elfutils-debuginfod$', # we don't need debuginfod server
@@ -519,13 +551,16 @@ platform_package_ignore_patterns = [
"^.*-devel$",
"^libappstream-glib-builder$", # may not need in the sdk either
"^gcc-gdb-plugin$", # pulls in gcc
+ '^gperf$',
"^gtk-doc$",
"^gtk4-devel-tools$",
"^icu$", # may not need in the sdk either
'^llvm$',
'^llvm-test$', # pulls in gcc and binutils
'^openssl$',
+ '^perl', # all perl components should be only in sdk
'^sqlite$',
+ '^xmltoman$',
]
platform_package_ignore_compiled = [re.compile(p) for p in platform_package_ignore_patterns]
diff --git a/tools/util.py b/tools/util.py
index 1d022d1..5244c91 100644
--- a/tools/util.py
+++ b/tools/util.py
@@ -22,7 +22,10 @@ XDG_CACHE_HOME = os.environ.get("XDG_CACHE_HOME") or os.path.expanduser("~/.cach
# packages that are only available or required on specific architectures
ARCH_SPECIFIC_PACKAGES = {}
-ARCH_SPECIFIC_PACKAGES['aarch64'] = []
+ARCH_SPECIFIC_PACKAGES['aarch64'] = [
+ "binutils-gprofng",
+ "libhwasan",
+]
ARCH_SPECIFIC_PACKAGES['ppc64le'] = [
"libquadmath",
@@ -34,9 +37,11 @@ ARCH_SPECIFIC_PACKAGES['s390x'] = [
]
ARCH_SPECIFIC_PACKAGES['x86_64'] = [
+ "binutils-gprofng",
"fftw-libs-quad",
"glibc-headers-x86",
"intel-mediasdk",
+ "libhwasan",
"libipt",
"libquadmath",
"libquadmath-devel",
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-11 14:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-11 14:42 [flatpaks/flatpak-runtime] f45: Update to FD.o 23.08 / GNOME 45 Yaakov Selkowitz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox