public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Kalev Lember <klember@redhat.com>
To: git-commits@fedoraproject.org
Subject: [flatpaks/flatpak-runtime] f45: Add back Qt 5 and Qt 6
Date: Fri, 11 Sep 2026 14:42:43 GMT	[thread overview]
Message-ID: <178913776359.1.2832252626000001950.flatpaks-flatpak-runtime-e7a3e3fdbcd9@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : flatpaks/flatpak-runtime
            Branch : f45
            Commit : e7a3e3fdbcd9d7a144be9665a8af4e095dc7d9bd
            Author : Kalev Lember <klember@redhat.com>
            Date   : 2026-03-02T20:29:46-05:00
            Stats  : +102/-0 in 3 file(s)
            URL    : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/e7a3e3fdbcd9d7a144be9665a8af4e095dc7d9bd?branch=f45

            Log:
            Add back Qt 5 and Qt 6

This adds back Qt 5 that we temporarily dropped from the F38 runtime as
an experiment, and adds Qt 6. Compared to the previous Qt package set
that we had in F37, we no longer try to exactly match Workstation Qt
packages but instead just add whatever is needed by actual app flatpaks.

The F38 experiment worked well, but now with the new flatpak build
system in F39 the /app-built Qt modules started causing build issues for
KDE flatpaks (as f39-flatpak-app build root is shared). This moves them
to the runtime to avoid causing issues for KDE builds.

---
diff --git a/container-sdk.yaml b/container-sdk.yaml
index 56c385c..10ac058 100644
--- a/container-sdk.yaml
+++ b/container-sdk.yaml
@@ -186,6 +186,11 @@ flatpak:
     - fcitx5-gtk2
     - fcitx5-gtk3
     - fcitx5-gtk4
+    - fcitx5-qt
+    - fcitx5-qt-libfcitx5qt5widgets
+    - fcitx5-qt-libfcitx5qtdbus
+    - fcitx5-qt-module
+    - fcitx5-qt6
     - fdk-aac-free
     - fdk-aac-free-devel
     - fedora-gpg-keys
@@ -1381,7 +1386,38 @@ flatpak:
     - python3-setuptools
     - python3-six
     - python3-wheel
+    - qadwaitadecorations-qt5
+    - qadwaitadecorations-qt6
+    - qt-settings
+    - qt5-qtbase
+    - qt5-qtbase-common
+    - qt5-qtbase-gui
+    - qt5-qtcharts
+    - qt5-qtdeclarative
+    - qt5-qtgraphicaleffects
+    - qt5-qtimageformats
+    - qt5-qtmultimedia
+    - qt5-qtquickcontrols
+    - qt5-qtquickcontrols2
+    - qt5-qtsensors
+    - qt5-qtsvg
+    - qt5-qtwayland
+    - qt5-qtx11extras
+    - qt5-qtxmlpatterns
     - qt5-srpm-macros
+    - qt6-qt5compat
+    - qt6-qtbase
+    - qt6-qtbase-common
+    - qt6-qtbase-gui
+    - qt6-qtcharts
+    - qt6-qtdeclarative
+    - qt6-qtimageformats
+    - qt6-qtmultimedia
+    - qt6-qtpositioning
+    - qt6-qtserialport
+    - qt6-qtshadertools
+    - qt6-qtsvg
+    - qt6-qtwayland
     - qt6-srpm-macros
     - rav1e-libs
     - readline
@@ -1471,6 +1507,7 @@ flatpak:
     - texinfo
     - tpm2-tss
     - tracker-devel
+    - tslib
     - turbojpeg
     - turbojpeg-devel
     - twolame-libs

diff --git a/container.yaml b/container.yaml
index 966c8c9..7385968 100644
--- a/container.yaml
+++ b/container.yaml
@@ -111,12 +111,20 @@ flatpak:
     - elfutils-libelf
     - elfutils-libs
     - emacs-filesystem
+    - enchant
     - enchant2
     - expat
+    - fcitx5
+    - fcitx5-data
     - fcitx5-gtk
     - fcitx5-gtk2
     - fcitx5-gtk3
     - fcitx5-gtk4
