[packages/qt-creator] up to 15.0.0

atler atler at pld-linux.org
Sat Dec 14 17:56:53 CET 2024


commit 4b4fbeea36c7a4c31ac63e86ed0e435644d4ce9d
Author: Jan Palus <atler at pld-linux.org>
Date:   Sat Dec 14 17:16:06 2024 +0100

    up to 15.0.0
    
    - requires golang now (EA:)
    - require upx with support for arm64

 go-vendor.patch | 11 +++++++++++
 qt-creator.spec | 29 +++++++++++++++++++++--------
 2 files changed, 32 insertions(+), 8 deletions(-)
---
diff --git a/qt-creator.spec b/qt-creator.spec
index 0f98f83..0b0e5c6 100644
--- a/qt-creator.spec
+++ b/qt-creator.spec
@@ -12,13 +12,20 @@
 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:	13.0.1
-Release:	4
+Version:	15.0.0
+Release:	1
 Epoch:		1
 License:	LGPL v2.1
 Group:		X11/Development/Tools
-Source0:	https://download.qt.io/official_releases/qtcreator/13.0/%{version}/%{name}-opensource-src-%{version}.tar.xz
-# Source0-md5:	4e7cb5c7c0287b9c3c838b8c436a35b8
+Source0:	https://download.qt.io/official_releases/qtcreator/15.0/%{version}/%{name}-opensource-src-%{version}.tar.xz
+# Source0-md5:	01c2e452721f81d070081eb2f8416ad0
+# cd src/libs/gocmdbridge/server
+# go mod vendor
+# cd ../../../..
+# tar acf go-vendor.tar.xz src/libs/gocmdbridge/server/vendor
+Source1:	go-vendor.tar.xz
+# Source1-md5:	be8524f78f4bff8f151db634c1d7e23d
+Patch0:		go-vendor.patch
 URL:		https://doc.qt.io/qtcreator/
 BuildRequires:	Qt6Concurrent-devel >= %{qtver}
 BuildRequires:	Qt6Designer-devel >= %{qtver}
@@ -38,15 +45,17 @@ BuildRequires:	Qt6UiTools-devel >= %{qtver}
 BuildRequires:	Qt6Widgets-devel >= %{qtver}
 BuildRequires:	Qt6Xml-devel >= %{qtver}
 BuildRequires:	clang-devel >= 6.0.0
-BuildRequires:	cmake >= 3.16
+BuildRequires:	cmake >= 3.20
 BuildRequires:	gdb
-BuildRequires:	libstdc++-devel >= 6:7
+BuildRequires:	golang >= 1.21.7
+BuildRequires:	libstdc++-devel >= 6:8
 BuildRequires:	llvm-devel >= 7.0.0
 BuildRequires:	qt6-build >= %{qtver}
 BuildRequires:	qt6-linguist
 BuildRequires:	qt6-shadertools
-BuildRequires:	rpmbuild(macros) >= 1.742
+BuildRequires:	rpmbuild(macros) >= 2.009
 BuildRequires:	tar >= 1:1.22
+BuildRequires:	upx >= 3.94
 BuildRequires:	xz
 BuildRequires:	yaml-cpp-devel >= 0.8
 Requires(post,postun):	desktop-file-utils
@@ -57,9 +66,11 @@ Requires:	hicolor-icon-theme
 Requires:	qt5-qtdeclarative
 # for xdg-open
 Suggests:	xdg-utils
+ExclusiveArch:	%go_arches
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		skip_post_check_so	'libClangsupport\.so.*'
+%define		_noautostrip		.*cmdbridge.*
 
 %description
 Qt Creator is a cross-platform integrated development environment
@@ -71,6 +82,7 @@ Qt.
 
 %prep
 %setup -q -n %{name}-opensource-src-%{version}
+%patch -P 0 -p1
 
 sed -i '1s,/usr/bin/env python,%{__python},' src/shared/qbs/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/__main__.py
 
@@ -122,6 +134,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/ld.so.conf.d/qtcreator.conf
 %dir %{_libexecdir}/qtcreator
 %attr(755,root,root) %{_libexecdir}/qtcreator/buildoutputparser
+%attr(755,root,root) %{_libexecdir}/qtcreator/cmdbridge-*
 %attr(755,root,root) %{_libexecdir}/qtcreator/cpaster
 %{?with_qbs:%attr(755,root,root) %{_libexecdir}/qtcreator/dmgbuild}
 %attr(755,root,root) %{_libexecdir}/qtcreator/perf2text
@@ -135,7 +148,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.13
+%attr(755,root,root) %ghost %{_libdir}/qtcreator/lib*.so.15
 %dir %{_libdir}/qtcreator/plugins
 %attr(755,root,root) %{_libdir}/qtcreator/plugins/lib*.so
 %if %{with qbs}
diff --git a/go-vendor.patch b/go-vendor.patch
new file mode 100644
index 0000000..c3f18b3
--- /dev/null
+++ b/go-vendor.patch
@@ -0,0 +1,11 @@
+--- qt-creator-opensource-src-15.0.0/src/libs/gocmdbridge/server/CMakeLists.txt.orig	2024-11-27 11:00:23.000000000 +0100
++++ qt-creator-opensource-src-15.0.0/src/libs/gocmdbridge/server/CMakeLists.txt	2024-12-14 15:50:21.597791166 +0100
+@@ -11,7 +11,7 @@
+             if ((${PLATFORM} STREQUAL "linux" OR (${PLATFORM} STREQUAL "windows" AND ${ARCHITECTURE} STREQUAL "amd64")) AND NOT UPX_BIN STREQUAL "UPX_BIN-NOTFOUND")
+                 add_custom_command(
+                     OUTPUT "${OUTPUT}"
+-                    COMMAND ${CMAKE_COMMAND} -E env GOARCH=${ARCHITECTURE} GOOS=${PLATFORM} ${GO_BIN} build -ldflags "-s -w ${LDFLAGS}" -o ${OUTPUT}
++                    COMMAND ${CMAKE_COMMAND} -E env GOARCH=${ARCHITECTURE} GOOS=${PLATFORM} ${GO_BIN} build -mod=veendor -ldflags "-s -w ${LDFLAGS}" -o ${OUTPUT}
+                     COMMAND ${UPX_BIN} -9 ${OUTPUT}
+                     DEPENDS ${SOURCES}
+                     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt-creator.git/commitdiff/4b4fbeea36c7a4c31ac63e86ed0e435644d4ce9d



More information about the pld-cvs-commit mailing list