public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [flatpaks/flatpak-runtime] f45: F39 fixes
@ 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 : 07c1719a287d93cd2cc28ed7b954b31982286459
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date : 2026-03-02T20:29:46-05:00
Stats : +35/-32 in 7 file(s)
URL : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/07c1719a287d93cd2cc28ed7b954b31982286459?branch=f45
Log:
F39 fixes
This removes some unmatched files, some obsolete versions, and reduces
the difference between this and the KDE runtimes.
---
diff --git a/README.md b/README.md
index 48cb563..59d5a70 100644
--- a/README.md
+++ b/README.md
@@ -74,9 +74,9 @@ top of that file has a comment describing the simple format.
First make sure that the branches for new Fedora release are created in the
following components:
-* [flatpaks/flatpak-runtime](https://src.fedoraproject.org/modules/flatpak-runtime/branches) - this repository
-* [flatpaks/flatpak-sdk](https://src.fedoraproject.org/modules/flatpak-sdk/branches)
- [rpms/flatpak-runtime-config](https://src.fedoraproject.org/rpms/flatpak-runtime-config)
+* [flatpaks/flatpak-runtime](https://src.fedoraproject.org/flatpaks/flatpak-runtime/branches) - this repository
+* [flatpaks/flatpak-sdk](https://src.fedoraproject.org/flatpaks/flatpak-sdk/branches)
+* [rpms/flatpak-runtime-config](https://src.fedoraproject.org/rpms/flatpak-runtime-config)
Once done, please do the following steps in this exact order:
diff --git a/container-sdk.yaml b/container-sdk.yaml
index 4cc52b2..2a1fd66 100644
--- a/container-sdk.yaml
+++ b/container-sdk.yaml
@@ -196,7 +196,6 @@ flatpak:
- fedora-release-common
- fedora-release-identity-basic
- fedora-repos
- - fedora-repos-rawhide
- ffmpeg-free
- fftw
- fftw-devel
@@ -321,6 +320,7 @@ flatpak:
- google-carlito-fonts
- google-crosextra-caladea-fonts
- google-droid-sans-fonts
+ - google-noto-color-emoji-fonts
- google-noto-fonts-common
- google-noto-sans-mono-vf-fonts
- google-noto-sans-vf-fonts
@@ -679,7 +679,6 @@ flatpak:
- libICE-devel
- libicu
- libicu-devel
- - libicu72
- libidn2
- libidn2-devel
- libiec61883
@@ -884,7 +883,6 @@ flatpak:
- libXcomposite
- libXcomposite-devel
- libxcrypt
- - libxcrypt-compat
- libxcrypt-devel
- libXcursor
- libXcursor-devel
@@ -969,8 +967,8 @@ flatpak:
- meson
- mkfontscale
- mlocate
- - mozjs102
- - mozjs102-devel
+ - mozjs115
+ - mozjs115-devel
- mpdecimal
- mpfr
- mpg123-devel
@@ -1345,6 +1343,7 @@ flatpak:
- poppler-glib
- popt
- procps-ng
+ - procps-ng-devel
- protobuf-c
- psl
- publicsuffix-list
diff --git a/container.yaml b/container.yaml
index acd867c..788c8e1 100644
--- a/container.yaml
+++ b/container.yaml
@@ -124,7 +124,6 @@ flatpak:
- fedora-release-common
- fedora-release-identity-basic
- fedora-repos
- - fedora-repos-rawhide
- ffmpeg-free
- fftw-libs-double
- file
@@ -184,6 +183,7 @@ flatpak:
- gobject-introspection
- google-carlito-fonts
- google-crosextra-caladea-fonts
+ - google-noto-color-emoji-fonts
- google-noto-fonts-common
- google-noto-sans-mono-vf-fonts
- google-noto-sans-vf-fonts
@@ -441,7 +441,6 @@ flatpak:
- libhandy
- libICE
- libicu
- - libicu72
- libidn2
- libiec61883
- libinput
@@ -560,7 +559,6 @@ flatpak:
- libxcb
- libXcomposite
- libxcrypt
- - libxcrypt-compat
- libXcursor
- libXdamage
- libXdmcp
@@ -607,7 +605,7 @@ flatpak:
- mesa-libGLU
- mesa-va-drivers
- mlocate
- - mozjs102
+ - mozjs115
- mpdecimal
- mpfr
- mpg123-libs
diff --git a/package-notes.txt b/package-notes.txt
index cfa9863..7d9dd02 100644
--- a/package-notes.txt
+++ b/package-notes.txt
@@ -129,7 +129,7 @@ python3-setuptools
readline
setup: FD: shadow-utils
shadow-utils: ????
-shared-mime-info: W: data flies
+shared-mime-info: W: data files
soundtouch
systemd-libs
systemd-standalone-tmpfiles: EB
diff --git a/tools/download-fedora-appstream.sh b/tools/download-fedora-appstream.sh
index 47f726e..e80759d 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 f38-build appstream-data|awk '{print $1}')
+nvr=$(koji list-tagged --quiet --inherit --latest f39-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/generate-app-reports.py b/tools/generate-app-reports.py
index d69de96..cb40c00 100755
--- a/tools/generate-app-reports.py
+++ b/tools/generate-app-reports.py
@@ -199,7 +199,7 @@ for app in iterate_apps(flathub_store):
name_app = name_to_application.get(name, None)
# Exceptions for homepages that have more than one Flatpak application associated.
if homepage != 'http://elementary.io/' and homepage != "http://www.w1hkj.com" and \
- homepage != 'https://www.chocolate-doom.org/':
+ homepage != 'https://www.chocolate-doom.org/' and homepage != "https://git-cola.github.io/":
homepage_app = homepage_to_application.get(homepage, None)
else:
homepage_app = None
diff --git a/tools/resolve-files.py b/tools/resolve-files.py
index 4c4edce..15877a6 100755
--- a/tools/resolve-files.py
+++ b/tools/resolve-files.py
@@ -31,10 +31,6 @@ bin_ignore = [
# /usr/share/doc/aspell/aspell-import in Fedora
'aspell-import',
- # Sends audit events to /var/run/audispd which is not available in the Flatpak
- # environment. End up pulling in systemd via a dependency on audit.
- 'audisp-af_unix',
-
# Part of dbus-x11, pulls in a pile of X11 stuff
'dbus-launch',
@@ -88,8 +84,8 @@ bin_ignore = [
# audit, audisp-plugins
'aulast', 'aulastlog', 'ausyscall', 'auvirt', 'auditctl', 'auditd',
- 'augenrules', 'aureport', 'ausearch', 'autrace', 'audisp-remote',
- 'audisp-statsd', 'audisp-syslog',
+ 'augenrules', 'aureport', 'ausearch', 'autrace', 'audisp-af_unix',
+ 'audisp-remote', 'audisp-statsd', 'audisp-syslog',
# In the freedesktop runtime for some reason, doesn't seem useful
'bsdcat',
@@ -177,7 +173,9 @@ bin_ignore = [
'paplay', 'parec', 'parecord', 'pax11publish',
# pipewire-utils
- 'pw-cat', 'pw-cli', 'pw-config', 'pw-dot', 'pw-dsdplay', 'pw-dump', 'pw-encplay', 'pw-link', 'pw-loopback', 'pw-metadata', 'pw-mididump', 'pw-midiplay', 'pw-midirecord', 'pw-mon', 'pw-play', 'pw-profiler', 'pw-record', 'pw-reserve', 'pw-top',
+ 'pw-cat', 'pw-cli', 'pw-config', 'pw-dot', 'pw-dsdplay', 'pw-dump', 'pw-encplay',
+ 'pw-link', 'pw-loopback', 'pw-metadata', 'pw-mididump', 'pw-midiplay', 'pw-midirecord',
+ 'pw-mon', 'pw-play', 'pw-profiler', 'pw-record', 'pw-reserve', 'pw-top',
'spa-acp-tool', 'spa-inspect', 'spa-json-dump', 'spa-monitor', 'spa-resample',
# pipewire-pulseaudio should only be installed on the host
@@ -195,7 +193,7 @@ bin_ignore = [
'fax2ps', 'fax2tiff', 'pal2rgb', 'ppm2tiff', 'raw2tiff', 'tiff2bw', 'tiff2pdf', 'tiff2ps', 'tiff2rgba',
'tiffcmp', 'tiffcp', 'tiffcrop', 'tiffdither', 'tiffdump', 'tiffinfo', 'tiffmedian', 'tiffset', 'tiffsplit',
- # Random test program from libproxy (libproxy-bin)
+ # libproxy-bin, golang-github-google-martian
'proxy',
# Tools from libvpx (libvpx-utils)
@@ -239,7 +237,8 @@ bin_rename = {
'getdefaultcon': 'selinuxdefcon',
# perl
- 'perl5.32.0': 'perl',
+ 'perl5.36.0': 'perl',
+ 'perl5.36.1': 'perl',
# procps-ng
'pwait': 'pidwait',
@@ -294,8 +293,8 @@ lib_rename = {
'libffi.so.7': 'libffi.so.8',
'libFLAC++.so.6': 'libFLAC++.so.10',
'libFLAC.so.8': 'libFLAC.so.12',
- 'libgettextlib-0.21.so': 'libgettextlib-0.21.1.so',
- 'libgettextsrc-0.21.so': 'libgettextsrc-0.21.1.so',
+ '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',
@@ -304,12 +303,16 @@ lib_rename = {
'libkdb5.so.9': 'libkdb5.so.10',
'libLLVM-10.so': 'libLLVM-14.so',
'libLTO.so.10': 'libLTO.so.14',
+ 'libmozjs-102.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.7': 'libprocps.so.8',
+ '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',
+ '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',
@@ -325,7 +328,7 @@ lib_rename = {
'libwebkit2gtk-5.0.so.0': 'libwebkitgtk-6.0.so.4',
# Replaced by libxcrypt in Fedora
- 'libcrypt-2.33.so': 'libcrypt.so.2',
+ 'libcrypt.so.1': 'libcrypt.so.2',
# Compat symlink in gcr
'libgcr-3.so.1': 'libgcr-ui-3.so.1',
@@ -357,7 +360,7 @@ for old in ['ld-2.33.so', 'libBrokenLocale-2.33.so', 'libanl-2.33.so', 'libc-2.3
# 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.72')
+ rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('so.71', 'so.73')
include_rename = {
'asoundlib.h': 'alsa/asoundlib.h',
@@ -416,6 +419,8 @@ 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',
'python-3.11.pc': 'python-3.12.pc',
'python-3.10-embed.pc': 'python-3.12-embed.pc',
@@ -493,10 +498,11 @@ ignore_patterns = [
ignore_compiled = [re.compile(x) for x in ignore_patterns]
rename_patterns = [
- (r'^/usr/include/c\+\+/12.2.0/x86_64-unknown-linux-gnu/(.*)', r'/usr/include/c++/13/x86_64-redhat-linux/\1'),
- (r'^/usr/include/c\+\+/12.2.0/(.*)', r'/usr/include/c++/13/\1'),
+ (r'^/usr/include/c\+\+/[0-9\.]*/x86_64-unknown-linux-gnu/(.*)', r'/usr/include/c++/13/x86_64-redhat-linux/\1'),
+ (r'^/usr/include/c\+\+/[0-9\.]*/(.*)', 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/nss/(.*)', r'/usr/include/nss3/\1'),
(r'^/usr/include/python3.10/(.*)', r'/usr/include/python3.12/\1'),
(r'^/usr/include/python3.11/(.*)', r'/usr/include/python3.12/\1'),
@@ -523,7 +529,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/noto-emoji/(.*)', r'/usr/share/fonts/google-noto-emoji/\1'),
+ (r'^/usr/share/fonts/noto-emoji/(NotoColorEmoji.*)', r'/usr/share/fonts/google-noto-color-emoji-fonts/\1'),
]
rename_compiled = [(re.compile(a), b) for a, b in rename_patterns]
^ 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: F39 fixes Yaakov Selkowitz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox