[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-3.0.3-8-g4151840
by Andre Heinecke
cvs at cvs.gnupg.org
Wed Feb 28 10:12:31 CET 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".
The branch, master has been updated
via 415184071dec425e7cd07b4580bd2434a5f48ade (commit)
via 740db3d8da1ae0b6b1685ff141dab69efaeae11a (commit)
via e30032757a3f6add4de576e0e4affcba420dcdeb (commit)
from 3d1a1b30e2b8df7770bec5c514d3fe30d84d8b7b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 415184071dec425e7cd07b4580bd2434a5f48ade
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Feb 28 10:10:27 2018 +0100
Update KDE Software to latest stable
* Makefile.am (EXTRA_DIST): Remove deleted patch.
* patches/ki18n/no-tests.patch: Deleted.
* packages/pacakges.current: Update KDE Software.
* src/gpg4win.mk.in: Adapt Version hacks.
* src/inst-breeze-icons.nsi, src/uninst-breeze-icons.nsi: Some
files moved.
* patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch: Refresh.
* patches/kconfigwidgets/0001-Make-QDbus-optional.patch: Refresh.
diff --git a/Makefile.am b/Makefile.am
index b836d80..7ef1a17 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,6 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/qtwinextras/support-xp.patch \
patches/w32pth-2.0.5/workaround-broken-libtool.patch \
patches/qttools/disable-most-tools.patch \
- patches/ki18n/no-tests.patch \
patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch \
patches/kxmlgui/0003-Make-KTextWidgets-optional.patch \
patches/kxmlgui/0004-Cruedly-disable-KSendbugmail.patch \
diff --git a/packages/packages.current b/packages/packages.current
index c05f33c..3088e68 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -390,131 +390,137 @@ chk 1f6d840e3d04b00b976bc1a86ea2be9d61051b7c3455dc2b891fae61772643fd
# KDE Frameworks generated by gen-frameworks.sh
-server http://ftp.iij.ad.jp/pub/X11/KDE/Attic/frameworks
+server https://download.kde.org/stable/frameworks/
##### Paste Here #####
+#
+# Don't forget to update gpg4win.mk.in with new version numbers
+#
# extra-cmake-modules
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/extra-cmake-modules-5.30.0.tar.xz
-chk 7da9647514e134db5054ab4848d4bfa6054537593a95720a7a9361f8cc71a96c
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/extra-cmake-modules-5.43.0.tar.xz
+chk 5757a5ddceede5321b58345a8dbf953c2282487bf9c24ae477efde800b94fffd
# kconfig
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kconfig-5.30.0.tar.xz
-chk a29a3ccb6c9e8124eca488417d602e689dc7240f9b10510f4152e739fdc143dc
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kconfig-5.43.0.tar.xz
+chk 22ebe055ae6545e01653b2e7d678145261cc5073202561735a894aa59b5841d9
# ki18n
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/ki18n-5.30.0.tar.xz
-chk 2dd2d0835570c5e9fcdabd124613131cb4042a4deb3a38e68ed05daf6fcd72f3
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/ki18n-5.43.0.tar.xz
+chk 8a802507ba6a5a91470d09c649e842843d70f37968d86473567928f2cdee57ff
# kwidgetsaddons
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kwidgetsaddons-5.30.0.tar.xz
-chk 34c322aa53a33ed883d8082e2435cd9464fb9d3f63e50c4a81d87166088fc24a
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kwidgetsaddons-5.43.0.tar.xz
+chk 59a7329e8a4a3b22677dc09648de9c0a042b9ae284af2556c5db48394a9aa797
# kcompletion
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kcompletion-5.30.0.tar.xz
-chk a667bd28575ba4462ed365ce3ea7d35e3f86b20e6fc034365914949205ee0588
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kcompletion-5.43.0.tar.xz
+chk 2999af185dea2164b6943c9cabf2330e4cae4bea46863a1c3d66e86b04ffb618
# kwindowsystem
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kwindowsystem-5.30.0.tar.xz
-chk 20ac7025f998f85e83f72609038b4bf7051f3c373dc039faf30340c595e7e16b
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kwindowsystem-5.43.0.tar.xz
+chk 4df6da4f313f8c52a5d202caa5cc90791b4a07f0d91d5b7252e2da5487a6997d
# kcoreaddons
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kcoreaddons-5.30.0.tar.xz
-chk f62bcef0aa391362e8797eb03135ad9d9b9fd5f3741298241ffb59eb182da040
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kcoreaddons-5.43.0.tar.xz
+chk c67f008b79365913cbb8c62d2b1b48353c1302f6a351a9bc34b874b18392ef82
# kcodecs
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kcodecs-5.30.0.tar.xz
-chk 6eb6935512e01a70d730938c28cb84852e73d4c023deebb5f2946b4c760f2aee
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kcodecs-5.43.0.tar.xz
+chk 5bc09761bf3a3e5fcbea76b1b41c2f07e372fd8449c14fb7276250e177ff9959
# kconfigwidgets
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kconfigwidgets-5.30.0.tar.xz
-chk 021d85537faf01b9a88a9614edf9011a7e2dac752330f4928a287f4832263996
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kconfigwidgets-5.43.0.tar.xz
+chk 7c9016f2c98452d912359def78185f4bf3c6f8c45833fe0e321278124c45bbe3
# kxmlgui
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kxmlgui-5.30.0.tar.xz
-chk da3f6f59aed6d7970f78a040e387fcec6509a2bac3e6efaa965b6600c9b1ac00
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kxmlgui-5.43.0.tar.xz
+chk a3fd16055c5c37130edc80cc331356dea0be78ad227ed4bf00d45bb59dbfccca
# kguiaddons
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kguiaddons-5.30.0.tar.xz
-chk f55f5b5ffe0e330ae3ee5971cf8d206040d82bd52d677a8478d6a9c88c8ac04e
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kguiaddons-5.43.0.tar.xz
+chk 19b32ef071dd51271b5999f22968864cf8409cb8caf9c9daa7707a922f71da7c
# kitemviews
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kitemviews-5.30.0.tar.xz
-chk 5e8466caa4d27cd78e37c3814e495590158a5a57cbb61e8d07505cea72d3a43b
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kitemviews-5.43.0.tar.xz
+chk 304cbdd832b12c9e2b08f29efc5d876a9de60076d444c3d502849fdc21ec86a7
# kitemmodels
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kitemmodels-5.30.0.tar.xz
-chk aeb94534470bb581196a3e2eef158694c5b5727a7e9db8ca2d873fdcbf5bc2f9
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kitemmodels-5.43.0.tar.xz
+chk ad617dc843297c2c4d5db97ea528c44c886d52c89125a77f9494da09de8187fb
# kiconthemes
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kiconthemes-5.30.0.tar.xz
-chk e969d2180f0d5b0802e7c57d63ff78314562cad4b50dbb3a0935d5edc4c33d6a
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kiconthemes-5.43.0.tar.xz
+chk 5ce7918311b89e30a4715f3ebeeb7263c550c9e9c59556a1a6e45ad24442ac80
# breeze-icons
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/breeze-icons-5.30.0.tar.xz
-chk 53e533d006e0289b969ee37534a71f02b2708cee28cfa829b95a144f75010759
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/breeze-icons-5.43.0.tar.xz
+chk 3eda58a4c7c9369fe9b246500d88a964d3411f83e1113727ed723989d935dea7
# karchive
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/karchive-5.30.0.tar.xz
-chk 18b35d437e7cbf6f00983d0f66372cbd6a0daedaa58e6c092838c20845571f38
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/karchive-5.43.0.tar.xz
+chk 0e639a2818700220bf20aea83a00697b385d67f39eba5840b400d8d72ec477b8
##### End Paste #####
# KDE Applications
-server https://download.kde.org/Attic/applications
+# For older releases check here:
+# server https://download.kde.org/Attic/applications
+
+server http://download.kde.org/stable/applications/
# kmime
-# last changed: 2017-02-02
+# last changed: 2018-02-02
# by: ah
-# verified: https://download.kde.org/Attic/applications/16.12.3/src/kmime-16.12.3.tar.xz.mirrorlist
-file 16.12.3/src/kmime-16.12.3.tar.xz
-chk 40c874c98c0eb0c76e9a5015aab5d5ed791c1e0bed138f412fb496031e80eb3f
+# verified: https://download.kde.org/stable/applications/17.12.2/src/kmime-17.12.2.tar.xz.mirrorlist
+file 17.12.2/src/kmime-17.12.2.tar.xz
+chk 29f11eafeb13c0045069a250bdcd57fda4bdd3423e7e1b7e0ca0517a9afefd24
# Devel versions are needed until Kleopatra can be based on
# a stable branch.
diff --git a/patches/kconfigwidgets/0001-Make-QDbus-optional.patch b/patches/kconfigwidgets/0001-Make-QDbus-optional.patch
index 94374fc..893dde7 100755
--- a/patches/kconfigwidgets/0001-Make-QDbus-optional.patch
+++ b/patches/kconfigwidgets/0001-Make-QDbus-optional.patch
@@ -19,15 +19,16 @@ is not available.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bed53d1..87f976c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -10,7 +10,16 @@
+--- CMakeLists.txt.orig 2018-02-28 08:33:32.052419561 +0100
++++ CMakeLists.txt 2018-02-28 08:35:44.523986191 +0100
+@@ -12,7 +12,17 @@
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
- set(REQUIRED_QT_VERSION 5.5.0)
+ set(REQUIRED_QT_VERSION 5.7.0)
-find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Widgets DBus)
++find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Widgets)
+if (UNIX)
-+ find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Widgets DBus)
++ find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED DBus)
+#else()
+# find_package(Qt5DBus "${REQUIRED_QT_VERSION}" CONFIG)
+# set_package_properties(Qt5DBus PROPERTIES DESCRIPTION "Qt DBus Library"
diff --git a/patches/ki18n/no-tests.patch b/patches/ki18n/no-tests.patch
deleted file mode 100755
index 5602850..0000000
--- a/patches/ki18n/no-tests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh
-patch -p0 -R -f $* < $0
-exit $?
-
---- CMakeLists.txt 2016-01-21 13:38:48.962678469 +0100
-+++ CMakeLists.txt.orig 2016-01-21 13:40:08.468110980 +0100
-@@ -58,9 +58,7 @@
- ki18n_install(po)
- endif()
- add_subdirectory(src)
--if (BUILD_TESTING)
-- add_subdirectory(autotests)
--endif()
-+add_subdirectory(autotests)
-
- # create a Config.cmake and a ConfigVersion.cmake file and install them
- set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5I18n")
diff --git a/patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch b/patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch
index a6826f9..ebf6f07 100755
--- a/patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch
+++ b/patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch
@@ -31,7 +31,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9728db..7d8cd00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -29,12 +29,14 @@ ecm_setup_version(PROJECT
+@@ -30,13 +30,16 @@
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5XmlGuiConfigVersion.cmake"
SOVERSION 5)
@@ -40,24 +40,17 @@ index d9728db..7d8cd00 100644
+# break behavior users (or other developers) of this library rely on.
+option(FORCE_DISABLE_KGLOBALACCEL "Force building KXmlGui without KGlobalAccel. This will break global shortcut support. [default=OFF]" OFF)
+option(FORCE_DISABLE_DBUS "Force building KXmlGui without a dependency to QDbus. This will break KMainWindow integration and style change notifications. [default=OFF]" OFF)
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
# Dependencies
- set(REQUIRED_QT_VERSION 5.5.0)
+ set(REQUIRED_QT_VERSION 5.7.0)
-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus Xml Network PrintSupport)
--
+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets Xml Network PrintSupport)
+
find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5ItemViews ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
-@@ -44,6 +46,7 @@ find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5TextWidgets ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED)
-+
- find_package(KF5Attica ${KF5_DEP_VERSION})
- set_package_properties(KF5Attica PROPERTIES DESCRIPTION "A Qt library that implements the Open Collaboration Services API"
- PURPOSE "Support for Get Hot New Stuff in KXMLGUI"
-@@ -57,6 +60,12 @@ if (NOT FORCE_DISABLE_KGLOBALACCEL)
+@@ -60,6 +64,12 @@
endif()
set (HAVE_GLOBALACCEL ${KF5GlobalAccel_FOUND})
@@ -361,13 +354,14 @@ diff --git a/src/kxmlguiwindow.cpp b/src/kxmlguiwindow.cpp
index 24d48f1..5b9fac7 100644
--- a/src/kxmlguiwindow.cpp
+++ b/src/kxmlguiwindow.cpp
-@@ -23,12 +23,13 @@
+@@ -23,13 +23,14 @@
Boston, MA 02110-1301, USA.
*/
+#include "config-xmlgui.h"
+
#include "kxmlguiwindow.h"
+ #include "debug.h"
#include "kmainwindow_p.h"
#include "kmessagebox.h"
@@ -376,14 +370,14 @@ index 24d48f1..5b9fac7 100644
#include "ktoolbarhandler_p.h"
#include "kxmlguifactory.h"
#include "kedittoolbar.h"
-@@ -36,7 +37,6 @@
+@@ -37,7 +38,6 @@
#include "ktoolbar.h"
#include <QCloseEvent>
-#include <QDBusConnection>
#include <QtXml/QDomDocument>
#include <QLayout>
- #include <QDebug>
+ #include <QMenuBar>
@@ -47,6 +47,11 @@
#include <QWidget>
#include <QList>
@@ -396,17 +390,18 @@ index 24d48f1..5b9fac7 100644
#include <ktoggleaction.h>
#include <kstandardaction.h>
#include <kconfig.h>
-@@ -87,7 +92,9 @@ KXmlGuiWindow::KXmlGuiWindow(QWidget *parent, Qt::WindowFlags f)
- d->toolBarHandler = 0;
- d->showStatusBarAction = 0;
- d->factory = 0;
+@@ -87,7 +92,9 @@
+ d->toolBarHandler = nullptr;
+ d->showStatusBarAction = nullptr;
+ d->factory = nullptr;
+- new KMainWindowInterface(this);
+#if HAVE_QDBUS
- new KMainWindowInterface(this);
++ new KMainWindowInterface(this);
+#endif
}
QAction *KXmlGuiWindow::toolBarMenuAction()
-@@ -117,6 +124,7 @@ KXmlGuiWindow::~KXmlGuiWindow()
+@@ -117,6 +124,7 @@
bool KXmlGuiWindow::event(QEvent *ev)
{
bool ret = KMainWindow::event(ev);
@@ -414,7 +409,7 @@ index 24d48f1..5b9fac7 100644
if (ev->type() == QEvent::Polish) {
QDBusConnection::sessionBus().registerObject(dbusName() + QStringLiteral("/actions"), actionCollection(),
QDBusConnection::ExportScriptableSlots |
-@@ -125,6 +133,7 @@ bool KXmlGuiWindow::event(QEvent *ev)
+@@ -125,6 +133,7 @@
QDBusConnection::ExportNonScriptableProperties |
QDBusConnection::ExportChildObjects);
}
diff --git a/src/gpg4win.mk.in b/src/gpg4win.mk.in
index c8c71e7..68b4f01 100644
--- a/src/gpg4win.mk.in
+++ b/src/gpg4win.mk.in
@@ -115,15 +115,15 @@ define DEFLATE_macro
rm -rf $$$${pkgsdir}; \
case "$(1)" in \
*/qtbase*.*.tar.xz) \
- $(TAR) -xJ --transform='s,^qtbase-opensource-src,qtbase,' -f "$(1)" ;; \
+ $(TAR) -xJ --transform='s,^qtbase-everywhere-src,qtbase,' -f "$(1)" ;; \
*/qttools*.*.tar.xz) \
- $(TAR) -xJ --transform='s,^qttools-opensource-src,qttools,' -f "$(1)" ;; \
+ $(TAR) -xJ --transform='s,^qttools-everywhere-src,qttools,' -f "$(1)" ;; \
*/qtwinextras*.*.tar.xz) \
- $(TAR) -xJ --transform='s,^qtwinextras-opensource-src,qtwinextras,' -f "$(1)" ;; \
+ $(TAR) -xJ --transform='s,^qtwinextras-everywhere-src,qtwinextras,' -f "$(1)" ;; \
*/qtsvg*.*.tar.xz) \
- $(TAR) -xJ --transform='s,^qtsvg-opensource-src,qtsvg,' -f "$(1)" ;; \
+ $(TAR) -xJ --transform='s,^qtsvg-everywhere-src,qtsvg,' -f "$(1)" ;; \
*/qttranslations*.*.tar.xz) \
- $(TAR) -xJ --transform='s,^qttranslations-opensource-src,qttranslations,' -f "$(1)" ;; \
+ $(TAR) -xJ --transform='s,^qttranslations-everywhere-src,qttranslations,' -f "$(1)" ;; \
*/boost*.*.tar.bz2) \
$(TAR) -xj --transform='s,^boost_1_60_0,boost-1.60.0,' -f "$(1)" ;; \
*.tar.gz | *.tgz) \
@@ -640,11 +640,11 @@ stamps/stamp-$(1)-01-patch: stamps/stamp-$(1)-00-unpack
(shopt -s nullglob; \
$(call SETVARS,$(1)); \
cd "$$$${pkgsdir}"; \
- sed -i 's/set(KF5_VERSION.*)/set(KF5_VERSION "5.30.0")/' CMakeLists.txt; \
+ sed -i 's/set(KF5_VERSION.*)/set(KF5_VERSION "5.43.0")/' CMakeLists.txt; \
sed -i 's/set(KMIME_VERSION.*)/set(KMIME_VERSION "5.2.40")/' CMakeLists.txt; \
sed -i 's/set(LIBKLEO_VERSION.*)/set(LIBKLEO_VERSION "5.4.40")/' CMakeLists.txt; \
- sed -i 's/set(QT_REQUIRED_VERSION.*)/set(QT_REQUIRED_VERSION "5.7.0")/' CMakeLists.txt; \
- sed -i 's/set(GPGME_REQUIRED_VERSION.*)/set(GPGME_REQUIRED_VERSION "1.8.0")/' CMakeLists.txt; \
+ sed -i 's/set(QT_REQUIRED_VERSION.*)/set(QT_REQUIRED_VERSION "5.10.0")/' CMakeLists.txt; \
+ sed -i 's/set(GPGME_REQUIRED_VERSION.*)/set(GPGME_REQUIRED_VERSION "1.10.0")/' CMakeLists.txt; \
for pfile in "$$$${pkgpbdir}"/*.patch "$$$${pkgpdir}"/*.patch ; do \
(cd "$$$${pkgsdir}"; "$$$${pfile}") \
done)
diff --git a/src/inst-breeze-icons.nsi b/src/inst-breeze-icons.nsi
index 1bc5ec2..0e96470 100644
--- a/src/inst-breeze-icons.nsi
+++ b/src/inst-breeze-icons.nsi
@@ -238,10 +238,10 @@ Section "-breeze-icons" SEC_breeze_icons
File ${prefix}/share/icons/breeze/apps/22/kde.svg
- SetOutPath "$INSTDIR\share\icons\breeze\apps\32"
+ SetOutPath "$INSTDIR\share\icons\breeze\preferences\32"
- File ${prefix}/share/icons/breeze/apps/32/preferences-desktop-locale.svg
- File ${prefix}/share/icons/breeze/apps/32/preferences-system-network.svg
+ File ${prefix}/share/icons/breeze/preferences/32/preferences-desktop-locale.svg
+ File ${prefix}/share/icons/breeze/preferences/32/preferences-system-network.svg
SetOutPath "$INSTDIR\share\icons\breeze\apps\48"
diff --git a/src/uninst-breeze-icons.nsi b/src/uninst-breeze-icons.nsi
index 6255574..9d7506d 100644
--- a/src/uninst-breeze-icons.nsi
+++ b/src/uninst-breeze-icons.nsi
@@ -52,8 +52,8 @@ Section "-un.breeze-icons"
Delete "$INSTDIR\share\icons\breeze\apps\48\usb-creator-kde.svg"
Delete "$INSTDIR\share\icons\breeze\apps\48\telepathy-kde.svg"
Delete "$INSTDIR\share\icons\breeze\apps\48\internet-mail.svg"
- Delete "$INSTDIR\share\icons\breeze\apps\32\preferences-system-network.svg"
- Delete "$INSTDIR\share\icons\breeze\apps\32\preferences-desktop-locale.svg"
+ Delete "$INSTDIR\share\icons\breeze\preferences\32\preferences-system-network.svg"
+ Delete "$INSTDIR\share\icons\breeze\preferences\32\preferences-desktop-locale.svg"
Delete "$INSTDIR\share\icons\breeze\apps\22\kde.svg"
Delete "$INSTDIR\share\icons\breeze\actions\32\window-close.svg"
Delete "$INSTDIR\share\icons\breeze\actions\32\view-refresh.svg"
@@ -247,6 +247,8 @@ Section "-un.breeze-icons"
Delete "$INSTDIR\share\icons\breeze\emblems\8\emblem-error.svg"
Delete "$INSTDIR\share\icons\breeze\emblems\8\emblem-question.svg"
+ RMDir "$INSTDIR\share\icons\breeze\preferences\32"
+ RMDir "$INSTDIR\share\icons\breeze\preferences"
RMDir "$INSTDIR\share\icons\breeze\emblems\8"
RMDir "$INSTDIR\share\icons\breeze\emblems"
RMDir "$INSTDIR\share\icons\breeze\status\64"
commit 740db3d8da1ae0b6b1685ff141dab69efaeae11a
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Feb 27 15:13:25 2018 +0100
Update gpg4win-tools
--
Fixes a build error
diff --git a/packages/packages.current b/packages/packages.current
index 841b86d..c05f33c 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -548,8 +548,8 @@ chk 4e6993d5a28de4f4338d96de0edb5d7cb9243976d647162d0539b021a853bafb
# last changed: see package date.
# by: ah
# verified: Tarball created by ah.
-file gpg4win-tools/gpg4win-tools-201802071407.tar.gz
-chk 4bfaad6ce235b0ee390d48df69764874317b7a6eb2433a8fec4120ce2ff9f6f5
+file gpg4win-tools/gpg4win-tools-201802271506.tar.gz
+chk f98bc97cf9fbbdcda1bcbcc5eab6f4ad2e4478ceaa6505f9b132c2f706bac0dc
# Kleopatra
# last changed: see package date.
commit e30032757a3f6add4de576e0e4affcba420dcdeb
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Feb 27 15:05:51 2018 +0100
Update Qt to 5.10.1
* Makfile.am (EXTRA_DIST): Remove obsolte patches
* patches/qtbase/config-standardpaths.patch,
patches/qtbase/qtbase-mingw-fixes.patch,
patches/qtbase/relative-paths.patch: Refresh.
diff --git a/Makefile.am b/Makefile.am
index 548e0f2..b836d80 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,9 +32,6 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/qtbase/relative-paths.patch \
patches/qtbase/qtbase-mingw-fixes.patch \
patches/qtbase/config-standardpaths.patch \
- patches/qtbase/windowsxp-support.patch \
- patches/qtbase/windowsxp-support-revert.patch \
- patches/qtbase/windowsxp-support-revert-2.patch \
patches/qtwinextras/support-xp.patch \
patches/w32pth-2.0.5/workaround-broken-libtool.patch \
patches/qttools/disable-most-tools.patch \
diff --git a/packages/packages.current b/packages/packages.current
index 69a7b33..841b86d 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -346,47 +346,47 @@ file 1.60.0/boost_1_60_0.tar.bz2
chk 686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b
# Qt base
-# last changed: 2016-07-22
+# last changed: 2018-02-27
# by: ah
-# verified: HTTPS https://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtbase-opensource-src-5.8.0.tar.xz.sha256
+# verified: HTTPS https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtbase-everywhere-src-5.10.1.tar.xz.sha256
server http://download.qt.io/official_releases/qt/
-name qtbase-5.8.0.tar.xz
-file 5.8/5.8.0/submodules/qtbase-opensource-src-5.8.0.tar.xz
-chk c17111ae02a44dc7be1ec2cf979a47ee9e58edf4904041a525c21f4fa53fc005
+name qtbase-5.10.1.tar.xz
+file 5.10/5.10.1/submodules/qtbase-everywhere-src-5.10.1.tar.xz
+chk d8660e189caa5da5142d5894d328b61a4d3ee9750b76d61ad74e4eee8765a969
# Qt Tools
-# last changed: 2016-07-22
+# last changed: 2018-02-27
# by: ah
-# verified: HTTPS https://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qttools-opensource-src-5.8.0.tar.xz.sha256
-name qttools-5.8.0.tar.xz
-file 5.8/5.8.0/submodules/qttools-opensource-src-5.8.0.tar.xz
-chk 95ec8e76d393b6ba26ffff5041fce41946d2bf3aec1402c6533e24d9fc269d83
+# verified: HTTPS https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qttools-everywhere-src-5.10.1.tar.xz.sha256
+name qttools-5.10.1.tar.xz
+file 5.10/5.10.1/submodules/qttools-everywhere-src-5.10.1.tar.xz
+chk f1ea441e5fe138756e6de3b60ab7d8d3051799eabe85a9408c995dfd4d048a53
# Qt Winextras
-# last changed: 2016-07-22
+# last changed: 2018-02-27
# by: ah
-# verified: HTTPS https://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtwinextras-opensource-src-5.8.0.tar.xz.sha256
-name qtwinextras-5.8.0.tar.xz
-file 5.8/5.8.0/submodules/qtwinextras-opensource-src-5.8.0.tar.xz
-chk 27ff7b94bd465709d5f8409b3e02a3a393e908613357b1edbf18ebbcb0c2c19c
+# verified: HTTPS https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtwinextras-everywhere-src-5.10.1.tar.xz.sha256
+name qtwinextras-5.10.1.tar.xz
+file 5.10/5.10.1/submodules/qtwinextras-everywhere-src-5.10.1.tar.xz
+chk 12401eea9abe87307b9aeba9d539ad403858ea43a99248421caf069f27b28917
# Qt svg
-# last changed: 2016-07-22
+# last changed: 2018-02-27
# by: ah
-# verified: HTTPS https://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtsvg-opensource-src-5.8.0.tar.xz.sha256
-name qtsvg-5.8.0.tar.xz
-file 5.8/5.8.0/submodules/qtsvg-opensource-src-5.8.0.tar.xz
-chk 9873191c211ab4da9c0bc47b1e3549f475db4d448bba3175e0f86b24eefadc89
+# verified: HTTPS https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtsvg-everywhere-src-5.10.1.tar.xz.sha256
+name qtsvg-5.10.1.tar.xz
+file 5.10/5.10.1/submodules/qtsvg-everywhere-src-5.10.1.tar.xz
+chk 00e00c04abcc8363cf7d94ca8b16af61840995a4af23685d49fa4ccafa1c7f5a
-# Qt svg
-# last changed: 2017-08-22
+# Qt translations
+# last changed: 2018-02-27
# by: ah
-# verified: HTTPS https://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qttranslations-opensource-src-5.8.0.tar.xz.sha256
-name qttranslations-5.8.0.tar.xz
-file 5.8/5.8.0/submodules/qttranslations-opensource-src-5.8.0.tar.xz
-chk 3b7cf72ec50bc2a02bf4e4427b184febac909dba0e02e1861321ca1629c3fc2e
+# verified: HTTPS https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qttranslations-everywhere-src-5.10.1.tar.xz.sha256
+name qttranslations-5.10.1.tar.xz
+file 5.10/5.10.1/submodules/qttranslations-everywhere-src-5.10.1.tar.xz
+chk 1f6d840e3d04b00b976bc1a86ea2be9d61051b7c3455dc2b891fae61772643fd
# KDE Frameworks generated by gen-frameworks.sh
diff --git a/patches/qtbase/config-standardpaths.patch b/patches/qtbase/config-standardpaths.patch
index 9987aa7..c1483e6 100755
--- a/patches/qtbase/config-standardpaths.patch
+++ b/patches/qtbase/config-standardpaths.patch
@@ -1,165 +1,17 @@
-#! /bin/sh
+i#! /bin/sh
patch -p1 -f -l $* < $0
exit $?
-diff -Nru qtbase-5.6.1.orig/src/corelib/global/global.pri qtbase-5.6.1/src/corelib/global/global.pri
---- qtbase-5.6.1.orig/src/corelib/global/global.pri 2016-07-22 15:11:23.303466531 +0200
-+++ qtbase-5.6.1/src/corelib/global/global.pri 2016-07-22 15:11:49.940044214 +0200
-@@ -10,6 +10,7 @@
- global/qnumeric_p.h \
- global/qnumeric.h \
- global/qglobalstatic.h \
-+ global/qlibraryinfo_p.h \
- global/qlibraryinfo.h \
- global/qlogging.h \
- global/qtypeinfo.h \
-diff -Nru qtbase-5.6.1.orig/src/corelib/global/qlibraryinfo.cpp qtbase-5.6.1/src/corelib/global/qlibraryinfo.cpp
---- qtbase-5.6.1.orig/src/corelib/global/qlibraryinfo.cpp 2016-07-22 15:11:23.303466531 +0200
-+++ qtbase-5.6.1/src/corelib/global/qlibraryinfo.cpp 2016-07-22 15:11:49.940044214 +0200
-@@ -38,6 +38,7 @@
- #include "qsettings.h"
- #include "qlibraryinfo.h"
- #include "qscopedpointer.h"
-+#include "qlibraryinfo_p.h"
-
- #ifdef QT_BUILD_QMAKE
- QT_BEGIN_NAMESPACE
-@@ -77,37 +78,33 @@
- };
- Q_GLOBAL_STATIC(QLibrarySettings, qt_library_settings)
-
--class QLibraryInfoPrivate
--{
--public:
-- static QSettings *findConfiguration();
- #ifdef QT_BUILD_QMAKE
-- static bool haveGroup(QLibraryInfo::PathGroup group)
-- {
-- QLibrarySettings *ls = qt_library_settings();
-- return ls ? (group == QLibraryInfo::EffectiveSourcePaths
-- ? ls->haveEffectiveSourcePaths
-- : group == QLibraryInfo::EffectivePaths
-- ? ls->haveEffectivePaths
-- : group == QLibraryInfo::DevicePaths
-- ? ls->haveDevicePaths
-- : ls->havePaths) : false;
-- }
-+bool QLibraryInfoPrivate::haveGroup(QLibraryInfo::PathGroup group)
-+{
-+ QLibrarySettings *ls = qt_library_settings();
-+ return ls ? (group == QLibraryInfo::EffectiveSourcePaths
-+ ? ls->haveEffectiveSourcePaths
-+ : group == QLibraryInfo::EffectivePaths
-+ ? ls->haveEffectivePaths
-+ : group == QLibraryInfo::DevicePaths
-+ ? ls->haveDevicePaths
-+ : ls->havePaths) : false;
-+}
- #endif
-- static QSettings *configuration()
-- {
-- QLibrarySettings *ls = qt_library_settings();
-- if (ls) {
-+QSettings *QLibraryInfoPrivate::configuration()
-+{
-+ QLibrarySettings *ls = qt_library_settings();
-+ if (ls) {
- #ifndef QT_BUILD_QMAKE
-- if (ls->reloadOnQAppAvailable && QCoreApplication::instance() != 0)
-- ls->load();
-+ if (ls->reloadOnQAppAvailable && QCoreApplication::instance() != 0)
-+ ls->load();
- #endif
-- return ls->settings.data();
-- } else {
-- return 0;
-- }
-+ return ls->settings.data();
-+ } else {
-+ return 0;
- }
--};
-+}
-+
-
- static const char platformsSection[] = "Platforms";
-
-diff -Nru qtbase-5.6.1.orig/src/corelib/global/qlibraryinfo_p.h qtbase-5.6.1/src/corelib/global/qlibraryinfo_p.h
---- qtbase-5.6.1.orig/src/corelib/global/qlibraryinfo_p.h 1970-01-01 01:00:00.000000000 +0100
-+++ qtbase-5.6.1/src/corelib/global/qlibraryinfo_p.h 2016-07-22 15:11:49.940044214 +0200
-@@ -0,0 +1,61 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2015 The Qt Company Ltd.
-+** Contact: http://www.qt.io/licensing/
-+**
-+** This file is part of the QtCore module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL21$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and The Qt Company. For licensing terms
-+** and conditions see http://www.qt.io/terms-conditions. For further
-+** information use the contact form at http://www.qt.io/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 or version 3 as published by the Free
-+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-+** following information to ensure the GNU Lesser General Public License
-+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** As a special exception, The Qt Company gives you certain additional
-+** rights. These rights are described in The Qt Company LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#ifndef QLIBRARYINFO_P_H
-+#define QLIBRARYINFO_P_H
-+
-+//
-+// W A R N I N G
-+// -------------
-+//
-+// This file is not part of the Qt API. It exists purely as an
-+// implementation detail. This header file may change from version to
-+// version without notice, or even be removed.
-+//
-+// We mean it.
-+//
-+
-+#include "qsettings.h"
-+#include "qlibraryinfo.h"
-+
-+class QLibraryInfoPrivate
-+{
-+public:
-+ static QSettings *findConfiguration();
-+#ifdef QT_BUILD_QMAKE
-+ static bool haveGroup(QLibraryInfo::PathGroup group);
-+#endif
-+ static QSettings *configuration();
-+};
-+
-+#endif
-\ No newline at end of file
diff -Nru qtbase-5.6.1.orig/src/corelib/io/qstandardpaths.cpp qtbase-5.6.1/src/corelib/io/qstandardpaths.cpp
--- qtbase-5.6.1.orig/src/corelib/io/qstandardpaths.cpp 2016-07-22 15:11:23.307466618 +0200
+++ qtbase-5.6.1/src/corelib/io/qstandardpaths.cpp 2016-07-22 15:12:52.629403686 +0200
-@@ -41,6 +41,14 @@
- #include <qcoreapplication.h>
+@@ -56,6 +56,14 @@
+ #include <unistd.h>
#endif
-+#if !defined(QT_BUILD_QMAKE) && !defined(QT_NO_SETTINGS) && !defined(QT_BOOTSTRAPPED)
-+#include "../global/qlibraryinfo_p.h"
++#if !defined(QT_BUILD_QMAKE) && !defined(QT_NO_SETTINGS)
+#include <qsettings.h>
++#include <qcoreapplication.h>
+#endif
+#ifdef Q_OS_WIN
+#include <windows.h>
@@ -168,12 +20,47 @@ diff -Nru qtbase-5.6.1.orig/src/corelib/io/qstandardpaths.cpp qtbase-5.6.1/src/c
#ifndef QT_NO_STANDARDPATHS
QT_BEGIN_NAMESPACE
-@@ -655,6 +663,55 @@
+@@ -671,6 +679,90 @@
return qsp_testMode;
}
+static const char standardPathsSection[] = "StandardPaths";
+
++static QSettings *findConfiguration()
++{
++#ifdef QT_BUILD_QMAKE
++ QString qtconfig = qmake_libraryInfoFile();
++ if (QFile::exists(qtconfig))
++ return new QSettings(qtconfig, QSettings::IniFormat);
++#else
++ QString qtconfig = QStringLiteral(":/qt/etc/qt.conf");
++ if (QFile::exists(qtconfig))
++ return new QSettings(qtconfig, QSettings::IniFormat);
++#ifdef Q_OS_DARWIN
++ CFBundleRef bundleRef = CFBundleGetMainBundle();
++ if (bundleRef) {
++ QCFType<CFURLRef> urlRef = CFBundleCopyResourceURL(bundleRef,
++ QCFString(QLatin1String("qt.conf")),
++ 0,
++ 0);
++ if (urlRef) {
++ QCFString path = CFURLCopyFileSystemPath(urlRef, kCFURLPOSIXPathStyle);
++ qtconfig = QDir::cleanPath(path);
++ if (QFile::exists(qtconfig))
++ return new QSettings(qtconfig, QSettings::IniFormat);
++ }
++ }
++#endif
++ if (QCoreApplication::instance()) {
++ QDir pwd(QCoreApplication::applicationDirPath());
++ qtconfig = pwd.filePath(QLatin1String("qt.conf"));
++ if (QFile::exists(qtconfig))
++ return new QSettings(qtconfig, QSettings::IniFormat);
++ }
++#endif
++ return 0; //no luck
++}
++
+QString QStandardPaths::presetLocation(StandardLocation type)
+{
+#if !defined(QT_BUILD_QMAKE) && !defined(QT_NO_SETTINGS) && !defined(QT_BOOTSTRAPPED)
@@ -198,7 +85,7 @@ diff -Nru qtbase-5.6.1.orig/src/corelib/io/qstandardpaths.cpp qtbase-5.6.1/src/c
+ << QStringLiteral("AppConfigLocation")
+ << QStringLiteral("AppLocalDataLocation");
+
-+ QScopedPointer<const QSettings> settings(QLibraryInfoPrivate::findConfiguration());
++ QScopedPointer<const QSettings> settings(findConfiguration());
+ if (!settings.isNull()) {
+ QString key = QLatin1String(standardPathsSection);
+ key += QLatin1Char('/');
@@ -224,7 +111,7 @@ diff -Nru qtbase-5.6.1.orig/src/corelib/io/qstandardpaths.cpp qtbase-5.6.1/src/c
QT_END_NAMESPACE
-diff -Nru qtbase-5.6.1.orig/src/corelib/io/qstandardpaths.h qtbase-5.6.1/src/corelib/io/qstandardpaths.h
+:diff -Nru qtbase-5.6.1.orig/src/corelib/io/qstandardpaths.h qtbase-5.6.1/src/corelib/io/qstandardpaths.h
--- qtbase-5.6.1.orig/src/corelib/io/qstandardpaths.h 2016-07-22 15:11:23.307466618 +0200
+++ qtbase-5.6.1/src/corelib/io/qstandardpaths.h 2016-07-22 15:11:49.940044214 +0200
@@ -92,6 +92,8 @@
diff --git a/patches/qtbase/qtbase-mingw-fixes.patch b/patches/qtbase/qtbase-mingw-fixes.patch
index 2c1d615..ee19679 100755
--- a/patches/qtbase/qtbase-mingw-fixes.patch
+++ b/patches/qtbase/qtbase-mingw-fixes.patch
@@ -40,10 +40,10 @@ index d2358ca..6b1dc95 100644
2.9.3
-From 9d8bca4d8c1d312cca4b161c93a091147dd7aa37 Mon Sep 17 00:00:00 2001
+From 68f406b40eb3708809c042dfaf41b5366b437308 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt at logyst.com>
Date: Sat, 16 Jul 2016 20:31:07 +1000
-Subject: [PATCH 2/5] Fix pkgconfig file and library naming
+Subject: [PATCH 2/6] Fix pkgconfig file and library naming
See: https://codereview.qt-project.org/#/c/165394/
https://bugreports.qt.io/browse/QTBUG-30898
@@ -68,10 +68,10 @@ Task-number: 30898
Change-Id: If75336ec7d21a7ec0cb6d245fe87c64afcb5a644
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 31d6285..8e24520 100644
+index e6a0d97f1a..5aefea28e5 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
-@@ -248,6 +248,10 @@ load(qt_installs)
+@@ -265,6 +265,10 @@ load(qt_installs)
load(qt_targets)
@@ -82,45 +82,45 @@ index 31d6285..8e24520 100644
# this builds on top of qt_common
!internal_module:!lib_bundle:if(unix|mingw) {
CONFIG += create_pc
-@@ -258,12 +262,12 @@ load(qt_targets)
+@@ -275,12 +279,12 @@ load(qt_targets)
QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw]
QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw]
- QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME
+ QMAKE_PKGCONFIG_CFLAGS = -D$$MODULE_DEFINE -I${includedir}/$$MODULE_INCNAME
- QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$QT_MAJOR_VERSION ")
- QMAKE_PKGCONFIG_FILE = $$replace(TARGET, ^Qt, Qt$$QT_MAJOR_VERSION)
+ QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt$$QT_MAJOR_VERSION, "Qt$$QT_MAJOR_VERSION ")
+ QMAKE_PKGCONFIG_FILE = $$TARGET
for(i, MODULE_DEPENDS): \
-- QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$eval(QT.$${i}.MAJOR_VERSION))
-+ QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$eval(QT.$${i}.MAJOR_VERSION))$$qtPlatformTargetSuffix()
+- QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$section(QT.$${i}.VERSION, ., 0, 0))
++ QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$section(QT.$${i}.VERSION, ., 0, 0))$$qtPlatformTargetSuffix()
isEmpty(QMAKE_PKGCONFIG_DESCRIPTION): \
- QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module
+ QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt$$QT_MAJOR_VERSION, "Qt ") module
pclib_replace.match = $$lib_replace.match
!isEmpty(lib_replace.replace): \
pclib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR
-@@ -297,5 +301,3 @@ win32 {
+@@ -314,5 +318,3 @@ win32 {
# On other platforms, Qt's own compilation goes needs to compile the Qt 5.0 API
DEFINES *= QT_DISABLE_DEPRECATED_BEFORE=0x050000
}
-
-TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX) # Do this towards the end
--
-2.9.3
+2.14.1
-From e4da2904bcab29d15ad137508390bec0595c0e72 Mon Sep 17 00:00:00 2001
+From d0ccaee377241a6b661ccb9a6d57ebc694b50f76 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand at mabrand.nl>
Date: Sun, 29 Jan 2017 13:02:16 +0100
-Subject: [PATCH 3/5] reenable fontconfig for win32 (MXE-specific)
+Subject: [PATCH 3/6] reenable fontconfig for win32 (MXE-specific)
Change-Id: I05b036366bd402e43309742412bcf8ca91fe125f
diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 1f50116..dd94429 100644
+index dab66fafb4..b90ce6e4d9 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
-@@ -471,7 +471,7 @@
+@@ -956,7 +956,7 @@
},
"fontconfig": {
"label": "Fontconfig",
@@ -130,61 +130,37 @@ index 1f50116..dd94429 100644
},
"gbm": {
diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp
-index 03c7250..7d0ffbd 100644
+index ca33689cd7..194523eee0 100644
--- a/src/plugins/platforms/minimal/qminimalintegration.cpp
+++ b/src/plugins/platforms/minimal/qminimalintegration.cpp
-@@ -120,7 +120,11 @@ QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const
- if (m_options & EnableFonts) {
+@@ -130,7 +130,11 @@ QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const
+ {
+ if (!m_fontDatabase && (m_options & EnableFonts)) {
#if QT_CONFIG(fontconfig)
- if (!m_fontDatabase)
+#ifdef Q_OS_WIN
-+ m_fontDatabase = new QBasicFontDatabase;
++ m_fontDatabase = new QFreeTypeFontDatabase;
+#else
- m_fontDatabase = new QGenericUnixFontDatabase;
+ m_fontDatabase = new QGenericUnixFontDatabase;
+#endif
- #else
- return QPlatformIntegration::fontDatabase();
- #endif
+ #elif defined(Q_OS_WINRT)
+ m_fontDatabase = new QWinRTFontDatabase;
+ #elif defined(Q_OS_WIN)
--
-2.9.3
+2.14.1
-From db3c6f5fecb9b93f3553273576954d363d0630bc Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand at mabrand.nl>
-Date: Sun, 29 Jan 2017 14:00:06 +0100
-Subject: [PATCH 4/5] fix included file name case
-
-Change-Id: I026787441aa43128aec001cfe1a7bc8d37799826
-
-diff --git a/src/plugins/platforms/windows/qwin10helpers.cpp b/src/plugins/platforms/windows/qwin10helpers.cpp
-index 977bbfd..12cccd1 100644
---- a/src/plugins/platforms/windows/qwin10helpers.cpp
-+++ b/src/plugins/platforms/windows/qwin10helpers.cpp
-@@ -57,7 +57,7 @@
- #endif
-
- #ifdef HAS_UI_VIEW_SETTINGS_INTEROP
--# include <UIViewSettingsInterop.h>
-+# include <uiviewsettingsinterop.h>
- #endif
-
- #ifndef HAS_UI_VIEW_SETTINGS_INTEROP
---
-2.9.3
-
-
-From ddf845adb0080016c2f69fcfa7e23edf70e5151a Mon Sep 17 00:00:00 2001
+From 35e8ce1f490f973045c77385f96acaa3736c8787 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand at mabrand.nl>
Date: Sun, 29 Jan 2017 16:22:03 +0100
-Subject: [PATCH 5/5] fix treatment of SYBASE_LIBS
+Subject: [PATCH 4/6] fix treatment of SYBASE_LIBS
Change-Id: I4c9914cf7ef9d91feb0718a57f2551c1eeed47e0
-diff --git a/src/sql/configure.pri b/src/sql/configure.pri
-index 1d8847b..229b6a1 100644
---- a/src/sql/configure.pri
-+++ b/src/sql/configure.pri
-@@ -76,7 +76,7 @@ defineTest(qtConfLibrary_sybaseEnv) {
+diff --git a/src/plugins/sqldrivers/configure.pri b/src/plugins/sqldrivers/configure.pri
+index b69b51b679..d37423adbd 100644
+--- a/src/plugins/sqldrivers/configure.pri
++++ b/src/plugins/sqldrivers/configure.pri
+@@ -92,7 +92,7 @@ defineTest(qtConfLibrary_sybaseEnv) {
libs += "-L$${sybase}/lib"
libs += $$getenv(SYBASE_LIBS)
!isEmpty(libs) {
@@ -194,4 +170,41 @@ index 1d8847b..229b6a1 100644
}
return(true)
--
-2.9.3
+2.14.1
+
+
+From 8427c411a789c537b41d113d1f8f9ea7eb9d009a Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand at mabrand.nl>
+Date: Thu, 23 Nov 2017 11:28:47 +0200
+Subject: [PATCH 6/6] disable qt_random_cpu for i686-w64-mingw32
+
+Workaround for gcc internal error compiling for mingw32:
+ global/qrandom.cpp: In function 'qsizetype qt_random_cpu(void*, qsizetype)':
+ global/qrandom.cpp:123:1: internal compiler error: in
+ ix86_compute_frame_layout, at config/i386/i386.c:10145
+ }
+ ^
+
+ global/qrandom.cpp:123:1: internal compiler error: Segmentation fault
+ i686-w64-mingw32.static-g++: internal compiler error: Segmentation fault
+ (program cc1plus)
+
+Based on https://codereview.qt-project.org/#/c/212360/
+
+Change-Id: Ia1c902e7b147bdda2b8d7904b40a3b968b8d0369
+
+diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
+index 72ba299280..90a0f378ff 100644
+--- a/src/corelib/global/qrandom.cpp
++++ b/src/corelib/global/qrandom.cpp
+@@ -92,7 +92,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando
+
+ QT_BEGIN_NAMESPACE
+
+-#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND)
++#if defined(Q_PROCESSOR_X86) && !defined(Q_PROCESSOR_X86_32) && QT_COMPILER_SUPPORTS_HERE(RDRND)
+ static qsizetype qt_random_cpu(void *buffer, qsizetype count) Q_DECL_NOTHROW;
+
+ # ifdef Q_PROCESSOR_X86_64
+--
+2.14.1
diff --git a/patches/qtbase/relative-paths.patch b/patches/qtbase/relative-paths.patch
index 9e38573..1758f91 100755
--- a/patches/qtbase/relative-paths.patch
+++ b/patches/qtbase/relative-paths.patch
@@ -40,16 +40,26 @@ diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platf
index 66735d8..5731560 100644
--- a/src/plugins/platforms/windows/qwindowstheme.cpp
+++ b/src/plugins/platforms/windows/qwindowstheme.cpp
-@@ -338,6 +338,8 @@
+@@ -414,12 +414,16 @@
+ static inline QStringList iconThemeSearchPaths()
+ {
+ const QFileInfo appDir(QCoreApplication::applicationDirPath() + QLatin1String("/icons"));
+- return appDir.isDir() ? QStringList(appDir.absoluteFilePath()) : QStringList();
++ QStringList ret;
++ ret << appDir.absoluteFilePath() << QCoreApplication::applicationDirPath() + QLatin1String("/../share/icons");
++
++ return ret;
+ }
+
static inline QStringList styleNames()
{
- QStringList result;
-+ result.append(QStringLiteral("breeze"));
-+ result.append(QStringLiteral("oxygen"));
- if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA)
- result.append(QStringLiteral("WindowsVista"));
- if (QSysInfo::WindowsVersion >= QSysInfo::WV_XP)
-@@ -398,6 +400,10 @@
+- return { QStringLiteral("WindowsVista"), QStringLiteral("Windows") };
++ return {QStringLiteral("breeze"), QStringLiteral("oxygen"),
++ QStringLiteral("WindowsVista"), QStringLiteral("Windows") };
+ }
+
+ static inline int uiEffects()
+@@ -472,6 +476,10 @@
result = int(scrollLines);
return QVariant(result);
}
diff --git a/patches/qtbase/windowsxp-support-revert-2.patch b/patches/qtbase/windowsxp-support-revert-2.patch
deleted file mode 100755
index a24a3e9..0000000
--- a/patches/qtbase/windowsxp-support-revert-2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh
-patch -p0 -R -f -l $* < $0
-exit $?
-
---- src/plugins/platforms/windows/qwindowstheme.cpp 2017-06-12 11:35:29.491363130 +0200
-+++ src/plugins/platforms/windows/qwindowstheme.cpp.orig 2017-06-12 11:35:24.223373397 +0200
-@@ -623,7 +623,7 @@
- memset(&iconInfo, 0, sizeof(iconInfo));
- iconInfo.cbSize = sizeof(iconInfo);
- stockFlags |= (pixmapSize.width() > 16 ? SHGFI_LARGEICON : SHGFI_SMALLICON);
-- if (QWindowsContext::shell32dll.sHGetStockIconInfo(stockId, SHGFI_ICON | stockFlags, &iconInfo) == S_OK) {
-+ if (SHGetStockIconInfo(stockId, SHGFI_ICON | stockFlags, &iconInfo) == S_OK) {
- pixmap = qt_pixmapFromWinHICON(iconInfo.hIcon);
- DestroyIcon(iconInfo.hIcon);
- return pixmap;
---- src/plugins/platforms/windows/qwindowswindow.cpp 2017-06-12 11:40:03.530833862 +0200
-+++ src/plugins/platforms/windows/qwindowswindow.cpp.orig 2017-06-12 11:37:38.367113636 +0200
-@@ -1599,7 +1599,8 @@
-
- static inline bool dwmIsCompositionEnabled()
- {
-- return false;
-+ BOOL dWmCompositionEnabled = FALSE;
-+ return SUCCEEDED(DwmIsCompositionEnabled(&dWmCompositionEnabled)) && dWmCompositionEnabled == TRUE;
- }
-
- bool QWindowsWindow::handleWmPaint(HWND hwnd, UINT message,
diff --git a/patches/qtbase/windowsxp-support-revert.patch b/patches/qtbase/windowsxp-support-revert.patch
deleted file mode 100755
index d4779a1..0000000
--- a/patches/qtbase/windowsxp-support-revert.patch
+++ /dev/null
@@ -1,478 +0,0 @@
-#! /bin/sh
-patch -p1 -f -l -R $* < $0
-exit $?
-
-commit 5cbc4609906bbd0484344f96643840ffdc723d69
-Author: Friedemann Kleint <Friedemann.Kleint at theqtcompany.com>
-Date: Wed Mar 9 09:14:23 2016 +0100
-
- Windows QPA: Increase API level to 0x600 (Windows Vista).
-
- - Directly link against dwmapi which should be present on
- Windows Vista and remove duplicated header constants.
- - Remove struct QWindowsShell32DL since all required functions
- are present on Windows Vista.
- - Remove functions that are no longer needed from QWindowsUser32DLL
- with exception of the clipboard functions which are not present
- in the MinGW stub libraries until v5.
-
- Task-number: QTBUG-51673
- Change-Id: Ia4a8a3f1db0f0d02322317d547e61ae39f9008b5
- Reviewed-by: Oliver Wolff <oliver.wolff at theqtcompany.com>
-
-diff --git a/src/plugins/platforms/windows/qwindowsbackingstore.cpp b/src/plugins/platforms/windows/qwindowsbackingstore.cpp
-index df6749ad25..2d5e4071bc 100644
---- a/src/plugins/platforms/windows/qwindowsbackingstore.cpp
-+++ b/src/plugins/platforms/windows/qwindowsbackingstore.cpp
-@@ -100,19 +100,15 @@ void QWindowsBackingStore::flush(QWindow *window, const QRegion ®ion,
- POINT ptDst = {r.x(), r.y()};
- POINT ptSrc = {0, 0};
- BLENDFUNCTION blend = {AC_SRC_OVER, 0, BYTE(qRound(255.0 * rw->opacity())), AC_SRC_ALPHA};
-- if (QWindowsContext::user32dll.updateLayeredWindowIndirect) {
-- RECT dirty = {dirtyRect.x(), dirtyRect.y(),
-- dirtyRect.x() + dirtyRect.width(), dirtyRect.y() + dirtyRect.height()};
-- UPDATELAYEREDWINDOWINFO info = {sizeof(info), NULL, &ptDst, &size, m_image->hdc(), &ptSrc, 0, &blend, ULW_ALPHA, &dirty};
-- const BOOL result = QWindowsContext::user32dll.updateLayeredWindowIndirect(rw->handle(), &info);
-- if (!result)
-- qErrnoWarning("UpdateLayeredWindowIndirect failed for ptDst=(%d, %d),"
-- " size=(%dx%d), dirty=(%dx%d %d, %d)", r.x(), r.y(),
-- r.width(), r.height(), dirtyRect.width(), dirtyRect.height(),
-- dirtyRect.x(), dirtyRect.y());
-- } else {
-- QWindowsContext::user32dll.updateLayeredWindow(rw->handle(), NULL, &ptDst, &size, m_image->hdc(), &ptSrc, 0, &blend, ULW_ALPHA);
-- }
-+ RECT dirty = {dirtyRect.x(), dirtyRect.y(),
-+ dirtyRect.x() + dirtyRect.width(), dirtyRect.y() + dirtyRect.height()};
-+ UPDATELAYEREDWINDOWINFO info = {sizeof(info), NULL, &ptDst, &size, m_image->hdc(), &ptSrc, 0, &blend, ULW_ALPHA, &dirty};
-+ const BOOL result = UpdateLayeredWindowIndirect(rw->handle(), &info);
-+ if (!result)
-+ qErrnoWarning("UpdateLayeredWindowIndirect failed for ptDst=(%d, %d),"
-+ " size=(%dx%d), dirty=(%dx%d %d, %d)", r.x(), r.y(),
-+ r.width(), r.height(), dirtyRect.width(), dirtyRect.height(),
-+ dirtyRect.x(), dirtyRect.y());
- } else {
- const HDC dc = rw->getDC();
- if (!dc) {
-diff --git a/src/plugins/platforms/windows/qwindowsclipboard.cpp b/src/plugins/platforms/windows/qwindowsclipboard.cpp
-index d527e07308..21bc9d7377 100644
---- a/src/plugins/platforms/windows/qwindowsclipboard.cpp
-+++ b/src/plugins/platforms/windows/qwindowsclipboard.cpp
-@@ -237,8 +237,7 @@ void QWindowsClipboard::propagateClipboardMessage(UINT message, WPARAM wParam, L
- return;
- // In rare cases, a clipboard viewer can hang (application crashed,
- // suspended by a shell prompt 'Select' or debugger).
-- if (QWindowsContext::user32dll.isHungAppWindow
-- && QWindowsContext::user32dll.isHungAppWindow(m_nextClipboardViewer)) {
-+ if (IsHungAppWindow(m_nextClipboardViewer)) {
- qWarning("Cowardly refusing to send clipboard message to hung application...");
- return;
- }
-diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp
-index 74dfa59988..ef0962c2ff 100644
---- a/src/plugins/platforms/windows/qwindowscontext.cpp
-+++ b/src/plugins/platforms/windows/qwindowscontext.cpp
-@@ -97,35 +97,26 @@ int QWindowsContext::verbose = 0;
- # define LANG_SYRIAC 0x5a
- #endif
-
--static inline bool useRTL_Extensions(QSysInfo::WinVersion ver)
-+static inline bool useRTL_Extensions()
- {
-- if ((ver & QSysInfo::WV_NT_based) && (ver >= QSysInfo::WV_VISTA)) {
-- // Since the IsValidLanguageGroup/IsValidLocale functions always return true on
-- // Vista, check the Keyboard Layouts for enabling RTL.
-- if (const int nLayouts = GetKeyboardLayoutList(0, 0)) {
-- QScopedArrayPointer<HKL> lpList(new HKL[nLayouts]);
-- GetKeyboardLayoutList(nLayouts, lpList.data());
-- for (int i = 0; i < nLayouts; ++i) {
-- switch (PRIMARYLANGID((quintptr)lpList[i])) {
-- case LANG_ARABIC:
-- case LANG_HEBREW:
-- case LANG_FARSI:
-- case LANG_SYRIAC:
-- return true;
-- default:
-- break;
-- }
-+ // Since the IsValidLanguageGroup/IsValidLocale functions always return true on
-+ // Vista, check the Keyboard Layouts for enabling RTL.
-+ if (const int nLayouts = GetKeyboardLayoutList(0, 0)) {
-+ QScopedArrayPointer<HKL> lpList(new HKL[nLayouts]);
-+ GetKeyboardLayoutList(nLayouts, lpList.data());
-+ for (int i = 0; i < nLayouts; ++i) {
-+ switch (PRIMARYLANGID((quintptr)lpList[i])) {
-+ case LANG_ARABIC:
-+ case LANG_HEBREW:
-+ case LANG_FARSI:
-+ case LANG_SYRIAC:
-+ return true;
-+ default:
-+ break;
- }
- }
-- return false;
-- } // NT/Vista
-- // Pre-NT: figure out whether a RTL language is installed
-- return IsValidLanguageGroup(LGRPID_ARABIC, LGRPID_INSTALLED)
-- || IsValidLanguageGroup(LGRPID_HEBREW, LGRPID_INSTALLED)
-- || IsValidLocale(MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_DEFAULT), SORT_DEFAULT), LCID_INSTALLED)
-- || IsValidLocale(MAKELCID(MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT), SORT_DEFAULT), LCID_INSTALLED)
-- || IsValidLocale(MAKELCID(MAKELANGID(LANG_SYRIAC, SUBLANG_DEFAULT), SORT_DEFAULT), LCID_INSTALLED)
-- || IsValidLocale(MAKELCID(MAKELANGID(LANG_FARSI, SUBLANG_DEFAULT), SORT_DEFAULT), LCID_INSTALLED);
-+ }
-+ return false;
- }
-
- #if !defined(QT_NO_SESSIONMANAGER)
-@@ -152,9 +143,7 @@ static inline QWindowsSessionManager *platformSessionManager() {
- \ingroup qt-lighthouse-win
- */
- QWindowsUser32DLL::QWindowsUser32DLL() :
-- setLayeredWindowAttributes(0), updateLayeredWindow(0),
-- updateLayeredWindowIndirect(0),
-- isHungAppWindow(0), isTouchWindow(0),
-+ isTouchWindow(0),
- registerTouchWindow(0), unregisterTouchWindow(0),
- getTouchInputInfo(0), closeTouchInputHandle(0), setProcessDPIAware(0),
- addClipboardFormatListener(0), removeClipboardFormatListener(0),
-@@ -165,20 +154,11 @@ QWindowsUser32DLL::QWindowsUser32DLL() :
- void QWindowsUser32DLL::init()
- {
- QSystemLibrary library(QStringLiteral("user32"));
-- // MinGW (g++ 3.4.5) accepts only C casts.
-- setLayeredWindowAttributes = (SetLayeredWindowAttributes)(library.resolve("SetLayeredWindowAttributes"));
-- updateLayeredWindow = (UpdateLayeredWindow)(library.resolve("UpdateLayeredWindow"));
-- if (Q_UNLIKELY(!setLayeredWindowAttributes || !updateLayeredWindow))
-- qFatal("This version of Windows is not supported (User32.dll is missing the symbols 'SetLayeredWindowAttributes', 'UpdateLayeredWindow').");
--
-- updateLayeredWindowIndirect = (UpdateLayeredWindowIndirect)(library.resolve("UpdateLayeredWindowIndirect"));
-- isHungAppWindow = (IsHungAppWindow)library.resolve("IsHungAppWindow");
- setProcessDPIAware = (SetProcessDPIAware)library.resolve("SetProcessDPIAware");
-
-- if (QSysInfo::windowsVersion() >= QSysInfo::WV_VISTA) {
-- addClipboardFormatListener = (AddClipboardFormatListener)library.resolve("AddClipboardFormatListener");
-- removeClipboardFormatListener = (RemoveClipboardFormatListener)library.resolve("RemoveClipboardFormatListener");
-- }
-+ addClipboardFormatListener = (AddClipboardFormatListener)library.resolve("AddClipboardFormatListener");
-+ removeClipboardFormatListener = (RemoveClipboardFormatListener)library.resolve("RemoveClipboardFormatListener");
-+
- getDisplayAutoRotationPreferences = (GetDisplayAutoRotationPreferences)library.resolve("GetDisplayAutoRotationPreferences");
- setDisplayAutoRotationPreferences = (SetDisplayAutoRotationPreferences)library.resolve("SetDisplayAutoRotationPreferences");
- }
-@@ -196,38 +176,6 @@ bool QWindowsUser32DLL::initTouch()
- return isTouchWindow && registerTouchWindow && unregisterTouchWindow && getTouchInputInfo && closeTouchInputHandle;
- }
-
--/*!
-- \class QWindowsShell32DLL
-- \brief Struct that contains dynamically resolved symbols of Shell32.dll.
--
-- The stub libraries shipped with the MinGW compiler miss some of the
-- functions. They need to be retrieved dynamically.
--
-- \sa QWindowsUser32DLL
--
-- \internal
-- \ingroup qt-lighthouse-win
--*/
--
--QWindowsShell32DLL::QWindowsShell32DLL()
-- : sHCreateItemFromParsingName(0)
-- , sHGetKnownFolderIDList(0)
-- , sHGetStockIconInfo(0)
-- , sHGetImageList(0)
-- , sHCreateItemFromIDList(0)
--{
--}
--
--void QWindowsShell32DLL::init()
--{
-- QSystemLibrary library(QStringLiteral("shell32"));
-- sHCreateItemFromParsingName = (SHCreateItemFromParsingName)(library.resolve("SHCreateItemFromParsingName"));
-- sHGetKnownFolderIDList = (SHGetKnownFolderIDList)(library.resolve("SHGetKnownFolderIDList"));
-- sHGetStockIconInfo = (SHGetStockIconInfo)library.resolve("SHGetStockIconInfo");
-- sHGetImageList = (SHGetImageList)library.resolve("SHGetImageList");
-- sHCreateItemFromIDList = (SHCreateItemFromIDList)library.resolve("SHCreateItemFromIDList");
--}
--
- QWindowsShcoreDLL::QWindowsShcoreDLL()
- : getProcessDpiAwareness(0)
- , setProcessDpiAwareness(0)
-@@ -246,7 +194,6 @@ void QWindowsShcoreDLL::init()
- }
-
- QWindowsUser32DLL QWindowsContext::user32dll;
--QWindowsShell32DLL QWindowsContext::shell32dll;
- QWindowsShcoreDLL QWindowsContext::shcoredll;
-
- QWindowsContext *QWindowsContext::m_instance = 0;
-@@ -292,16 +239,14 @@ QWindowsContextPrivate::QWindowsContextPrivate()
- , m_eventType(QByteArrayLiteral("windows_generic_MSG"))
- , m_lastActiveWindow(0), m_asyncExpose(0)
- {
-- const QSysInfo::WinVersion ver = QSysInfo::windowsVersion();
- QWindowsContext::user32dll.init();
-- QWindowsContext::shell32dll.init();
- QWindowsContext::shcoredll.init();
-
- if (m_mouseHandler.touchDevice() && QWindowsContext::user32dll.initTouch())
- m_systemInfo |= QWindowsContext::SI_SupportsTouch;
- m_displayContext = GetDC(0);
- m_defaultDPI = GetDeviceCaps(m_displayContext, LOGPIXELSY);
-- if (useRTL_Extensions(ver)) {
-+ if (useRTL_Extensions()) {
- m_systemInfo |= QWindowsContext::SI_RTL_Extensions;
- m_keyMapper.setUseRTLExtensions(true);
- }
-diff --git a/src/plugins/platforms/windows/qwindowscontext.h b/src/plugins/platforms/windows/qwindowscontext.h
-index df07f433ec..32d7800ef5 100644
---- a/src/plugins/platforms/windows/qwindowscontext.h
-+++ b/src/plugins/platforms/windows/qwindowscontext.h
-@@ -85,31 +85,17 @@ struct QWindowsUser32DLL
- inline void init();
- inline bool initTouch();
-
-- typedef BOOL (WINAPI *IsTouchWindow)(HWND, PULONG);
-+ typedef BOOL (WINAPI *IsTouchWindow)(HWND, PULONG); // Windows 7
- typedef BOOL (WINAPI *RegisterTouchWindow)(HWND, ULONG);
- typedef BOOL (WINAPI *UnregisterTouchWindow)(HWND);
- typedef BOOL (WINAPI *GetTouchInputInfo)(HANDLE, UINT, PVOID, int);
- typedef BOOL (WINAPI *CloseTouchInputHandle)(HANDLE);
-- typedef BOOL (WINAPI *SetLayeredWindowAttributes)(HWND, COLORREF, BYTE, DWORD);
-- typedef BOOL (WINAPI *UpdateLayeredWindow)(HWND, HDC , const POINT *,
-- const SIZE *, HDC, const POINT *, COLORREF,
-- const BLENDFUNCTION *, DWORD);
-- typedef BOOL (WINAPI *UpdateLayeredWindowIndirect)(HWND, const UPDATELAYEREDWINDOWINFO *);
-- typedef BOOL (WINAPI *IsHungAppWindow)(HWND);
- typedef BOOL (WINAPI *SetProcessDPIAware)();
- typedef BOOL (WINAPI *AddClipboardFormatListener)(HWND);
- typedef BOOL (WINAPI *RemoveClipboardFormatListener)(HWND);
- typedef BOOL (WINAPI *GetDisplayAutoRotationPreferences)(DWORD *);
- typedef BOOL (WINAPI *SetDisplayAutoRotationPreferences)(DWORD);
-
-- // Functions missing in Q_CC_GNU stub libraries.
-- SetLayeredWindowAttributes setLayeredWindowAttributes;
-- UpdateLayeredWindow updateLayeredWindow;
--
-- // Functions missing in older versions of Windows
-- UpdateLayeredWindowIndirect updateLayeredWindowIndirect;
-- IsHungAppWindow isHungAppWindow;
--
- // Touch functions from Windows 7 onwards (also for use with Q_CC_MSVC).
- IsTouchWindow isTouchWindow;
- RegisterTouchWindow registerTouchWindow;
-@@ -120,7 +106,8 @@ struct QWindowsUser32DLL
- // Windows Vista onwards
- SetProcessDPIAware setProcessDPIAware;
-
-- // Clipboard listeners, Windows Vista onwards
-+ // Clipboard listeners are present on Windows Vista onwards
-+ // but missing in MinGW 4.9 stub libs. Can be removed in MinGW 5.
- AddClipboardFormatListener addClipboardFormatListener;
- RemoveClipboardFormatListener removeClipboardFormatListener;
-
-@@ -129,24 +116,6 @@ struct QWindowsUser32DLL
- SetDisplayAutoRotationPreferences setDisplayAutoRotationPreferences;
- };
-
--struct QWindowsShell32DLL
--{
-- QWindowsShell32DLL();
-- inline void init();
--
-- typedef HRESULT (WINAPI *SHCreateItemFromParsingName)(PCWSTR, IBindCtx *, const GUID&, void **);
-- typedef HRESULT (WINAPI *SHGetKnownFolderIDList)(const GUID &, DWORD, HANDLE, PIDLIST_ABSOLUTE *);
-- typedef HRESULT (WINAPI *SHGetStockIconInfo)(int , int , _SHSTOCKICONINFO *);
-- typedef HRESULT (WINAPI *SHGetImageList)(int, REFIID , void **);
-- typedef HRESULT (WINAPI *SHCreateItemFromIDList)(PCIDLIST_ABSOLUTE, REFIID, void **);
--
-- SHCreateItemFromParsingName sHCreateItemFromParsingName;
-- SHGetKnownFolderIDList sHGetKnownFolderIDList;
-- SHGetStockIconInfo sHGetStockIconInfo;
-- SHGetImageList sHGetImageList;
-- SHCreateItemFromIDList sHCreateItemFromIDList;
--};
--
- // Shell scaling library (Windows 8.1 onwards)
- struct QWindowsShcoreDLL {
- QWindowsShcoreDLL();
-@@ -235,7 +204,6 @@ public:
- QWindowsTabletSupport *tabletSupport() const;
-
- static QWindowsUser32DLL user32dll;
-- static QWindowsShell32DLL shell32dll;
- static QWindowsShcoreDLL shcoredll;
-
- static QByteArray comErrorString(HRESULT hr);
-diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
-index f2beeb6f54..e1b0d36922 100644
---- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
-+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
-@@ -988,22 +988,18 @@ void QWindowsNativeFileDialogBase::setWindowTitle(const QString &title)
- IShellItem *QWindowsNativeFileDialogBase::shellItem(const QUrl &url)
- {
- if (url.isLocalFile()) {
-- if (!QWindowsContext::shell32dll.sHCreateItemFromParsingName)
-- return Q_NULLPTR;
- IShellItem *result = Q_NULLPTR;
- const QString native = QDir::toNativeSeparators(url.toLocalFile());
- const HRESULT hr =
-- QWindowsContext::shell32dll.sHCreateItemFromParsingName(reinterpret_cast<const wchar_t *>(native.utf16()),
-- NULL, IID_IShellItem,
-- reinterpret_cast<void **>(&result));
-+ SHCreateItemFromParsingName(reinterpret_cast<const wchar_t *>(native.utf16()),
-+ NULL, IID_IShellItem,
-+ reinterpret_cast<void **>(&result));
- if (FAILED(hr)) {
- qErrnoWarning("%s: SHCreateItemFromParsingName(%s)) failed", __FUNCTION__, qPrintable(url.toString()));
- return Q_NULLPTR;
- }
- return result;
- } else if (url.scheme() == QLatin1String("clsid")) {
-- if (!QWindowsContext::shell32dll.sHGetKnownFolderIDList || !QWindowsContext::shell32dll.sHCreateItemFromIDList)
-- return Q_NULLPTR;
- // Support for virtual folders via GUID
- // (see https://msdn.microsoft.com/en-us/library/windows/desktop/dd378457(v=vs.85).aspx)
- // specified as "clsid:<GUID>" (without '{', '}').
-@@ -1014,12 +1010,12 @@ IShellItem *QWindowsNativeFileDialogBase::shellItem(const QUrl &url)
- return Q_NULLPTR;
- }
- PIDLIST_ABSOLUTE idList;
-- HRESULT hr = QWindowsContext::shell32dll.sHGetKnownFolderIDList(uuid, 0, 0, &idList);
-+ HRESULT hr = SHGetKnownFolderIDList(uuid, 0, 0, &idList);
- if (FAILED(hr)) {
- qErrnoWarning("%s: SHGetKnownFolderIDList(%s)) failed", __FUNCTION__, qPrintable(url.toString()));
- return Q_NULLPTR;
- }
-- hr = QWindowsContext::shell32dll.sHCreateItemFromIDList(idList, IID_IShellItem, reinterpret_cast<void **>(&result));
-+ hr = SHCreateItemFromIDList(idList, IID_IShellItem, reinterpret_cast<void **>(&result));
- CoTaskMemFree(idList);
- if (FAILED(hr)) {
- qErrnoWarning("%s: SHCreateItemFromIDList(%s)) failed", __FUNCTION__, qPrintable(url.toString()));
-diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platforms/windows/qwindowstheme.cpp
-index f33267e5e3..046c32a80a 100644
---- a/src/plugins/platforms/windows/qwindowstheme.cpp
-+++ b/src/plugins/platforms/windows/qwindowstheme.cpp
-@@ -490,7 +490,7 @@ QPixmap QWindowsTheme::standardPixmap(StandardPixmap sp, const QSizeF &size) con
- const int scaleFactor = primaryScreen ? qRound(QHighDpiScaling::factor(primaryScreen)) : 1;
- const QSizeF pixmapSize = size * scaleFactor;
- int resourceId = -1;
-- int stockId = SIID_INVALID;
-+ SHSTOCKICONID stockId = SIID_INVALID;
- UINT stockFlags = 0;
- LPCTSTR iconName = 0;
- switch (sp) {
-@@ -669,14 +665,8 @@ static QPixmap pixmapFromShellImageList(int iImageList, const SHFILEINFO &info)
- // For MinGW:
- static const IID iID_IImageList = {0x46eb5926, 0x582e, 0x4017, {0x9f, 0xdf, 0xe8, 0x99, 0x8d, 0xaa, 0x9, 0x50}};
-
-- if (!QWindowsContext::shell32dll.sHGetImageList)
-- return result;
-- if (iImageList == sHIL_JUMBO && QSysInfo::WindowsVersion < QSysInfo::WV_VISTA)
-- return result;
--
- IImageList *imageList = 0;
-- HRESULT hr = QWindowsContext::shell32dll.sHGetImageList(iImageList, iID_IImageList,
-- reinterpret_cast<void **>(&imageList));
-+ HRESULT hr = SHGetImageList(iImageList, iID_IImageList, reinterpret_cast<void **>(&imageList));
- if (hr != S_OK)
- return result;
- HICON hIcon;
-diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
-index a60ab5a2ab..c369bafafc 100644
---- a/src/plugins/platforms/windows/qwindowswindow.cpp
-+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
-@@ -62,6 +62,8 @@
-
- #include <QtCore/QDebug>
-
-+#include <dwmapi.h>
-+
- QT_BEGIN_NAMESPACE
-
- enum {
-@@ -258,55 +260,22 @@ static inline bool windowIsOpenGL(const QWindow *w)
-
- static bool applyBlurBehindWindow(HWND hwnd)
- {
-- enum { dwmBbEnable = 0x1, dwmBbBlurRegion = 0x2 };
--
-- struct DwmBlurBehind {
-- DWORD dwFlags;
-- BOOL fEnable;
-- HRGN hRgnBlur;
-- BOOL fTransitionOnMaximized;
-- };
--
-- typedef HRESULT (WINAPI *PtrDwmEnableBlurBehindWindow)(HWND, const DwmBlurBehind*);
-- typedef HRESULT (WINAPI *PtrDwmIsCompositionEnabled)(BOOL *);
--
-- // DWM API is available only from Windows Vista
-- if (QSysInfo::windowsVersion() < QSysInfo::WV_VISTA)
-- return false;
--
-- static bool functionPointersResolved = false;
-- static PtrDwmEnableBlurBehindWindow dwmBlurBehind = 0;
-- static PtrDwmIsCompositionEnabled dwmIsCompositionEnabled = 0;
--
-- if (Q_UNLIKELY(!functionPointersResolved)) {
-- QSystemLibrary library(QStringLiteral("dwmapi"));
-- if (library.load()) {
-- dwmBlurBehind = (PtrDwmEnableBlurBehindWindow)(library.resolve("DwmEnableBlurBehindWindow"));
-- dwmIsCompositionEnabled = (PtrDwmIsCompositionEnabled)(library.resolve("DwmIsCompositionEnabled"));
-- }
--
-- functionPointersResolved = true;
-- }
--
-- if (Q_UNLIKELY(!dwmBlurBehind || !dwmIsCompositionEnabled))
-- return false;
--
- BOOL compositionEnabled;
-- if (dwmIsCompositionEnabled(&compositionEnabled) != S_OK)
-+ if (DwmIsCompositionEnabled(&compositionEnabled) != S_OK)
- return false;
-
-- DwmBlurBehind blurBehind = {0, 0, 0, 0};
-+ DWM_BLURBEHIND blurBehind = {0, 0, 0, 0};
-
- if (compositionEnabled) {
-- blurBehind.dwFlags = dwmBbEnable | dwmBbBlurRegion;
-+ blurBehind.dwFlags = DWM_BB_ENABLE | DWM_BB_BLURREGION;
- blurBehind.fEnable = TRUE;
- blurBehind.hRgnBlur = CreateRectRgn(0, 0, -1, -1);
- } else {
-- blurBehind.dwFlags = dwmBbEnable;
-+ blurBehind.dwFlags = DWM_BB_ENABLE;
- blurBehind.fEnable = FALSE;
- }
-
-- const bool result = dwmBlurBehind(hwnd, &blurBehind) == S_OK;
-+ const bool result = DwmEnableBlurBehindWindow(hwnd, &blurBehind) == S_OK;
-
- if (blurBehind.hRgnBlur)
- DeleteObject(blurBehind.hRgnBlur);
-@@ -351,9 +320,9 @@ static void setWindowOpacity(HWND hwnd, Qt::WindowFlags flags, bool hasAlpha, bo
- if (hasAlpha && !openGL && (flags & Qt::FramelessWindowHint)) {
- // Non-GL windows with alpha: Use blend function to update.
- BLENDFUNCTION blend = {AC_SRC_OVER, 0, alpha, AC_SRC_ALPHA};
-- QWindowsContext::user32dll.updateLayeredWindow(hwnd, NULL, NULL, NULL, NULL, NULL, 0, &blend, ULW_ALPHA);
-+ UpdateLayeredWindow(hwnd, NULL, NULL, NULL, NULL, NULL, 0, &blend, ULW_ALPHA);
- } else {
-- QWindowsContext::user32dll.setLayeredWindowAttributes(hwnd, 0, alpha, LWA_ALPHA);
-+ SetLayeredWindowAttributes(hwnd, 0, alpha, LWA_ALPHA);
- }
- } else if (IsWindowVisible(hwnd)) { // Repaint when switching from layered.
- InvalidateRect(hwnd, NULL, TRUE);
-diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro
-index aef9f5330c..adafa830d5 100644
---- a/src/plugins/platforms/windows/windows.pro
-+++ b/src/plugins/platforms/windows/windows.pro
-@@ -4,7 +4,7 @@ QT *= core-private
- QT *= gui-private
- QT *= platformsupport-private
-
--LIBS += -lgdi32
-+LIBS += -lgdi32 -ldwmapi
-
- include(windows.pri)
diff --git a/patches/qtbase/windowsxp-support.patch b/patches/qtbase/windowsxp-support.patch
deleted file mode 100755
index dcfbed4..0000000
--- a/patches/qtbase/windowsxp-support.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /bin/sh
-patch -p1 -f -l $* < $0
-exit $?
-
-diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
-index e12da68671..c9d2a4b80f 100644
---- a/src/corelib/io/qsettings.cpp
-+++ b/src/corelib/io/qsettings.cpp
-@@ -54,6 +54,8 @@
- #include "qstandardpaths.h"
- #include <qdatastream.h>
-
-+#include <private/qsystemlibrary_p.h>
-+
- #ifndef QT_NO_TEXTCODEC
- # include "qtextcodec.h"
- #endif
-@@ -951,15 +953,34 @@ void QConfFileSettingsPrivate::initAccess()
- }
-
- #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
--static QString windowsConfigPath(const KNOWNFOLDERID &type)
-+static QString convertCharArray(const wchar_t *path)
-+{
-+ return QDir::fromNativeSeparators(QString::fromWCharArray(path));
-+}
-+
-+// Convenience for SHGetKnownFolderPath().
-+static QString sHGetKnownFolderPath(const GUID &clsid)
- {
- QString result;
-+ typedef HRESULT (WINAPI *GetKnownFolderPath)(const GUID&, DWORD, HANDLE, LPWSTR*);
-
-- PWSTR path = nullptr;
-- if (SHGetKnownFolderPath(type, KF_FLAG_DONT_VERIFY, NULL, &path) == S_OK) {
-- result = QString::fromWCharArray(path);
-+ static const GetKnownFolderPath sHGetKnownFolderPath = // Vista onwards.
-+ reinterpret_cast<GetKnownFolderPath>(QSystemLibrary::resolve(QLatin1String("shell32"), "SHGetKnownFolderPath"));
-+
-+ LPWSTR path;
-+ if (Q_LIKELY(sHGetKnownFolderPath && SUCCEEDED(sHGetKnownFolderPath(clsid, KF_FLAG_DONT_VERIFY, 0, &path)))) {
-+ result = convertCharArray(path);
- CoTaskMemFree(path);
- }
-+ return result;
-+}
-+
-+static QString windowsConfigPath(const KNOWNFOLDERID &type)
-+{
-+ QString result;
-+
-+ PWSTR path = nullptr;
-+ result = sHGetKnownFolderPath(type);
-
- if (result.isEmpty()) {
- if (type == FOLDERID_ProgramData) {
-diff --git a/src/plugins/platforms/windows/qwin10helpers.cpp b/src/plugins/platforms/windows/qwin10helpers.cpp
-index 12cccd124b..fe444c9420 100644
---- a/src/plugins/platforms/windows/qwin10helpers.cpp
-+++ b/src/plugins/platforms/windows/qwin10helpers.cpp
-@@ -42,10 +42,10 @@
- #include <QtCore/QDebug>
- #include <QtCore/private/qsystemlibrary_p.h>
-
--#if defined(Q_CC_MINGW)
-+#if 0
- # define HAS_UI_VIEW_SETTINGS_INTEROP
- // Present from MSVC2015 + SDK 10 onwards
--#elif (!defined(Q_CC_MSVC) || _MSC_VER >= 1900) && NTDDI_VERSION >= 0xa000000
-+#elif 0
- # define HAS_UI_VIEW_SETTINGS_INTEROP
- # define HAS_UI_VIEW_SETTINGS
- #endif
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 4 -
packages/packages.current | 202 ++++-----
.../kconfigwidgets/0001-Make-QDbus-optional.patch | 11 +-
patches/ki18n/no-tests.patch | 17 -
.../0002-Make-QDBus-dependency-optional.patch | 41 +-
patches/qtbase/config-standardpaths.patch | 199 ++-------
patches/qtbase/qtbase-mingw-fixes.patch | 125 +++---
patches/qtbase/relative-paths.patch | 26 +-
patches/qtbase/windowsxp-support-revert-2.patch | 27 --
patches/qtbase/windowsxp-support-revert.patch | 478 ---------------------
patches/qtbase/windowsxp-support.patch | 73 ----
src/gpg4win.mk.in | 16 +-
src/inst-breeze-icons.nsi | 6 +-
src/uninst-breeze-icons.nsi | 6 +-
14 files changed, 273 insertions(+), 958 deletions(-)
delete mode 100755 patches/ki18n/no-tests.patch
delete mode 100755 patches/qtbase/windowsxp-support-revert-2.patch
delete mode 100755 patches/qtbase/windowsxp-support-revert.patch
delete mode 100755 patches/qtbase/windowsxp-support.patch
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list