public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Yaakov Selkowitz <yselkowi@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/cube] rawhide: Switch to Qt6
Date: Tue, 28 Jul 2026 13:57:39 GMT	[thread overview]
Message-ID: <178524705939.1.5228523599220947357.rpms-cube-0d7a88c7cc74@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/cube
            Branch : rawhide
            Commit : 0d7a88c7cc74e1d13740761d22ccc671f83fdfd0
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2026-07-27T14:58:14-04:00
            Stats  : +7/-8 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/cube/c/0d7a88c7cc74e1d13740761d22ccc671f83fdfd0?branch=rawhide

            Log:
            Switch to Qt6

Qt6 has been supported upstream since 4.6.

---
diff --git a/cube.spec b/cube.spec
index 6b1974d..7a6ef59 100644
--- a/cube.spec
+++ b/cube.spec
@@ -8,7 +8,7 @@
 
 Name:           cube
 Version:        4.9.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        CUBE Uniform Behavioral Encoding generic presentation component
 License:        BSD-3-Clause
 URL:            http://www.scalasca.org/software/cube-4.x/download.html
@@ -16,15 +16,15 @@ Source0:        http://apps.fz-juelich.de/scalasca/releases/cube/%shortv/dist/cu
 Source1:        http://apps.fz-juelich.de/scalasca/releases/cube/%shortwv/dist/cubew-%{cubew_vers}.tar.gz
 Source2:        http://apps.fz-juelich.de/scalasca/releases/cube/%shortv/dist/cubelib-%{version}.tar.gz
 BuildRequires:  dbus-devel
-BuildRequires:  qt5-qtbase-devel
+BuildRequires:  qt6-qtbase-devel
 BuildRequires:  chrpath
 BuildRequires:  desktop-file-utils
 BuildRequires:  zlib-devel
 BuildRequires: 	make
 BuildRequires:  gcc-c++
-%ifarch %qt5_qtwebengine_arches
+%ifarch %qt6_qtwebengine_arches
 # Not in ppc64le el9, for instance
-BuildRequires:  qt5-qtwebengine-devel
+BuildRequires:  qt6-qtwebengine-devel
 %endif
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -144,10 +144,6 @@ make install DESTDIR=$(pwd)/inst
 # Wrong paths in .la cause trouble
 #rm inst%_libdir/*.la
 cd ../cubegui-%ver
-# Kludge: For some reason the Qt dependencies are found as .so paths
-# in Fedora (only), and libtool re-orders them with libcube4gui after what it
-# should link against, and linking fails.
-%{?fedora:export LIBS="$LIBS -lQt5PrintSupport -lQt5Widgets -lQt5Gui -lQt5Network -lQt5Concurrent -lQt5Core"}
 %configure --disable-static \
   --disable-silent-rules \
   --with-platform=linux \
@@ -349,6 +345,9 @@ make -C cubew-%cubew_vers check || { cat test/test*/*log && false; }
 
 
 %changelog
+* Mon Jul 27 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 4.9.1-6
+- Switch to Qt6
+
 * Mon Jul 20 2026 Dave Love <loveshack@fedoraproject.org> - 4.9.1-5
 - Don't include libcube4gui.so in cube-libs-devel
 

                 reply	other threads:[~2026-07-28 13:57 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=178524705939.1.5228523599220947357.rpms-cube-0d7a88c7cc74@fedoraproject.org \
    --to=yselkowi@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