public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [flatpaks/flatpak-runtime] f45: Update exclusions and renames for Fedora 44
@ 2026-09-11 14:43 Yaakov Selkowitz
0 siblings, 0 replies; only message in thread
From: Yaakov Selkowitz @ 2026-09-11 14:43 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : flatpaks/flatpak-runtime
Branch : f45
Commit : 07e154cc78ff3f3c05da682ecc7c0897b434c5e0
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date : 2026-03-02T23:08:33-05:00
Stats : +88/-35 in 4 file(s)
URL : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/07e154cc78ff3f3c05da682ecc7c0897b434c5e0?branch=f45
Log:
Update exclusions and renames for Fedora 44
---
diff --git a/package-notes.txt b/package-notes.txt
index c04bf64..81c0f11 100644
--- a/package-notes.txt
+++ b/package-notes.txt
@@ -18,7 +18,7 @@ audit-libs: Fedora builds things this way
authselect: EB: needed for /etc/nsswitch.conf
avahi-glib: EB: include this as well as we already have avahi-libs
avahi-libs: cups-libs(built that way?)
-breeze-gtk: E: for theming of GTK apps when running on KDE Plasma
+bash-completion: EB: data files
cmake-filesystem: E: avoid problems with cmake autorequires; the prefix=/usr is incorrect for /app builds but unowned directories do not matter for flatpaks
crypto-policies: W: data files
cyrus-sasl-gssapi: E: for libvirt
@@ -89,5 +89,6 @@ tzdata-java: E: for java-*-openjdk
util-linux: F?: Are getopt, kill, uuidgen worth all the deps
xkeyboard-config: W: data
xml-common: W: dependency of fontconfig and iso-codes
+wget2-wget: EB: instead of wget1-wget
zlib-ng: E: same SRPM as zlib-ng-compat which is a dependency of rpm, and because of that cannot be built for /app as rpm in koji buildroots can't use libraries installed in /app
zlib-ng-devel: E_SDK: same SRPM as zlib-ng-compat which is a dependency of rpm, and because of that cannot be built for /app as rpm in koji buildroots can't use libraries installed in /app
diff --git a/tools/list-files.py b/tools/list-files.py
index 4446e40..1f5ce0c 100755
--- a/tools/list-files.py
+++ b/tools/list-files.py
@@ -36,7 +36,6 @@ for d in python_dirs:
output_dir_recurse(d)
output_dir_recurse('/usr/share/aclocal')
-output_dir_recurse('/usr/share/bash-completion')
output_dir_recurse('/usr/share/cracklib')
output_dir_recurse('/usr/share/fonts')
output_dir_recurse('/usr/share/iso-codes')
diff --git a/tools/resolve-files.py b/tools/resolve-files.py
index be8cf94..77d5de7 100755
--- a/tools/resolve-files.py
+++ b/tools/resolve-files.py
@@ -135,6 +135,10 @@ bin_rename = {
# perl
'perl5.42.0': 'perl',
+ # tcl/tk
+ 'tclsh8.6': 'tclsh9.0',
+ 'wish8.6': 'wish9.0',
+
# vala
'vala-0.58': 'vala-0.56',
'vala-gen-introspect-0.58': 'vala-gen-introspect-0.56',
@@ -152,7 +156,7 @@ lib_ignore = [
'libapparmor.so', 'libapparmor.so.1',
# binutils internal libraries
- 'libbfd-2.45.so', 'libopcodes-2.45.so', 'libgprofng.so', 'libgprofng.so.0',
+ 'libbfd-2.45.1.so', 'libopcodes-2.45.1.so', 'libgprofng.so', 'libgprofng.so.0',
# Trimmed from gettext(-devel)
'libgettextlib.so', 'libgettextsrc.so', 'libtextstyle.so', 'libtextstyle.so.0',
@@ -168,6 +172,9 @@ lib_ignore = [
'libSPVRemapper.so.15', 'libSPVRemapper.so', 'libglslang.so.15', 'libglslang.so',
'libglslang-default-resource-limits.so.15', 'libglslang-default-resource-limits.so',
+ # Only used by man-db in Fedora
+ 'libpipeline.so', 'libpipeline.so.1',
+
# Disabled in libunwind
'libunwind-ptrace.so', 'libunwind-ptrace.so.0',
'libunwind-setjmp.so', 'libunwind-setjmp.so.0',
@@ -177,42 +184,45 @@ ignore.update('/usr/lib64/' + x for x in lib_ignore)
lib_rename = {
# Newer or older in Fedora
'libassuan.so.9': 'libassuan.so.0',
- 'libgettextlib-0.26.so': 'libgettextlib-0.25.1.so',
- 'libgettextsrc-0.26.so': 'libgettextsrc-0.25.1.so',
- 'libgpgme.so.45': 'libgpgme.so.11',
- 'libgpgmepp.so.7': 'libgpgmepp.so.6',
+ 'libFLAC++.so.10': 'libFLAC++.so.11',
+ 'libFLAC.so.12': 'libFLAC.so.14',
+# 'libgettextlib-0.26.so': 'libgettextlib-0.25.1.so',
+# 'libgettextsrc-0.26.so': 'libgettextsrc-0.25.1.so',
'libmanette-1.so.0': 'libmanette-0.2.so.0',
'libnsl.so.1': 'libnsl.so.3',
- 'libpkgconf.so.7': 'libpkgconf.so.5',
- 'libproc2.so.1': 'libproc2.so.0',
'libpython3.13.so.1.0': 'libpython3.14.so.1.0',
'libpython3.13.so': 'libpython3.14.so',
- 'libtag.so.2': 'libtag.so.1',
- 'libtag_c.so.2': 'libtag_c.so.0',
+ 'libsframe.so.2': 'libsframe.so.3',
+ 'libtcl8.6.so': 'libtcl9.0.so',
+ 'libtk8.6.so': 'libtcl9tk9.0.so',
'libtheora.so.1': 'libtheora.so.0',
'libtheoradec.so.2': 'libtheoradec.so.1',
'libtheoraenc.so.2': 'libtheoraenc.so.1',
'libvala-0.58.so.0': 'libvala-0.56.so.0',
'libverto.so.0': 'libverto.so.1',
'libvpx.so.11': 'libvpx.so.9',
- 'libwebrtc-audio-processing-2.so': 'libwebrtc-audio-processing-1.so',
- 'libwebrtc-audio-processing-2.so.1': 'libwebrtc-audio-processing-1.so.3',
+ 'libwget.so.3': 'libwget.so.4',
'libxml2.so.16': 'libxml2.so.2',
+ 'libZXing.so.1': 'libZXing.so.3',
# ffmpeg-free version may be different
- 'libavcodec.so.60': 'libavcodec.so.61',
- 'libavdevice.so.60': 'libavdevice.so.61',
- 'libavfilter.so.9': 'libavfilter.so.10',
- 'libavformat.so.60': 'libavformat.so.61',
- 'libavutil.so.58': 'libavutil.so.59',
- 'libswresample.so.4': 'libswresample.so.5',
- 'libswscale.so.7': 'libswscale.so.8',
+ 'libavcodec.so.61': 'libavcodec.so.62',
+ 'libavdevice.so.61': 'libavdevice.so.62',
+ 'libavfilter.so.10': 'libavfilter.so.11',
+ 'libavformat.so.61': 'libavformat.so.62',
+ 'libavutil.so.59': 'libavutil.so.60',
+ 'libswresample.so.5': 'libswresample.so.6',
+ 'libswscale.so.8': 'libswscale.so.9',
+
+ # Replaced by libxcrypt in Fedora
+ 'libcrypt.so.1': 'libcrypt.so.2',
# 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',
}
@@ -223,10 +233,10 @@ gcc_libs = [
'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/15/' + x for x in gcc_libs})
+rename.update({'/usr/lib64/' + x: '/usr/lib/gcc/x86_64-redhat-linux/16/' + x for x in gcc_libs})
for old in ['libasm-0.193.so', 'libdw-0.193.so', 'libelf-0.193.so', 'libdebuginfod-0.193.so']:
- rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('-0.193', '-0.193')
+ rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('-0.193', '-0.194')
# Fedora may have newer icu
for old in ['libicudata.so.77', 'libicui18n.so.77', 'libicuio.so.77', 'libicutest.so.77',
@@ -261,6 +271,8 @@ rename.update({'/usr/lib64/' + x: '/usr/lib64/pipewire-0.3/jack/' + x for x in j
# in turn pulls in a lot more dependencies. If they are useful, they should be moved
# to gstreamer-plugins-bad-free.
gstreamer_plugins_ignore = {
+ 'libgstfallbackswitch.so', 'libgstfmp4.so', 'libgsthsv.so', 'libgstjson.so',
+ 'libgstlivesync.so', 'libgstmp4.so', 'libgstopenh264.so', 'libgstreqwest.so',
'libgstdecklink.so', 'libgstladspa.so', 'libgstwildmidi.so'
}
ignore.update('/usr/lib64/gstreamer-1.0/' + x for x in gstreamer_plugins_ignore)
@@ -294,7 +306,6 @@ pc_rename = {
'python-3.13.pc': 'python-3.14.pc',
'python-3.13-embed.pc': 'python-3.14-embed.pc',
'vapigen-0.58.pc': 'vapigen-0.56.pc',
- 'webrtc-audio-processing-2.pc': 'webrtc-audio-processing-1.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()})
@@ -377,11 +388,6 @@ ignore_patterns = [
# Monolithic driver (individual driver symlinks are detected)
r'^/usr/lib64/GL/default/lib/dri/libgallium_.*.so',
- r'^/usr/lib64/GL/default/lib/vdpau/libvdpau_gallium.so.*',
- # Trace library
- r'^/usr/lib64/GL/default/lib/vdpau/libvdpau_trace.so.*',
- # Unversioned symlinks are not packaged
- r'^/usr/lib64/GL/default/lib/vdpau/libvdpau_.*.so$',
# symlinks to pkcs11(prov).so
r'^/usr/lib64/ossl-modules/libpkcs11.so',
@@ -424,8 +430,8 @@ ignore_patterns = [
ignore_compiled = [re.compile(x) for x in ignore_patterns]
rename_patterns = [
- (r'^/usr/include/c\+\+/[\d\.]*/x86_64-unknown-linux-gnu/(.*)', r'/usr/include/c++/15/x86_64-redhat-linux/\1'),
- (r'^/usr/include/c\+\+/[\d\.]*/(.*)', r'/usr/include/c++/15/\1'),
+ (r'^/usr/include/c\+\+/[\d\.]*/x86_64-unknown-linux-gnu/(.*)', r'/usr/include/c++/16/x86_64-redhat-linux/\1'),
+ (r'^/usr/include/c\+\+/[\d\.]*/(.*)', r'/usr/include/c++/16/\1'),
(r'^/usr/include/(libav.*)', r'/usr/include/ffmpeg/\1'),
(r'^/usr/include/(libsw.*)', r'/usr/include/ffmpeg/\1'),
# (r'^/usr/include/mozjs-140/(.*)', r'/usr/include/mozjs-140/\1'),
@@ -561,11 +567,12 @@ global_package_ignore_patterns = [
'^gcr$',
'^gcr3.*',
'^gdbm$',
+ '^gdk-pixbuf2-modules.*',
'^giflib-utils$',
'^gitk$',
'^glibc-utils$',
'^gstreamer1-plugins-base-tools$',
- '^gstreamer1-plugins-ugly-free$',
+ '^gstreamer1-plugins-ugly.*',
'^gtksourceview5-tests$',
'^idn2$',
'^itcl$',
@@ -573,6 +580,7 @@ global_package_ignore_patterns = [
'^itk$',
'^itk-devel$',
r'^kf[\d]+-sonnet-aspell$',
+ '^kio-extras-info$',
'^lcms2-utils$',
'^libXt$', # needs to be rebuilt to search /app
'^libXt-devel$',
@@ -613,10 +621,14 @@ global_package_ignore_patterns = [
'^wildmidi.*', # requires fluid-soundfont
'^xxhash$',
+ # Not widely used
+ '^qca-qt.*',
+ '^qcoro-qt.*',
+
# file conflicts
'^coreutils$', # conflicts with coreutils-single
r'^openssl1\.1-devel$', # conflicts with openssl-devel from openssl 3.0
- '^golang-github-cespare-xxhash$', # conflicts with xxhash
+ '^golang-github-oneofone-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
@@ -638,16 +650,22 @@ platform_package_ignore_patterns = [
"^gtk4-devel-tools$",
"^icu$", # may not need in the sdk either
'^itstool$',
+ '^jq$',
'^krb5-pkinit$',
'^krb5-workstation$',
'^librsvg2-tools$',
+ '^libtraceevent$',
'^llvm$',
'^llvm-test$', # pulls in gcc and binutils
+ '^oniguruma$', # dependency of jq, slang-slsh
'^openssl$',
'^perl', # all perl components should be only in sdk
'^python3-attrs$',
'^python3-jinja2$',
'^python3-test$',
+ r'^qt[\d]+-doctools$',
+ r'^qt[\d]+-linguist$',
+ '^slang-slsh$',
'^sqlite$',
'^xcb-proto$',
'^xmltoman$',
@@ -739,7 +757,7 @@ for r in to_resolve:
'/usr/share/perl5/' + r[len('/usr/lib64/perl5/'):],
]
elif r.startswith('/usr/bin/'):
- search = [r, '/bin/' + os.path.basename(r), '/usr/sbin/' + os.path.basename(r), '/sbin/' + os.path.basename(r)]
+ search = [r, '/bin/' + os.path.basename(r)]
else:
search = [r]
diff --git a/tools/util.py b/tools/util.py
index 04f4c5e..5da1f5a 100644
--- a/tools/util.py
+++ b/tools/util.py
@@ -25,22 +25,44 @@ ARCH_SPECIFIC_PACKAGES = {}
ARCH_SPECIFIC_PACKAGES['aarch64'] = [
"binutils-gprofng",
+ "cpuinfo",
"libhwasan",
+ "luajit",
+ "opencsd",
+ "python3-pyqt6-webengine",
+ "python3-qt5-webengine",
+ "qt5-qtwebengine",
+ "qt5-qtwebengine-devel",
+ "qt5-qtwebengine-devtools",
+ "qt6-qtpdf",
+ "qt6-qtpdf-devel",
+ "qt6-qtquick3dphysics",
+ "qt6-qtquick3dphysics-devel",
+ "qt6-qtwebengine",
+ "qt6-qtwebengine-devel",
+ "qt6-qtwebengine-devtools",
]
ARCH_SPECIFIC_PACKAGES['ppc64le'] = [
"libquadmath",
"libquadmath-devel",
+ "librtas",
+ "python3-pyqt6-webengine",
+ "qt6-qtpdf",
+ "qt6-qtpdf-devel",
+ "qt6-qtwebengine",
+ "qt6-qtwebengine-devel",
+ "qt6-qtwebengine-devtools",
]
ARCH_SPECIFIC_PACKAGES['s390x'] = [
- "glibc-headers-s390",
+ "luajit",
]
ARCH_SPECIFIC_PACKAGES['x86_64'] = [
"binutils-gprofng",
+ "cpuinfo",
"fftw-libs-quad",
- "glibc-headers-x86",
"intel-mediasdk",
"libhwasan",
"libipt",
@@ -49,6 +71,19 @@ ARCH_SPECIFIC_PACKAGES['x86_64'] = [
"libvmaf",
"libvmaf-devel",
"libvpl",
+ "luajit",
+ "python3-pyqt6-webengine",
+ "python3-qt5-webengine",
+ "qt5-qtwebengine",
+ "qt5-qtwebengine-devel",
+ "qt5-qtwebengine-devtools",
+ "qt6-qtpdf",
+ "qt6-qtpdf-devel",
+ "qt6-qtquick3dphysics",
+ "qt6-qtquick3dphysics-devel",
+ "qt6-qtwebengine",
+ "qt6-qtwebengine-devel",
+ "qt6-qtwebengine-devtools",
]
_log_name = None
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-11 14:43 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:43 [flatpaks/flatpak-runtime] f45: Update exclusions and renames for Fedora 44 Yaakov Selkowitz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox