rmpkg(x11/qt-creator): Remove outdated package

This commit is contained in:
termux-pacman-bot
2025-11-16 08:40:15 +00:00
parent 4a18f3bd90
commit 0fc282e4d3
13 changed files with 0 additions and 471 deletions

View File

@@ -1,22 +0,0 @@
excinfo.h is not available on Termux environment
Add an extra macro check for __ANDROID__ so it's excluded
--- src/src/plugins/debugger/shared/backtrace.cpp 2020-07-07 06:44:20.000000000 +0000
+++ src.mod/src/plugins/debugger/shared/backtrace.cpp 2021-05-24 10:38:54.023502983 +0000
@@ -27,7 +27,7 @@
#include <QDebug>
#include <QProcess>
-#if defined(Q_OS_LINUX)
+#if defined(Q_OS_LINUX) && !defined(__ANDROID__)
#include <stdio.h>
#include <signal.h>
#include <execinfo.h>
@@ -40,7 +40,7 @@
{
if (maxdepth == -1)
maxdepth = 200;
-#if defined(Q_OS_LINUX)
+#if defined(Q_OS_LINUX) && !defined(__ANDROID__)
void *bt[200] = {nullptr};
qDebug() << "BACKTRACE:";
int size = backtrace(bt, sizeof(bt) / sizeof(bt[0]));

View File

@@ -1,47 +0,0 @@
TERMUX_PKG_HOMEPAGE=https://www.qt.io/
TERMUX_PKG_DESCRIPTION="Integrated Development Environment for Qt"
TERMUX_PKG_LICENSE="LGPL-3.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=4.15.2
TERMUX_PKG_REVISION=6
TERMUX_PKG_SRCURL="https://github.com/qt-creator/qt-creator/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz"
TERMUX_PKG_SHA256=e23e76ea518cc65949f29e9eff18331a9a1da0817b292afbcbb4d5cdeada3c47
TERMUX_PKG_AUTO_UPDATE=false
TERMUX_PKG_DEPENDS="libc++, libllvm, qt5-qtbase, qt5-qtdeclarative, qt5-qtxmlpatterns, qt5-qttools, qt5-qtx11extras, qt5-qtsvg, llvm, clang"
TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools, qt5-qtdeclarative-cross-tools, qt5-qttools-cross-tools"
TERMUX_PKG_RECOMMENDS="gdb, git, make, cmake, valgrind"
TERMUX_PKG_SUGGESTS="cvs, subversion"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_NO_STATICSPLIT=true
termux_step_configure () {
# -r to force Makefile generations for all subdirs at this step so process_stub can be patched
# Disable QML Designer plugin which requires OpenGL
# Disable clang refactoring plugin which has odd linking issues at the moment
export QTC_DO_NOT_BUILD_QMLDESIGNER=1
export QTC_DISABLE_CLANG_REFACTORING=1
"${TERMUX_PREFIX}/opt/qt/cross/bin/qmake" -r \
-spec "${TERMUX_PREFIX}/lib/qt/mkspecs/termux-cross" \
LLVM_CONFIG=$TERMUX_PREFIX/bin/llvm-config
}
termux_step_post_configure() {
# process_stub's Makefile has the incorrect LINK executable (it should've been QMAKE_CXX)
sed -i "s|^LINK = clang|LINK = ${CXX}|" \
${TERMUX_PKG_SRCDIR}/src/libs/utils/Makefile.process_stub
# clangbackend's Makefile lacks -lc++_shared to link against libc++ on x86_64
sed -i -e 's|^LIBS = $(SUBLIBS)|LIBS = $(SUBLIBS) -lc++_shared|' \
-e 's|-Wl,-rpath,'${TERMUX_COMMON_CACHEDIR//./\\.}'/android-r[0-9][^/]*/lib64||g' \
-e 's|-L'${TERMUX_COMMON_CACHEDIR//./\\.}'/android-r[0-9][^/]*/lib64||g' \
${TERMUX_PKG_SRCDIR}/src/tools/clangbackend/Makefile
# make sure clangtools link against libc++_shared on x86_64
sed -i -e 's|^LIBS = $(SUBLIBS)|LIBS = $(SUBLIBS) -lc++_shared|' \
-e 's|-Wl,-rpath,'${TERMUX_COMMON_CACHEDIR//./\\.}'/android-r[0-9][^/]*/lib64||g' \
-e 's|-L'${TERMUX_COMMON_CACHEDIR//./\\.}'/android-r[0-9][^/]*/lib64||g' \
${TERMUX_PKG_SRCDIR}/src/plugins/clangtools/Makefile
# required by make install, otherwise it installs to '/'
export INSTALL_ROOT="${TERMUX_PREFIX}"
}

View File

@@ -1,11 +0,0 @@
--- src/src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h 2020-07-07 06:44:20.000000000 +0000
+++ src.mod//src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h 2021-05-24 12:46:08.430407000 +0000
@@ -44,7 +44,7 @@
#if LLVM_VERSION_MAJOR >= 12
compilerInstance.getPreprocessorOpts().DisablePCHOrModuleValidation = clang::DisableValidationForModuleKind::PCH;
#else
- compilerInstance.getPreprocessorOpts().DisablePCHValidation = true;
+ // compilerInstance.getPreprocessorOpts().DisablePCHValidation = true;
#endif
compilerInstance.getPreprocessorOpts().AllowPCHWithCompilerErrors = true;
compilerInstance.getDiagnosticOpts().ErrorLimit = 0;

View File

@@ -1,44 +0,0 @@
--- src/src/plugins/plugins.pro 2021-05-24 18:00:34.384117000 +0000
+++ src.mod/src/plugins/plugins.pro 2021-05-24 18:01:03.292691000 +0000
@@ -16,7 +16,6 @@
bookmarks \
projectexplorer \
vcsbase \
- perforce \
subversion \
git \
cvs \
@@ -35,9 +34,6 @@
qmlprojectmanager \
glsleditor \
python \
- nim \
- mercurial \
- bazaar \
classview \
tasklist \
qmljstools \
@@ -46,13 +42,8 @@
android \
valgrind \
todo \
- qnx \
- clearcase \
- baremetal \
- ios \
beautifier \
modeleditor \
- winrt \
updateinfo \
scxmleditor \
welcome \
@@ -61,9 +52,6 @@
cppcheck \
compilationdatabaseprojectmanager \
qmlpreview \
- studiowelcome \
- webassembly \
- mcusupport \
marketplace \
incredibuild \
conan

View File

@@ -1,18 +0,0 @@
Host bin should be used instead of the target bin (QT_INSTALL_BINS)
--- src/share/qtcreator/translations/translations.pro 2020-07-07 06:44:20.000000000 +0000
+++ src.mod/share/qtcreator/translations/translations.pro 2021-05-24 13:16:43.593579000 +0000
@@ -12,10 +12,10 @@
return($$result)
}
-XMLPATTERNS = $$shell_path($$[QT_INSTALL_BINS]/xmlpatterns)
-LUPDATE = $$shell_path($$[QT_INSTALL_BINS]/lupdate) -locations relative -no-ui-lines -no-sort
-LRELEASE = $$shell_path($$[QT_INSTALL_BINS]/lrelease)
-LCONVERT = $$shell_path($$[QT_INSTALL_BINS]/lconvert)
+XMLPATTERNS = $$shell_path($$[QT_HOST_BINS]/xmlpatterns)
+LUPDATE = $$shell_path($$[QT_HOST_BINS]/lupdate) -locations relative -no-ui-lines -no-sort
+LRELEASE = $$shell_path($$[QT_HOST_BINS]/lrelease)
+LCONVERT = $$shell_path($$[QT_HOST_BINS]/lconvert)
wd = $$replace(IDE_SOURCE_TREE, /, $$QMAKE_DIR_SEP)

View File

@@ -1,158 +0,0 @@
--- a/src/plugins/clangformat/clangformatbaseindenter.cpp
+++ b/src/plugins/clangformat/clangformatbaseindenter.cpp
@@ -42,12 +42,24 @@
ReplacementsToKeep replacementsToKeep)
{
style.MaxEmptyLinesToKeep = 100;
+#if LLVM_VERSION_MAJOR >= 13
+ style.SortIncludes = clang::format::FormatStyle::SI_Never;
+#else
style.SortIncludes = false;
+#endif
+#if LLVM_VERSION_MAJOR >= 16
+ style.SortUsingDeclarations = clang::format::FormatStyle::SUD_Never;
+#else
style.SortUsingDeclarations = false;
+#endif
// This is a separate pass, don't do it unless it's the full formatting.
style.FixNamespaceComments = false;
+#if LLVM_VERSION_MAJOR >= 16
+ style.AlignTrailingComments = {clang::format::FormatStyle::TCAS_Never, 0};
+#else
style.AlignTrailingComments = false;
+#endif
if (replacementsToKeep == ReplacementsToKeep::IndentAndBefore)
return;
--- a/src/plugins/clangformat/clangformatutils.cpp
+++ b/src/plugins/clangformat/clangformatutils.cpp
@@ -51,7 +51,16 @@
style.Language = FormatStyle::LK_Cpp;
style.AccessModifierOffset = -4;
style.AlignAfterOpenBracket = FormatStyle::BAS_Align;
-#if LLVM_VERSION_MAJOR >= 12
+#if LLVM_VERSION_MAJOR >= 20
+ style.AlignConsecutiveAssignments = {false, false, false, false, false, false, false};
+ style.AlignConsecutiveDeclarations = {false, false, false, false, false, false, false};
+#elif LLVM_VERSION_MAJOR >= 18
+ style.AlignConsecutiveAssignments = {false, false, false, false, false, false};
+ style.AlignConsecutiveDeclarations = {false, false, false, false, false, false};
+#elif LLVM_VERSION_MAJOR >= 15
+ style.AlignConsecutiveAssignments = {false, false, false, false, false};
+ style.AlignConsecutiveDeclarations = {false, false, false, false, false};
+#elif LLVM_VERSION_MAJOR >= 12
style.AlignConsecutiveAssignments = FormatStyle::ACS_None;
style.AlignConsecutiveDeclarations = FormatStyle::ACS_None;
#else
@@ -64,7 +73,11 @@
#else
style.AlignOperands = true;
#endif
+#if LLVM_VERSION_MAJOR >= 16
+ style.AlignTrailingComments = {FormatStyle::TCAS_Always, 0};
+#else
style.AlignTrailingComments = true;
+#endif
style.AllowAllParametersOfDeclarationOnNextLine = true;
#if LLVM_VERSION_MAJOR >= 10
style.AllowShortBlocksOnASingleLine = FormatStyle::SBS_Never;
@@ -79,11 +92,20 @@
style.AllowShortIfStatementsOnASingleLine = false;
#endif
style.AllowShortLoopsOnASingleLine = false;
- style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_None;
style.AlwaysBreakBeforeMultilineStrings = false;
+#if LLVM_VERSION_MAJOR >= 19
+ style.BreakAfterReturnType = FormatStyle::RTBS_None;
+ style.BreakTemplateDeclarations = FormatStyle::BTDS_Yes;
+#else
+ style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_None;
style.AlwaysBreakTemplateDeclarations = FormatStyle::BTDS_Yes;
+#endif
style.BinPackArguments = false;
+#if LLVM_VERSION_MAJOR >= 20
+ style.BinPackParameters = FormatStyle::BPPS_OnePerLine;
+#else
style.BinPackParameters = false;
+#endif
style.BraceWrapping.AfterClass = true;
#if LLVM_VERSION_MAJOR >= 10
style.BraceWrapping.AfterControlStatement = FormatStyle::BWACS_Never;
@@ -111,7 +133,11 @@
style.ColumnLimit = 100;
style.CommentPragmas = "^ IWYU pragma:";
style.CompactNamespaces = false;
+#if LLVM_VERSION_MAJOR >= 15
+ style.PackConstructorInitializers = FormatStyle::PCIS_BinPack;
+#else
style.ConstructorInitializerAllOnOneLineOrOnePerLine = false;
+#endif
style.ConstructorInitializerIndentWidth = 4;
style.ContinuationIndentWidth = 4;
style.Cpp11BracedListStyle = true;
@@ -120,14 +146,22 @@
style.ExperimentalAutoDetectBinPacking = false;
style.FixNamespaceComments = true;
style.ForEachMacros = {"forever", "foreach", "Q_FOREACH", "BOOST_FOREACH"};
+#if LLVM_VERSION_MAJOR >= 12
+ style.IncludeStyle.IncludeCategories = {{"^<Q.*", 200, 200, true}};
+#else
style.IncludeStyle.IncludeCategories = {{"^<Q.*", 200, 200}};
+#endif
style.IncludeStyle.IncludeIsMainRegex = "(Test)?$";
style.IndentCaseLabels = false;
style.IndentWidth = 4;
style.IndentWrappedFunctionNames = false;
style.JavaScriptQuotes = FormatStyle::JSQS_Leave;
style.JavaScriptWrapImports = true;
+#if LLVM_VERSION_MAJOR >= 19
+ style.KeepEmptyLines = {false, false, false};
+#else
style.KeepEmptyLinesAtTheStartOfBlocks = false;
+#endif
// Do not add QT_BEGIN_NAMESPACE/QT_END_NAMESPACE as this will indent lines in between.
style.MacroBlockBegin = "";
style.MacroBlockEnd = "";
@@ -144,19 +178,41 @@
style.PenaltyExcessCharacter = 50;
style.PenaltyReturnTypeOnItsOwnLine = 300;
style.PointerAlignment = FormatStyle::PAS_Right;
+#if LLVM_VERSION_MAJOR >= 20
+ style.ReflowComments = FormatStyle::RCS_Never;
+#else
style.ReflowComments = false;
+#endif
+#if LLVM_VERSION_MAJOR >= 13
+ style.SortIncludes = FormatStyle::SI_CaseSensitive;
+#else
style.SortIncludes = true;
+#endif
+#if LLVM_VERSION_MAJOR >= 16
+ style.SortUsingDeclarations = FormatStyle::SUD_Lexicographic;
+#else
style.SortUsingDeclarations = true;
+#endif
style.SpaceAfterCStyleCast = true;
style.SpaceAfterTemplateKeyword = false;
style.SpaceBeforeAssignmentOperators = true;
style.SpaceBeforeParens = FormatStyle::SBPO_ControlStatements;
+#if LLVM_VERSION_MAJOR < 17
style.SpaceInEmptyParentheses = false;
+#endif
style.SpacesBeforeTrailingComments = 1;
+#if LLVM_VERSION_MAJOR >= 13
+ style.SpacesInAngles = FormatStyle::SIAS_Never;
+#else
style.SpacesInAngles = false;
+#endif
style.SpacesInContainerLiterals = false;
+#if LLVM_VERSION_MAJOR >= 17
+ style.SpacesInParens = FormatStyle::SIPO_Never;
+#else
style.SpacesInCStyleCastParentheses = false;
style.SpacesInParentheses = false;
+#endif
style.SpacesInSquareBrackets = false;
style.Standard = FormatStyle::LS_Cpp11;
style.TabWidth = 4;

View File

@@ -1,14 +0,0 @@
--- a/src/plugins/clangformat/clangformatbaseindenter.cpp
+++ b/src/plugins/clangformat/clangformatbaseindenter.cpp
@@ -73,7 +73,11 @@
llvm::StringRef clearExtraNewline(llvm::StringRef text)
{
+#if LLVM_VERSION_MAJOR >= 19
+ while (text.starts_with("\n\n"))
+#else
while (text.startswith("\n\n"))
+#endif
text = text.drop_front();
return text;
}

View File

@@ -1,14 +0,0 @@
Android or not, let Qt consider it compatible as long as other criteria met
--- src/src/plugins/projectexplorer/abi.cpp 2021-05-24 17:41:06.487058000 +0000
+++ src.mod/src/plugins/projectexplorer/abi.cpp 2021-05-24 17:44:21.724678000 +0000
@@ -654,10 +654,6 @@
isCompat = true;
}
- // Make Android matching more strict than the generic Linux matches so far:
- if (isCompat && (osFlavor() == AndroidLinuxFlavor || other.osFlavor() == AndroidLinuxFlavor))
- isCompat = (architecture() == other.architecture()) && (osFlavor() == other.osFlavor());
-
if (!isCompat && wordWidth() == other.wordWidth()
&& compatibleMSVCFlavors(osFlavor(), other.osFlavor())) {
isCompat = true;

View File

@@ -1,12 +0,0 @@
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -79,6 +79,9 @@
#ifdef Q_OS_LINUX
#include <malloc.h>
+#ifdef __ANDROID__
+#define malloc_trim(pad) (0)
+#endif
#endif
using namespace ExtensionSystem;

View File

@@ -1,17 +0,0 @@
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -4371,7 +4371,14 @@
};
using Flag = GenerateGetterSetterOp::GenerateFlag;
constexpr static Flag ColumnFlag[] = {
+#if defined(__clang__) && __clang_major__ >= 16
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wenum-constexpr-conversion"
+#endif
static_cast<Flag>(-1),
+#if defined(__clang__) && __clang_major__ >= 16
+#pragma GCC diagnostic pop
+#endif
Flag::GenerateGetter,
Flag::GenerateSetter,
Flag::GenerateSignal,

View File

@@ -1,36 +0,0 @@
--- src/src/shared/qtsingleapplication/qtsingleapplication.cpp 2020-07-07 06:44:20.000000000 +0000
+++ src.mod/src/shared/qtsingleapplication/qtsingleapplication.cpp 2021-05-24 10:25:32.415055562 +0000
@@ -53,6 +53,10 @@
{
this->appId = appId;
+#ifdef QT_NO_SHAREDMEMORY
+ instances = 0;
+ return;
+#else
const QString appSessionId = QtLocalPeer::appSessionId(appId);
// This shared memory holds a zero-terminated array of active (or crashed) instances
@@ -94,12 +98,14 @@
connect(pidPeer, &QtLocalPeer::messageReceived, this, &QtSingleApplication::messageReceived);
pidPeer->isClient();
lockfile.unlock();
+#endif
}
QtSingleApplication::~QtSingleApplication()
{
if (!instances)
return;
+#ifndef QT_NO_SHAREDMEMORY
const qint64 appPid = QCoreApplication::applicationPid();
QtLockedFile lockfile(instancesLockFilename(QtLocalPeer::appSessionId(appId)));
lockfile.open(QtLockedFile::ReadWrite);
@@ -113,6 +119,7 @@
}
*newpids = 0;
lockfile.unlock();
+#endif
}
bool QtSingleApplication::event(QEvent *event)

View File

@@ -1,49 +0,0 @@
Make sure RPATH is enabled regardless of the OS detection.
--- src/src/rpath.pri 2020-07-07 06:44:20.000000000 +0000
+++ src.mod/src/rpath.pri 2021-05-24 14:00:48.228091000 +0000
@@ -8,7 +8,7 @@
macos {
QMAKE_LFLAGS += -Wl,-rpath,@loader_path/$$REL_PATH_TO_LIBS,-rpath,@loader_path/$$REL_PATH_TO_PLUGINS
-} else:linux-* {
+} else {
QMAKE_RPATHDIR += \$\$ORIGIN
QMAKE_RPATHDIR += \$\$ORIGIN/$$REL_PATH_TO_LIBS
QMAKE_RPATHDIR += \$\$ORIGIN/$$REL_PATH_TO_PLUGINS
--- src/src/qtcreatorplugin.pri 2020-07-07 06:44:20.000000000 +0000
+++ src.mod/src/qtcreatorplugin.pri 2021-05-24 14:01:30.264902000 +0000
@@ -96,7 +96,7 @@
TEMPLATE = lib
CONFIG += plugin plugin_with_soname
-linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
+QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
target.path = $$INSTALL_PLUGIN_PATH
INSTALLS += target
--- src/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro 2020-07-07 06:44:20.000000000 +0000
+++ src.mod/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro 2021-05-24 14:02:28.788142000 +0000
@@ -13,17 +13,13 @@
IDE_LIBRARY_BASENAME = lib
}
-linux-*||win32 {
- # form abs path to qtcreator lib dir
- QTC_LIBS=$$dirname(OUT_PWD)
- QTC_LIBS=$$dirname(QTC_LIBS)
- QTC_LIBS=$$dirname(QTC_LIBS)
- QTC_LIBS=$$QTC_LIBS/$$IDE_LIBRARY_BASENAME/qtcreator
-}
+# form abs path to qtcreator lib dir
+QTC_LIBS=$$dirname(OUT_PWD)
+QTC_LIBS=$$dirname(QTC_LIBS)
+QTC_LIBS=$$dirname(QTC_LIBS)
+QTC_LIBS=$$QTC_LIBS/$$IDE_LIBRARY_BASENAME/qtcreator
-linux-*{
- QMAKE_RPATHDIR *= $$QTC_LIBS
-}
+QMAKE_RPATHDIR *= $$QTC_LIBS
INCLUDEPATH += ../../../src/libs
macx {

View File

@@ -1,29 +0,0 @@
--- src/src/plugins/plugins.pro 2020-07-07 06:44:20.000000000 +0000
+++ src.mod/src/plugins/plugins.pro 2021-05-24 11:08:50.489277117 +0000
@@ -72,12 +72,6 @@
warning("SerialTerminal plugin has been disabled since the Qt SerialPort module is not available.")
}
-qtHaveModule(quick) {
- SUBDIRS += qmlprofiler perfprofiler ctfvisualizer
-} else {
- warning("QmlProfiler, PerfProfiler and CTF Visualizer plugins have been disabled since the Qt Quick module is not available.")
-}
-
qtHaveModule(help) {
SUBDIRS += help
} else {
--- src/src/libs/libs.pro 2020-07-07 06:44:20.000000000 +0000
+++ src.mod/src/libs/libs.pro 2021-05-24 10:03:26.192640937 +0000
@@ -18,11 +18,6 @@
languageserverprotocol \
sqlite
-qtHaveModule(quick) {
- SUBDIRS += \
- tracing
-}
-
QTC_DO_NOT_BUILD_QMLDESIGNER = $$(QTC_DO_NOT_BUILD_QMLDESIGNER)
isEmpty(QTC_DO_NOT_BUILD_QMLDESIGNER):qtHaveModule(quick-private) {
exists($$[QT_INSTALL_QML]/QtQuick/Controls/qmldir) {