diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2020-02-17 06:03:43 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2020-02-17 17:59:51 +0100 |
commit | 8ea9f1e02e85e3cc2b4ccda52639e96651d21653 (patch) | |
tree | dacfd5fff40a77f9335c18e572a6587149bb0abc /source/l/qt5/patches/qt5.private-includes.patch | |
parent | 6087aff6cae8d8d4c46ce086cb7b70a5af412d2b (diff) | |
download | current-8ea9f1e02e85e3cc2b4ccda52639e96651d21653.tar.gz current-8ea9f1e02e85e3cc2b4ccda52639e96651d21653.tar.xz |
Mon Feb 17 06:03:43 UTC 202020200217060343
ap/ksh93-20200131_e4fea8c5-x86_64-1.txz: Upgraded.
ap/zsh-5.8-x86_64-1.txz: Upgraded.
l/brotli-1.0.7-x86_64-1.txz: Added.
l/gmime-3.2.6-x86_64-1.txz: Upgraded.
l/hyphen-2.8.8-x86_64-1.txz: Added.
l/openal-soft-1.20.1-x86_64-1.txz: Upgraded.
Thanks to Skaendo and Willy Sudiarto Raharjo.
l/qt5-webkit-5.212.0_alpha3-x86_64-1.txz: Added.
Thanks to alienBOB.
l/woff2-20180531_a0d0ed7-x86_64-1.txz: Added.
n/bluez-5.53-x86_64-1.txz: Upgraded.
n/mutt-1.13.4-x86_64-1.txz: Upgraded.
n/samba-4.11.6-x86_64-3.txz: Rebuilt.
n/socat-1.7.3.4-x86_64-1.txz: Added.
n/whois-5.5.6-x86_64-1.txz: Upgraded.
testing/packages/PAM/samba-4.11.6-x86_64-3_pam.txz: Rebuilt.
Added patches to fix joining a DC when using krb5. Looks like the patches are
already upstreamed in the latest 4.12.0-rc. Thanks to camerabambai.
Diffstat (limited to 'source/l/qt5/patches/qt5.private-includes.patch')
-rw-r--r-- | source/l/qt5/patches/qt5.private-includes.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/source/l/qt5/patches/qt5.private-includes.patch b/source/l/qt5/patches/qt5.private-includes.patch deleted file mode 100644 index 3ef8ebe42..000000000 --- a/source/l/qt5/patches/qt5.private-includes.patch +++ /dev/null @@ -1,53 +0,0 @@ -# Taken from http://code.qt.io/cgit/qt/qtbase.git/patch/?id=67aa365d -# ------------------------------------------------------------------ - -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 - - |