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

From 76972d6a76390f21e4e70fd960773e597d810de3 Mon Sep 17 00:00:00 2001 From: Kalev Lember klember@redhat.com Date: Sep 30 2021 23:22:14 +0000 Subject: Update to Fedora 35

---

diff --git a/container.yaml b/container.yaml index 6a16656..3d34f8e 100644 --- a/container.yaml +++ b/container.yaml @@ -1,10 +1,10 @@ compose: modules: - - flatpak-runtime:f34 + - flatpak-runtime:f35 flatpak: id: org.fedoraproject.Platform - name: f34/flatpak-runtime - branch: f34 + name: f35/flatpak-runtime + branch: f35 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 4e817f2..645a4e0 100644 --- a/flatpak-runtime.yaml +++ b/flatpak-runtime.yaml @@ -12,9 +12,9 @@ data: - MIT dependencies: buildrequires: - platform: f34 + platform: f35 requires: - platform: f34 + platform: f35 profiles: runtime: rpms: @@ -134,7 +134,6 @@ data: - geoclue2-libs - gettext - gettext-libs - - libtextstyle - giflib - gjs - glib-networking @@ -182,6 +181,7 @@ data: - gtk3-immodule-xim - gtk3-immodules - gtk4 + - gtk4-devel-tools - gtksourceview4 - gupnp - gupnp-igd @@ -333,7 +333,7 @@ data: - libtool-ltdl - libunistring - libunwind - - libusbx + - libusb1 - libutempter - libva - libvdpau @@ -378,6 +378,7 @@ data: - mesa-libGLU - mlocate - mozjs78 + - mpdecimal - mpfr - mpg123-libs - mtdev @@ -490,6 +491,7 @@ data: - xml-common - shadow-utils - shared-mime-info + - sndfile-tools - sord - sound-theme-freedesktop - soundtouch @@ -501,7 +503,6 @@ data: - systemd - systemd-libs - systemd-pam - - systemd-rpm-macros - taglib - tar - libtracker-sparql @@ -514,6 +515,7 @@ data: - libsmartcols - libuuid - util-linux + - util-linux-core - uuidd - libdvbv5 - libv4l @@ -661,7 +663,6 @@ data: - geoclue2-libs - gettext - gettext-libs - - libtextstyle - giflib - glib-networking - glib2 @@ -850,7 +851,7 @@ data: - libtool-ltdl - libunistring - libunwind - - libusbx + - libusb1 - libutempter - libva - libvdpau @@ -892,6 +893,7 @@ data: - mesa-vulkan-drivers - glx-utils - mlocate + - mpdecimal - mpfr - mpg123-libs - mtdev @@ -996,6 +998,7 @@ data: - xml-common - shadow-utils - shared-mime-info + - sndfile-tools - sord - sound-theme-freedesktop - soundtouch @@ -1007,9 +1010,9 @@ data: - systemd - systemd-libs - systemd-pam - - systemd-rpm-macros - taglib - tar + - libtracker-sparql - twolame-libs - tzdata - unzip @@ -1019,6 +1022,7 @@ data: - libsmartcols - libuuid - util-linux + - util-linux-core - uuidd - libdvbv5 - libv4l @@ -1070,7 +1074,9 @@ data: - libadwaita-qt5 - alsa-lib - alsa-lib-devel - - annobin + - annobin-docs + - annobin-plugin-clang + - annobin-plugin-gcc - libaom - libaom-devel - libargon2 @@ -1128,8 +1134,6 @@ data: - clang-resource-filesystem - clang-tools-extra - git-clang-format - - clang11-libs - - clang11-resource-filesystem - clutter - clutter-devel - clutter-gst3 @@ -1171,6 +1175,7 @@ data: - dbus-libs - dbus-tools - dbus-broker + - debugedit - dejavu-sans-fonts - dejavu-sans-mono-fonts - dejavu-serif-fonts @@ -1286,8 +1291,6 @@ data: - gettext-common-devel - gettext-devel - gettext-libs - - libtextstyle - - libtextstyle-devel - ghc-srpm-macros - libgs - giflib @@ -1307,6 +1310,7 @@ data: - glibc-all-langpacks - glibc-common - glibc-devel + - glibc-gconv-extra - glibc-headers-x86 - glibc-minimal-langpack - glibc-nss-devel @@ -1378,10 +1382,10 @@ data: - gtk3-immodules - gtk4 - gtk4-devel + - gtk4-devel-tools - gtksourceview4 - gtksourceview4-devel - gts - - guile - guile22 - gupnp - gupnp-devel @@ -1416,6 +1420,7 @@ data: - iso-codes - iso-codes-devel - itstool + - jansson - jasper-libs - jbig2dec-libs - jbigkit-libs @@ -1555,6 +1560,7 @@ data: - libgpg-error - libgpg-error-devel - libgudev + - libgudev-devel - libgusb - libhandy - libhandy-devel @@ -1586,6 +1592,9 @@ data: - libnotify - libnotify-devel - libnsl2 + - libnsl2-devel + - libobjc2 + - libobjc2-devel - libogg - libogg-devel - libpaper @@ -1641,6 +1650,7 @@ data: - libtiff - libtiff-devel - libtirpc + - libtirpc-devel - libtool - libtool-ltdl - libtool-ltdl-devel @@ -1649,7 +1659,7 @@ data: - libunistring-devel - libunwind - libunwind-devel - - libusbx + - libusb1 - libutempter - libuv - libva @@ -1698,7 +1708,6 @@ data: - llvm-libs - llvm-static - llvm-test - - llvm11-libs - lua-libs - lua-srpm-macros - lv2 @@ -1735,6 +1744,7 @@ data: - mlocate - mozjs78 - mozjs78-devel + - mpdecimal - mpfr - mpg123-devel - mpg123-libs @@ -2169,7 +2179,6 @@ data: - rubypick - rav1e-libs - rust-srpm-macros - - SDL - SDL2 - SDL2-devel - SDL2-static @@ -2183,6 +2192,7 @@ data: - SDL2_ttf-devel - SDL_sound - libsbc + - sdl12-compat - sed - serd - setup @@ -2191,6 +2201,7 @@ data: - shadow-utils - shared-mime-info - slang + - sndfile-tools - sord - sound-theme-freedesktop - soundtouch @@ -2216,7 +2227,6 @@ data: - systemd-devel - systemd-libs - systemd-pam - - systemd-rpm-macros - systemtap-sdt-devel - taglib - tar @@ -2251,6 +2261,7 @@ data: - libuuid - libuuid-devel - util-linux + - util-linux-core - uuidd - libdvbv5 - libdvbv5-devel @@ -2348,7 +2359,9 @@ data: - libadwaita-qt5 - alsa-lib - alsa-lib-devel - - annobin + - annobin-docs + - annobin-plugin-clang + - annobin-plugin-gcc - libaom - libaom-devel - libargon2 @@ -2405,8 +2418,6 @@ data: - clang-resource-filesystem - clang-tools-extra - git-clang-format - - clang11-libs - - clang11-resource-filesystem - cmake - cmake-data - cmake-filesystem @@ -2438,6 +2449,7 @@ data: - dbus-devel - dbus-libs - dbus-broker + - debugedit - dejavu-sans-fonts - dejavu-sans-mono-fonts - dejavu-serif-fonts @@ -2548,8 +2560,6 @@ data: - gettext-common-devel - gettext-devel - gettext-libs - - libtextstyle - - libtextstyle-devel - ghc-srpm-macros - libgs - giflib @@ -2566,6 +2576,7 @@ data: - glibc-all-langpacks - glibc-common - glibc-devel + - glibc-gconv-extra - glibc-headers-x86 - glibc-minimal-langpack - glibc-nss-devel @@ -2636,7 +2647,6 @@ data: - gtk3-immodule-xim - gtk3-immodules - gts - - guile - guile22 - gupnp - gupnp-devel @@ -2668,6 +2678,7 @@ data: - iso-codes - iso-codes-devel - itstool + - jansson - jasper-libs - jbig2dec-libs - jbigkit-libs @@ -2804,6 +2815,7 @@ data: - libgpg-error - libgpg-error-devel - libgudev + - libgudev-devel - libgusb - libidn2 - libidn2-devel @@ -2831,6 +2843,9 @@ data: - libnl3 - libnotify - libnsl2 + - libnsl2-devel + - libobjc2 + - libobjc2-devel - libogg - libogg-devel - libpaper @@ -2884,6 +2899,7 @@ data: - libtiff - libtiff-devel - libtirpc + - libtirpc-devel - libtool - libtool-ltdl - libtool-ltdl-devel @@ -2892,7 +2908,7 @@ data: - libunistring-devel - libunwind - libunwind-devel - - libusbx + - libusb1 - libutempter - libuv - libva @@ -2939,7 +2955,6 @@ data: - llvm-libs - llvm-static - llvm-test - - llvm11-libs - lua-libs - lua-srpm-macros - lv2 @@ -2972,6 +2987,7 @@ data: - meson - mkfontscale - mlocate + - mpdecimal - mpfr - mpg123-devel - mpg123-libs @@ -3397,7 +3413,6 @@ data: - rubypick - rav1e-libs - rust-srpm-macros - - SDL - SDL2 - SDL2-devel - SDL2-static @@ -3411,6 +3426,7 @@ data: - SDL2_ttf-devel - SDL_sound - libsbc + - sdl12-compat - sed - serd - setup @@ -3419,6 +3435,7 @@ data: - shadow-utils - shared-mime-info - slang + - sndfile-tools - sord - sound-theme-freedesktop - soundtouch @@ -3444,12 +3461,12 @@ data: - systemd-devel - systemd-libs - systemd-pam - - systemd-rpm-macros - systemtap-sdt-devel - taglib - tar - info - texinfo + - libtracker-sparql - twolame-libs - tzdata - unbound-libs @@ -3477,6 +3494,7 @@ data: - libuuid - libuuid-devel - util-linux + - util-linux-core - uuidd - libdvbv5 - libdvbv5-devel @@ -3557,13 +3575,13 @@ data: rpms: flatpak-rpm-macros: rationale: Set up build root for flatpak RPMS - ref: f34 + ref: f35 flatpak-runtime-config: rationale: Runtime configuration files - ref: f34 + ref: f35 xmd: flatpak: - branch: f34 + branch: f35 runtimes: runtime: id: org.fedoraproject.Platform diff --git a/tools/download-fedora-appstream.sh b/tools/download-fedora-appstream.sh index 0ce5de1..ef1e35c 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 f34-build appstream-data|awk '{print $1}') +nvr=$(koji list-tagged --quiet --inherit --latest f35-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 5635e0b..1c73575 100755 --- a/tools/resolve-files.py +++ b/tools/resolve-files.py @@ -203,10 +203,10 @@ bin_rename = { 'psicc': 'psicc2', 'tificc': 'tificc2', 'transicc': 'transicc2', - 'vala-0.52': 'vala-0.48', - 'vala-gen-introspect-0.52': 'vala-gen-introspect-0.48', - 'valac-0.52': 'valac-0.48', - 'vapigen-0.52': 'vapigen-0.48', + 'vala-0.52': 'vala-0.54', + 'vala-gen-introspect-0.52': 'vala-gen-introspect-0.54', + 'valac-0.52': 'valac-0.54', + 'vapigen-0.52': 'vapigen-0.54', } rename.update({ '/usr/bin/' + k: '/usr/bin/' + v for k, v in bin_rename.items() })

@@ -223,25 +223,27 @@ lib_rename = { # Newer in Fedora 'libaom.so.2': 'libaom.so.3', 'libasan.so.5': 'libasan.so.6', - 'libclang-cpp.so.10': 'libclang-cpp.so.12', - 'libclang.so.10': 'libclang.so.12', + 'libclang-cpp.so.10': 'libclang-cpp.so.13.0', + 'libclang.so.10': 'libclang.so.13', 'libdav1d.so.4': 'libdav1d.so.5', 'libgettextlib-0.20.2.so': 'libgettextlib-0.21.so', 'libgettextsrc-0.20.2.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', - 'libLLVM-10.so': 'libLLVM-12.so', - 'libLTO.so.10': 'libLTO.so.12', + 'libLLVM-10.so': 'libLLVM-13.so', + '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.9.so', - 'libRemarks.so.10': 'libRemarks.so.12', + 'libpython3.8.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', + 'libvala-0.52.so.0': 'libvala-0.54.so.0', 'libverto.so.0': 'libverto.so.1',

# Older in Fedora 'libffi.so.7': 'libffi.so.6', - 'libvala-0.52.so': 'libvala-0.48.so', - 'libvala-0.52.so.0': 'libvala-0.48.so.0',

# Replaced by libxcrypt in Fedora 'libcrypt-2.31.so': 'libcrypt.so.2', @@ -255,7 +257,7 @@ lib_rename = { rename.update({ '/usr/lib64/' + k: '/usr/lib64/' + v for k, v in lib_rename.items() })

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.183') + 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', @@ -264,12 +266,12 @@ for old in ['ld-2.31.so', 'libBrokenLocale-2.31.so', 'libanl-2.31.so', 'libc-2.3 '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', '-2.33') + rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('-2.31', '')

# 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.67') +for old in ['libicudata.so.67', 'libicui18n.so.67', 'libicuio.so.67', 'libicutest.so.67', + 'libicutu.so.67', 'libicuuc.so.67']: + rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('so.67', 'so.69')

include_rename = { 'assuan.h': 'libassuan2/assuan.h', @@ -316,11 +318,11 @@ pc_ignore = { ignore.update('/usr/lib64/pkgconfig/' + x for x in pc_ignore)

pc_rename = { - 'libvala-0.50.pc': 'libvala-0.48.pc', - 'python-3.8.pc': 'python-3.9.pc', - 'python-3.8-embed.pc': 'python-3.9-embed.pc', + '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', - 'vapigen-0.50.pc': 'vapigen-0.48.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() }) rename.update({ '/usr/share/pkgconfig/' + k: '/usr/share/pkgconfig/' + v for k, v in pc_rename.items() }) @@ -371,13 +373,13 @@ rename_patterns = [ (r'^/usr/include/c++/10.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.9/\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/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.9/\1'), + (r'^/usr/lib64/python3.8/(.*)', 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'), diff --git a/tools/util.py b/tools/util.py index 6ac2da4..d1c7cc8 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 = 'f34' +STREAM = 'f35' ID_PREFIX = 'org.fedoraproject' # branch of flatpak-rpm-macros and flatpak-runtime-config -RPM_BRANCH = 'f34' -DATASET_ARG = '--dataset=f34' +RPM_BRANCH = 'f35' +DATASET_ARG = '--dataset=f35' # 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 = [ - "f34--fedora", + "f35--fedora", ]

_log_name = None

https://src.fedoraproject.org/modules/flatpak-runtime/c/76972d6a76390f21e4e7...