diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/qtcreator/PKGBUILD | 12 | ||||
| -rw-r--r-- | libre/qtcreator/qtcreator-clang-9.patch | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/libre/qtcreator/PKGBUILD b/libre/qtcreator/PKGBUILD index 7bdbf3d83..bdbd5bf64 100644 --- a/libre/qtcreator/PKGBUILD +++ b/libre/qtcreator/PKGBUILD @@ -13,7 +13,7 @@ pkgname=qtcreator -pkgver=4.10.1 +pkgver=4.10.2 _clangver=9.0.0 pkgrel=1 pkgrel+=.parabola1 @@ -38,12 +38,10 @@ optdepends=('qt5-doc: integrated Qt documentation' 'valgrind: analyze support' 'perf: performer analyzer') source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz" - qtcreator-preload-plugins.patch - qtcreator-clang-9.patch) + qtcreator-preload-plugins.patch) source+=('libre.patch') -sha256sums=('5098d87027bec3296bd93a7e112588759ccb0511fbfdc5558c1a1e83dff8d2a9' - '150c444e76ec969fc8765774b648984037829623300d0ce9d41a915b2afa792d' - '1d66eb008e84459f6570e6e72acedcf80d2f0bb82650df3b733f7ca0a3f08a3d') +sha256sums=('9add6bdddfe5726bb02535409c2ed788b1afeee082121f54f887281d0e3c449a' + '150c444e76ec969fc8765774b648984037829623300d0ce9d41a915b2afa792d') sha256sums+=('b44b9217770573b16e7bea873b0a0fb1b9f6f59502686eb6136d78bebc671ddb') prepare() { @@ -59,8 +57,6 @@ prepare() { # see http://code.qt.io/cgit/clang/clang.git/commit/?id=7f349701d3ea0c47be3a43e265699dddd3fd55cf # and https://bugs.archlinux.org/task/59492 patch -p1 -i ../qtcreator-preload-plugins.patch - # Fix build with clang 9 (Fedora) - patch -p1 -i ../qtcreator-clang-9.patch # remove qt5-webengine support patch -Np1 -i "$srcdir"/libre.patch diff --git a/libre/qtcreator/qtcreator-clang-9.patch b/libre/qtcreator/qtcreator-clang-9.patch deleted file mode 100644 index 0fc9418e0..000000000 --- a/libre/qtcreator/qtcreator-clang-9.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN qt-creator-opensource-src-4.10.0/src/plugins/clangformat/clangformatutils.cpp qt-creator-opensource-src-4.10.0-new/src/plugins/clangformat/clangformatutils.cpp ---- qt-creator-opensource-src-4.10.0/src/plugins/clangformat/clangformatutils.cpp 2019-09-03 16:36:38.000000000 +0200 -+++ qt-creator-opensource-src-4.10.0-new/src/plugins/clangformat/clangformatutils.cpp 2019-09-25 13:33:27.230835047 +0200 -@@ -60,7 +60,7 @@ static clang::format::FormatStyle qtcSty - style.AllowShortBlocksOnASingleLine = false; - style.AllowShortCaseLabelsOnASingleLine = false; - style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline; -- style.AllowShortIfStatementsOnASingleLine = false; -+ style.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_Never; - style.AllowShortLoopsOnASingleLine = false; - style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_None; - style.AlwaysBreakBeforeMultilineStrings = false; |