diff options
| author | Andreas Grapentin <andreas@grapentin.org> | 2018-03-14 17:28:38 +0100 |
|---|---|---|
| committer | Andreas Grapentin <andreas@grapentin.org> | 2018-03-14 17:28:56 +0100 |
| commit | 23197174ae44716df8e0f85bae737ebf6f767b67 (patch) | |
| tree | 3f83cd4e70e99cab49d80a46d5fa2ef26dc79248 | |
| parent | e0a18e5cb1df1dcff5ce512c73b13f4135eed4d3 (diff) | |
| download | abslibre-23197174ae44716df8e0f85bae737ebf6f767b67.tar.gz abslibre-23197174ae44716df8e0f85bae737ebf6f767b67.tar.bz2 abslibre-23197174ae44716df8e0f85bae737ebf6f767b67.zip | |
libre/qtcreator: updated to 4.5.2
| -rw-r--r-- | libre/qtcreator/PKGBUILD | 24 | ||||
| -rw-r--r-- | libre/qtcreator/libre.patch | 6 |
2 files changed, 17 insertions, 13 deletions
diff --git a/libre/qtcreator/PKGBUILD b/libre/qtcreator/PKGBUILD index f76221351..d5b1dcfc2 100644 --- a/libre/qtcreator/PKGBUILD +++ b/libre/qtcreator/PKGBUILD @@ -13,11 +13,14 @@ # - added patch to build on arm pkgname=qtcreator -pkgver=4.5.0 +pkgver=4.5.2 _clangver=5.0.1 -pkgrel=2.parabola2 -pkgdesc='Lightweight, cross-platform integrated development environment, without nonfree qt5-webengine support' -arch=(x86_64 i686 armv7h) +pkgrel=1 +pkgrel+=.parabola2 +pkgdesc='Lightweight, cross-platform integrated development environment' +pkgdesc+=', without nonfree qt5-webengine support' +arch=(x86_64) +arch+=(i686 armv7h) url='http://qt-project.org' license=(LGPL) depends=(qt5-tools qt5-quickcontrols qt5-quickcontrols2 clang=$_clangver qbs) @@ -33,12 +36,11 @@ optdepends=('qt5-doc: integrated Qt documentation' 'mercurial: mercurial support' 'bzr: bazaar support' 'valgrind: analyze support') -source=("http://download.qt.io/official_releases/qtcreator/${pkgver%.*}/${pkgver}/qt-creator-opensource-src-${pkgver}.tar.xz" - '0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch' - 'libre.patch') -sha512sums=('9296ebef4a3d5ae40a9fa3a4039e77b8e407dfb52af3a88b4cc615a89e163d92de420d9db614bc689adc695879f0c2e1906e9a218e7a6b96c4b222d52c94912c' - 'af0a0d5a2fadcfce14def65be73c99bff8227794b9ad2be333713c89e226e2c6b43802a802b6e30f3e6c1b4b77f31183bffdcca3404d9686f15fa84dfc64d1a1' - 'a1be1d669e1a496ab8e975b925e4b2fa962fc268616deffa09163c42d62874adf210e47cd16ee375110ef53791bd84d53d115b422cef49ba98efbd552e99944c') +source=("http://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz") +source+=('0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch' 'libre.patch') +sha256sums=('32fe9ffbb170d0461f6b010dcb0db4dd73c3b27cc575c760958507929975693a' + '56e6876f41ee8909ee197f7ab5a2bb18ad5a7fe26ce490a48cdf062fa199ffc6' + '14c2ded79d5e263f78a748afb5688b946ae243f3e7e4b765c198681c371d467c') prepare() { mkdir -p build @@ -52,6 +54,8 @@ prepare() { cd qt-creator-opensource-src-${pkgver} patch -Np1 -i "$srcdir"/libre.patch rm -rv src/plugins/help/webenginehelpviewer.{cpp,h} + + # fix arm build if [[ "$CARCH" == arm* ]]; then git apply ../0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch fi diff --git a/libre/qtcreator/libre.patch b/libre/qtcreator/libre.patch index 01ea21ae1..3fc595350 100644 --- a/libre/qtcreator/libre.patch +++ b/libre/qtcreator/libre.patch @@ -2,7 +2,7 @@ diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/tran index 63d7263b7..b0f6223de 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts -@@ -7469,14 +7469,6 @@ Rename %2 to %3 anyway?</source> +@@ -8120,14 +8120,6 @@ Rename %2 to %3 anyway?</source> <translation>Klassen zur Anzeige des Inhalts von SVG-Dateien</translation> </message> <message> @@ -49,7 +49,7 @@ index 07f8e0ba8..f05abba0f 100644 - </message> - <message> - <source>WebEngine and QWidget-based classes using Chromium backend</source> -- <translation>Klasy WebEngine i klasy bazujące na QWidget, używające back-endu Chromium </translation> +- <translation>Klasy WebEngine i klasy bazujące na QWidget, używające back-endu Chromium</translation> - </message> - <message> <source>Classes for displaying and editing Web content</source> @@ -78,7 +78,7 @@ diff --git a/src/plugins/qtsupport/qtcreator_tutorials.xml b/src/plugins/qtsuppo index 23fad843d..4864a9c8d 100644 --- a/src/plugins/qtsupport/qtcreator_tutorials.xml +++ b/src/plugins/qtsupport/qtcreator_tutorials.xml -@@ -105,14 +105,6 @@ +@@ -124,14 +124,6 @@ <description><![CDATA[Using Qt with macOS native windows.]]></description> <tags>macos</tags> </tutorial> |