[rpms/qt-creator] epel10: Merge branch f44 into epel10

public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed

From: Troy Dawson <tdawson@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/qt-creator] epel10: Merge branch f44 into epel10
Date: Fri, 11 Sep 2026 17:21:01 GMT	[thread overview]
Message-ID: <178914726130.1.606840639636054673.rpms-qt-creator-96cded717474@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/qt-creator
Branch : epel10
Commit : 96cded717474bc4d8d57efaf4ceac624d99996eb
Author : Troy Dawson <tdawson@redhat.com>
Date   : 2026-09-11T10:20:49-07:00
Stats  : +63/-19 in 7 file(s)
URL    : https://src.fedoraproject.org/rpms/qt-creator/c/96cded717474bc4d8d57efaf4ceac624d99996eb?branch=epel10

Log:
Merge branch f44 into epel10

---
diff --git a/.gitignore b/.gitignore
index 0207e65..72bfd72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -187,3 +187,8 @@
 /qt-creator-opensource-src-18.0.2.tar.xz
 /qt-creator-opensource-src-19.0.0-beta1.tar.xz
 /qt-creator-opensource-src-19.0.1.tar.xz
+/qt-creator-opensource-src-20.0.0-beta1.tar.xz
+/qt-creator-opensource-src-20.0.0-beta2.tar.xz
+/qt-creator-opensource-src-20.0.0-rc1.tar.xz
+/qt-creator-opensource-src-20.0.0.tar.xz
+/qt-creator-opensource-src-20.0.1.tar.xz

diff --git a/qt-creator-Fedora-privlibs b/qt-creator-Fedora-privlibs
index 2136aa0..9e1aac0 100644
--- a/qt-creator-Fedora-privlibs
+++ b/qt-creator-Fedora-privlibs
@@ -1,4 +1,6 @@
-%global privlibs libAdvancedDockingSystem
+%global privlibs libAcpClient
+%global privlibs %{privlibs}|libAcpLib
+%global privlibs %{privlibs}|libAdvancedDockingSystem
 %global privlibs %{privlibs}|libAggregation
 %global privlibs %{privlibs}|libAndroid
 %global privlibs %{privlibs}|libAnt
@@ -46,6 +48,7 @@
 %global privlibs %{privlibs}|libFossil
 %global privlibs %{privlibs}|libGLSL
 %global privlibs %{privlibs}|libGLSLEditor
+%global privlibs %{privlibs}|libGNProjectManager
 %global privlibs %{privlibs}|libGenericProjectManager
 %global privlibs %{privlibs}|libGit
 %global privlibs %{privlibs}|libGitLab
@@ -63,6 +66,7 @@
 %global privlibs %{privlibs}|libLua
 %global privlibs %{privlibs}|libLuaLanguageClient
 %global privlibs %{privlibs}|libMacros
+%global privlibs %{privlibs}|libMcpServerLib
 %global privlibs %{privlibs}|libMcuSupport
 %global privlibs %{privlibs}|libMercurial
 %global privlibs %{privlibs}|libMesonProjectManager
@@ -115,8 +119,10 @@
 %global privlibs %{privlibs}|libVcsBase
 %global privlibs %{privlibs}|libWebAssembly
 %global privlibs %{privlibs}|libWelcome
+%global privlibs %{privlibs}|libZenMode
 %global privlibs %{privlibs}|libcomponentsplugin
 %global privlibs %{privlibs}|libmcpserver
+%global privlibs %{privlibs}|libptracepreload
 %global privlibs %{privlibs}|libqlitehtml
 %global privlibs %{privlibs}|libqmlpreviewplugin
 %global privlibs %{privlibs}|libqtkeychain

diff --git a/qt-creator-debuginfod.patch b/qt-creator-debuginfod.patch
index d929ebf..20a5ecf 100644
--- a/qt-creator-debuginfod.patch
+++ b/qt-creator-debuginfod.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qt-creator-opensource-src-19.0.1/cmake/Findelfutils.cmake qt-creator-opensource-src-19.0.1-new/cmake/Findelfutils.cmake
---- qt-creator-opensource-src-19.0.1/cmake/Findelfutils.cmake	2026-04-21 03:35:01.000000000 +0200
-+++ qt-creator-opensource-src-19.0.1-new/cmake/Findelfutils.cmake	2026-05-04 00:10:40.652467348 +0200
+diff -rupN --no-dereference qt-creator-opensource-src-20.0.1/cmake/Findelfutils.cmake qt-creator-opensource-src-20.0.1-new/cmake/Findelfutils.cmake
+--- qt-creator-opensource-src-20.0.1/cmake/Findelfutils.cmake	2026-07-28 03:35:34.000000000 +0200
++++ qt-creator-opensource-src-20.0.1-new/cmake/Findelfutils.cmake	2026-08-25 22:58:18.763995507 +0200
 @@ -32,7 +32,7 @@ find_path(ELFUTILS_INCLUDE_DIR
      "${ELFUTILS_INSTALL_DIR}" ENV ELFUTILS_INSTALL_DIR "${CMAKE_PREFIX_PATH}"
  )

