summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2019-12-24 22:48:54 +0100
committerMartchus2019-12-24 22:48:54 +0100
commitddca990e3e6fd5d8f544691149eb1bb65edaef74 (patch)
treef8d8767ff2ecb44280e87a9e6347d20d30468c9a
parent8fb57d500f061584148d6c587a9293e4f30f79e2 (diff)
downloadaur-ddca990e3e6fd5d8f544691149eb1bb65edaef74.tar.gz
Update to 5.14.0
-rw-r--r--.SRCINFO8
-rw-r--r--0001-Revert-Directly-link-to-functions-available-from-Win.patch14
-rw-r--r--PKGBUILD6
3 files changed, 14 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f663e9fec6e2..c962dd3a2190 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt5-winextras
pkgdesc = Classes and functions that enable you to use Windows-specific functions (mingw-w64)
- pkgver = 5.13.2
+ pkgver = 5.14.0
pkgrel = 1
url = https://www.qt.io/
arch = any
@@ -19,10 +19,10 @@ pkgbase = mingw-w64-qt5-winextras
options = !strip
options = !buildflags
options = staticlibs
- source = https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtwinextras-everywhere-src-5.13.2.tar.xz
+ source = https://download.qt.io/official_releases/qt/5.14/5.14.0/submodules/qtwinextras-everywhere-src-5.14.0.tar.xz
source = 0001-Revert-Directly-link-to-functions-available-from-Win.patch
- sha256sums = e94d70f68dacbcfa2bb0cbe53c7024083b16d5d44806c107fe268d34028cb779
- sha256sums = 90238b09cf7c601d76540d262f0f284dfc4764b3a0675a79661fa0360e4c62cb
+ sha256sums = cbe7d73f1972e99ea27c0e5f4fed2b713109167388814dcfe2932c19ae218a18
+ sha256sums = 738ef04bc5d6932283b0525449d2090dcd63228459186815c0d907df25ed259e
pkgname = mingw-w64-qt5-winextras
diff --git a/0001-Revert-Directly-link-to-functions-available-from-Win.patch b/0001-Revert-Directly-link-to-functions-available-from-Win.patch
index 414878c65e51..fe4472ca4e03 100644
--- a/0001-Revert-Directly-link-to-functions-available-from-Win.patch
+++ b/0001-Revert-Directly-link-to-functions-available-from-Win.patch
@@ -1,4 +1,4 @@
-From bdf1efddd731cd894066c7782dc953335ed8e072 Mon Sep 17 00:00:00 2001
+From bc075232c06699402e18c257deb21b27645d39f3 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 27 May 2018 14:23:11 +0200
Subject: [PATCH] Revert "Directly link to functions available from Windows 7
@@ -42,7 +42,7 @@ Binary file /usr/i686-w64-mingw32/lib/libdwmapi.a matches
create mode 100644 src/winextras/qwinfunctions_p.cpp
diff --git a/src/winextras/qwinfunctions.cpp b/src/winextras/qwinfunctions.cpp
-index 82fd25b..4edf76f 100644
+index b237a50..7866140 100644
--- a/src/winextras/qwinfunctions.cpp
+++ b/src/winextras/qwinfunctions.cpp
@@ -38,13 +38,6 @@
@@ -154,7 +154,7 @@ index 0000000..ea9dcf9
+
+QT_END_NAMESPACE
diff --git a/src/winextras/qwinfunctions_p.h b/src/winextras/qwinfunctions_p.h
-index 03dff5e..31536bb 100644
+index 0ee73cb..a5816fe 100644
--- a/src/winextras/qwinfunctions_p.h
+++ b/src/winextras/qwinfunctions_p.h
@@ -64,8 +64,20 @@ enum qt_DWMWINDOWATTRIBUTE // Not present in MinGW 4.9
@@ -211,7 +211,7 @@ index 03dff5e..31536bb 100644
{
dst[src.toWCharArray(dst)] = 0;
diff --git a/src/winextras/qwinthumbnailtoolbar.cpp b/src/winextras/qwinthumbnailtoolbar.cpp
-index 3aa39b6..d7eb4aa 100644
+index fc8d76e..59880c7 100644
--- a/src/winextras/qwinthumbnailtoolbar.cpp
+++ b/src/winextras/qwinthumbnailtoolbar.cpp
@@ -38,13 +38,6 @@
@@ -282,10 +282,10 @@ index 3aa39b6..d7eb4aa 100644
qWarning() << QWinThumbnailToolBarPrivate::msgComFailed("DwmSetIconicLivePreviewBitmap", hr);
}
diff --git a/src/winextras/winextras.pro b/src/winextras/winextras.pro
-index 705c48c..5d93c6b 100644
+index 8f582a5..a899f6c 100644
--- a/src/winextras/winextras.pro
+++ b/src/winextras/winextras.pro
-@@ -6,6 +6,7 @@ DEFINES += QT_NO_FOREACH
+@@ -4,6 +4,7 @@ QT += gui-private core-private
SOURCES += \
qwinfunctions.cpp \
@@ -294,5 +294,5 @@ index 705c48c..5d93c6b 100644
qwintaskbarprogress.cpp \
windowsguidsdefs.cpp \
--
-2.24.0
+2.24.1
diff --git a/PKGBUILD b/PKGBUILD
index 652557d69c02..02b404edb454 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
_qt_module=qtwinextras
pkgname="mingw-w64-qt5-winextras"
-pkgver=5.13.2
+pkgver=5.14.0
pkgrel=1
arch=('any')
pkgdesc="Classes and functions that enable you to use Windows-specific functions (mingw-w64)"
@@ -22,8 +22,8 @@ url='https://www.qt.io/'
_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
'0001-Revert-Directly-link-to-functions-available-from-Win.patch')
-sha256sums=('e94d70f68dacbcfa2bb0cbe53c7024083b16d5d44806c107fe268d34028cb779'
- '90238b09cf7c601d76540d262f0f284dfc4764b3a0675a79661fa0360e4c62cb')
+sha256sums=('cbe7d73f1972e99ea27c0e5f4fed2b713109167388814dcfe2932c19ae218a18'
+ '738ef04bc5d6932283b0525449d2090dcd63228459186815c0d907df25ed259e')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
[[ $NO_STATIC_LIBS ]] || \