summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--0001-Fix-condition-for-_WIN32_IE-SHCreateItemFromParsingN.patch25
-rw-r--r--PKGBUILD17
3 files changed, 7 insertions, 45 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ed5c7b894271..0f66f96e9201 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Thu Jul 6 21:13:14 UTC 2017
+# Mon Oct 16 17:36:30 UTC 2017
pkgbase = mingw-w64-qt5-winextras
pkgdesc = Classes and functions that enable you to use Windows-specific functions (mingw-w64)
- pkgver = 5.9.1
+ pkgver = 5.9.2
pkgrel = 1
url = https://www.qt.io/
arch = any
@@ -21,10 +21,8 @@ pkgbase = mingw-w64-qt5-winextras
options = !strip
options = !buildflags
options = staticlibs
- source = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwinextras-opensource-src-5.9.1.tar.xz
- source = 0001-Fix-condition-for-_WIN32_IE-SHCreateItemFromParsingN.patch
- sha256sums = 1acc9ebd85146c75ae8dde20dcf5ffadd04da5d998a452eba055bce10849eef4
- sha256sums = 5617949df83ce9f378d1043bb8823b0003e8e31ec65b4948b305d59424e42285
+ source = https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtwinextras-opensource-src-5.9.2.tar.xz
+ sha256sums = b4f6689871403c3abb8d2b8fe9bebedc95d69694bae3c301181442437b4e181f
pkgname = mingw-w64-qt5-winextras
diff --git a/0001-Fix-condition-for-_WIN32_IE-SHCreateItemFromParsingN.patch b/0001-Fix-condition-for-_WIN32_IE-SHCreateItemFromParsingN.patch
deleted file mode 100644
index 99d1faffbddd..000000000000
--- a/0001-Fix-condition-for-_WIN32_IE-SHCreateItemFromParsingN.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 91fb69ece1a43dd153ba17b11e08c01b19fe5313 Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Thu, 9 Feb 2017 01:07:46 +0100
-Subject: [PATCH] Fix condition for _WIN32_IE/SHCreateItemFromParsingName
-
----
- src/winextras/qwinjumplist.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/winextras/qwinjumplist.cpp b/src/winextras/qwinjumplist.cpp
-index 12fa2e5..94b8e81 100644
---- a/src/winextras/qwinjumplist.cpp
-+++ b/src/winextras/qwinjumplist.cpp
-@@ -41,7 +41,7 @@
- #include <QtCore/QtGlobal>
-
- #ifdef Q_CC_MINGW // MinGW: Enable SHCreateItemFromParsingName()
--# if defined(_WIN32_IE) && _WIN32_IE << 0x0700 // _WIN32_IE_IE70
-+# if defined(_WIN32_IE) && _WIN32_IE < 0x0700 // _WIN32_IE_IE70
- # undef _WIN32_IE
- # endif
- # ifndef _WIN32_IE
---
-2.13.2
-
diff --git a/PKGBUILD b/PKGBUILD
index c503a9b069ec..46c8909f76a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
_qt_module=qtwinextras
pkgname="mingw-w64-qt5-winextras"
-pkgver=5.9.1
+pkgver=5.9.2
pkgrel=1
arch=('any')
pkgdesc="Classes and functions that enable you to use Windows-specific functions (mingw-w64)"
@@ -20,10 +20,8 @@ groups=('mingw-w64-qt5')
license=('GPL3' 'LGPL3' 'LGPL2.1' 'FDL' 'custom')
url='https://www.qt.io/'
_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
- '0001-Fix-condition-for-_WIN32_IE-SHCreateItemFromParsingN.patch')
-sha256sums=('1acc9ebd85146c75ae8dde20dcf5ffadd04da5d998a452eba055bce10849eef4'
- '5617949df83ce9f378d1043bb8823b0003e8e31ec65b4948b305d59424e42285')
+source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('b4f6689871403c3abb8d2b8fe9bebedc95d69694bae3c301181442437b4e181f')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
[[ $NO_STATIC_LIBS ]] || \
@@ -33,15 +31,6 @@ _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
[[ $NO_SHARED_LIBS ]] || \
_configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared')
-prepare() {
- cd "${srcdir}/${_pkgfqn}"
-
- # Apply patches; further descriptions can be found in patch files itself
- for patch in "$srcdir/"*.patch; do
- patch -p1 -i "$patch"
- done
-}
-
build() {
cd "${srcdir}/${_pkgfqn}"