diff --git a/qt-creator.spec b/qt-creator.spec
index cc3e6b9..5ea9200 100644
--- a/qt-creator.spec
+++ b/qt-creator.spec
@@ -1,12 +1,12 @@
-#define prerelease beta1
+#define prerelease rc1
 
 # We need avoid oython byte compiler to not crash over template .py file which
 # is not a valid python file, only for the IDE
 %global _python_bytecompile_errors_terminate_build 0
 
 Name:           qt-creator
-Version:        19.0.1
-Release:        1%{?dist}
+Version:        20.0.1
+Release:        2%{?dist}
 Summary:        Cross-platform IDE for Qt
 
 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
@@ -14,7 +14,7 @@ ExcludeArch:    %{ix86}
 
 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/19.0/%{version}%{?prerelease:-%prerelease}/qt-creator-opensource-src-%{version}%{?prerelease:-%prerelease}.tar.xz
+Source0:        https://download.qt.io/%{?prerelease:development}%{?!prerelease:official}_releases/qtcreator/20.0/%{version}%{?prerelease:-%prerelease}/qt-creator-opensource-src-%{version}%{?prerelease:-%prerelease}.tar.xz
 Source1:        qt-creator-Fedora-privlibs
 
 # Fix leading whitespace in desktop file
@@ -58,7 +58,7 @@ BuildRequires:	cmake(Qt6WebEngineWidgets)
 # The imported target "Qt6::QmlDomPrivate" references the file
 #    "/usr/lib64/libQt6QmlDom.a"
 # but this file does not exist.
-BuildRequires:  qt6-qtdeclarative-static
+# BuildRequires:  qt6-qtdeclarative-static
 BuildRequires:  desktop-file-utils
 BuildRequires:  diffutils
 BuildRequires:  elfutils-devel
@@ -73,7 +73,7 @@ BuildRequires:  libffi-devel
 BuildRequires:  libxkbcommon-devel
 BuildRequires:  clang-devel
 BuildRequires:  llvm-devel
-BuildRequires:  litehtml-devel
+# BuildRequires:  litehtml-devel
 BuildRequires:  libsecret-devel
 BuildRequires:  ninja-build
 BuildRequires:  python3
@@ -146,8 +146,8 @@ User documentation for %{name}.
 
 # Remove some bundled libraries to be sure
 rm -rf src/shared/qbs
-rm -rf src/plugins/help/qlitehtml/litehtml
-#rm -rf src/libs/3rdparty/syntax-highlighting/src
+# rm -rf src/libs/qlitehtml/src/3rdparty/litehtml
+# rm -rf src/libs/3rdparty/syntax-highlighting/src
 # rm -rf src/libs/3rdparty/yaml-cpp
 
 
@@ -220,6 +220,39 @@ diff -u %{SOURCE1} $outfile
 
 
 %changelog
+* Wed Aug 26 2026 Jan Grulich <jgrulich@redhat.com>
+- Rebuild (qt6)
+
+* Tue Aug 25 2026 Sandro Mani <manisandro@gmail.com>
+- Update to 20.0.1
+
+* Tue Aug 25 2026 Jan Grulich <jgrulich@redhat.com>
+- Rebuild (qt6)
+
+* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Wed Jun 17 2026 Sandro Mani <manisandro@gmail.com> - 20.0.0-1
+- Update to 20.0.0
+
+* Mon Jun 15 2026 Sandro Mani <manisandro@gmail.com> - 20.0.0-0.6.rc1
+- Rebuild (litehtml)
+
+* Thu Jun 04 2026 Sandro Mani <manisandro@gmail.com> - 20.0.0-0.5.rc1
+- Update to 20.0.0-rc1
+
+* Thu May 21 2026 Sandro Mani <manisandro@gmail.com> - 20.0.0-0.4.beta2
+- Update to 20.0.0-beta2
+
+* Thu May 14 2026 Jan Grulich <jgrulich@redhat.com>
+- Rebuild (qt6)
+
+* Wed May 13 2026 Jan Grulich <jgrulich@redhat.com>
+- Rebuild (qt6)
+
+* Tue May 12 2026 Sandro Mani <manisandro@gmail.com> - 20.0.0-0.1.beta1
+- Update to 20.0.0-beta1
+
 * Mon May 04 2026 Sandro Mani <manisandro@gmail.com> - 19.0.1-1
 - Update to 19.0.1
 

