kalev pushed to flatpak-runtime (f35). "Switch to Freedesktop SDK 21.08 and GNOME SDK 41"

Notification time stamped 2021-09-30 23:23:07 UTC

From 01f334c38c9c30323923739626bb3a29c15f6a6b Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember(a)redhat.com&gt;
Date: Sep 30 2021 23:22:14 +0000
Subject: Switch to Freedesktop SDK 21.08 and GNOME SDK 41


---

diff --git a/README.md b/README.md
index 210b8db..2602194 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/20.08`
-* `org.freedesktop.Sdk/x86_64/20.08`
-* `org.gnome.Platform/x86_64/40`
-* `org.gnome.Sdk/x86_64/40`
+* `org.freedesktop.Platform/x86_64/21.08`
+* `org.freedesktop.Sdk/x86_64/21.08`
+* `org.gnome.Platform/x86_64/41`
+* `org.gnome.Sdk/x86_64/41`
 
 You also need `python3-jinja2` and possibly a few other Python
 packages installed.
diff --git a/flatpak-runtime.yaml b/flatpak-runtime.yaml
index 0663643..b47346a 100644
--- a/flatpak-runtime.yaml
+++ b/flatpak-runtime.yaml
@@ -51,8 +51,6 @@ data:
       - cairo-gobject
       - cdparanoia-libs
       - alternatives
-      - clang-libs
-      - clang-resource-filesystem
       - clutter
       - clutter-gst3
       - clutter-gtk
@@ -83,12 +81,12 @@ data:
       - e2fsprogs-libs
       - libcom_err
       - libss
+      - elfutils-debuginfod-client
       - elfutils-default-yama-scope
       - elfutils-libelf
       - elfutils-libs
       - emacs-filesystem
       - enchant2
-      - eosrei-emojione-fonts
       - expat
       - fdk-aac-free
       - fedora-release
@@ -188,6 +186,7 @@ data:
       - gzip
       - harfbuzz
       - harfbuzz-icu
+      - hfg-gmuend-openmoji-color-fonts
       - hicolor-icon-theme
       - hostname
       - ht-caladea-fonts
@@ -268,6 +267,7 @@ data:
       - liberation-sans-fonts
       - liberation-serif-fonts
       - libevdev
+      - libevdev-utils
       - libevent
       - libexif
       - libffi
@@ -349,6 +349,7 @@ data:
       - libxcrypt
       - libxcrypt-compat
       - libxkbcommon
+      - libxkbcommon-utils
       - libxkbcommon-x11
       - libxkbfile
       - libxml2
@@ -369,7 +370,6 @@ data:
       - mesa-filesystem
       - mesa-libEGL
       - mesa-libGL
-      - mesa-libOSMesa
       - mesa-libgbm
       - mesa-libglapi
       - mesa-vulkan-drivers
@@ -401,6 +401,7 @@ data:
       - openjpeg2
       - openldap
       - openssl-libs
+      - openssl-pkcs11
       - opus
       - opusfile
       - orc
@@ -416,6 +417,7 @@ data:
       - pcre2
       - pcre2-syntax
       - pcre2-utf16
+      - pcre2-utf32
       - pinentry
       - pinentry-gnome3
       - pipewire-gstreamer
@@ -435,12 +437,10 @@ data:
       - python3-cairo
       - python3-gobject
       - python3-gobject-base
-      - python3-lxml
       - python3-mako
       - python3-markdown
       - python3-markupsafe
       - python-pip-wheel
-      - python3-pygments
       - python-setuptools-wheel
       - python3-setuptools
       - python3-six
@@ -475,7 +475,6 @@ data:
       - qt5-qtxmlpatterns
       - libibverbs
       - readline
-      - rest
       - rpm
       - rpm-libs
       - SDL2
@@ -551,10 +550,10 @@ data:
       - yelp
       - yelp-libs
       - yelp-xsl
-      - zenity
       - zip
       - zlib
       - libzstd
+      - zstd
     runtime-base:
       rpms:
       - flatpak-runtime-config
@@ -588,8 +587,6 @@ data:
       - cairo-gobject
       - cdparanoia-libs
       - alternatives
-      - clang-libs
-      - clang-resource-filesystem
       - colord-libs
       - coreutils
       - coreutils-common
@@ -614,11 +611,11 @@ data:
       - e2fsprogs-libs
       - libcom_err
       - libss
+      - elfutils-debuginfod-client
       - elfutils-default-yama-scope
       - elfutils-libelf
       - elfutils-libs
       - emacs-filesystem
-      - eosrei-emojione-fonts
       - expat
       - fdk-aac-free
       - fedora-release
@@ -713,6 +710,7 @@ data:
       - gzip
       - harfbuzz
       - harfbuzz-icu
+      - hfg-gmuend-openmoji-color-fonts
       - hicolor-icon-theme
       - hostname
       - ht-caladea-fonts
@@ -866,6 +864,7 @@ data:
       - libxcrypt
       - libxcrypt-compat
       - libxkbcommon
+      - libxkbcommon-utils
       - libxkbcommon-x11
       - libxkbfile
       - libxml2
@@ -886,7 +885,6 @@ data:
       - mesa-filesystem
       - mesa-libEGL
       - mesa-libGL
-      - mesa-libOSMesa
       - mesa-libgbm
       - mesa-libglapi
       - mesa-vulkan-drivers
@@ -916,6 +914,7 @@ data:
       - openjpeg2
       - openldap
       - openssl-libs
+      - openssl-pkcs11
       - opus
       - opusfile
       - orc
@@ -931,6 +930,7 @@ data:
       - pcre2
       - pcre2-syntax
       - pcre2-utf16
+      - pcre2-utf32
       - pipewire-gstreamer
       - pipewire-jack-audio-connection-kit
       - pipewire-libs
@@ -1055,6 +1055,7 @@ data:
       - zip
       - zlib
       - libzstd
+      - zstd
     sdk:
       rpms:
       - flatpak-runtime-config
@@ -1074,7 +1075,6 @@ data:
       - alsa-lib
       - alsa-lib-devel
       - annobin-docs
-      - annobin-plugin-clang
       - annobin-plugin-gcc
       - libaom
       - libaom-devel
@@ -1126,13 +1126,8 @@ data:
       - check
       - check-devel
       - alternatives
-      - clang
-      - clang-analyzer
-      - clang-devel
       - clang-libs
       - clang-resource-filesystem
-      - clang-tools-extra
-      - git-clang-format
       - clutter
       - clutter-devel
       - clutter-gst3
@@ -1195,7 +1190,9 @@ data:
       - ed
       - efi-srpm-macros
       - elfutils
+      - elfutils-debuginfod
       - elfutils-debuginfod-client
+      - elfutils-debuginfod-client-devel
       - elfutils-default-yama-scope
       - elfutils-devel
       - elfutils-libelf
@@ -1204,7 +1201,6 @@ data:
       - emacs-filesystem
       - enchant2
       - enchant2-devel
-      - eosrei-emojione-fonts
       - expat
       - expat-devel
       - fdk-aac-free
@@ -1397,6 +1393,7 @@ data:
       - harfbuzz-devel
       - harfbuzz-icu
       - help2man
+      - hfg-gmuend-openmoji-color-fonts
       - hicolor-icon-theme
       - highway-devel
       - hostname
@@ -1516,7 +1513,6 @@ data:
       - libcap-devel
       - libcap-ng
       - libcbor
-      - libclc
       - libcloudproviders
       - libcloudproviders-devel
       - libdatrie
@@ -1529,7 +1525,6 @@ data:
       - libdvdread
       - libeconf
       - libedit
-      - libedit-devel
       - libepoxy
       - libepoxy-devel
       - liberation-fonts-common
@@ -1537,6 +1532,8 @@ data:
       - liberation-sans-fonts
       - liberation-serif-fonts
       - libevdev
+      - libevdev-devel
+      - libevdev-utils
       - libevent
       - libexif
       - libexif-devel
@@ -1579,10 +1576,11 @@ data:
       - libksba-devel
       - libldac
       - libmanette
+      - libmanette-devel
       - libmetalink
-      - libmikmod
+      - libmicrohttpd
+      - libmicrohttpd-devel
       - libmng
-      - libmodplug
       - libmpc
       - libnice
       - libnice-devel
@@ -1687,6 +1685,7 @@ data:
       - libxcrypt-devel
       - libxkbcommon
       - libxkbcommon-devel
+      - libxkbcommon-utils
       - libxkbcommon-x11
       - libxkbcommon-x11-devel
       - libxkbfile
@@ -1700,13 +1699,7 @@ data:
       - libxslt-devel
       - libyaml
       - lilv
-      - lld
-      - lld-libs
-      - llvm
-      - llvm-devel
       - llvm-libs
-      - llvm-static
-      - llvm-test
       - lua-libs
       - lua-srpm-macros
       - lv2
@@ -1728,8 +1721,6 @@ data:
       - mesa-libEGL-devel
       - mesa-libGL
       - mesa-libGL-devel
-      - mesa-libOSMesa
-      - mesa-libOSMesa-devel
       - mesa-libd3d
       - mesa-libd3d-devel
       - mesa-libgbm
@@ -1762,6 +1753,7 @@ data:
       - nettle
       - nettle-devel
       - libnghttp2
+      - libnghttp2-devel
       - nim-srpm-macros
       - ninja-build
       - npth
@@ -1787,7 +1779,6 @@ data:
       - oniguruma-devel
       - openal-soft
       - openal-soft-devel
-      - openal-soft-examples
       - openblas-srpm-macros
       - opencl-headers
       - opencsd
@@ -1803,6 +1794,7 @@ data:
       - openssl-devel
       - openssl-libs
       - openssl-perl
+      - openssl-pkcs11
       - opus
       - opus-devel
       - opusfile
@@ -2055,7 +2047,6 @@ data:
       - perl-threads
       - perl-threads-shared
       - perl-version
-      - physfs
       - pinentry
       - pinentry-gnome3
       - pipewire-devel
@@ -2071,7 +2062,6 @@ data:
       - pkgconf-m4
       - pkgconf-pkg-config
       - popt
-      - popt-devel
       - procps-ng
       - procps-ng-devel
       - protobuf-c
@@ -2157,8 +2147,6 @@ data:
       - readline
       - readline-devel
       - redhat-rpm-config
-      - rest
-      - rest-devel
       - rhash
       - rpm
       - rpm-libs
@@ -2170,7 +2158,9 @@ data:
       - rubygem-io-console
       - rubygem-irb
       - rubygem-psych
+      - rubygem-rbs
       - rubygem-rdoc
+      - rubygem-typeprof
       - rubygems
       - rubygem-json
       - rubygem-racc
@@ -2189,9 +2179,7 @@ data:
       - SDL2_net-devel
       - SDL2_ttf
       - SDL2_ttf-devel
-      - SDL_sound
       - libsbc
-      - sdl12-compat
       - sed
       - serd
       - setup
@@ -2200,6 +2188,8 @@ data:
       - shadow-utils
       - shared-mime-info
       - slang
+      - slang-devel
+      - slang-slsh
       - sndfile-tools
       - sord
       - sound-theme-freedesktop
@@ -2336,12 +2326,12 @@ data:
       - yelp-tools
       - yelp-xsl
       - yelp-xsl-devel
-      - zenity
       - zip
       - zlib
       - zlib-devel
       - libzstd
       - libzstd-devel
+      - zstd
     sdk-base:
       rpms:
       - flatpak-runtime-config
@@ -2359,7 +2349,6 @@ data:
       - alsa-lib
       - alsa-lib-devel
       - annobin-docs
-      - annobin-plugin-clang
       - annobin-plugin-gcc
       - libaom
       - libaom-devel
@@ -2410,13 +2399,8 @@ data:
       - check
       - check-devel
       - alternatives
-      - clang
-      - clang-analyzer
-      - clang-devel
       - clang-libs
       - clang-resource-filesystem
-      - clang-tools-extra
-      - git-clang-format
       - cmake
       - cmake-data
       - cmake-filesystem
@@ -2469,14 +2453,15 @@ data:
       - ed
       - efi-srpm-macros
       - elfutils
+      - elfutils-debuginfod
       - elfutils-debuginfod-client
+      - elfutils-debuginfod-client-devel
       - elfutils-default-yama-scope
       - elfutils-devel
       - elfutils-libelf
       - elfutils-libelf-devel
       - elfutils-libs
       - emacs-filesystem
-      - eosrei-emojione-fonts
       - expat
       - expat-devel
       - fdk-aac-free
@@ -2656,6 +2641,7 @@ data:
       - harfbuzz-devel
       - harfbuzz-icu
       - help2man
+      - hfg-gmuend-openmoji-color-fonts
       - hicolor-icon-theme
       - highway-devel
       - hostname
@@ -2692,6 +2678,8 @@ data:
       - qt-settings
       - kernel-headers
       - kernel-srpm-macros
+      - libperf
+      - libperf-devel
       - perf
       - keyutils-libs
       - keyutils-libs-devel
@@ -2773,7 +2761,6 @@ data:
       - libcap-ng
       - libcbor
       - libcdio
-      - libclc
       - libcloudproviders
       - libcloudproviders-devel
       - libdatrie
@@ -2786,7 +2773,6 @@ data:
       - libdvdread
       - libeconf
       - libedit
-      - libedit-devel
       - libepoxy
       - libepoxy-devel
       - liberation-fonts-common
@@ -2831,9 +2817,9 @@ data:
       - libksba-devel
       - libldac
       - libmetalink
-      - libmikmod
+      - libmicrohttpd
+      - libmicrohttpd-devel
       - libmng
-      - libmodplug
       - libmpc
       - libmpeg2
       - libnice
@@ -2934,6 +2920,7 @@ data:
       - libxcrypt-devel
       - libxkbcommon
       - libxkbcommon-devel
+      - libxkbcommon-utils
       - libxkbcommon-x11
       - libxkbcommon-x11-devel
       - libxkbfile
@@ -2947,13 +2934,7 @@ data:
       - libxslt-devel
       - libyaml
       - lilv
-      - lld
-      - lld-libs
-      - llvm
-      - llvm-devel
       - llvm-libs
-      - llvm-static
-      - llvm-test
       - lua-libs
       - lua-srpm-macros
       - lv2
@@ -2974,8 +2955,6 @@ data:
       - mesa-libEGL-devel
       - mesa-libGL
       - mesa-libGL-devel
-      - mesa-libOSMesa
-      - mesa-libOSMesa-devel
       - mesa-libd3d
       - mesa-libd3d-devel
       - mesa-libgbm
@@ -3005,6 +2984,7 @@ data:
       - nettle
       - nettle-devel
       - libnghttp2
+      - libnghttp2-devel
       - nim-srpm-macros
       - ninja-build
       - npth
@@ -3030,7 +3010,6 @@ data:
       - oniguruma-devel
       - openal-soft
       - openal-soft-devel
-      - openal-soft-examples
       - openblas-srpm-macros
       - opencl-headers
       - opencsd
@@ -3046,6 +3025,7 @@ data:
       - openssl-devel
       - openssl-libs
       - openssl-perl
+      - openssl-pkcs11
       - opus
       - opus-devel
       - opusfile
@@ -3298,7 +3278,6 @@ data:
       - perl-threads
       - perl-threads-shared
       - perl-version
-      - physfs
       - pipewire-devel
       - pipewire-gstreamer
       - pipewire-jack-audio-connection-kit
@@ -3312,7 +3291,6 @@ data:
       - pkgconf-m4
       - pkgconf-pkg-config
       - popt
-      - popt-devel
       - procps-ng
       - procps-ng-devel
       - protobuf-c
@@ -3404,7 +3382,9 @@ data:
       - rubygem-io-console
       - rubygem-irb
       - rubygem-psych
+      - rubygem-rbs
       - rubygem-rdoc
+      - rubygem-typeprof
       - rubygems
       - rubygem-json
       - rubygem-racc
@@ -3423,9 +3403,7 @@ data:
       - SDL2_net-devel
       - SDL2_ttf
       - SDL2_ttf-devel
-      - SDL_sound
       - libsbc
-      - sdl12-compat
       - sed
       - serd
       - setup
@@ -3434,6 +3412,8 @@ data:
       - shadow-utils
       - shared-mime-info
       - slang
+      - slang-devel
+      - slang-slsh
       - sndfile-tools
       - sord
       - sound-theme-freedesktop
@@ -3558,6 +3538,7 @@ data:
       - zlib-devel
       - libzstd
       - libzstd-devel
+      - zstd
     buildroot:
       rpms:
       - flatpak-rpm-macros
diff --git a/tools/generate-files.sh b/tools/generate-files.sh
index 3295729..7f68a2c 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=20.08
+	version=21.08
 	;;
     gnome-*)
 	ns=org.gnome
-	version=40
+	version=41
 	;;
     *)
 	echo 1>&2 "Can't identify runtime for $base"
diff --git a/tools/resolve-files.py b/tools/resolve-files.py
index 652458a..a8e2319 100755
--- a/tools/resolve-files.py
+++ b/tools/resolve-files.py
@@ -47,9 +47,9 @@ bin_ignore = [
     # An implementation of tar for cross-platform compatibility, disabled in gnupg2.spec
     'gpgtar',
 
-    # Versioned python-3.8 binaries
-    'pydoc3.8', 'python3.8', 'python3.8-config',
'python3.8m',  'python3.8m-config', '2to3-3.8',
-    'easy_install-3.8', 'pip3.8', 'pyvenv-3.8',
+    # Versioned python-3.9 binaries
+    'pydoc3.9', 'python3.9', 'python3.9-config',
'python3.9m',  'python3.9m-config', '2to3-3.9',
+    'easy_install-3.9', 'pip3.9', 'pyvenv-3.9',
 
     # nettle utilities not currently packaged in fedora
     #
(https://src.fedoraproject.org/rpms/nettle/c/2ec204e2de17006b566c9ff7d90ec...)
@@ -235,7 +235,7 @@ lib_rename = {
     'libLTO.so.10': 'libLTO.so.13.0',
     'libpcre2-posix.so.2': 'libpcre2-posix.so.3',
     'libprocps.so.7': 'libprocps.so.8',
-    'libpython3.8.so': 'libpython3.10.so',
+    'libpython3.9.so': 'libpython3.10.so',
     'libRemarks.so.10': 'libRemarks.so.13.0',
     'libsepol.so.1': 'libsepol.so.2',
     'libvala-0.52.so': 'libvala-0.54.so',
@@ -246,7 +246,7 @@ lib_rename = {
     'libffi.so.7': 'libffi.so.6',
 
     # Replaced by libxcrypt in Fedora
-    'libcrypt-2.31.so': 'libcrypt.so.2',
+    'libcrypt-2.33.so': 'libcrypt.so.2',
 
     # Compat symlink in gcr
     'libgcr-3.so.1': 'libgcr-ui-3.so.1',
@@ -260,13 +260,13 @@ for old in ['libasm-0.180.so', 'libdw-0.180.so',
'libelf-0.180.so']:
     rename['/usr/lib64/' + old] = '/usr/lib64/' +
old.replace('-0.180', '-0.185')
 
 # Fedora has newer glibc
-for old in ['ld-2.31.so', 'libBrokenLocale-2.31.so',
'libanl-2.31.so', 'libc-2.31.so',
-            'libdl-2.31.so', 'libm-2.31.so',
-            'libmvec-2.31.so', 'libnsl-2.31.so',
'libnss_compat-2.31.so',
-            'libnss_db-2.31.so', 'libnss_dns-2.31.so',
'libnss_files-2.31.so',
-            'libnss_hesiod-2.31.so', 'libpthread-2.31.so',
'libresolv-2.31.so',
-            'librt-2.31.so', 'libutil-2.31.so']:
-    rename['/usr/lib64/' + old] = '/usr/lib64/' +
old.replace('-2.31', '')
+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', '')
 
 # Fedora has newer icu
 for old in ['libicudata.so.67', 'libicui18n.so.67',
'libicuio.so.67', 'libicutest.so.67',
@@ -319,9 +319,9 @@ ignore.update('/usr/lib64/pkgconfig/' + x for x in pc_ignore)
 
 pc_rename = {
     'libvala-0.52.pc': 'libvala-0.54.pc',
-    'python-3.8.pc': 'python-3.10.pc',
-    'python-3.8-embed.pc': 'python-3.10-embed.pc',
-    'ruby-2.7.pc': 'ruby.pc',
+    'python-3.9.pc': 'python-3.10.pc',
+    'python-3.9-embed.pc': 'python-3.10-embed.pc',
+    'ruby-3.0.pc': 'ruby.pc',
     'vapigen-0.52.pc': 'vapigen-0.54.pc',
 }
 rename.update({ '/usr/lib64/pkgconfig/' + k: '/usr/lib64/pkgconfig/' + v
for k, v in pc_rename.items() })
@@ -338,15 +338,15 @@ ignore_patterns = [
     r'/usr/include/md/.*',
 
     # Windows binaries?
-    r'/usr/lib64/python3.8/site-packages/setuptools/.*.exe',
+    r'/usr/lib64/python3.9/site-packages/setuptools/.*.exe',
 
     # differences in pip packaging - unbundling
-    r'^/usr/lib64/python3.8/site-packages/pip/_internal/.*',
-    r'^/usr/lib64/python3.8/site-packages/pip/_vendor/.*',
+    r'^/usr/lib64/python3.9/site-packages/pip/_internal/.*',
+    r'^/usr/lib64/python3.9/site-packages/pip/_vendor/.*',
 
     # Let the python files pull in the packages, avoid versioned directory names
-    r'^/usr/lib64/python3.8/site-packages/[^/]*.dist-info/.*',
-    r'^/usr/lib64/python3.8/site-packages/[^/]*.egg-info/.*',
+    r'^/usr/lib64/python3.9/site-packages/[^/]*.dist-info/.*',
+    r'^/usr/lib64/python3.9/site-packages/[^/]*.egg-info/.*',
 
     # fcitx
     r'/usr/lib64/libfcitx.*',
@@ -370,16 +370,16 @@ ignore_patterns = [
 ignore_compiled = [re.compile(x) for x in ignore_patterns]
 
 rename_patterns = [
-    (r'^/usr/include/c\+\+/10.2.0/(.*)', r'/usr/include/c++/11/\1'),
+    (r'^/usr/include/c\+\+/11.2.0/(.*)', r'/usr/include/c++/11/\1'),
     (r'^/usr/include/c\+\+/11/x86_64-unknown-linux-gnu/(.*)',
r'/usr/include/c++/11/x86_64-redhat-linux/\1'),
     (r'^/usr/include/nss/(.*)', r'/usr/include/nss3/\1'),
-    (r'^/usr/include/python3.8/(.*)', r'/usr/include/python3.10/\1'),
-    (r'^/usr/include/ruby-2.7.0/ruby/(.*)', r'/usr/include/ruby/\1'),
-    (r'^/usr/include/ruby-2.7.0/x86_64-linux/ruby/(.*)',
r'/usr/include/ruby/\1'),
-    (r'^/usr/include/ruby-2.7.0/(.*)', r'/usr/include/ruby/\1'),
+    (r'^/usr/include/python3.9/(.*)', r'/usr/include/python3.10/\1'),
+    (r'^/usr/include/ruby-3.0.0/ruby/(.*)', r'/usr/include/ruby/\1'),
+    (r'^/usr/include/ruby-3.0.0/x86_64-linux/ruby/(.*)',
r'/usr/include/ruby/\1'),
+    (r'^/usr/include/ruby-3.0.0/(.*)', r'/usr/include/ruby/\1'),
     (r'^/usr/lib64/GL/default/lib/dri/(.*)', r'/usr/lib64/dri/\1'),
     (r'^/usr/lib64/pkgconfig/(.*proto.pc)', r'/usr/share/pkgconfig/\1'),
-    (r'^/usr/lib64/python3.8/(.*)', r'/usr/lib64/python3.10/\1'),
+    (r'^/usr/lib64/python3.9/(.*)', r'/usr/lib64/python3.10/\1'),
     (r'^/usr/share/fonts/dejavu/(DejaVuSansMono.*)',
r'/usr/share/fonts/dejavu-sans-mono-fonts/\1'),
     (r'^/usr/share/fonts/dejavu/(DejaVuSans.*)',
r'/usr/share/fonts/dejavu-sans-fonts/\1'),
     (r'^/usr/share/fonts/dejavu/(DejaVuMath.*)',
r'/usr/share/fonts/dejavu-serif-fonts/\1'),
@@ -389,6 +389,7 @@ rename_patterns = [
     (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'),
     (r'^/usr/share/fonts/liberation-fonts/(LiberationSerif.*)',
r'/usr/share/fonts/liberation-serif/\1'),
+    (r'^/usr/share/fonts/openemoji/(.*)',
r'/usr/share/fonts/hfg-gmuend-openmoji-color-fonts/\1'),
     (r'^/usr/share/fonts/adobe-source-code-pro-fonts/(.*)',
r'/usr/share/fonts/adobe-source-code-pro/\1'),
 ]
 rename_compiled = [(re.compile(a), b) for a, b in rename_patterns]


	https://src.fedoraproject.org/modules/flatpak-runtime/c/01f334c38c9c30323...