qt-creator: Update to 3.5.0-beta1
This commit is contained in:
Ray Donnelly
@@ -1,37 +0,0 @@
|
||||
From 09a4253ff82f71d5de711b561b8c4b9f73b48f50 Mon Sep 17 00:00:00 2001
|
||||
From: Ray Donnelly <mingw.android@gmail.com>
|
||||
Date: Sat, 9 May 2015 14:49:19 +0100
|
||||
Subject: [PATCH 2/2] Debugger: Handle case of os.path.sep being '/'
|
||||
|
||||
On MSYS2, if QtCreator is launched from one of the msys2 shells
|
||||
then the MSYSTEM env. var is set and our Pythons set os.sep and
|
||||
os.path.sep to '/' so that it aligns with the default separator
|
||||
of those shells.
|
||||
|
||||
fromNativePath(str) then fails to convert '\' seprators embedded
|
||||
in binaries since str.replace('/', '/') is a noop. The operation
|
||||
we want here is to convert all '\' to '/' anyway so this is more
|
||||
explicit regardless of any opinions on our choice to dynamically
|
||||
vary os.sep and os.path.sep
|
||||
|
||||
Change-Id: I76c05b188abca41c6a1b516c68b584e0c06e7235
|
||||
---
|
||||
share/qtcreator/debugger/gdbbridge.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py
|
||||
index d219689..e96fe86 100644
|
||||
--- a/share/qtcreator/debugger/gdbbridge.py
|
||||
+++ b/share/qtcreator/debugger/gdbbridge.py
|
||||
@@ -1545,7 +1545,7 @@ class Dumper(DumperBase):
|
||||
|
||||
def stackListFrames(self, args):
|
||||
def fromNativePath(str):
|
||||
- return str.replace(os.path.sep, '/')
|
||||
+ return str.replace('\\', '/')
|
||||
|
||||
limit = int(args['limit'])
|
||||
if limit <= 0:
|
||||
--
|
||||
2.4.0
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
From b25518e13179bc6553bd8b0d9a0f554bcf7bd288 Mon Sep 17 00:00:00 2001
|
||||
From: Ray Donnelly <mingw.android@gmail.com>
|
||||
Date: Wed, 10 Sep 2014 00:20:34 +0100
|
||||
Subject: [PATCH 2/2] autotools: Use summaryInWorkdir()
|
||||
|
||||
.. for the configure step. Though IMHO displaying the relative
|
||||
path would look better.
|
||||
|
||||
Change-Id: If5ec2597d8c4ae064281f848104a8eb99f2c5d1f
|
||||
---
|
||||
src/plugins/autotoolsprojectmanager/configurestep.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/plugins/autotoolsprojectmanager/configurestep.cpp b/src/plugins/autotoolsprojectmanager/configurestep.cpp
|
||||
index 06acfb9..f97f094 100644
|
||||
--- a/src/plugins/autotoolsprojectmanager/configurestep.cpp
|
||||
+++ b/src/plugins/autotoolsprojectmanager/configurestep.cpp
|
||||
@@ -298,6 +298,6 @@ void ConfigureStepConfigWidget::updateDetails()
|
||||
param.setWorkingDirectory(bc->buildDirectory().toString());
|
||||
param.setCommand(projectDirRelativeToBuildDir(bc) + QLatin1String("configure"));
|
||||
param.setArguments(m_configureStep->additionalArguments());
|
||||
- m_summaryText = param.summary(displayName());
|
||||
+ m_summaryText = param.summaryInWorkdir(displayName());
|
||||
emit updateSummary();
|
||||
}
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
_realname=qt-creator
|
||||
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
__pre=
|
||||
_base_ver=3.4.2
|
||||
__pre=-beta1
|
||||
_base_ver=3.5.0
|
||||
pkgver=${_base_ver}${_pre}
|
||||
pkgrel=1
|
||||
pkgdesc='Cross-patform IDE (mingw-w64)'
|
||||
@@ -26,11 +26,8 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-gdb: for the debugger"
|
||||
#'bzr: for bazaar support'
|
||||
)
|
||||
_pkgfqn="${_realname}-opensource-src-${_base_ver}${__pre}"
|
||||
source=(#http://download.qt-project.org/development_releases/qtcreator/${_base_ver%.*}/${_base_ver}${__pre}/${_pkgfqn}.tar.gz
|
||||
http://download.qt-project.org/official_releases/qtcreator/${pkgver%.*}/${pkgver}/${_pkgfqn}.tar.gz
|
||||
0001-autotools-Set-a-default-buildDir.patch
|
||||
0002-Debugger-Handle-case-of-os.path.sep-being.patch
|
||||
0002-autotools-Use-summaryInWorkdir.patch
|
||||
source=(http://download.qt-project.org/development_releases/qtcreator/${_base_ver%.*}/${_base_ver}${__pre}/${_pkgfqn}.tar.gz
|
||||
#http://download.qt-project.org/official_releases/qtcreator/${pkgver%.*}/${pkgver}/${_pkgfqn}.tar.gz
|
||||
qt-creator-3.2.0-Allow-static-clang-via-LLVM_STATIC-env-var.patch
|
||||
qt-creator-3.2.0-Allow-iOS-plugin-on-any-platform.patch
|
||||
qt-creator-3.2.0-Define-QBS_INSTALL_DIR-as-relative-path.patch
|
||||
@@ -39,13 +36,12 @@ source=(#http://download.qt-project.org/development_releases/qtcreator/${_base_v
|
||||
qt-creator-3.2.0-autotools-allow-non-Automake-Makefile-in-projects.patch
|
||||
qt-creator-3.2.0-i[3456]86-and-x86-have-32bit-wordWidth.patch
|
||||
qt-creator-3.3.0-abi-msys-is-Windows.patch
|
||||
qt-creator-3.3.0-MinGW-w64-MIB_TCP_STATE-not-defined-until-Vista.patch)
|
||||
qt-creator-3.3.0-MinGW-w64-MIB_TCP_STATE-not-defined-until-Vista.patch
|
||||
qt-creator-3.5.0-shellquote-declspec-dllexport-for-unix-shell.patch)
|
||||
noextract=(${_pkgfqn}.tar.gz)
|
||||
sha256sums=('f57df9954768badb252154a51cca9b21a4903f8e003ef944d25801cde1754bab'
|
||||
'205d8637152d6e6e57c4a9d9c5146efa7fa16db5fb7b8cabc3bc5ded96823d8a'
|
||||
'6217d0682c40ac586205abc835490b36ac79525fdefde5afd66e3b02daabd8a0'
|
||||
sha256sums=('e1a1c7daf7fb47bf3df1183c342d263ad4333120394d857b52c6ba58116d1148'
|
||||
'22253cf29a2c8effebb1cc8313a0f350cf993d7fc404763063e6bd8444fa61f1'
|
||||
'45b9fc82c7a9364450420920adcdb04a3b67eeb96f64733166da757a5ab91013'
|
||||
'3197763396b90e640e7897c648d48d6ca906df5b3a4bc343a7e1bfdf05f07cef'
|
||||
'96c14f54577bf6cadf5c12018745666a9e99cd8d6a876c29a28b13599a8cb368'
|
||||
'68133c95b70c1b54e55ab4c8b31023afe4ab9a33667e4510bda64c828b95e91e'
|
||||
'1a1738379b0413484fd1ff3521b6bc85d034f5f964311d963dd044b4966b274b'
|
||||
@@ -53,7 +49,8 @@ sha256sums=('f57df9954768badb252154a51cca9b21a4903f8e003ef944d25801cde1754bab'
|
||||
'0b0bba8bda0fd8247563e3827f58fe73baed17b09b9de6ea28375b7f1afa3ee1'
|
||||
'79fc4d2ef02ff8f458b1b330c683c2a86397f056369c90176a9ddbeba3b719fd'
|
||||
'c4cae708825102d538e1ecb9a88ecb216d366feb779553a2e91f97c4b78f8427'
|
||||
'b4cf07e2772b2ec6710ee7df6463feddb4195d65fa59e6c6095fbc0cb240417e')
|
||||
'b4cf07e2772b2ec6710ee7df6463feddb4195d65fa59e6c6095fbc0cb240417e'
|
||||
'802376acf3bc4546db60efdc026b348c4d09485b532a8db31d51d9e3fb74cecc')
|
||||
|
||||
prepare() {
|
||||
[ -d ${srcdir}/${_pkgfqn} ] && rm -rf ${srcdir}/${_pkgfqn}
|
||||
@@ -61,12 +58,6 @@ prepare() {
|
||||
|
||||
cd ${srcdir}/${_pkgfqn}
|
||||
|
||||
# Attempting to upstream: https://codereview.qt-project.org/#/c/94366/
|
||||
patch -p1 -i "${srcdir}"/0001-autotools-Set-a-default-buildDir.patch
|
||||
patch -p1 -i "${srcdir}"/0002-Debugger-Handle-case-of-os.path.sep-being.patch
|
||||
|
||||
# patch -p1 -i "${srcdir}"/0002-autotools-Use-summaryInWorkdir.patch
|
||||
|
||||
patch -p1 -i "${srcdir}"/qt-creator-3.2.0-Allow-static-clang-via-LLVM_STATIC-env-var.patch
|
||||
patch -p1 -i "${srcdir}"/qt-creator-3.2.0-Allow-iOS-plugin-on-any-platform.patch
|
||||
patch -p1 -i "${srcdir}"/qt-creator-3.2.0-Define-QBS_INSTALL_DIR-as-relative-path.patch
|
||||
@@ -78,6 +69,8 @@ prepare() {
|
||||
patch -p1 -i "${srcdir}"/qt-creator-3.3.0-abi-msys-is-Windows.patch
|
||||
patch -p1 -i "${srcdir}"/qt-creator-3.3.0-MinGW-w64-MIB_TCP_STATE-not-defined-until-Vista.patch
|
||||
|
||||
patch -p1 -i "${srcdir}"/qt-creator-3.5.0-shellquote-declspec-dllexport-for-unix-shell.patch
|
||||
|
||||
# Use system installed qbs
|
||||
rm -rf src/shared/qbs
|
||||
}
|
||||
|
||||
@@ -1,55 +1,44 @@
|
||||
--- qt-creator-opensource-src-3.2.0-rc1/src/plugins/clangcodemodel/clang_installation.pri.orig 2014-08-01 10:17:30.000000000 +0100
|
||||
+++ qt-creator-opensource-src-3.2.0-rc1/src/plugins/clangcodemodel/clang_installation.pri 2014-08-17 20:14:44.611209200 +0100
|
||||
@@ -50,7 +50,7 @@
|
||||
error("Cannot find clang shared library at $${LLVM_INSTALL_DIR}")
|
||||
--- qt-creator-opensource-src-3.5.0-beta1/src/shared/clang/clang_installation.pri.orig 2015-07-07 14:02:27.000000000 +0100
|
||||
+++ qt-creator-opensource-src-3.5.0-beta1/src/shared/clang/clang_installation.pri 2015-07-08 16:29:43.546384900 +0100
|
||||
@@ -40,7 +40,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
-win32 {
|
||||
+win32:!win32-g++ {
|
||||
LLVM_INCLUDEPATH = "$$LLVM_INSTALL_DIR/include"
|
||||
CLANG_LIB_PATH = $$findClangOnWindows()
|
||||
CLANG_LIB = clang
|
||||
@@ -61,7 +61,7 @@
|
||||
LLVM_VERSION = 3.4
|
||||
LLVM_LIBDIR = $$findClangOnWindows()
|
||||
isEmpty(LLVM_LIBDIR): error("Cannot find clang shared library at $${LLVM_INSTALL_DIR}")
|
||||
@@ -53,7 +53,7 @@
|
||||
LLVM_LIBS += -ladvapi32 -lshell32
|
||||
}
|
||||
|
||||
-unix {
|
||||
+unix|win32-g++ {
|
||||
LLVM_CONFIG = $$findLLVMConfig()
|
||||
llvm_config = $$LLVM_INSTALL_DIR/bin/llvm-config
|
||||
exists($$llvm_config) {
|
||||
#message("llvm-config found, querying it for paths and version")
|
||||
@@ -74,5 +74,22 @@
|
||||
clang_lib = $$findClangLibInLibDir($$LLVM_LIBDIR)
|
||||
isEmpty(clang_lib): error("Cannot find Clang shared library in $$LLVM_LIBDIR")
|
||||
|
||||
LLVM_VERSION = $$system($$LLVM_CONFIG --version)
|
||||
@@ -93,7 +93,33 @@
|
||||
}
|
||||
|
||||
LLVM_LIBS = -L$${LLVM_LIBDIR}
|
||||
- LLVM_LIBS += -l$${CLANG_LIB}
|
||||
+
|
||||
- LLVM_LIBS = -L$${LLVM_LIBDIR} -l$${clang_lib}
|
||||
+ LLVM_STATIC = $$(LLVM_STATIC)
|
||||
+ isEqual($$(LLVM_STATIC), 0): {
|
||||
+ LLVM_LIBS += -l$${CLANG_LIB}
|
||||
+ LLVM_LIBS += -l$${clang_lib}
|
||||
+ } else {
|
||||
+ # Since there is no clang-config ..
|
||||
+ LLVM_LIBS += -Wl,--start-group
|
||||
+ CLANG_LIBS = $$files($${LLVM_LIBDIR}/libclang*)
|
||||
+ for (CLANG_LIB, CLANG_LIBS) {
|
||||
+ CLANG_LIB = $$basename(CLANG_LIB)
|
||||
+ CLANG_LIB ~= s,^$$QMAKE_PREFIX_STATICLIB,,
|
||||
+ CLANG_LIB ~= s,\.$$QMAKE_EXTENSION_STATICLIB\$,,
|
||||
+ LLVM_LIBS += -l$${CLANG_LIB}
|
||||
+ CLANG_STATIC_LIBS = $$files($${LLVM_LIBDIR}/libclang*)
|
||||
+ for (CLANG_STATIC_LIB, CLANG_STATIC_LIBS) {
|
||||
+ CLANG_STATIC_LIB = $$basename(CLANG_STATIC_LIB)
|
||||
+ CLANG_STATIC_LIB ~= s,^$$QMAKE_PREFIX_STATICLIB,,
|
||||
+ CLANG_STATIC_LIB ~= s,\.$$QMAKE_EXTENSION_STATICLIB\$,,
|
||||
+ LLVM_LIBS += -l$${CLANG_STATIC_LIB}
|
||||
+ }
|
||||
+ # We might want to try "$$LLVM_CONFIG --libs analysis" instead.
|
||||
+ LLVM_LIBS += $$system($$LLVM_CONFIG --libs)
|
||||
+ LLVM_LIBS += $$system($$LLVM_CONFIG --system-libs)
|
||||
+ # We might want to try "$$llvm_config --libs analysis" instead.
|
||||
+ LLVM_LIBS += $$system($$llvm_config --libs)
|
||||
+ LLVM_LIBS += $$system($$llvm_config --system-libs)
|
||||
+ LLVM_LIBS += -Wl,--end-group
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+# llvm-config --ldflags could be used here, but
|
||||
+# that lists lots of unnecessary libraries:
|
||||
+# llvm-config.exe --ldflags
|
||||
+# -LC:\msys64\mingw64/lib -lz -lffi -lncurses -lshell32 -lpsapi -limagehlp -lm
|
||||
+win32 {
|
||||
+ LLVM_LIBS += -limagehlp
|
||||
}
|
||||
|
||||
DEFINES += CLANG_VERSION=\\\"$${LLVM_VERSION}\\\"
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- qt-creator-opensource-src-3.5.0-beta1/src/libs/3rdparty/sqlite/sqlite.pri.orig 2015-07-07 14:02:27.000000000 +0100
|
||||
+++ qt-creator-opensource-src-3.5.0-beta1/src/libs/3rdparty/sqlite/sqlite.pri 2015-07-08 18:22:04.719461900 +0100
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
SOURCES += $$PWD/sqlite3.c
|
||||
|
||||
-win32:DEFINES += SQLITE_API=__declspec(dllexport)
|
||||
+win32:DEFINES += $$shell_quote(SQLITE_API=__declspec(dllexport))
|
||||
unix:DEFINES += SQLITE_API=\"__attribute__((visibility(\\\"default\\\")))\"
|
||||
|
||||
gcc {
|
||||
Reference in New Issue
Block a user