[packages/qt-creator] - updated to 11.0.2, added yaml-cpp patch to fix build with yaml-cpp 0.8
qboosh
qboosh at pld-linux.org
Thu Aug 31 08:01:29 CEST 2023
commit 9ba7c2722fcd25bc76b8cf06856058ecea7b483e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Aug 31 06:36:42 2023 +0200
- updated to 11.0.2, added yaml-cpp patch to fix build with yaml-cpp 0.8
build.patch | 11 -----------
qt-creator-yaml-cpp.patch | 11 +++++++++++
qt-creator.spec | 21 +++++++++++----------
3 files changed, 22 insertions(+), 21 deletions(-)
---
diff --git a/qt-creator.spec b/qt-creator.spec
index e9feac5..d93ddea 100644
--- a/qt-creator.spec
+++ b/qt-creator.spec
@@ -7,20 +7,20 @@
%undefine with_webengine
%endif
-%define qtver 6
+%define qtver 6.2.0
Summary: An IDE tailored to the needs of Qt developers
Summary(pl.UTF-8): IDE dostosowane do potrzeb programistów Qt
Name: qt-creator
-Version: 10.0.0
-Release: 3
+Version: 11.0.2
+Release: 1
Epoch: 1
License: LGPL v2.1
Group: X11/Development/Tools
-Source0: https://download.qt.io/official_releases/qtcreator/10.0/%{version}/%{name}-opensource-src-%{version}.tar.xz
-# Source0-md5: fceb0dc8bacc759d5291574be1190c2f
-Patch0: build.patch
-URL: https://doc.qt.io/qt-5/topics-app-development.html
+Source0: https://download.qt.io/official_releases/qtcreator/11.0/%{version}/%{name}-opensource-src-%{version}.tar.xz
+# Source0-md5: 3fbaa230c6a92308190e807f7d5e0119
+Patch0: %{name}-yaml-cpp.patch
+URL: https://doc.qt.io/qtcreator/
BuildRequires: Qt6Concurrent-devel >= %{qtver}
BuildRequires: Qt6Designer-devel >= %{qtver}
BuildRequires: Qt6Gui-devel >= %{qtver}
@@ -41,7 +41,7 @@ BuildRequires: Qt6Xml-devel >= %{qtver}
BuildRequires: clang-devel >= 6.0.0
BuildRequires: cmake >= 3.16
BuildRequires: gdb
-BuildRequires: libstdc++-devel
+BuildRequires: libstdc++-devel >= 6:7
BuildRequires: llvm-devel >= 7.0.0
BuildRequires: qt6-build >= %{qtver}
BuildRequires: qt6-linguist
@@ -49,6 +49,7 @@ BuildRequires: qt6-shadertools
BuildRequires: rpmbuild(macros) >= 1.742
BuildRequires: tar >= 1:1.22
BuildRequires: xz
+BuildRequires: yaml-cpp-devel >= 0.8
Requires(post,postun): desktop-file-utils
%requires_eq Qt6Core
Requires: Qt6Gui-platform-xcb
@@ -73,7 +74,7 @@ Qt.
%setup -q -n %{name}-opensource-src-%{version}
%patch0 -p1
-sed -i '1s|^#!.*python\b|#!%{__python}|' src/shared/qbs/src/3rdparty/python/bin/dmgbuild
+sed -i '1s,/usr/bin/env python,%{__python},' src/shared/qbs/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/__main__.py
%build
%cmake -B build \
@@ -136,7 +137,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libexecdir}/qtcreator/sdktool
%dir %{_libdir}/qtcreator
%attr(755,root,root) %{_libdir}/qtcreator/lib*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/qtcreator/lib*.so.10
+%attr(755,root,root) %ghost %{_libdir}/qtcreator/lib*.so.11
%dir %{_libdir}/qtcreator/plugins
%attr(755,root,root) %{_libdir}/qtcreator/plugins/lib*.so
%if %{with qbs}
diff --git a/build.patch b/build.patch
deleted file mode 100644
index a4364ae..0000000
--- a/build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt-creator-opensource-src-10.0.0/src/shared/qbs/src/lib/corelib/jsextensions/domxml.cpp.orig 2023-04-11 21:39:31.321826852 +0200
-+++ qt-creator-opensource-src-10.0.0/src/shared/qbs/src/lib/corelib/jsextensions/domxml.cpp 2023-04-11 21:39:38.731872451 +0200
-@@ -369,7 +369,7 @@
-
- template<> bool XmlDomNode<QDomDocument>::setContent(const QString &content)
- {
-- return m_value.setContent(content);
-+ return bool(m_value.setContent(content));
- }
-
- template<> QString XmlDomNode<QDomDocument>::toString(int indent)
diff --git a/qt-creator-yaml-cpp.patch b/qt-creator-yaml-cpp.patch
new file mode 100644
index 0000000..bbe89b1
--- /dev/null
+++ b/qt-creator-yaml-cpp.patch
@@ -0,0 +1,11 @@
+--- qt-creator-opensource-src-11.0.2/cmake/Findyaml-cpp.cmake.orig 2023-08-14 03:53:08.000000000 +0200
++++ qt-creator-opensource-src-11.0.2/cmake/Findyaml-cpp.cmake 2023-08-30 21:30:11.818177005 +0200
+@@ -15,7 +15,7 @@ if (yaml-cpp_FOUND)
+ unset(yaml_cpp_include_dir CACHE)
+ find_path(yaml_cpp_include_dir yaml-cpp/yaml.h)
+ endif()
+- set_target_properties(yaml-cpp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}")
++ set_target_properties(yaml-cpp::yaml-cpp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}")
+ else()
+ if(TARGET yaml-cpp)
+ return()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt-creator.git/commitdiff/9ba7c2722fcd25bc76b8cf06856058ecea7b483e
More information about the pld-cvs-commit
mailing list