public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Thomas Zimmermann <thomas.zimmermann@voestalpine.com>
To: git-commits@fedoraproject.org
Subject: [rpms/qt-creator] epel9: Update to 18.0.2
Date: Tue, 18 Aug 2026 07:53:48 GMT	[thread overview]
Message-ID: <178703962804.1.11390690035317337720.rpms-qt-creator-61548d5822c1@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/qt-creator
            Branch : epel9
            Commit : 61548d5822c134a873d01f0851d1dbcb5d85f3fc
            Author : Thomas Zimmermann <thomas.zimmermann@voestalpine.com>
            Date   : 2026-08-18T09:53:13+02:00
            Stats  : +39/-38 in 6 file(s)
            URL    : https://src.fedoraproject.org/rpms/qt-creator/c/61548d5822c134a873d01f0851d1dbcb5d85f3fc?branch=epel9

            Log:
            Update to 18.0.2

Remove WebEngine dependency, to compile it without qt-tools rebuild (see #2481167)

---
diff --git a/.gitignore b/.gitignore
index cbdf1d1..82308c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -175,3 +175,5 @@
 /qt-creator-opensource-src-15.0.0-beta2.tar.xz
 /qt-creator-opensource-src-15.0.0-rc1.tar.xz
 /qt-creator-opensource-src-15.0.0.tar.xz
+/qt-creator-opensource-src-16.0.2.tar.xz
+/qt-creator-opensource-src-18.0.2.tar.xz

diff --git a/qt-creator-Fedora-privlibs b/qt-creator-Fedora-privlibs
index c5d7150..946e1d1 100644
--- a/qt-creator-Fedora-privlibs
+++ b/qt-creator-Fedora-privlibs
@@ -30,9 +30,10 @@
 %global privlibs %{privlibs}|libCtfVisualizer
 %global privlibs %{privlibs}|libDebugger
 %global privlibs %{privlibs}|libDesigner
+%global privlibs %{privlibs}|libDevContainer
+%global privlibs %{privlibs}|libDevContainerPlugin
 %global privlibs %{privlibs}|libDiffEditor
 %global privlibs %{privlibs}|libDocker
-%global privlibs %{privlibs}|libEffectComposer
 %global privlibs %{privlibs}|libEmacsKeys
 %global privlibs %{privlibs}|libExtensionManager
 %global privlibs %{privlibs}|libExtensionSystem
@@ -43,21 +44,19 @@
 %global privlibs %{privlibs}|libGenericProjectManager
 %global privlibs %{privlibs}|libGit
 %global privlibs %{privlibs}|libGitLab
-%global privlibs %{privlibs}|libHaskell
 %global privlibs %{privlibs}|libHelloWorld
 %global privlibs %{privlibs}|libHelp
 %global privlibs %{privlibs}|libImageViewer
 %global privlibs %{privlibs}|libIncrediBuild
-%global privlibs %{privlibs}|libInsight
 %global privlibs %{privlibs}|libIos
 %global privlibs %{privlibs}|libKSyntaxHighlighting
 %global privlibs %{privlibs}|libLanguageClient
 %global privlibs %{privlibs}|libLanguageServerProtocol
 %global privlibs %{privlibs}|libLanguageUtils
+%global privlibs %{privlibs}|libLearning
 %global privlibs %{privlibs}|libLua
 %global privlibs %{privlibs}|libLuaLanguageClient
 %global privlibs %{privlibs}|libMacros
-%global privlibs %{privlibs}|libMarketplace
 %global privlibs %{privlibs}|libMcuSupport
 %global privlibs %{privlibs}|libMercurial
 %global privlibs %{privlibs}|libMesonProjectManager
@@ -73,17 +72,11 @@
 %global privlibs %{privlibs}|libQbsProjectManager
 %global privlibs %{privlibs}|libQmakeProjectManager
 %global privlibs %{privlibs}|libQmlDebug
-%global privlibs %{privlibs}|libQmlDesigner
-%global privlibs %{privlibs}|libQmlDesignerBase
-%global privlibs %{privlibs}|libQmlDesignerCore
-%global privlibs %{privlibs}|libQmlDesignerLite
 %global privlibs %{privlibs}|libQmlEditorWidgets
 %global privlibs %{privlibs}|libQmlJS
 %global privlibs %{privlibs}|libQmlJSEditor
 %global privlibs %{privlibs}|libQmlJSTools
-%global privlibs %{privlibs}|libQmlPreview
 %global privlibs %{privlibs}|libQmlProfiler
-%global privlibs %{privlibs}|libQmlProjectManager
 %global privlibs %{privlibs}|libQnx
 %global privlibs %{privlibs}|libQtApplicationManagerIntegration
 %global privlibs %{privlibs}|libQtSupport
@@ -94,10 +87,9 @@
 %global privlibs %{privlibs}|libScxmlEditor
 %global privlibs %{privlibs}|libSerialTerminal
 %global privlibs %{privlibs}|libSilverSearcher
-%global privlibs %{privlibs}|libSqlite
 %global privlibs %{privlibs}|libSquish
-%global privlibs %{privlibs}|libStudioWelcome
 %global privlibs %{privlibs}|libSubversion
+%global privlibs %{privlibs}|libTasking
 %global privlibs %{privlibs}|libTerminal
 %global privlibs %{privlibs}|libTerminalLib
 %global privlibs %{privlibs}|libTextEditor
@@ -110,10 +102,5 @@
 %global privlibs %{privlibs}|libVcsBase
 %global privlibs %{privlibs}|libWebAssembly
 %global privlibs %{privlibs}|libWelcome
-%global privlibs %{privlibs}|libZip
-%global privlibs %{privlibs}|libassetexporterplugin
-%global privlibs %{privlibs}|libcomponentsplugin
 %global privlibs %{privlibs}|libqlitehtml
-%global privlibs %{privlibs}|libqmlpreviewplugin
 %global privlibs %{privlibs}|libqtkeychain
-%global privlibs %{privlibs}|libqtquickplugin

diff --git a/qt-creator.spec b/qt-creator.spec
index fccb6fb..f827542 100644
--- a/qt-creator.spec
+++ b/qt-creator.spec
@@ -5,13 +5,13 @@
 %global _python_bytecompile_errors_terminate_build 0
 
 Name:           qt-creator
-Version:        15.0.0
-Release:        5%{?prerelease:.%prerelease}%{?dist}
+Version:        18.0.2
+Release:        1%{?prerelease:.%prerelease}%{?dist}
 Summary:        Cross-platform IDE for Qt
 
 License:        GPL-3.0-only WITH Qt-GPL-exception-1.0
 URL:            https://www.qt.io/ide/
-Source0:        https://download.qt.io/%{?prerelease:development}%{?!prerelease:official}_releases/qtcreator/15.0/%{version}%{?prerelease:-%prerelease}/qt-creator-opensource-src-%{version}%{?prerelease:-%prerelease}.tar.xz
+Source0:        https://download.qt.io/%{?prerelease:development}%{?!prerelease:official}_releases/qtcreator/18.0/%{version}%{?prerelease:-%prerelease}/qt-creator-opensource-src-%{version}%{?prerelease:-%prerelease}.tar.xz
 Source1:        qt-creator-Fedora-privlibs
 
 # Fix leading whitespace in desktop file
@@ -48,9 +48,9 @@ BuildRequires:  cmake(Qt6Svg)
 BuildRequires:  cmake(Qt6UiPlugin)
 BuildRequires:  cmake(Qt6Widgets)
 BuildRequires:  cmake(Qt6Xml)
-%ifarch %{qt6_qtwebengine_arches}
-BuildRequires:	cmake(Qt6WebEngineWidgets)
-%endif
+#%%ifarch %%{qt6_qtwebengine_arches}
+#BuildRequires:	cmake(Qt6WebEngineWidgets)
+#%%endif
 # FIXME: qt6-qtdeclarative packaging bug?
 # The imported target "Qt6::QmlDomPrivate" references the file
 #    "/usr/lib64/libQt6QmlDom.a"
@@ -63,6 +63,7 @@ BuildRequires:  elfutils-debuginfod-client-devel
 BuildRequires:  libappstream-glib
 BuildRequires:  libffi-devel
 BuildRequires:  libxkbcommon-devel
+BuildRequires:  clang
 BuildRequires:  clang-devel
 BuildRequires:  llvm-devel
 BuildRequires:  litehtml-devel
@@ -151,7 +152,11 @@ rm -rf src/libs/3rdparty/yaml-cpp
     -DWITH_DOCS=ON \
     -Djournald=ON \
     -DBUILD_DEVELOPER_DOCS=ON \
-    -DCMAKE_INSTALL_LIBDIR=%{_lib}
+    -DCMAKE_INSTALL_LIBDIR=%{_lib} \
+    -DCMAKE_C_COMPILER=/usr/bin/clang \
+    -DCMAKE_CXX_COMPILER=/usr/bin/clang++ \
+    -DCMAKE_CXX_FLAGS="-fPIC" \
+    -DBUILD_EXECUTABLE_CMDBRIDGE=OFF
 %cmake_build
 %cmake_build -- qch_docs
 
@@ -187,7 +192,7 @@ diff -u %{SOURCE1} $outfile
 
 %files
 %doc README.md
-%license LICENSE.GPL3-EXCEPT
+%license LICENSES/LICENSE.GPL3-EXCEPT
 %{_bindir}/qtcreator
 %{_bindir}/qtcreator.sh
 %{_libdir}/qtcreator
@@ -211,6 +216,10 @@ diff -u %{SOURCE1} $outfile
 
 
 %changelog
+* Tue Nov 25 2025 Thomas Zimmermann <thomas.zimmermann@voestalpine.com> - 18.0.2-1
+- Update to 18.0.2
+- Remove WebEngine dependency, to compile it without qt-tools rebuild (see #2481167)
+
 * Tue Nov 25 2025 Thomas Zimmermann <thomas.zimmermann@voestalpine.com> - 15.0.0-5
 - Rebuild (LLVM20)
 

diff --git a/qt-creator_qmake-names.patch b/qt-creator_qmake-names.patch
index c5ba89e..a437b38 100644
--- a/qt-creator_qmake-names.patch
+++ b/qt-creator_qmake-names.patch
@@ -1,12 +1,12 @@
-diff -rupN --no-dereference qt-creator-opensource-src-15.0.0/src/libs/utils/buildablehelperlibrary.cpp qt-creator-opensource-src-15.0.0-new/src/libs/utils/buildablehelperlibrary.cpp
---- qt-creator-opensource-src-15.0.0/src/libs/utils/buildablehelperlibrary.cpp	2024-11-27 11:00:22.000000000 +0100
-+++ qt-creator-opensource-src-15.0.0-new/src/libs/utils/buildablehelperlibrary.cpp	2024-12-02 15:01:24.941317507 +0100
-@@ -162,7 +162,7 @@ QStringList BuildableHelperLibrary::poss
+diff -Nurd qt-creator-opensource-src-18.0.2.orig/src/libs/utils/buildablehelperlibrary.cpp qt-creator-opensource-src-18.0.2/src/libs/utils/buildablehelperlibrary.cpp
+--- qt-creator-opensource-src-18.0.2.orig/src/libs/utils/buildablehelperlibrary.cpp	2026-01-23 03:07:26.000000000 +0100
++++ qt-creator-opensource-src-18.0.2/src/libs/utils/buildablehelperlibrary.cpp	2026-08-17 13:13:48.837516356 +0200
+@@ -169,7 +169,7 @@
      // Qt 6 CMake built targets, such as Android, are dependent on the host installation
      // and use a script wrapper around the host qmake executable
      // Remote build configurations (e.g. Windows host + Linux target) must be taken into account too
--    return {"qmake*"};
-+    return {"qmake-qt6", "qmake-qt5", "qmake-qt4", "qmake-qt3", "qmake"};
+-    return {"qmake*", "qtpaths*"};
++    return {"qmake-qt6", "qmake-qt5", "qmake-qt4", "qmake-qt3", "qmake", "qtpaths*"};
  }
  
  } // namespace Utils

