[PR PATCH] [WIP] qt5: update to 5.13.2.

[PR PATCH] [WIP] qt5: update to 5.13.2.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 326 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages qt5.13.2
https://github.com/void-linux/void-packages/pull/16034

[WIP] qt5: update to 5.13.2.
None

A patch file from https://github.com/void-linux/void-packages/pull/16034.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt5.13.2-16034.patch --]
[-- Type: text/x-diff, Size: 11493 bytes --]

From f7b77efcccfb4a6db06fdc034ec02d4a749a9f25 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Fri, 1 Nov 2019 16:11:15 +0100
Subject: [PATCH 1/5] qt5: update to 5.13.2.

---
 srcpkgs/qt5/patches/0050-pulse-stubs.patch | 49 ----------------------
 srcpkgs/qt5/patches/0100-qtbug-77364.patch | 26 ------------
 srcpkgs/qt5/template                       |  6 +--
 3 files changed, 3 insertions(+), 78 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/0050-pulse-stubs.patch
 delete mode 100644 srcpkgs/qt5/patches/0100-qtbug-77364.patch

diff --git a/srcpkgs/qt5/patches/0050-pulse-stubs.patch b/srcpkgs/qt5/patches/0050-pulse-stubs.patch
deleted file mode 100644
index c4f0fae86ee..00000000000
--- a/srcpkgs/qt5/patches/0050-pulse-stubs.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Pulse changed API in a recent update and these need to be fixed
-in order to avoid build errors.
-
---- qtwebengine/src/3rdparty/chromium/media/audio/pulse/pulse.sigs
-+++ qtwebengine/src/3rdparty/chromium/media/audio/pulse/pulse.sigs
-@@ -24,11 +24,11 @@ pa_operation* pa_context_get_source_info_by_index(pa_context* c, uint32_t idx, p
- pa_operation* pa_context_get_source_info_by_name(pa_context* c, const char* name, pa_source_info_cb_t cb, void *userdata);
- pa_operation* pa_context_get_source_info_list(pa_context* c, pa_source_info_cb_t cb, void* userdata);
- pa_operation* pa_context_get_sink_info_list(pa_context* c, pa_sink_info_cb_t cb, void* userdata);
--pa_context_state_t pa_context_get_state(pa_context* c);
-+pa_context_state_t pa_context_get_state(const pa_context* c);
- pa_context* pa_context_new(pa_mainloop_api* mainloop, const char* name);
- pa_operation* pa_context_set_source_volume_by_index(pa_context* c, uint32_t idx, const pa_cvolume* volume, pa_context_success_cb_t cb, void* userdata);
- void pa_context_set_state_callback(pa_context* c, pa_context_notify_cb_t cb, void* userdata);
--pa_operation_state_t pa_operation_get_state(pa_operation* o);
-+pa_operation_state_t pa_operation_get_state(const pa_operation* o);
- void pa_context_unref(pa_context* c);
- void pa_operation_unref(pa_operation* o);
- int pa_stream_begin_write(pa_stream* p, void** data, size_t* nbytes);
-@@ -38,23 +38,23 @@ pa_operation* pa_stream_cork(pa_stream* s, int b, pa_stream_success_cb_t cb, voi
- int pa_stream_disconnect(pa_stream* s);
- int pa_stream_drop(pa_stream *p);
- pa_operation* pa_stream_flush(pa_stream* s, pa_stream_success_cb_t cb, void* userdata);
--uint32_t pa_stream_get_device_index(pa_stream* s);
-+uint32_t pa_stream_get_device_index(const pa_stream* s);
- int pa_stream_get_latency(pa_stream* s, pa_usec_t* r_usec, int* negative);
--pa_stream_state_t pa_stream_get_state(pa_stream* p);
-+pa_stream_state_t pa_stream_get_state(const pa_stream* p);
- pa_stream* pa_stream_new(pa_context*  c, const char*  name, const pa_sample_spec*  ss, const pa_channel_map *  map);
- pa_stream* pa_stream_new_with_proplist(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map* map, pa_proplist* p);
- pa_proplist* pa_proplist_new(void);
--int pa_proplist_contains(pa_proplist* p, const char* key);
-+int pa_proplist_contains(const pa_proplist* p, const char* key);
- void pa_proplist_free(pa_proplist* p);
--const char* pa_proplist_gets(pa_proplist* p, const char* key);
-+const char* pa_proplist_gets(const pa_proplist* p, const char* key);
- int pa_proplist_sets(pa_proplist* p, const char* key, const char* value);
--size_t pa_stream_readable_size(pa_stream *p);
-+size_t pa_stream_readable_size(const pa_stream *p);
- int pa_stream_peek(pa_stream* p, const void** data, size_t* nbytes);
- void pa_stream_set_read_callback(pa_stream* p, pa_stream_request_cb_t cb, void* userdata);
- void pa_stream_set_state_callback(pa_stream* s, pa_stream_notify_cb_t cb, void* userdata);
- int pa_stream_write(pa_stream* p, const void* data, size_t nbytes, pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek);
- void pa_stream_set_write_callback(pa_stream *p, pa_stream_request_cb_t cb, void *userdata);
- void pa_stream_unref(pa_stream* s);
--int pa_context_errno(pa_context *c);
-+int pa_context_errno(const pa_context *c);
- const char* pa_strerror(int error);
- pa_cvolume* pa_cvolume_set(pa_cvolume* a, unsigned  channels, pa_volume_t v);
diff --git a/srcpkgs/qt5/patches/0100-qtbug-77364.patch b/srcpkgs/qt5/patches/0100-qtbug-77364.patch
deleted file mode 100644
index 5a3629bf0b7..00000000000
--- a/srcpkgs/qt5/patches/0100-qtbug-77364.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c09cf578bd7267b867326101cd2d0f39e7c814fe Mon Sep 17 00:00:00 2001
-From: David Faure <david.faure@kdab.com>
-Date: Mon, 09 Sep 2019 18:12:26 +0200
-Subject: [PATCH] QWidget::setFocusProxy: adjust focus widget properly
-
-My commit 3e7463411e adjusted the focus widget by setting
-QApplicationPrivate::focus_widget directly, while there is a method for
-doing this properly, including setFocus_sys() and emitting signals.
-
-Fixes: QTBUG-77364
-Change-Id: I218acf7a9de39173d282ced46def4f65594f80b4
----
-
-diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
-index cf5a81c..6889c2e 100644
---- qtbase/src/widgets/kernel/qwidget.cpp
-+++ qtbase/src/widgets/kernel/qwidget.cpp
-@@ -6204,7 +6204,7 @@
- 
-     if (changingAppFocusWidget) {
-         QWidget *newDeepestFocusProxy = d_func()->deepestFocusProxy();
--        QApplicationPrivate::focus_widget = newDeepestFocusProxy ? newDeepestFocusProxy : this;
-+        QApplicationPrivate::setFocusWidget(newDeepestFocusProxy ? newDeepestFocusProxy : this, Qt::NoFocusReason);
-     }
- }
- 
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 8641832bc7a..8c62762e47a 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
-version=5.13.1
-revision=2
+version=5.13.2
+revision=1
 wrksrc="qt-everywhere-src-${version}"
 build_style=gnu-configure
 hostmakedepends="cmake clang flex git glib-devel gperf ninja pkg-config
@@ -21,7 +21,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-src-${version}.tar.xz"
-checksum=adf00266dc38352a166a9739f1a24a1e36f1be9c04bf72e16e142a256436974e
+checksum=55e8273536be41f4f63064a79e552a22133848bb419400b6fa8e9fc0dc05de08
 replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 

From dbe4771f8f3cfaf7e90c6cf46174e7aef2c4fee8 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Fri, 1 Nov 2019 16:12:32 +0100
Subject: [PATCH 2/5] telegram-desktop: rebuild against qt5.13.2

---
 srcpkgs/telegram-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index be11cde6cfb..cab544c532b 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=1.8.15
-revision=1
+revision=2
 _libtgvoip_commit=d4a0f719ffd8d29e88474f67abc9fc862661c3b9
 _GSL_commit=d846fe50a3f0bb7767c7e087a05f4be95f4da0ec
 _variant_commit=550ac2f159ca883d360c196149b466955c77a573
@@ -18,7 +18,7 @@ makedepends="alsa-lib-devel ffmpeg-devel gtk+3-devel libappindicator-devel
  libdbusmenu-glib-devel libopenal-devel minizip-devel opus-devel xxHash-devel
  $(vopt_if pulseaudio 'pulseaudio-devel') qt5-devel range-v3 libva-devel
  rapidjson liblz4-devel rlottie-devel MesaLib-devel"
-depends="qt5-imageformats qt5>=5.13.1<5.13.2"
+depends="qt5-imageformats qt5>=5.13.2<5.13.3"
 short_desc="Telegram Desktop messaging app"
 maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-or-later WITH OpenSSL"

From de10f20299b4e232329afc64b20f8ab93199c3c3 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Fri, 1 Nov 2019 16:13:28 +0100
Subject: [PATCH 3/5] qt5-styleplugins: rebuild against qt5.13.2

---
 srcpkgs/qt5-styleplugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt5-styleplugins/template b/srcpkgs/qt5-styleplugins/template
index d136d665c9a..f6c511cad4c 100644
--- a/srcpkgs/qt5-styleplugins/template
+++ b/srcpkgs/qt5-styleplugins/template
@@ -1,13 +1,13 @@
 # Template file for 'qt5-styleplugins'
 pkgname=qt5-styleplugins
 version=5.0.0
-revision=10
+revision=11
 _gitrev=335dbece103e2cbf6c7cf819ab6672c2956b17b3
 wrksrc="qtstyleplugins-${_gitrev}"
 build_style=qmake
 hostmakedepends="pkg-config qt5-host-tools qt5-devel"
 makedepends="libxcb-devel libxkbcommon-devel libinput-devel tslib-devel gtk+-devel qt5-devel"
-depends="qt5>=5.13.1<5.13.2"
+depends="qt5>=5.13.2<5.13.3"
 short_desc="Additional style plugins for Qt5"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only, LGPL-3.0-only"

From a54492e614862bacc4b0657a6f2ccc69ddd06b81 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Fri, 1 Nov 2019 16:14:18 +0100
Subject: [PATCH 4/5] qt5dxcb-plugin: rebuild against qt5.13.2

---
 srcpkgs/qt5dxcb-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt5dxcb-plugin/template b/srcpkgs/qt5dxcb-plugin/template
index 1dbb3a8f99c..b5408ed89fb 100644
--- a/srcpkgs/qt5dxcb-plugin/template
+++ b/srcpkgs/qt5dxcb-plugin/template
@@ -1,14 +1,14 @@
 # Template file for 'qt5dxcb-plugin'
 pkgname=qt5dxcb-plugin
 version=5.0.1
-revision=2
+revision=3
 build_style=qmake
 make_build_args="VERSION=${version}"
 hostmakedepends="pkg-config qt5-qmake"
 makedepends="cairo-devel libSM-devel libXi-devel libxkbcommon-devel
  qt5-x11extras-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel"
-depends="qt5>=5.13.1<5.13.2"
+depends="qt5>=5.13.2<5.13.3"
 short_desc="Qt platform plugins for DDE"
 maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-or-later"
@@ -33,7 +33,7 @@ pre_configure() {
 	# no headers for 5.13.1 yet; 5.13.0 headers are the same for this
 	# remove on next version upgrade (after upstream has added them)
 	ln -s ${wrksrc}/platformplugin/libqt5xcbqpa-dev/5.13.0 \
-		${wrksrc}/platformplugin/libqt5xcbqpa-dev/5.13.1
+		${wrksrc}/platformplugin/libqt5xcbqpa-dev/5.13.2
 }
 
 if [ "$CROSS_BUILD" ]; then

From 03179d015bd63a57c37113b068abc2faf7495798 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Fri, 1 Nov 2019 16:15:04 +0100
Subject: [PATCH 5/5] qt5integration: rebuild against qt5.13.2

---
 srcpkgs/qt5integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt5integration/template b/srcpkgs/qt5integration/template
index 5b948a83f4e..87cdb911915 100644
--- a/srcpkgs/qt5integration/template
+++ b/srcpkgs/qt5integration/template
@@ -1,12 +1,12 @@
 # Template file for 'qt5integration'
 pkgname=qt5integration
 version=5.0.0
-revision=2
+revision=3
 build_style=qmake
 hostmakedepends="qt5-qmake pkg-config"
 makedepends="libqtxdg-devel dtkwm-devel dtkwidget-devel mtdev-devel
  qt5-svg-devel qt5-x11extras-devel qt5-multimedia-devel"
-depends="qt5dxcb-plugin qt5-styleplugins qt5>=5.13.1<5.13.2"
+depends="qt5dxcb-plugin qt5-styleplugins qt5>=5.13.2<5.13.3"
 short_desc="Qt platform theme integration plugins for Deepin Desktop Environment"
 maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-or-later"

Re: [PR PATCH] [Merged]: [WIP] qt5: update to 5.13.2.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

There's a merged pull request on the void-packages repository

[WIP] qt5: update to 5.13.2.
https://github.com/void-linux/void-packages/pull/16034

Description:
None