Date: Fri, 29 Sep 2023 21:42:53 GMT From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1525b560852b - main - devel/qtcreator: Update to 11.0.3 Message-ID: <202309292142.38TLgrLN000610@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=1525b560852b4c48950c20cbca42375683387940 commit 1525b560852b4c48950c20cbca42375683387940 Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2023-09-29 21:39:55 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2023-09-29 21:42:37 +0000 devel/qtcreator: Update to 11.0.3 https://www.qt.io/blog/qt-creator-11.0.3-released --- devel/qtcreator/Makefile | 2 +- devel/qtcreator/distinfo | 6 +++--- .../files/patch-src_libs_qmljs_qmljscontext.cpp | 4 ++-- .../files/patch-src_libs_sqlite_CMakeLists.txt | 4 ++-- .../files/patch-src_tools_process__stub_main.cpp | 17 ++++++++++------- devel/qtcreator/pkg-plist | 1 + 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile index 3a8de18e4585..0317bd48bc28 100644 --- a/devel/qtcreator/Makefile +++ b/devel/qtcreator/Makefile @@ -1,5 +1,5 @@ PORTNAME= qtcreator -DISTVERSION= 11.0.2 +DISTVERSION= 11.0.3 CATEGORIES= devel MASTER_SITES= QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION} DISTNAME= qt-creator-opensource-src-${DISTVERSION} diff --git a/devel/qtcreator/distinfo b/devel/qtcreator/distinfo index 8559d1c965df..325a061998b3 100644 --- a/devel/qtcreator/distinfo +++ b/devel/qtcreator/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1692026346 -SHA256 (KDE/Qt/qtcreator/qt-creator-opensource-src-11.0.2.tar.xz) = 9de9925dfce0ad1e6fcc37af7441e1052dddd15f97206493758d8303479a2d03 -SIZE (KDE/Qt/qtcreator/qt-creator-opensource-src-11.0.2.tar.xz) = 49828532 +TIMESTAMP = 1695967211 +SHA256 (KDE/Qt/qtcreator/qt-creator-opensource-src-11.0.3.tar.xz) = 5f501e64e836b7e3e50b98b3ebc345b201396a5fd92e49738dabb5e268d5cf1c +SIZE (KDE/Qt/qtcreator/qt-creator-opensource-src-11.0.3.tar.xz) = 49863336 diff --git a/devel/qtcreator/files/patch-src_libs_qmljs_qmljscontext.cpp b/devel/qtcreator/files/patch-src_libs_qmljs_qmljscontext.cpp index dd009dd6ecef..ad90524947b0 100644 --- a/devel/qtcreator/files/patch-src_libs_qmljs_qmljscontext.cpp +++ b/devel/qtcreator/files/patch-src_libs_qmljs_qmljscontext.cpp @@ -4,9 +4,9 @@ In default ports builds Without this spurious qDebug(), the pointer allocated by the program. This hack may be disguising a memory problem higher up in the application. ---- src/libs/qmljs/qmljscontext.cpp.orig 2021-11-03 12:01:09 UTC +--- src/libs/qmljs/qmljscontext.cpp.orig 2023-09-27 07:28:12 UTC +++ src/libs/qmljs/qmljscontext.cpp -@@ -191,6 +191,7 @@ ReferenceContext::ReferenceContext(const ContextPtr &c +@@ -169,6 +169,7 @@ const Value *ReferenceContext::lookupReference(const V const Value *ReferenceContext::lookupReference(const Value *value) { const Reference *reference = value_cast<Reference>(value); diff --git a/devel/qtcreator/files/patch-src_libs_sqlite_CMakeLists.txt b/devel/qtcreator/files/patch-src_libs_sqlite_CMakeLists.txt index 876fe1aff572..75b6d7235767 100644 --- a/devel/qtcreator/files/patch-src_libs_sqlite_CMakeLists.txt +++ b/devel/qtcreator/files/patch-src_libs_sqlite_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/libs/sqlite/CMakeLists.txt.orig 2022-12-14 03:18:24 UTC +--- src/libs/sqlite/CMakeLists.txt.orig 2023-09-27 07:28:11 UTC +++ src/libs/sqlite/CMakeLists.txt -@@ -53,6 +53,8 @@ add_qtc_library(Sqlite +@@ -55,6 +55,8 @@ if (APPLE) if (APPLE) extend_qtc_library(SqliteC DEFINES _BSD_SOURCE) diff --git a/devel/qtcreator/files/patch-src_tools_process__stub_main.cpp b/devel/qtcreator/files/patch-src_tools_process__stub_main.cpp index 3ee92fc68956..2045918eab7c 100644 --- a/devel/qtcreator/files/patch-src_tools_process__stub_main.cpp +++ b/devel/qtcreator/files/patch-src_tools_process__stub_main.cpp @@ -1,15 +1,18 @@ ---- src/tools/process_stub/main.cpp.orig 2023-06-08 07:45:07 UTC +--- src/tools/process_stub/main.cpp.orig 2023-09-27 07:28:08 UTC +++ src/tools/process_stub/main.cpp -@@ -22,7 +22,7 @@ +@@ -22,10 +22,9 @@ #include <unistd.h> #endif -#ifdef Q_OS_LINUX +#ifdef Q_OS_UNIX #include <sys/ptrace.h> + #include <sys/wait.h> +-#include <sys/prctl.h> #endif -@@ -211,6 +211,9 @@ void onInferiorStarted() + #include <iostream> +@@ -254,6 +253,9 @@ void onInferiorStarted() // In debug mode we use the poll timer to send the pid. if (!debugMode) sendPid(inferiorId); @@ -17,9 +20,9 @@ + ptrace(PT_DETACH, inferiorId, 0, SIGSTOP); + sendPid(inferiorId); #else - ptrace(PTRACE_DETACH, inferiorId, 0, SIGSTOP); - sendPid(inferiorId); -@@ -230,6 +233,9 @@ void setupUnixInferior() + + if (debugMode) { +@@ -287,6 +289,9 @@ void setupUnixInferior() // Suspend ourselves ... raise(SIGSTOP); }); @@ -28,4 +31,4 @@ + inferiorProcess.setChildProcessModifier([] { ptrace(PT_TRACE_ME, 0, 0, 0); }); #else // PTRACE_TRACEME will stop execution of the child process as soon as execve is called. - inferiorProcess.setChildProcessModifier([] { ptrace(PTRACE_TRACEME, 0, 0, 0); }); + inferiorProcess.setChildProcessModifier([] { diff --git a/devel/qtcreator/pkg-plist b/devel/qtcreator/pkg-plist index 775c4f4e84fd..0dc3f1708b35 100644 --- a/devel/qtcreator/pkg-plist +++ b/devel/qtcreator/pkg-plist @@ -157,6 +157,7 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml %%DATADIR%%/changelog/changes-11.0.0.md %%DATADIR%%/changelog/changes-11.0.1.md %%DATADIR%%/changelog/changes-11.0.2.md +%%DATADIR%%/changelog/changes-11.0.3.md %%DATADIR%%/changelog/changes-2.0.0 %%DATADIR%%/changelog/changes-2.0.1 %%DATADIR%%/changelog/changes-2.1.0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309292142.38TLgrLN000610>