diff --git a/qt-creator_unbundle.patch b/qt-creator_unbundle.patch
index 6942cb0..ade6a56 100644
--- a/qt-creator_unbundle.patch
+++ b/qt-creator_unbundle.patch
@@ -1,7 +1,7 @@
-diff -rupN --no-dereference qt-creator-opensource-src-15.0.0/qt_attributions.json qt-creator-opensource-src-15.0.0-new/qt_attributions.json
---- qt-creator-opensource-src-15.0.0/qt_attributions.json	2024-11-27 11:00:22.000000000 +0100
-+++ qt-creator-opensource-src-15.0.0-new/qt_attributions.json	2024-12-02 15:01:26.981323588 +0100
-@@ -1,19 +1,5 @@
+diff -Nurd qt-creator-opensource-src-18.0.2.orig/qt_attributions.json qt-creator-opensource-src-18.0.2/qt_attributions.json
+--- qt-creator-opensource-src-18.0.2.orig/qt_attributions.json	2026-01-23 03:07:26.000000000 +0100
++++ qt-creator-opensource-src-18.0.2/qt_attributions.json	2026-08-17 13:11:35.016795846 +0200
+@@ -1,22 +1,5 @@
  [
      {
 -        "Id": "yaml-cpp",
@@ -9,12 +9,15 @@ diff -rupN --no-dereference qt-creator-opensource-src-15.0.0/qt_attributions.jso
 -        "QDocModule": "qtcreator",
 -        "QtParts": ["tools"],
 -        "QtUsage": "Used for parsing output of Clazy and Clang Tidy.",
--        "Path": "src/libs/3rdparty/yaml-cpp",
+-        "Path": "@SOURCE_DIR@/src/libs/3rdparty/yaml-cpp",
 -        "Description": "yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec.",
 -        "Homepage": "https://github.com/jbeder/yaml-cpp",
 -        "Version": "0.8.0",
+-        "PURL": "pkg:github/jbeder/yaml-cpp@$<VERSION>",
+-        "CPE": "cpe:2.3:a:yaml-cpp_project:yaml-cpp:$<VERSION>:*:*:*:*:*:*:*",
+-        "LicenseId": "MIT",
 -        "License": "MIT License",
--        "LicenseFile": "src/libs/3rdparty/yaml-cpp/LICENSE",
+-        "LicenseFile": "@SOURCE_DIR@/src/libs/3rdparty/yaml-cpp/LICENSE",
 -        "Copyright": "Copyright (c) 2008-2015 Jesse Beder."
 -    },
 -    {

diff --git a/sources b/sources
index dc45672..696dd6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qt-creator-opensource-src-15.0.0.tar.xz) = 0a003a17bec60b34c4dc4ac700125dc62be9d2cf50e9044b61cc926b1d7cfa1e8303b98f9ae25abca07cb893398c25f61c3ec28029efe50e88339e5d984d1279
+SHA512 (qt-creator-opensource-src-18.0.2.tar.xz) = 6fa9f64ecccbb19a8c8504d4cfa4a46691e347c1f2fe7e6fa0683e248a6a7a454b9a31649a41c049854092ef09568ba049a4cd4d7df8dcebb8f3805bdd2fb78b

                 reply	other threads:[~2026-08-18  7:53 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=178703962804.1.11390690035317337720.rpms-qt-creator-61548d5822c1@fedoraproject.org \
    --to=thomas.zimmermann@voestalpine.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