public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [flatpaks/flatpak-runtime] f45: Switch to Freedesktop SDK 19.08 and GNOME SDK 3.34
@ 2026-09-11 14:40 Kalev Lember
0 siblings, 0 replies; only message in thread
From: Kalev Lember @ 2026-09-11 14:40 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : flatpaks/flatpak-runtime
Branch : f45
Commit : 8b808a73965bbfec5f157495622729718817f45b
Author : Kalev Lember <klember@redhat.com>
Date : 2020-03-20T21:51:58+01:00
Stats : +102/-135 in 4 file(s)
URL : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/8b808a73965bbfec5f157495622729718817f45b?branch=f45
Log:
Switch to Freedesktop SDK 19.08 and GNOME SDK 3.34
---
diff --git a/README.md b/README.md
index 81a340d..7f33a76 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,10 @@ Updating
*Prequisites*: you need to have the following "upstream" runtimes installed:
-* `org.freedesktop.Platform/x86_64/18.08`
-* `org.freedesktop.Sdk/x86_64/18.08`
-* `org.gnome.platform/x86_64/3.32`
-* `org.gnome.Sdk/x86_64/3.32`
+* `org.freedesktop.Platform/x86_64/19.08`
+* `org.freedesktop.Sdk/x86_64/19.08`
+* `org.gnome.Platform/x86_64/3.34`
+* `org.gnome.Sdk/x86_64/3.34`
You also need `python3-jinja2` and possibly a few other Python
packages installed.
diff --git a/flatpak-runtime.yaml b/flatpak-runtime.yaml
index 8304de2..b536243 100644
--- a/flatpak-runtime.yaml
+++ b/flatpak-runtime.yaml
@@ -55,7 +55,6 @@ data:
- clutter-gtk
- cogl
- colord-libs
- - compat-libvpx5
- coreutils
- coreutils-common
- cracklib
@@ -65,13 +64,13 @@ data:
- curl
- libcurl
- cyrus-sasl-lib
+ - libdav1d
- dbus
- dbus-common
- dbus-daemon
- dbus-libs
- dbus-tools
- dbus-broker
- - dbus-glib
- dconf
- dejavu-fonts-common
- dejavu-math-tex-gyre-fonts
@@ -90,6 +89,7 @@ data:
- enchant2
- eosrei-emojione-fonts
- expat
+ - fdk-aac-free
- fedora-release
- fedora-release-common
- fedora-gpg-keys
@@ -144,8 +144,7 @@ data:
- nss_db
- nss_hesiod
- gmp
- - adwaita-gtk2-theme
- - gnome-themes-extra
+ - gmp-c++
- gnu-free-fonts-common
- gnu-free-mono-fonts
- gnu-free-sans-fonts
@@ -170,7 +169,6 @@ data:
- gstreamer1-plugins-base
- gstreamer1-plugins-good
- gstreamer1-plugins-good-gtk
- - gstreamer1-vaapi
- gtk2
- gtk2-immodules
- gtk-update-icon-cache
@@ -208,6 +206,7 @@ data:
- krb5-libs
- krb5-workstation
- libkadm5
+ - ladspa
- lame-libs
- lcms2
- lcms2-utils
@@ -246,7 +245,6 @@ data:
- libcanberra-gtk3
- libcap
- libcap-ng
- - libclc
- libcroco
- libdatrie
- libdb
@@ -285,6 +283,7 @@ data:
- libmng
- libmodman
- libnice
+ - libnice-gstreamer1
- libnotify
- libnsl2
- libogg
@@ -334,6 +333,7 @@ data:
- libwacom-data
- libwebp
- libwebp-tools
+ - libwpe
- libxcb
- libxcrypt
- libxcrypt-compat
@@ -359,7 +359,6 @@ data:
- mesa-libEGL
- mesa-libGL
- mesa-libOSMesa
- - mesa-libOpenCL
- mesa-libgbm
- mesa-libglapi
- mesa-vulkan-drivers
@@ -387,7 +386,6 @@ data:
- nss-util
- ocl-icd
- openal-soft
- - opencl-filesystem
- openjpeg2
- openldap
- openssl-libs
@@ -398,10 +396,13 @@ data:
- p11-kit-trust
- pam
- pango
+ - pciutils
+ - pciutils-libs
- pcre
- pcre-cpp
- pcre2
- pcre2-utf16
+ - pipewire-libs
- pixman
- libpkgconf
- pkgconf
@@ -503,6 +504,7 @@ data:
- webrtc-audio-processing
- which
- woff2
+ - wpebackend-fdo
- xcb-proto
- xcb-util
- xcb-util-cursor
@@ -562,7 +564,6 @@ data:
- alternatives
- clang-libs
- colord-libs
- - compat-libvpx5
- coreutils
- coreutils-common
- cracklib
@@ -572,6 +573,7 @@ data:
- curl
- libcurl
- cyrus-sasl-lib
+ - libdav1d
- dbus
- dbus-common
- dbus-daemon
@@ -644,6 +646,7 @@ data:
- nss_db
- nss_hesiod
- gmp
+ - gmp-c++
- gnu-free-fonts-common
- gnu-free-mono-fonts
- gnu-free-sans-fonts
@@ -668,7 +671,6 @@ data:
- gstreamer1-plugins-good
- gstreamer1-plugins-good-gtk
- gstreamer1-plugins-ugly-free
- - gstreamer1-vaapi
- gtk2
- gtk2-immodules
- gtk-update-icon-cache
@@ -702,8 +704,7 @@ data:
- keyutils-libs
- kmod-libs
- krb5-libs
- - krb5-workstation
- - libkadm5
+ - ladspa
- lame-libs
- lcms2
- lcms2-utils
@@ -741,7 +742,6 @@ data:
- libcap
- libcap-ng
- libcdio
- - libclc
- libcroco
- libdatrie
- libdb
@@ -780,6 +780,7 @@ data:
- libmodman
- libmpeg2
- libnice
+ - libnice-gstreamer1
- libnotify
- libnsl2
- libogg
@@ -851,7 +852,6 @@ data:
- mesa-libEGL
- mesa-libGL
- mesa-libOSMesa
- - mesa-libOpenCL
- mesa-libgbm
- mesa-libglapi
- mesa-vulkan-drivers
@@ -877,7 +877,6 @@ data:
- nss-util
- ocl-icd
- openal-soft
- - opencl-filesystem
- openldap
- openssl-libs
- opus
@@ -893,6 +892,7 @@ data:
- pcre-cpp
- pcre2
- pcre2-utf16
+ - pipewire-libs
- pixman
- libpkgconf
- pkgconf
@@ -1036,7 +1036,6 @@ data:
- libattr-devel
- audit-libs
- autoconf
- - autoconf-archive
- automake
- avahi-glib
- avahi-libs
@@ -1088,7 +1087,6 @@ data:
- cogl
- cogl-devel
- colord-libs
- - compat-libvpx5
- coreutils
- coreutils-common
- cpio
@@ -1107,6 +1105,8 @@ data:
- cyrus-sasl
- cyrus-sasl-devel
- cyrus-sasl-lib
+ - libdav1d
+ - libdav1d-devel
- dbus
- dbus-common
- dbus-daemon
@@ -1114,8 +1114,6 @@ data:
- dbus-libs
- dbus-tools
- dbus-broker
- - dbus-glib
- - dbus-glib-devel
- dconf
- dconf-devel
- dejavu-fonts-common
@@ -1182,8 +1180,11 @@ data:
- freeglut
- freetype
- freetype-devel
+ - frei0r-devel
+ - frei0r-plugins
- fribidi
- fribidi-devel
+ - gavl
- gawk
- gawk-devel
- gc
@@ -1228,6 +1229,7 @@ data:
- gettext-devel
- gettext-libs
- libtextstyle
+ - libtextstyle-devel
- ghc-srpm-macros
- giflib
- giflib-devel
@@ -1247,6 +1249,7 @@ data:
- glibc-devel
- glibc-headers
- glibc-minimal-langpack
+ - glibc-nss-devel
- libnsl
- nscd
- nss_db
@@ -1255,9 +1258,6 @@ data:
- gmp-c++
- gmp-devel
- gnat-srpm-macros
- - gnome-common
- - adwaita-gtk2-theme
- - gnome-themes-extra
- gnu-free-fonts-common
- gnu-free-mono-fonts
- gnu-free-sans-fonts
@@ -1292,6 +1292,7 @@ data:
- gsettings-desktop-schemas-devel
- gsm
- gssdp
+ - gssdp-devel
- gstreamer1
- gstreamer1-devel
- gstreamer1-plugins-bad-free
@@ -1300,7 +1301,6 @@ data:
- gstreamer1-plugins-base-devel
- gstreamer1-plugins-good
- gstreamer1-plugins-good-gtk
- - gstreamer1-vaapi
- gtk-doc
- gtk2
- gtk2-devel
@@ -1312,7 +1312,9 @@ data:
- gtk3-immodules
- guile22
- gupnp
+ - gupnp-devel
- gupnp-igd
+ - gupnp-igd-devel
- gvfs-client
- gvfs-devel
- gzip
@@ -1338,7 +1340,6 @@ data:
- imsettings
- imsettings-gsettings
- imsettings-libs
- - intltool
- iptables-libs
- isl
- iso-codes
@@ -1361,6 +1362,8 @@ data:
- krb5-libs
- krb5-workstation
- libkadm5
+ - ladspa
+ - ladspa-devel
- lame-devel
- lame-libs
- lcms2
@@ -1459,6 +1462,7 @@ data:
- libffi-devel
- libgcrypt
- libgcrypt-devel
+ - libgdither
- libgee
- libgee-devel
- libglvnd
@@ -1492,6 +1496,8 @@ data:
- libmodplug
- libmpc
- libnice
+ - libnice-devel
+ - libnice-gstreamer1
- libnotify
- libnotify-devel
- libnsl2
@@ -1547,7 +1553,6 @@ data:
- libtiff
- libtiff-devel
- libtirpc
- - libtirpc-devel
- libtool
- libtool-ltdl
- libtool-ltdl-devel
@@ -1575,6 +1580,8 @@ data:
- libwebp
- libwebp-devel
- libwebp-tools
+ - libwpe
+ - libwpe-devel
- libxcb
- libxcb-devel
- libxcrypt
@@ -1612,7 +1619,6 @@ data:
- man-db
- libmcpp
- mcpp
- - mercurial
- mesa-dri-drivers
- mesa-filesystem
- mesa-khr-devel
@@ -1624,8 +1630,6 @@ data:
- mesa-libGLES-devel
- mesa-libOSMesa
- mesa-libOSMesa-devel
- - mesa-libOpenCL
- - mesa-libOpenCL-devel
- mesa-libd3d
- mesa-libd3d-devel
- mesa-libgbm
@@ -1682,7 +1686,6 @@ data:
- openal-soft-devel
- openal-soft-examples
- openblas-srpm-macros
- - opencl-filesystem
- opencl-headers
- openjade
- openjpeg2
@@ -1706,10 +1709,12 @@ data:
- p11-kit-server
- p11-kit-trust
- pam
- - pam-devel
- pango
- pango-devel
- patch
+ - pciutils
+ - pciutils-devel
+ - pciutils-libs
- pcre
- pcre-cpp
- pcre-devel
@@ -1835,13 +1840,14 @@ data:
- perl-URI
- perl-Unicode-EastAsianWidth
- perl-WWW-RobotRules
- - perl-XML-Parser
- perl-YAML-Tiny
- perl-libintl-perl
- perl-libwww-perl
- perl-podlators
- perl-srpm-macros
- physfs
+ - pipewire-devel
+ - pipewire-libs
- pixman
- pixman-devel
- libpkgconf
@@ -1867,25 +1873,18 @@ data:
- python3-gobject
- python3-gobject-base
- python3-pyparsing
- - python2-docutils
- python3-lit
- python3-mako
- python3-markupsafe
- python-pip-wheel
- - python2-pip
- python3-pip
- - python3-rpm-generators
- - python-rpm-macros
+ - python3-pygments
- python-srpm-macros
- - python2-rpm-macros
- python-setuptools-wheel
- - python2-setuptools
- python3-setuptools
- python3-six
- python2
- - python2-devel
- python2-libs
- - python-unversioned-command
- python3
- python3-devel
- python3-libs
@@ -1949,6 +1948,7 @@ data:
- ruby
- ruby-devel
- ruby-libs
+ - rubygem-bundler
- rubygem-io-console
- rubygem-irb
- rubygem-openssl
@@ -2049,9 +2049,12 @@ data:
- webkit2gtk3-jsc
- webkit2gtk3-jsc-devel
- webrtc-audio-processing
+ - webrtc-audio-processing-devel
- which
- woff2
- woff2-devel
+ - wpebackend-fdo
+ - wpebackend-fdo-devel
- xcb-proto
- xcb-util
- xcb-util-devel
@@ -2164,7 +2167,6 @@ data:
- cmake-filesystem
- cmake-rpm-macros
- colord-libs
- - compat-libvpx5
- coreutils
- coreutils-common
- cpio
@@ -2183,6 +2185,8 @@ data:
- cyrus-sasl
- cyrus-sasl-devel
- cyrus-sasl-lib
+ - libdav1d
+ - libdav1d-devel
- dbus
- dbus-common
- dbus-daemon
@@ -2224,6 +2228,7 @@ data:
- expat
- expat-devel
- fdk-aac-free
+ - fdk-aac-free-devel
- fedora-release
- fedora-release-common
- fedora-gpg-keys
@@ -2253,8 +2258,11 @@ data:
- freeglut
- freetype
- freetype-devel
+ - frei0r-devel
+ - frei0r-plugins
- fribidi
- fribidi-devel
+ - gavl
- gawk
- gawk-devel
- gc
@@ -2294,6 +2302,7 @@ data:
- gettext-devel
- gettext-libs
- libtextstyle
+ - libtextstyle-devel
- ghc-srpm-macros
- giflib
- giflib-devel
@@ -2311,6 +2320,7 @@ data:
- glibc-devel
- glibc-headers
- glibc-minimal-langpack
+ - glibc-nss-devel
- libnsl
- nscd
- nss_db
@@ -2351,6 +2361,7 @@ data:
- gsettings-desktop-schemas-devel
- gsm
- gssdp
+ - gssdp-devel
- gstreamer1
- gstreamer1-devel
- gstreamer1-plugins-bad-free
@@ -2360,7 +2371,6 @@ data:
- gstreamer1-plugins-good
- gstreamer1-plugins-good-gtk
- gstreamer1-plugins-ugly-free
- - gstreamer1-vaapi
- gtk-doc
- gtk2
- gtk2-immodules
@@ -2371,7 +2381,9 @@ data:
- gtk3-immodules
- guile22
- gupnp
+ - gupnp-devel
- gupnp-igd
+ - gupnp-igd-devel
- gzip
- harfbuzz
- harfbuzz-devel
@@ -2394,7 +2406,6 @@ data:
- imsettings
- imsettings-gsettings
- imsettings-libs
- - intltool
- iptables-libs
- isl
- iso-codes
@@ -2415,8 +2426,9 @@ data:
- kmod-libs
- krb5-devel
- krb5-libs
- - krb5-workstation
- libkadm5
+ - ladspa
+ - ladspa-devel
- lame-devel
- lame-libs
- lcms2
@@ -2512,6 +2524,7 @@ data:
- libffi-devel
- libgcrypt
- libgcrypt-devel
+ - libgdither
- libglvnd
- libglvnd-core-devel
- libglvnd-devel
@@ -2543,6 +2556,8 @@ data:
- libmpc
- libmpeg2
- libnice
+ - libnice-devel
+ - libnice-gstreamer1
- libnotify
- libnsl2
- libogg
@@ -2595,7 +2610,6 @@ data:
- libtiff
- libtiff-devel
- libtirpc
- - libtirpc-devel
- libtool
- libtool-ltdl
- libtool-ltdl-devel
@@ -2608,7 +2622,6 @@ data:
- libuv
- libva
- libva-devel
- - libva-utils
- libvdpau
- libvdpau-devel
- libvdpau-trace
@@ -2660,7 +2673,6 @@ data:
- man-db
- libmcpp
- mcpp
- - mercurial
- mesa-filesystem
- mesa-khr-devel
- mesa-libEGL
@@ -2671,8 +2683,6 @@ data:
- mesa-libGLES-devel
- mesa-libOSMesa
- mesa-libOSMesa-devel
- - mesa-libOpenCL
- - mesa-libOpenCL-devel
- mesa-libd3d
- mesa-libd3d-devel
- mesa-libgbm
@@ -2726,7 +2736,6 @@ data:
- openal-soft-devel
- openal-soft-examples
- openblas-srpm-macros
- - opencl-filesystem
- opencl-headers
- openjade
- openldap
@@ -2747,7 +2756,6 @@ data:
- p11-kit-server
- p11-kit-trust
- pam
- - pam-devel
- pango
- pango-devel
- patch
@@ -2879,13 +2887,14 @@ data:
- perl-URI
- perl-Unicode-EastAsianWidth
- perl-WWW-RobotRules
- - perl-XML-Parser
- perl-YAML-Tiny
- perl-libintl-perl
- perl-libwww-perl
- perl-podlators
- perl-srpm-macros
- physfs
+ - pipewire-devel
+ - pipewire-libs
- pixman
- pixman-devel
- libpkgconf
@@ -2903,25 +2912,15 @@ data:
- pulseaudio-libs-devel
- pulseaudio-libs-glib2
- python3-pyparsing
- - python2-docutils
- python3-lit
- python3-mako
- python3-markupsafe
- python-pip-wheel
- - python2-pip
- python3-pip
- - python3-rpm-generators
- - python-rpm-macros
- python-srpm-macros
- - python2-rpm-macros
- python-setuptools-wheel
- - python2-setuptools
- python3-setuptools
- python3-six
- - python2
- - python2-devel
- - python2-libs
- - python-unversioned-command
- python3
- python3-devel
- python3-libs
@@ -2985,6 +2984,7 @@ data:
- ruby
- ruby-devel
- ruby-libs
+ - rubygem-bundler
- rubygem-io-console
- rubygem-irb
- rubygem-openssl
@@ -3074,6 +3074,7 @@ data:
- wayland-devel
- wayland-protocols-devel
- webrtc-audio-processing
+ - webrtc-audio-processing-devel
- which
- woff2
- xcb-proto
diff --git a/tools/generate-files.sh b/tools/generate-files.sh
index dd1a9d3..3006c38 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=18.08
+ version=19.08
;;
gnome-*)
ns=org.gnome
- version=3.32
+ version=3.34
;;
*)
echo 1>&2 "Can't identify runtime for $base"
diff --git a/tools/resolve-files.py b/tools/resolve-files.py
index 6304243..4558b56 100755
--- a/tools/resolve-files.py
+++ b/tools/resolve-files.py
@@ -78,15 +78,12 @@ bin_ignore = [
# just want cyrus-sasl-libs
'pluginviewer', 'saslauthd', 'sasldblistusers2', 'saslpasswd2', 'testsaslauthd',
+ # just want libdav1d
+ 'dav1d',
+
# From pulseaudio, wrapper script to start a pulseaudio server as if it was ESD (pulseaudio-esound-compat)
'esdcompat',
- # e2fsprogs binaries
- 'badblocks', 'chattr', 'debugfs', 'dumpe2fs',
- 'e2freefrag', 'e2fsck', 'e2image', 'e2label', 'e2mmpstatus', 'e2undo', 'e4crypt', 'e4defrag',
- 'filefrag', 'fsck.ext2', 'fsck.ext3', 'fsck.ext4', 'logsave', 'lsattr', 'mke2fs',
- 'mkfs.ext2', 'mkfs.ext3', 'mkfs.ext4', 'mklost+found', 'resize2fs', 'tune2fs',
-
# flac - jut want the library
'flac', 'metaflac',
@@ -130,6 +127,15 @@ bin_ignore = [
# lame
'lame',
+ # openssh
+ 'ssh-keygen',
+
+ # openssh-clients
+ 'scp', 'sftp', 'ssh', 'ssh-add', 'ssh-agent', 'ssh-keyscan',
+
+ # openssl
+ 'openssl',
+
# (pcre-tools)
'pcregrep', 'pcretest',
'pcre2grep', 'pcre2test',
@@ -138,6 +144,9 @@ bin_ignore = [
'pacat', 'pacmd', 'pactl', 'padsp', 'pamon',
'paplay', 'parec', 'parecord', 'pax11publish',
+ # pipewire-utils
+ 'pipewire-cli', 'pipewire-monitor', 'spa-inspect', 'spa-monitor',
+
# libsndfile-utils
'sndfile-cmp', 'sndfile-concat', 'sndfile-convert', 'sndfile-deinterleave',
'sndfile-info', 'sndfile-interleave', 'sndfile-metadata-get', 'sndfile-metadata-set',
@@ -165,14 +174,10 @@ ignore.update('/usr/bin/' + x for x in bin_ignore)
# development tools in the freedesktop runtime
platform_bin_ignore = [
- 'aclocal', 'aclocal-1.16', 'autoconf', 'autoheader', 'autom4te', 'automake',
- 'automake-1.16', 'autopoint', 'autoreconf', 'autoscan', 'autoupdate',
'croco-0.6-config',
- 'flex', 'flex++',
+ 'dwz',
'fftw-wisdom', 'fftw-wisdom-to-conf',
- 'gettextize',
'ifnames',
- 'libtool', 'libtoolize',
'make',
'm4',
'orcc',
@@ -186,17 +191,12 @@ bin_rename = {
# conflicts between lcms and lcms2 - jpegicc was renamed to jpgicc, etc.
'jpgicc': 'jpgicc2',
'linkicc': 'linkicc2',
- 'perl5.28.1': 'perl',
'psicc': 'psicc2',
'tificc': 'tificc2',
'transicc': 'transicc2',
}
rename.update({ '/usr/bin/' + k: '/usr/bin/' + v for k, v in bin_rename.items() })
-# Newer vala in Fedora
-for old in ['vala-0.44', 'vala-gen-introspect-0.44', 'valac-0.44', 'vapigen-0.44']:
- rename['/usr/bin/' + old] = '/usr/bin/' + old.replace('-0.44', '-0.46')
-
lib_ignore = [
# Symlink created in freedesktop.org flatpak runtime, not standard
'libEGL_indirect.so.0',
@@ -211,64 +211,28 @@ ignore.update('/usr/lib64/' + x for x in lib_ignore)
lib_rename = {
# Newer in Fedora
- 'libhunspell-1.3.so.0': 'libhunspell-1.7.so.0',
- 'libhistory.so.7': 'libhistory.so.8',
- 'libprocps.so.6': 'libprocps.so.7',
- 'libreadline.so.7': 'libreadline.so.8',
- 'libfdk-aac.so.1': 'libfdk-aac.so.2',
- 'libclang.so.6': 'libclang.so.8',
- 'libclang.so.7': 'libclang.so.8',
- 'libvala-0.44.so': 'libvala-0.46.so',
- 'libvala-0.44.so.1': 'libvala-0.46.so.0',
+ 'libkadm5clnt_mit.so.11': 'libkadm5clnt_mit.so.12',
+ 'libkadm5srv_mit.so.11': 'libkadm5srv_mit.so.12',
+ 'libverto.so.0': 'libverto.so.1',
# Replaced by libxcrypt in Fedora
- 'libcrypt-2.28.so': 'libcrypt.so.2',
+ 'libcrypt-2.30.so': 'libcrypt.so.2',
# Fedora arch-handling
'ld-linux.so.2': 'ld-linux-x86-64.so.2',
}
rename.update({ '/usr/lib64/' + k: '/usr/lib64/' + v for k, v in lib_rename.items() })
-for old in ['ld-2.28.so', 'libBrokenLocale-2.28.so', 'libanl-2.28.so', 'libc-2.28.so',
- 'libcidn-2.28.so', 'libdl-2.28.so', 'libm-2.28.so',
- 'libmvec-2.28.so', 'libnsl-2.28.so', 'libnss_compat-2.28.so',
- 'libnss_db-2.28.so', 'libnss_dns-2.28.so', 'libnss_files-2.28.so',
- 'libnss_hesiod-2.28.so', 'libpthread-2.28.so', 'libresolv-2.28.so',
- 'librt-2.28.so', 'libutil-2.28.so']:
- rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('-2.28', '-2.30')
-
-for old in ['libicudata.so.62', 'libicui18n.so.62', 'libicuio.so.62', 'libicutest.so.62',
- 'libicutu.so.62', 'libicuuc.so.62']:
- rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('so.62', 'so.63')
-
-# libelf
-for old in ['libasm-0.176.so', 'libdw-0.176.so', 'libelf-0.176.so']:
- rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('-0.176', '-0.177')
-
-# gettext
-for old in ['libgettextlib-0.19.8.1.so', 'libgettextsrc-0.19.8.1.so']:
- rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('-0.19.8.1', '-0.20.1')
+# icu
+for old in ['libicudata.so.64', 'libicui18n.so.64', 'libicuio.so.64', 'libicutest.so.64',
+ 'libicutu.so.64', 'libicuuc.so.64']:
+ rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('so.64', 'so.63')
include_ignore = {
- # https://git.gnome.org/browse/at-spi2-core/commit/?id=1eb223bb48464d707290ef540581e9763b0ceee8
- 'at-spi-2.0/atspi/atspi-gmain.c',
-
- # Removed in 7.55 https://github.com/curl/curl/commit/73a2fcea0b4adea6ba342cd7ed1149782c214ae3
- 'curl/curlbuild-64.h', 'curl/curlbuild.h', 'curl/curlrules.h',
-
# Not enabled on Fedora
'harfbuzz/hb-gobject-enums.h',
'harfbuzz/hb-gobject-structs.h',
'harfbuzz/hb-gobject.h',
-
- # https://github.com/hunspell/hunspell/commit/99675e791d123cbe1be914b1a49dd83062134301
- 'hunspell/affentry.hxx', 'hunspell/affixmgr.hxx', 'hunspell/baseaffix.hxx', 'hunspell/dictmgr.hxx',
- 'hunspell/filemgr.hxx','hunspell/hashmgr.hxx','hunspell/hunzip.hxx','hunspell/langnum.hxx',
- 'hunspell/phonet.hxx','hunspell/replist.hxx','hunspell/suggestmgr.hxx',
-
- # Removed in openssl-1.1
- 'openssl/des_old.h', 'openssl/dso.h', 'openssl/krb5_asn.h', 'openssl/kssl.h', 'openssl/pqueue.h',
- 'openssl/ssl23.h', 'openssl/ui_compat.h',
}
ignore.update('/usr/include/' + x for x in include_ignore)
@@ -310,15 +274,13 @@ pc_ignore = {
ignore.update('/usr/lib64/pkgconfig/' + x for x in pc_ignore)
pc_rename = {
- 'python-3.5.pc': 'python-3.6.pc',
- 'python-3.5m.pc': 'python-3.6m.pc',
- 'ruby-2.5.pc': 'ruby.pc',
+ 'ruby-2.6.pc': 'ruby.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() })
ignore_patterns = [
- # Flatpak runtime has a versioned gawk-4.1.3
+ # Flatpak runtime has a versioned gawk-5.0.1
r'/usr/bin/gawk-.*',
# Architecture specific aliases for gcc, binutils, etc
@@ -357,12 +319,12 @@ ignore_patterns = [
ignore_compiled = [re.compile(x) for x in ignore_patterns]
rename_patterns = [
- (r'^/usr/include/c\+\+/8.3.0/(.*)', r'/usr/include/c++/9/\1'),
+ (r'^/usr/include/c\+\+/9.2.0/(.*)', r'/usr/include/c++/9/\1'),
(r'^/usr/include/c\+\+/9/x86_64-unknown-linux-gnu/(.*)', r'/usr/include/c++/9/x86_64-redhat-linux/\1'),
(r'^/usr/include/nss/(.*)', r'/usr/include/nss3/\1'),
- (r'^/usr/include/ruby-2.5.0/ruby/(.*)', r'/usr/include/ruby/\1'),
- (r'^/usr/include/ruby-2.5.0/x86_64-linux/ruby/(.*)', r'/usr/include/ruby/\1'),
- (r'^/usr/include/ruby-2.5.0/(.*)', r'/usr/include/ruby/\1'),
+ (r'^/usr/include/ruby-2.6.0/ruby/(.*)', r'/usr/include/ruby/\1'),
+ (r'^/usr/include/ruby-2.6.0/x86_64-linux/ruby/(.*)', r'/usr/include/ruby/\1'),
+ (r'^/usr/include/ruby-2.6.0/(.*)', r'/usr/include/ruby/\1'),
(r'^/usr/lib64/pkgconfig/(.*proto.pc)', r'/usr/share/pkgconfig/\1'),
(r'^/usr/share/fonts/liberation-fonts/(LiberationMono.*)', r'/usr/share/fonts/liberation-mono/\1'),
(r'^/usr/share/fonts/liberation-fonts/(LiberationSans.*)', r'/usr/share/fonts/liberation-sans/\1'),
@@ -375,6 +337,10 @@ global_package_ignore_patterns = [
# runtime in including fcitx for full compatiblity when the host is using fcitx,
# it doesn't seem worth the increase in runtime size.
'^fcitx-.*$',
+
+ # Should be installed on the host instead
+ '^xdg-desktop-portal$',
+ '^xdg-desktop-portal-devel$',
]
global_package_ignore_compiled = [re.compile(p) for p in global_package_ignore_patterns]
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-11 14:40 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:40 [flatpaks/flatpak-runtime] f45: Switch to Freedesktop SDK 19.08 and GNOME SDK 3.34 Kalev Lember
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox