public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [flatpaks/flatpak-runtime] f45: Update to F33
@ 2026-09-11 14:41 Kalev Lember
0 siblings, 0 replies; only message in thread
From: Kalev Lember @ 2026-09-11 14:41 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : flatpaks/flatpak-runtime
Branch : f45
Commit : 81f579b2f22def8b2cc5d41a27a7ec062ce01fe1
Author : Kalev Lember <klember@redhat.com>
Date : 2020-09-14T22:11:01+02:00
Stats : +209/-69 in 5 file(s)
URL : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/81f579b2f22def8b2cc5d41a27a7ec062ce01fe1?branch=f45
Log:
Update to F33
---
diff --git a/container.yaml b/container.yaml
index 945c71b..148b81f 100644
--- a/container.yaml
+++ b/container.yaml
@@ -1,10 +1,10 @@
compose:
modules:
- - flatpak-runtime:f32
+ - flatpak-runtime:f33
flatpak:
id: org.fedoraproject.Platform
- name: f32/flatpak-runtime
- branch: f32
+ name: f33/flatpak-runtime
+ branch: f33
sdk: org.fedoraproject.Sdk
finish-args: >
--env=GI_TYPELIB_PATH=/app/lib64/girepository-1.0
diff --git a/flatpak-runtime.yaml b/flatpak-runtime.yaml
index c254c4f..59e34a9 100644
--- a/flatpak-runtime.yaml
+++ b/flatpak-runtime.yaml
@@ -12,9 +12,9 @@ data:
- MIT
dependencies:
buildrequires:
- platform: f32
+ platform: f33
requires:
- platform: f32
+ platform: f33
profiles:
runtime:
rpms:
@@ -61,6 +61,7 @@ data:
- coreutils-common
- cracklib
- crypto-policies
+ - crypto-policies-scripts
- cryptsetup-libs
- cups-libs
- curl
@@ -74,9 +75,6 @@ data:
- dbus-tools
- dbus-broker
- dconf
- - compat-f32-dejavu-sans-fonts
- - compat-f32-dejavu-sans-mono-fonts
- - compat-f32-dejavu-serif-fonts
- dejavu-sans-fonts
- dejavu-sans-mono-fonts
- dejavu-serif-fonts
@@ -95,6 +93,7 @@ data:
- fdk-aac-free
- fedora-release
- fedora-release-common
+ - fedora-release-identity-basic
- fedora-gpg-keys
- fedora-repos
- fftw-libs-double
@@ -148,6 +147,7 @@ data:
- nss_hesiod
- gmp
- gmp-c++
+ - gmp-devel
- adwaita-gtk2-theme
- gnome-themes-extra
- gnu-free-fonts-common
@@ -159,8 +159,7 @@ data:
- gnutls
- gnutls-c++
- gobject-introspection
- - google-crosextra-caladea-fonts
- - google-crosextra-carlito-fonts
+ - google-carlito-fonts
- gpgme
- gpgmepp
- graphene
@@ -188,6 +187,7 @@ data:
- harfbuzz-icu
- hicolor-icon-theme
- hostname
+ - ht-caladea-fonts
- hunspell
- hunspell-en-US
- hwdata
@@ -256,11 +256,11 @@ data:
- libcap-ng
- libdatrie
- libdb
- - libdb-utils
- libdrm
- libdv
- libdvdnav
- libdvdread
+ - libeconf
- libedit
- libepoxy
- liberation-fonts-common
@@ -268,6 +268,7 @@ data:
- liberation-sans-fonts
- liberation-serif-fonts
- libevdev
+ - libevent
- libexif
- libffi
- libgcrypt
@@ -287,7 +288,9 @@ data:
- libjpeg-turbo-utils
- turbojpeg
- libksba
+ - liblrdf
- libmetalink
+ - libmicrodns
- libmng
- libmnl
- libmodman
@@ -295,9 +298,11 @@ data:
- libnfnetlink
- libnice
- libnice-gstreamer1
+ - libnl3
- libnotify
- libnsl2
- libogg
+ - libopenmpt
- libpcap
- libpciaccess
- libpng
@@ -379,7 +384,7 @@ data:
- glx-utils
- mesa-libGLU
- mlocate
- - mozjs68
+ - mozjs78
- mpfr
- mpg123-libs
- mtdev
@@ -430,6 +435,7 @@ data:
- popt
- procps-ng
- publicsuffix-list-dafsa
+ - pugixml
- pulseaudio-libs
- pulseaudio-libs-glib2
- python3-cairo
@@ -472,6 +478,9 @@ data:
- qt5-qtwebsockets
- qt5-qtx11extras
- qt5-qtxmlpatterns
+ - raptor2
+ - libibverbs
+ - rdma-core
- readline
- rest
- rpm
@@ -496,6 +505,7 @@ data:
- spirv-tools-libs
- sqlite-libs
- sratom
+ - srt-libs
- systemd
- systemd-libs
- systemd-pam
@@ -514,6 +524,7 @@ data:
- util-linux
- uuidd
- libv4l
+ - libvmaf
- vulkan-loader
- vulkan-validation-layers
- wavpack
@@ -544,6 +555,7 @@ data:
- xz
- xz-libs
- xz-lzma-compat
+ - yajl
- yelp
- yelp-libs
- yelp-xsl
@@ -589,6 +601,7 @@ data:
- coreutils-common
- cracklib
- crypto-policies
+ - crypto-policies-scripts
- cryptsetup-libs
- cups-libs
- curl
@@ -602,9 +615,6 @@ data:
- dbus-tools
- dbus-broker
- dconf
- - compat-f32-dejavu-sans-fonts
- - compat-f32-dejavu-sans-mono-fonts
- - compat-f32-dejavu-serif-fonts
- dejavu-sans-fonts
- dejavu-sans-mono-fonts
- dejavu-serif-fonts
@@ -620,6 +630,7 @@ data:
- fdk-aac-free
- fedora-release
- fedora-release-common
+ - fedora-release-identity-basic
- fedora-gpg-keys
- fedora-repos
- fftw-libs-double
@@ -670,6 +681,7 @@ data:
- nss_hesiod
- gmp
- gmp-c++
+ - gmp-devel
- adwaita-gtk2-theme
- gnome-themes-extra
- gnu-free-fonts-common
@@ -681,8 +693,7 @@ data:
- gnutls
- gnutls-c++
- gobject-introspection
- - google-crosextra-caladea-fonts
- - google-crosextra-carlito-fonts
+ - google-carlito-fonts
- gpgme
- gpgmepp
- graphene
@@ -710,6 +721,7 @@ data:
- harfbuzz-icu
- hicolor-icon-theme
- hostname
+ - ht-caladea-fonts
- hunspell
- hunspell-en-US
- hwdata
@@ -769,14 +781,13 @@ data:
- libcap
- libcap-ng
- libcdio
- - libcroco
- libdatrie
- libdb
- - libdb-utils
- libdrm
- libdv
- libdvdnav
- libdvdread
+ - libeconf
- libedit
- libepoxy
- liberation-fonts-common
@@ -784,6 +795,7 @@ data:
- liberation-sans-fonts
- liberation-serif-fonts
- libevdev
+ - libevent
- libexif
- libffi
- libgcrypt
@@ -802,7 +814,9 @@ data:
- libjpeg-turbo-utils
- turbojpeg
- libksba
+ - liblrdf
- libmetalink
+ - libmicrodns
- libmng
- libmnl
- libmodman
@@ -811,9 +825,11 @@ data:
- libnfnetlink
- libnice
- libnice-gstreamer1
+ - libnl3
- libnotify
- libnsl2
- libogg
+ - libopenmpt
- libpcap
- libpciaccess
- libpng
@@ -934,6 +950,7 @@ data:
- popt
- procps-ng
- publicsuffix-list-dafsa
+ - pugixml
- pulseaudio-libs
- pulseaudio-libs-glib2
- python3-mako
@@ -973,6 +990,9 @@ data:
- qt5-qtwebsockets
- qt5-qtx11extras
- qt5-qtxmlpatterns
+ - raptor2
+ - libibverbs
+ - rdma-core
- readline
- rest
- rpm
@@ -996,6 +1016,7 @@ data:
- spirv-tools-libs
- sqlite-libs
- sratom
+ - srt-libs
- systemd
- systemd-libs
- systemd-pam
@@ -1013,6 +1034,7 @@ data:
- util-linux
- uuidd
- libv4l
+ - libvmaf
- vulkan-loader
- vulkan-validation-layers
- wavpack
@@ -1039,6 +1061,7 @@ data:
- xz
- xz-libs
- xz-lzma-compat
+ - yajl
- zenity
- zip
- zlib
@@ -1112,6 +1135,7 @@ data:
- clang-libs
- clang-tools-extra
- git-clang-format
+ - clang10-libs
- clutter
- clutter-devel
- clutter-gst3
@@ -1132,6 +1156,7 @@ data:
- cracklib
- cracklib-devel
- crypto-policies
+ - crypto-policies-scripts
- cryptsetup-libs
- ctags
- cups-devel
@@ -1155,9 +1180,6 @@ data:
- dbus-broker
- dconf
- dconf-devel
- - compat-f32-dejavu-sans-fonts
- - compat-f32-dejavu-sans-mono-fonts
- - compat-f32-dejavu-serif-fonts
- dejavu-sans-fonts
- dejavu-sans-mono-fonts
- dejavu-serif-fonts
@@ -1194,6 +1216,7 @@ data:
- fdk-aac-free-devel
- fedora-release
- fedora-release-common
+ - fedora-release-identity-basic
- fedora-gpg-keys
- fedora-repos
- fftw
@@ -1286,7 +1309,8 @@ data:
- glibc-all-langpacks
- glibc-common
- glibc-devel
- - glibc-headers
+ - glibc-headers-s390
+ - glibc-headers-x86
- glibc-minimal-langpack
- glibc-nss-devel
- libnsl
@@ -1313,8 +1337,7 @@ data:
- gobject-introspection
- gobject-introspection-devel
- golang-github-docker-distribution
- - google-crosextra-caladea-fonts
- - google-crosextra-carlito-fonts
+ - google-carlito-fonts
- gperf
- gpgme
- gpgme-devel
@@ -1368,6 +1391,7 @@ data:
- help2man
- hicolor-icon-theme
- hostname
+ - ht-caladea-fonts
- hunspell
- hunspell-devel
- hunspell-en-US
@@ -1401,6 +1425,7 @@ data:
- jsoncpp
- qt-settings
- kernel-headers
+ - kernel-srpm-macros
- keyutils-libs
- keyutils-libs-devel
- kmod-libs
@@ -1487,12 +1512,12 @@ data:
- libdatrie
- libdatrie-devel
- libdb
- - libdb-utils
- libdrm
- libdrm-devel
- libdv
- libdvdnav
- libdvdread
+ - libeconf
- libedit
- libedit-devel
- libepoxy
@@ -1537,7 +1562,9 @@ data:
- turbojpeg-devel
- libksba
- libksba-devel
+ - liblrdf
- libmetalink
+ - libmicrodns
- libmikmod
- libmng
- libmnl
@@ -1549,11 +1576,13 @@ data:
- libnice
- libnice-devel
- libnice-gstreamer1
+ - libnl3
- libnotify
- libnotify-devel
- libnsl2
- libogg
- libogg-devel
+ - libopenmpt
- libpcap
- libpciaccess
- libpciaccess-devel
@@ -1657,7 +1686,9 @@ data:
- llvm
- llvm-devel
- llvm-libs
+ - llvm-static
- llvm-test
+ - llvm10-libs
- lua
- lua-libs
- lua-posix
@@ -1694,6 +1725,8 @@ data:
- mlocate
- mozjs68
- mozjs68-devel
+ - mozjs78
+ - mozjs78-devel
- mpfr
- mpg123-devel
- mpg123-libs
@@ -1776,19 +1809,63 @@ data:
- pcre2-syntax
- pcre2-utf16
- pcre2-utf32
+ - perl-AutoLoader
+ - perl-AutoSplit
+ - perl-B
+ - perl-Benchmark
+ - perl-Class-Struct
+ - perl-DirHandle
+ - perl-Dumpvalue
+ - perl-DynaLoader
+ - perl-English
- perl-Errno
+ - perl-ExtUtils-Constant
+ - perl-Fcntl
+ - perl-File-Basename
+ - perl-File-Compare
+ - perl-File-Copy
+ - perl-File-Find
+ - perl-File-stat
+ - perl-FileHandle
+ - perl-FindBin
+ - perl-Getopt-Std
+ - perl-Hash-Util
+ - perl-Hash-Util-FieldHash
+ - perl-I18N-LangTags
+ - perl-I18N-Langinfo
- perl-IO
- perl-IO-Zlib
+ - perl-IPC-Open3
- perl-Locale-Maketext-Simple
- perl-Math-Complex
- perl-Net-Ping
+ - perl-Opcode
+ - perl-POSIX
- perl-Pod-Html
+ - perl-Safe
+ - perl-SelectSaver
+ - perl-Symbol
+ - perl-Sys-Hostname
+ - perl-Term-ReadLine
+ - perl-Tie
+ - perl-User-pwent
+ - perl-autouse
+ - perl-base
- perl-devel
+ - perl-diagnostics
+ - perl-if
- perl-interpreter
+ - perl-lib
- perl-libnetcfg
- perl-libs
+ - perl-locale
- perl-macros
+ - perl-mro
+ - perl-overload
+ - perl-overloading
+ - perl-subs
- perl-utils
+ - perl-vars
- perl-Algorithm-Diff
- perl-Archive-Tar
- perl-Archive-Zip
@@ -1936,6 +2013,7 @@ data:
- procps-ng-devel
- publicsuffix-list
- publicsuffix-list-dafsa
+ - pugixml
- pulseaudio-libs
- pulseaudio-libs-devel
- pulseaudio-libs-glib2
@@ -2012,6 +2090,9 @@ data:
- qt5-qtx11extras-devel
- qt5-qtxmlpatterns
- qt5-qtxmlpatterns-devel
+ - raptor2
+ - libibverbs
+ - rdma-core
- readline
- readline-devel
- redhat-rpm-config
@@ -2028,10 +2109,10 @@ data:
- rubygem-irb
- rubygem-openssl
- rubygem-psych
- - rubygem-rdoc
- - rubygems
- rubygem-json
- rubygem-rake
+ - rubygem-rdoc
+ - rubygems
- rubypick
- rust-srpm-macros
- SDL
@@ -2067,6 +2148,7 @@ data:
- sqlite-devel
- sqlite-libs
- sratom
+ - srt-libs
- strace
- subunit
- subunit-devel
@@ -2106,6 +2188,7 @@ data:
- valgrind-tools-devel
- vim-filesystem
- vim-minimal
+ - libvmaf
- vulkan-headers
- vulkan-loader
- vulkan-loader-devel
@@ -2159,6 +2242,7 @@ data:
- xz-devel
- xz-libs
- xz-lzma-compat
+ - yajl
- yelp
- yelp-devel
- yelp-libs
@@ -2237,6 +2321,7 @@ data:
- clang-libs
- clang-tools-extra
- git-clang-format
+ - clang10-libs
- cmake
- cmake-data
- cmake-filesystem
@@ -2248,6 +2333,7 @@ data:
- cracklib
- cracklib-devel
- crypto-policies
+ - crypto-policies-scripts
- cryptsetup-libs
- ctags
- cups-devel
@@ -2271,9 +2357,6 @@ data:
- dbus-broker
- dconf
- dconf-devel
- - compat-f32-dejavu-sans-fonts
- - compat-f32-dejavu-sans-mono-fonts
- - compat-f32-dejavu-serif-fonts
- dejavu-sans-fonts
- dejavu-sans-mono-fonts
- dejavu-serif-fonts
@@ -2308,6 +2391,7 @@ data:
- fdk-aac-free-devel
- fedora-release
- fedora-release-common
+ - fedora-release-identity-basic
- fedora-gpg-keys
- fedora-repos
- fftw
@@ -2395,7 +2479,8 @@ data:
- glibc-all-langpacks
- glibc-common
- glibc-devel
- - glibc-headers
+ - glibc-headers-s390
+ - glibc-headers-x86
- glibc-minimal-langpack
- glibc-nss-devel
- libnsl
@@ -2422,8 +2507,7 @@ data:
- gobject-introspection
- gobject-introspection-devel
- golang-github-docker-distribution
- - google-crosextra-caladea-fonts
- - google-crosextra-carlito-fonts
+ - google-carlito-fonts
- gperf
- gpgme
- gpgme-devel
@@ -2472,6 +2556,7 @@ data:
- help2man
- hicolor-icon-theme
- hostname
+ - ht-caladea-fonts
- hunspell
- hunspell-devel
- hunspell-en-US
@@ -2502,6 +2587,7 @@ data:
- jsoncpp
- qt-settings
- kernel-headers
+ - kernel-srpm-macros
- keyutils-libs
- keyutils-libs-devel
- kmod-libs
@@ -2581,17 +2667,15 @@ data:
- libcdio
- libclc
- libclc-devel
- - libcroco
- - libcroco-devel
- libdatrie
- libdatrie-devel
- libdb
- - libdb-utils
- libdrm
- libdrm-devel
- libdv
- libdvdnav
- libdvdread
+ - libeconf
- libedit
- libedit-devel
- libepoxy
@@ -2633,7 +2717,9 @@ data:
- turbojpeg-devel
- libksba
- libksba-devel
+ - liblrdf
- libmetalink
+ - libmicrodns
- libmikmod
- libmng
- libmnl
@@ -2646,10 +2732,12 @@ data:
- libnice
- libnice-devel
- libnice-gstreamer1
+ - libnl3
- libnotify
- libnsl2
- libogg
- libogg-devel
+ - libopenmpt
- libpcap
- libpciaccess
- libpciaccess-devel
@@ -2747,7 +2835,9 @@ data:
- llvm
- llvm-devel
- llvm-libs
+ - llvm-static
- llvm-test
+ - llvm10-libs
- lua-libs
- device-mapper
- device-mapper-libs
@@ -2856,19 +2946,63 @@ data:
- pcre2-syntax
- pcre2-utf16
- pcre2-utf32
+ - perl-AutoLoader
+ - perl-AutoSplit
+ - perl-B
+ - perl-Benchmark
+ - perl-Class-Struct
+ - perl-DirHandle
+ - perl-Dumpvalue
+ - perl-DynaLoader
+ - perl-English
- perl-Errno
+ - perl-ExtUtils-Constant
+ - perl-Fcntl
+ - perl-File-Basename
+ - perl-File-Compare
+ - perl-File-Copy
+ - perl-File-Find
+ - perl-File-stat
+ - perl-FileHandle
+ - perl-FindBin
+ - perl-Getopt-Std
+ - perl-Hash-Util
+ - perl-Hash-Util-FieldHash
+ - perl-I18N-LangTags
+ - perl-I18N-Langinfo
- perl-IO
- perl-IO-Zlib
+ - perl-IPC-Open3
- perl-Locale-Maketext-Simple
- perl-Math-Complex
- perl-Net-Ping
+ - perl-Opcode
+ - perl-POSIX
- perl-Pod-Html
+ - perl-Safe
+ - perl-SelectSaver
+ - perl-Symbol
+ - perl-Sys-Hostname
+ - perl-Term-ReadLine
+ - perl-Tie
+ - perl-User-pwent
+ - perl-autouse
+ - perl-base
- perl-devel
+ - perl-diagnostics
+ - perl-if
- perl-interpreter
+ - perl-lib
- perl-libnetcfg
- perl-libs
+ - perl-locale
- perl-macros
+ - perl-mro
+ - perl-overload
+ - perl-overloading
+ - perl-subs
- perl-utils
+ - perl-vars
- perl-Algorithm-Diff
- perl-Archive-Tar
- perl-Archive-Zip
@@ -3014,6 +3148,7 @@ data:
- procps-ng-devel
- publicsuffix-list
- publicsuffix-list-dafsa
+ - pugixml
- pulseaudio-libs
- pulseaudio-libs-devel
- pulseaudio-libs-glib2
@@ -3085,6 +3220,9 @@ data:
- qt5-qtx11extras-devel
- qt5-qtxmlpatterns
- qt5-qtxmlpatterns-devel
+ - raptor2
+ - libibverbs
+ - rdma-core
- readline
- readline-devel
- redhat-rpm-config
@@ -3101,10 +3239,10 @@ data:
- rubygem-irb
- rubygem-openssl
- rubygem-psych
- - rubygem-rdoc
- - rubygems
- rubygem-json
- rubygem-rake
+ - rubygem-rdoc
+ - rubygems
- rubypick
- rust-srpm-macros
- SDL
@@ -3139,6 +3277,7 @@ data:
- sqlite-devel
- sqlite-libs
- sratom
+ - srt-libs
- strace
- subunit
- subunit-devel
@@ -3174,6 +3313,7 @@ data:
- valgrind-tools-devel
- vim-filesystem
- vim-minimal
+ - libvmaf
- vulkan-headers
- vulkan-loader
- vulkan-loader-devel
@@ -3219,6 +3359,7 @@ data:
- xz-devel
- xz-libs
- xz-lzma-compat
+ - yajl
- zenity
- zip
- zlib
@@ -3236,13 +3377,13 @@ data:
rpms:
flatpak-rpm-macros:
rationale: Set up build root for flatpak RPMS
- ref: f32
+ ref: f33
flatpak-runtime-config:
rationale: Runtime configuration files
- ref: f32
+ ref: f33
xmd:
flatpak:
- branch: f32
+ branch: f33
runtimes:
runtime:
id: org.fedoraproject.Platform
diff --git a/tools/download-fedora-appstream.sh b/tools/download-fedora-appstream.sh
index 2b315a1..728a3db 100755
--- a/tools/download-fedora-appstream.sh
+++ b/tools/download-fedora-appstream.sh
@@ -1,7 +1,7 @@
#!/bin/bash
set -e
-nvr=$(koji list-tagged --quiet --inherit --latest f32-build appstream-data|awk '{print $1}')
+nvr=$(koji list-tagged --quiet --inherit --latest f33-build appstream-data|awk '{print $1}')
path=$(koji buildinfo $nvr | grep noarch.rpm | sed 's/\t.*$//')
url=$(echo $path | sed s@/mnt/koji/packages/@https://kojipkgs.fedoraproject.org/packages/@)
diff --git a/tools/resolve-files.py b/tools/resolve-files.py
index 75963d5..81f0e50 100755
--- a/tools/resolve-files.py
+++ b/tools/resolve-files.py
@@ -205,9 +205,6 @@ lib_ignore = [
# Symlink created in freedesktop.org flatpak runtime, not standard
'libEGL_indirect.so.0',
- # Not enabled in fedora (consider fixing)
- 'libharfbuzz-gobject.so.0',
-
# Part of glibc
'libssp.so.0',
]
@@ -215,14 +212,18 @@ ignore.update('/usr/lib64/' + x for x in lib_ignore)
lib_rename = {
# Newer in Fedora
+ 'libaom.so.0': 'libaom.so.2',
'libasan.so.5': 'libasan.so.6',
- 'libclang.so.8': 'libclang.so.10',
+ 'libclang.so.8': 'libclang.so.11',
'libdav1d.so.2': 'libdav1d.so.4',
+ 'libgettextlib-0.20.1.so': 'libgettextlib-0.21.so',
+ 'libgettextsrc-0.20.1.so': 'libgettextsrc-0.21.so',
'libkadm5clnt_mit.so.11': 'libkadm5clnt_mit.so.12',
'libkadm5srv_mit.so.11': 'libkadm5srv_mit.so.12',
'libkdb5.so.9': 'libkdb5.so.10',
- 'libLTO.so.8': 'libLTO.so.10',
- 'libpython3.7m.so': 'libpython3.8.so',
+ 'libLTO.so.8': 'libLTO.so.11',
+ 'libprocps.so.7': 'libprocps.so.8',
+ 'libpython3.7m.so': 'libpython3.9.so',
'libverto.so.0': 'libverto.so.1',
# Replaced by libxcrypt in Fedora
@@ -237,7 +238,7 @@ lib_rename = {
rename.update({ '/usr/lib64/' + k: '/usr/lib64/' + v for k, v in lib_rename.items() })
for old in ['libasm-0.177.so', 'libdw-0.177.so', 'libelf-0.177.so']:
- rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('-0.177', '-0.178')
+ rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('-0.177', '-0.180')
# Fedora has newer glibc
for old in ['ld-2.30.so', 'libBrokenLocale-2.30.so', 'libanl-2.30.so', 'libc-2.30.so',
@@ -246,20 +247,12 @@ for old in ['ld-2.30.so', 'libBrokenLocale-2.30.so', 'libanl-2.30.so', 'libc-2.3
'libnss_db-2.30.so', 'libnss_dns-2.30.so', 'libnss_files-2.30.so',
'libnss_hesiod-2.30.so', 'libpthread-2.30.so', 'libresolv-2.30.so',
'librt-2.30.so', 'libutil-2.30.so']:
- rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('-2.30', '-2.31')
+ rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('-2.30', '-2.32')
-# Fedora has newer icu 65
+# Fedora has newer 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.65')
-
-include_ignore = {
- # Not enabled on Fedora
- 'harfbuzz/hb-gobject-enums.h',
- 'harfbuzz/hb-gobject-structs.h',
- 'harfbuzz/hb-gobject.h',
-}
-ignore.update('/usr/include/' + x for x in include_ignore)
+ rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('so.64', 'so.67')
include_rename = {
'assuan.h': 'libassuan2/assuan.h',
@@ -299,8 +292,8 @@ pc_ignore = {
ignore.update('/usr/lib64/pkgconfig/' + x for x in pc_ignore)
pc_rename = {
- 'python-3.7.pc': 'python-3.8.pc',
- 'python-3.7m.pc': 'python-3.8.pc',
+ 'python-3.7.pc': 'python-3.9.pc',
+ 'python-3.7m.pc': 'python-3.9.pc',
'ruby-2.6.pc': 'ruby.pc',
}
rename.update({ '/usr/lib64/pkgconfig/' + k: '/usr/lib64/pkgconfig/' + v for k, v in pc_rename.items() })
@@ -352,12 +345,18 @@ rename_patterns = [
(r'^/usr/include/c\+\+/9.2.0/(.*)', r'/usr/include/c++/10/\1'),
(r'^/usr/include/c\+\+/10/x86_64-unknown-linux-gnu/(.*)', r'/usr/include/c++/10/x86_64-redhat-linux/\1'),
(r'^/usr/include/nss/(.*)', r'/usr/include/nss3/\1'),
- (r'^/usr/include/python3.7m/(.*)', r'/usr/include/python3.8/\1'),
+ (r'^/usr/include/python3.7m/(.*)', r'/usr/include/python3.9/\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/lib64/python3.7/(.*)', r'/usr/lib64/python3.8/\1'),
+ (r'^/usr/lib64/python3.7/(.*)', r'/usr/lib64/python3.9/\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'),
+ (r'^/usr/share/fonts/dejavu/(DejaVuSerif.*)', r'/usr/share/fonts/dejavu-serif-fonts/\1'),
+ (r'^/usr/share/fonts/google-crosextra-caladea/(Caladea.*).ttf', r'/usr/share/fonts/ht-caladea-fonts/\1.otf'),
+ (r'^/usr/share/fonts/google-crosextra-carlito/(Carlito.*)', r'/usr/share/fonts/google-carlito-fonts/\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'),
(r'^/usr/share/fonts/liberation-fonts/(LiberationSerif.*)', r'/usr/share/fonts/liberation-serif/\1'),
diff --git a/tools/util.py b/tools/util.py
index a58a851..5c82f28 100644
--- a/tools/util.py
+++ b/tools/util.py
@@ -7,11 +7,11 @@ import sys
import xml.etree.ElementTree as ET
import xml.sax
-STREAM = 'f32'
+STREAM = 'f33'
ID_PREFIX = 'org.fedoraproject'
# branch of flatpak-rpm-macros and flatpak-runtime-config
-RPM_BRANCH = 'f32'
-DATASET_ARG = '--dataset=f32'
+RPM_BRANCH = 'f33'
+DATASET_ARG = '--dataset=f33'
# If this is True, then we'll use the "base" profiles (freedesktop-based) as the main profiles
BASEONLY = False
@@ -19,7 +19,7 @@ XDG_CACHE_HOME = os.environ.get("XDG_CACHE_HOME") or os.path.expanduser("~/.cach
# This needs to be in sync with fedmod
REPOS = [
- "f32--fedora",
+ "f33--fedora",
]
_log_name = None
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-11 14:41 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:41 [flatpaks/flatpak-runtime] f45: Update to F33 Kalev Lember
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox