From 00d8419b814f4335903ef4e9a3c7f0f7556abadc Mon Sep 17 00:00:00 2001
From: obarun <eric@obarun.org>
Date: Fri, 22 Jun 2018 12:05:41 +1100
Subject: [PATCH] upgpkg : 5.11.1-3
---
PKGBUILD | 18 +++++---------
qt-private-includes.patch | 49 ---------------------------------------
2 files changed, 6 insertions(+), 61 deletions(-)
delete mode 100644 qt-private-includes.patch
diff --git a/PKGBUILD b/PKGBUILD
index 09cce66..ef28471 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,16 +5,16 @@
pkgbase=qt5-base
pkgname=(qt5-base qt5-xcb-private-headers)
-_qtver=5.11.0
+_qtver=5.11.1
pkgver=${_qtver/-/}
pkgrel=3
arch=(x86_64)
url='http://qt-project.org/'
license=('GPL3' 'LGPL3' 'FDL' 'custom')
pkgdesc='A cross-platform application and UI framework'
-depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 'fontconfig' 'xdg-utils' 'shared-mime-info'
- 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' 'pcre2'
- 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 'double-conversion')
+depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 'fontconfig' 'xdg-utils'
+ 'shared-mime-info' 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image'
+ 'tslib' 'libinput' 'libxkbcommon-x11' 'libproxy' 'libcups' 'double-conversion')
makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
'gtk3' 'libpulse' 'cups' 'freetds' 'vulkan-headers' 'icu')
optdepends=('qt5-svg: to use SVG icon themes'
@@ -27,10 +27,8 @@ optdepends=('qt5-svg: to use SVG icon themes'
conflicts=('qtchooser')
groups=('qt' 'qt5')
_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
- qt-private-includes.patch::"http://code.qt.io/cgit/qt/qtbase.git/patch/?id=67aa365d")
-sha256sums=('ed6e46db84f7d34923ab4eae165c63e05ab3cfa9d19a73d3f57b4e7bfd41de66'
- 'bf6e52cc613599ff3dc756113ffb61aa1896a84abefbe69f42bdb846202d1f71')
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46')
validpgpkeys=('6DD4217456569BA711566AC7F06E8FDE7B45DAAC') # Eric Vidal
prepare() {
@@ -43,10 +41,6 @@ prepare() {
sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
mkspecs/common/g++-unix.conf
-
- # Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417
- patch -p1 -i ../qt-private-includes.patch
-
}
build() {
diff --git a/qt-private-includes.patch b/qt-private-includes.patch
deleted file mode 100644
index e0c3b25..0000000
--- a/qt-private-includes.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 67aa365d41ebfe082b4efcfd725e4d5f08be678c Mon Sep 17 00:00:00 2001
-From: Ulf Hermann <ulf.hermann@qt.io>
-Date: Wed, 25 Apr 2018 12:48:21 +0200
-Subject: Do emit CMake declarations for existing private headers
-
-We need to make sure we don't emit CMake declarations for private
-headers if those headers are absent. However, most of the time we have
-private headers and should add them.
-
-Task-number: QTBUG-37417
-Change-Id: I639eb93d008de27928dedac540894af70c1883b9
-Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
----
- mkspecs/features/create_cmake.prf | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 66acedef55..2ed708e085 100644
---- a/mkspecs/features/create_cmake.prf
-+++ b/mkspecs/features/create_cmake.prf
-@@ -28,9 +28,13 @@ CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake
-
- CMAKE_MODULE_NAME = $$cmakeModuleName($${MODULE})
-
-+!generated_privates {
-+ isEmpty(SYNCQT.INJECTED_PRIVATE_HEADER_FILES):isEmpty(SYNCQT.PRIVATE_HEADER_FILES): \
-+ CMAKE_NO_PRIVATE_INCLUDES = true
-+}
-+
- split_incpath {
- CMAKE_ADD_SOURCE_INCLUDE_DIRS = true
-- CMAKE_NO_PRIVATE_INCLUDES = true # Don't add private includes in the build dir which don't exist
- CMAKE_SOURCE_INCLUDES = \
- $$cmakeTargetPaths($$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt$${CMAKE_MODULE_NAME})
- CMAKE_SOURCE_PRIVATE_INCLUDES = \
-@@ -53,10 +57,6 @@ contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") {
- CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True
- }
-
--isEmpty(QT.$${MODULE}_private.includes)| \
-- !exists($$first(QT.$${MODULE}_private.includes)): \
-- CMAKE_NO_PRIVATE_INCLUDES = true
--
- CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])
- contains(CMAKE_LIB_DIR,"^\\.\\./.*") {
- CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/
---
-cgit v1.1-6-g87c4
-
--
GitLab