From 4fe0fd89ec28f65b2b71b5949f58b83516372e36 Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Mon, 15 Jan 2018 19:53:40 +0100 Subject: libre/qtcreator: updated to 4.5.0 --- ...t-creator-to-build-on-arm-aarch32-and-aar.patch | 94 ---------------------- libre/qtcreator/PKGBUILD | 62 +++++++------- libre/qtcreator/libre.patch | 46 ++++------- 3 files changed, 49 insertions(+), 153 deletions(-) delete mode 100644 libre/qtcreator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch (limited to 'libre') diff --git a/libre/qtcreator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch b/libre/qtcreator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch deleted file mode 100644 index 84e268712..000000000 --- a/libre/qtcreator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch +++ /dev/null @@ -1,94 +0,0 @@ -From c6d02dba2911d93e2379cfb5e550b93558dd51bf Mon Sep 17 00:00:00 2001 -From: Greg Nietsky -Date: Tue, 4 Mar 2014 11:33:40 +0200 -Subject: [PATCH] Fix: Allow qt-creator to build on arm aarch32 and aarch64 - -Botan is imported hardwired for x86 this small patch allows it -too operate on arm other platforms could be added. - -Task-number: QTCREATORBUG-8107 -Change-Id: Iddea28f21c9fa1afd2fdd5d16a44e6c96a516a7a ---- - src/libs/3rdparty/botan/botan.cpp | 16 +++++++++++++++- - src/libs/3rdparty/botan/botan.h | 2 ++ - 2 files changed, 17 insertions(+), 1 deletion(-) - -diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp -index 917c385..4364a2e 100644 ---- a/src/libs/3rdparty/botan/botan.cpp -+++ b/src/libs/3rdparty/botan/botan.cpp -@@ -1101,6 +1101,8 @@ class Montgomery_Exponentiator : public Modular_Exponentiator - - #if (BOTAN_MP_WORD_BITS != 32) - #error The mp_x86_32 module requires that BOTAN_MP_WORD_BITS == 32 -+#elif !defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) -+typedef Botan::u64bit dword; - #endif - - #ifdef Q_OS_UNIX -@@ -1118,6 +1120,7 @@ extern "C" { - */ - inline word word_madd2(word a, word b, word* c) - { -+#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) - asm( - ASM("mull %[b]") - ASM("addl %[c],%[a]") -@@ -1127,6 +1130,11 @@ inline word word_madd2(word a, word b, word* c) - : "0"(a), "1"(b), [c]"g"(*c) : "cc"); - - return a; -+#else -+ dword z = (dword)a * b + *c; -+ *c = (word)(z >> BOTAN_MP_WORD_BITS); -+ return (word)z; -+#endif - } - - /* -@@ -1134,6 +1142,7 @@ inline word word_madd2(word a, word b, word* c) - */ - inline word word_madd3(word a, word b, word c, word* d) - { -+#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) - asm( - ASM("mull %[b]") - -@@ -1147,6 +1156,11 @@ inline word word_madd3(word a, word b, word c, word* d) - : "0"(a), "1"(b), [c]"g"(c), [d]"g"(*d) : "cc"); - - return a; -+#else -+ dword z = (dword)a * b + c + *d; -+ *d = (word)(z >> BOTAN_MP_WORD_BITS); -+ return (word)z; -+#endif - } - - } -@@ -2315,7 +2329,7 @@ namespace Botan { - - extern "C" { - --#ifdef Q_OS_UNIX -+#if defined(Q_OS_UNIX) && defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) - /* - * Helper Macros for x86 Assembly - */ -diff --git a/src/libs/3rdparty/botan/botan.h b/src/libs/3rdparty/botan/botan.h -index 6a9cbe0..3bfdbc2 100644 ---- a/src/libs/3rdparty/botan/botan.h -+++ b/src/libs/3rdparty/botan/botan.h -@@ -81,7 +81,9 @@ - #endif - - #define BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN -+#if !defined(__arm__) && !defined(__aarch64__) - #define BOTAN_TARGET_CPU_IS_X86_FAMILY -+#endif - #define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 1 - - #if defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) || \ --- -2.3.0 - diff --git a/libre/qtcreator/PKGBUILD b/libre/qtcreator/PKGBUILD index 8363ad5bb..093e85b93 100644 --- a/libre/qtcreator/PKGBUILD +++ b/libre/qtcreator/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 291844 2017-03-30 10:00:44Z arojas $ +# $Id$ # Maintainer (Arch): Sven-Hendrik Haase +# Maintainer (Arch): Antonio Rojas # Contributor (Arch): Imanol Celaya # Contributor (Arch): Lukas Jirkovsky # Contributor (Arch): Dan Vratil # Contributor (Arch): thotypous # Contributor (Arch): delor -# Maintainer: André Silva +# Contributor: André Silva pkgname=qtcreator -pkgver=4.2.1 -_pkgver=v4.2.1 -pkgrel=4.parabola1 +pkgver=4.5.0 +_clangver=5.0.1 +pkgrel=2.parabola1 pkgdesc='Lightweight, cross-platform integrated development environment, without nonfree qt5-webengine support' -arch=('i686' 'x86_64' 'armv7h') +arch=(x86_64 i686 armv7h) url='http://qt-project.org' -license=('LGPL') -depends=('qt5-tools' 'qt5-declarative' 'qt5-script' 'qt5-quickcontrols' 'qt5-quickcontrols2' 'clang' 'qbs') -makedepends=('git' 'mesa' 'llvm') -options=('docs') +license=(LGPL) +depends=(qt5-tools qt5-declarative qt5-script qt5-quickcontrols qt5-quickcontrols2 clang=$_clangver qbs) +makedepends=(git mesa llvm) +options=(docs) optdepends=('qt5-doc: integrated Qt documentation' 'qt5-examples: welcome page examples' 'qt5-translations: for other languages' @@ -28,38 +29,39 @@ optdepends=('qt5-doc: integrated Qt documentation' 'mercurial: mercurial support' 'bzr: bazaar support' 'valgrind: analyze support') -source=("http://download.qt.io/official_releases/qtcreator/4.2/${pkgver}/qt-creator-opensource-src-${pkgver}.tar.xz" - 'libre.patch' - '0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch') -sha512sums=('3135b64a36240bffe41c1373d5e5d5327cfa556f42eb339afcacf2f8d294843b96269269417ab262ba8292e28a57472c78ab7ff4686f0360616a4014c75809e9' - '57dd505e183661463567b6a7711a7b58f1d5e5b6ecc808acbae4df78366ed3d08be9eb04f6883ad8fd15318c826645e655e7028136b16a801e0084d3a2b51b2a' - 'af0a0d5a2fadcfce14def65be73c99bff8227794b9ad2be333713c89e226e2c6b43802a802b6e30f3e6c1b4b77f31183bffdcca3404d9686f15fa84dfc64d1a1') +source=("http://download.qt.io/official_releases/qtcreator/${pkgver%.*}/${pkgver}/qt-creator-opensource-src-${pkgver}.tar.xz" + 'libre.patch') +sha512sums=('9296ebef4a3d5ae40a9fa3a4039e77b8e407dfb52af3a88b4cc615a89e163d92de420d9db614bc689adc695879f0c2e1906e9a218e7a6b96c4b222d52c94912c' + 'a1be1d669e1a496ab8e975b925e4b2fa962fc268616deffa09163c42d62874adf210e47cd16ee375110ef53791bd84d53d115b422cef49ba98efbd552e99944c') prepare() { - cd $srcdir/qt-creator-opensource-src-$pkgver - patch -p1 -i ../libre.patch - rm -rv src/plugins/help/webenginehelpviewer.{cpp,h} + mkdir -p build + + # fix hardcoded libexec path + sed -e 's|libexec\/qtcreator|lib\/qtcreator|g' -i qt-creator-opensource-src-${pkgver}/qtcreator.pri + # use system qbs + rm -r qt-creator-opensource-src-${pkgver}/src/shared/qbs - if [[ "$CARCH" =~ ^arm*|^aarch64$ ]]; then - git apply ../0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch - fi + # remove qt5-webengine support + cd qt-creator-opensource-src-${pkgver} + patch -Np1 -i "$srcdir"/libre.patch + rm -rv src/plugins/help/webenginehelpviewer.{cpp,h} } build() { - [[ -d build ]] && rm -r build - mkdir build && cd build + cd build - LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr qmake QMAKE_CFLAGS_ISYSTEM=-I \ - CONFIG+=journald -r ../qt-creator-opensource-src-${pkgver}/qtcreator.pro + qmake LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr CONFIG+=journald QMAKE_CFLAGS_ISYSTEM=-I \ + DEFINES+=QBS_ENABLE_PROJECT_FILE_UPDATES "$srcdir"/qt-creator-opensource-src-${pkgver}/qtcreator.pro make - make docs -j1 + make docs } package() { cd build - make INSTALL_ROOT="${pkgdir}/usr/" install - make INSTALL_ROOT="${pkgdir}/usr/" install_docs + make INSTALL_ROOT="$pkgdir/usr/" install + make INSTALL_ROOT="$pkgdir/usr/" install_docs - install -Dm644 ${srcdir}/qt-creator-opensource-src-${pkgver}/LICENSE.GPL3-EXCEPT ${pkgdir}/usr/share/licenses/qtcreator/LICENSE.GPL3-EXCEPT + install -Dm644 "$srcdir"/qt-creator-opensource-src-$pkgver/LICENSE.GPL3-EXCEPT "$pkgdir"/usr/share/licenses/qtcreator/LICENSE.GPL3-EXCEPT } diff --git a/libre/qtcreator/libre.patch b/libre/qtcreator/libre.patch index ef434c9d9..01ea21ae1 100644 --- a/libre/qtcreator/libre.patch +++ b/libre/qtcreator/libre.patch @@ -40,7 +40,7 @@ diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/tran index 07f8e0ba8..f05abba0f 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts -@@ -8875,14 +8875,6 @@ do projektu "%2". +@@ -8946,14 +8946,6 @@ do projektu "%2". Klasy służące do wyświetlania zawartości plików SVG @@ -59,7 +59,7 @@ diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/tran index 7ada6cbbc..ba74b030b 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts -@@ -34077,14 +34077,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf +@@ -35630,14 +35630,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Классы для отображения содержимого файлов SVG @@ -74,25 +74,25 @@ index 7ada6cbbc..ba74b030b 100644 Classes for displaying and editing Web content Классы для отображения и правки вэб-страниц -diff --git a/share/qtcreator/welcomescreen/qtcreator_tutorials.xml b/share/qtcreator/welcomescreen/qtcreator_tutorials.xml +diff --git a/src/plugins/qtsupport/qtcreator_tutorials.xml b/src/plugins/qtsupport/qtcreator_tutorials.xml index 23fad843d..4864a9c8d 100644 ---- a/share/qtcreator/welcomescreen/qtcreator_tutorials.xml -+++ b/share/qtcreator/welcomescreen/qtcreator_tutorials.xml +--- a/src/plugins/qtsupport/qtcreator_tutorials.xml ++++ b/src/plugins/qtsupport/qtcreator_tutorials.xml @@ -105,14 +105,6 @@ - - qt quick,widgets + + macos -- +- - - qt webengine - -- +- - - qt webengine - - - - qt,qt creator,3d + + + qt,qt quick,screen resolution diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro index ffe71b6f1..a8d0bd72f 100644 --- a/src/plugins/help/help.pro @@ -125,7 +125,7 @@ index 115bdfbca..8bde52c9f 100644 #include #include -@@ -376,9 +373,6 @@ HelpViewer *HelpPlugin::createHelpViewer(qreal zoom) +@@ -369,9 +366,6 @@ HelpViewer *HelpPlugin::createHelpViewer(qreal zoom) typedef std::function ViewerFactory; typedef QPair ViewerFactoryItem; // id -> factory QVector factories; @@ -154,23 +154,11 @@ index a10899a2a..9ce2b463d 100644 {"webkit", QLatin1String("QtWebKit"), QCoreApplication::translate("QtModulesInfo", "Classes for displaying and editing Web content"), -diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp -index df9a8110a..e2d2eaa37 100644 ---- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp -+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp -@@ -792,7 +792,6 @@ static bool isBlacklistImport(const ImportKey &importKey) - || importKey.libraryQualifiedPath() == QStringLiteral("Qt.WebSockets") - || importKey.libraryQualifiedPath() == QStringLiteral("QtWebkit") - || importKey.libraryQualifiedPath() == QStringLiteral("QtLocation") -- || importKey.libraryQualifiedPath() == QStringLiteral("QtWebEngine") - || importKey.libraryQualifiedPath() == QStringLiteral("QtWebChannel") - || importKey.libraryQualifiedPath() == QStringLiteral("QtWinExtras") - || importKey.libraryQualifiedPath() == QStringLiteral("QtPurchasing") diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py index db4c4e1cd..6703f190c 100644 --- a/tests/system/shared/utils.py +++ b/tests/system/shared/utils.py -@@ -673,9 +673,6 @@ def getHelpViewer(): +@@ -688,9 +688,6 @@ def getHelpViewer(): except: pass try: @@ -185,7 +173,7 @@ index 7f046e76a..90412afa6 100755 --- a/tests/system/suite_HELP/tst_HELP04/test.py +++ b/tests/system/suite_HELP/tst_HELP04/test.py @@ -32,22 +32,6 @@ urlDictionary = { "deployment":"qthelp://com.trolltech.qt.481/qdoc/gettingstarte - "build":"qthelp://com.trolltech.qt.481/qdoc/sql-driver.html" } + "build":"qthelp://com.trolltech.qt.487/qdoc/sql-driver.html" } -def __getSelectedText__(): @@ -223,7 +211,7 @@ diff --git a/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_ index d3a824e96..8a98b8b6e 100644 --- a/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv +++ b/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv -@@ -6862,7 +6862,6 @@ +@@ -7306,7 +7306,6 @@ "searchtaskhandler.h" "4" "searchwidget.h" "4" "textbrowserhelpviewer.h" "4" @@ -231,7 +219,7 @@ index d3a824e96..8a98b8b6e 100644 "xbelsupport.h" "4" "Sources" "3" "centralwidget.cpp" "4" -@@ -6886,7 +6885,6 @@ +@@ -7328,7 +7327,6 @@ "searchtaskhandler.cpp" "4" "searchwidget.cpp" "4" "textbrowserhelpviewer.cpp" "4" -- cgit v1.2.3