diff --git a/qt-creator_desktop.patch b/qt-creator_desktop.patch
index a4b88f4..8855f22 100644
--- a/qt-creator_desktop.patch
+++ b/qt-creator_desktop.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qt-creator-opensource-src-19.0.1/share/applications/org.qt-project.qtcreator.desktop qt-creator-opensource-src-19.0.1-new/share/applications/org.qt-project.qtcreator.desktop
---- qt-creator-opensource-src-19.0.1/share/applications/org.qt-project.qtcreator.desktop	2026-04-21 03:35:05.000000000 +0200
-+++ qt-creator-opensource-src-19.0.1-new/share/applications/org.qt-project.qtcreator.desktop	2026-05-04 00:10:38.828995924 +0200
+diff -rupN --no-dereference qt-creator-opensource-src-20.0.1/share/applications/org.qt-project.qtcreator.desktop qt-creator-opensource-src-20.0.1-new/share/applications/org.qt-project.qtcreator.desktop
+--- qt-creator-opensource-src-20.0.1/share/applications/org.qt-project.qtcreator.desktop	2026-07-28 03:35:38.000000000 +0200
++++ qt-creator-opensource-src-20.0.1-new/share/applications/org.qt-project.qtcreator.desktop	2026-08-25 22:58:16.565147222 +0200
 @@ -8,5 +8,5 @@ Icon=QtProject-qtcreator
  StartupWMClass=qtcreator
  Terminal=false

diff --git a/qt-creator_qmake-names.patch b/qt-creator_qmake-names.patch
index fc0b858..9ce1de4 100644
--- a/qt-creator_qmake-names.patch
+++ b/qt-creator_qmake-names.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qt-creator-opensource-src-19.0.1/src/libs/utils/buildablehelperlibrary.cpp qt-creator-opensource-src-19.0.1-new/src/libs/utils/buildablehelperlibrary.cpp
---- qt-creator-opensource-src-19.0.1/src/libs/utils/buildablehelperlibrary.cpp	2026-04-21 03:35:01.000000000 +0200
-+++ qt-creator-opensource-src-19.0.1-new/src/libs/utils/buildablehelperlibrary.cpp	2026-05-04 00:10:39.767715047 +0200
+diff -rupN --no-dereference qt-creator-opensource-src-20.0.1/src/libs/utils/buildablehelperlibrary.cpp qt-creator-opensource-src-20.0.1-new/src/libs/utils/buildablehelperlibrary.cpp
+--- qt-creator-opensource-src-20.0.1/src/libs/utils/buildablehelperlibrary.cpp	2026-07-28 03:35:34.000000000 +0200
++++ qt-creator-opensource-src-20.0.1-new/src/libs/utils/buildablehelperlibrary.cpp	2026-08-25 22:58:17.695186783 +0200
 @@ -179,7 +179,10 @@ QStringList BuildableHelperLibrary::poss
      // Qt 6 CMake built targets, such as Android, are dependent on the host installation
      // and use a script wrapper around the host qmake executable

diff --git a/sources b/sources
index 5289f14..c9a887c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qt-creator-opensource-src-19.0.1.tar.xz) = 9cce61ea678f5c98c5a7cecce28d74a2c22687b1fa26aeb61e475534effdaa6558fe59beef805f9c5ac77fd5c6f28bd7738b870e4801008e05c84ca0dac4a8ff
+SHA512 (qt-creator-opensource-src-20.0.1.tar.xz) = 199d7473d9ee3f729a05a79bf499c14e53aeb252ff8aba5fe4e59085a793f8c29000a090c58967ff7021470f7af81ac6004d8c3e71bdb8e8037a5566f3803618

                 reply	other threads:[~2026-09-11 17:21 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=178914726130.1.606840639636054673.rpms-qt-creator-96cded717474@fedoraproject.org \
    --to=tdawson@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