+    - fcitx5-qt
+    - fcitx5-qt-libfcitx5qt5widgets
+    - fcitx5-qt-libfcitx5qtdbus
+    - fcitx5-qt-module
+    - fcitx5-qt6
     - fdk-aac-free
     - fedora-gpg-keys
     - fedora-release
@@ -719,6 +727,37 @@ flatpak:
     - python3-packaging
     - python3-setuptools
     - python3-six
+    - qadwaitadecorations-qt5
+    - qadwaitadecorations-qt6
+    - qt-settings
+    - qt5-qtbase
+    - qt5-qtbase-common
+    - qt5-qtbase-gui
+    - qt5-qtcharts
+    - qt5-qtdeclarative
+    - qt5-qtgraphicaleffects
+    - qt5-qtimageformats
+    - qt5-qtmultimedia
+    - qt5-qtquickcontrols
+    - qt5-qtquickcontrols2
+    - qt5-qtsensors
+    - qt5-qtsvg
+    - qt5-qtwayland
+    - qt5-qtx11extras
+    - qt5-qtxmlpatterns
+    - qt6-qt5compat
+    - qt6-qtbase
+    - qt6-qtbase-common
+    - qt6-qtbase-gui
+    - qt6-qtcharts
+    - qt6-qtdeclarative
+    - qt6-qtimageformats
+    - qt6-qtmultimedia
+    - qt6-qtpositioning
+    - qt6-qtserialport
+    - qt6-qtshadertools
+    - qt6-qtsvg
+    - qt6-qtwayland
     - rav1e-libs
     - readline
     - rpm
@@ -760,6 +799,7 @@ flatpak:
     - tesseract-langpack-eng
     - tesseract-tessdata-doc
     - tpm2-tss
+    - tslib
     - turbojpeg
     - twolame-libs
     - tzdata
@@ -786,6 +826,7 @@ flatpak:
     - which
     - woff2
     - wpebackend-fdo
+    - xcb-imdkit
     - xcb-proto
     - xcb-util
     - xcb-util-cursor

diff --git a/package-notes.txt b/package-notes.txt
index 542aa80..cc85690 100644
--- a/package-notes.txt
+++ b/package-notes.txt
@@ -29,6 +29,7 @@ double-conversion: EB: required by qt5-qtbase-gui and qt6-qtbase-gui
 elfutils-default-yama-scope: provides default-yama-scope required by elfutils in Fedora
 emacs-filesystem: required by desktop-file-utils
 fcitx5-gtk2: EB
+fcitx5-qt: EB
 fedora-gpg-keys
 fedora-release
 fedora-repos
@@ -128,6 +129,29 @@ python3-libs
 python3-packaging: EB: dependency of python3-rpm-generators, and because of that cannot be built for /app as rpmbuild in koji buildroots can't use modules installed in /app
 python3-pip
 python3-setuptools
+qadwaitadecorations-qt5: EB
+qadwaitadecorations-qt6: EB
+qt5-qtbase: EB
+qt5-qtcharts: EB
+qt5-qtdeclarative: EB
+qt5-qtgraphicaleffects: EB
+qt5-qtimageformats: EB
+qt5-qtmultimedia: EB
+qt5-qtquickcontrols2: EB
+qt5-qtquickcontrols: EB
+qt5-qtsensors: EB
+qt5-qtx11extras: EB
+qt5-qtxmlpatterns: EB
+qt6-qt5compat: EB
+qt6-qtbase: EB
+qt6-qtcharts: EB
+qt6-qtdeclarative: EB
+qt6-qtimageformats: EB
+qt6-qtmultimedia: EB
+qt6-qtpositioning: EB
+qt6-qtserialport: EB
+qt6-qtshadertools: EB
+qt6-qtsvg: EB
 readline
 setup: FD: shadow-utils
 shadow-utils: ????

                 reply	other threads:[~2026-09-11 14:42 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178913776359.1.2832252626000001950.flatpaks-flatpak-runtime-e7a3e3fdbcd9@fedoraproject.org \
    --to=klember@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox