[PR PATCH] wxWidgets: update to 3.1.4.

[sirikid <sirikid@users.noreply.github.com>]

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

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

https://github.com/sirikid/void-packages update/wxWidgets-3.1.4
https://github.com/void-linux/void-packages/pull/27487

wxWidgets: update to 3.1.4.
I think wxWidgets is mistaking Musl for Windows. @Hoshpak have you seen this error?

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/wxWidgets-3.1.4-27487.patch --]
[-- Type: text/x-diff, Size: 4558 bytes --]

From 14b074f6feaaa7b799aee5acef1089c32c2cffa3 Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Sun, 27 Dec 2020 22:54:22 +0300
Subject: [PATCH] wxWidgets: update to 3.1.4.

---
 common/shlibs              | 14 ++++++++++++++
 srcpkgs/wxWidgets/template | 32 +++++++++++++++++---------------
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a05844bbebb..6e52dc24c2f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4040,3 +4040,17 @@ libndr-samba4.so samba-libs-4.13.2_1
 libsmb-transport-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libwx_baseu-3.1.so.4 wxWidgets-common-3.1.4_1
+libwx_baseu_xml-3.1.so.4 wxWidgets-common-3.1.4_1
+libwx_gtk2u_adv-3.1.so.4 wxWidgets-3.1.4_1
+libwx_gtk2u_aui-3.1.so.4 wxWidgets-3.1.4_1
+libwx_gtk2u_core-3.1.so.4 wxWidgets-3.1.4_1
+libwx_gtk2u_gl-3.1.so.4 wxWidgets-3.1.4_1
+libwx_gtk2u_html-3.1.so.4 wxWidgets-3.1.4_1
+libwx_gtk2u_media-3.1.so.4 wxWidgets-3.1.4_1
+libwx_gtk2u_propgrid-3.1.so.4 wxWidgets-3.1.4_1
+libwx_gtk2u_qa-3.1.so.4 wxWidgets-3.1.4_1
+libwx_gtk2u_ribbon-3.1.so.4 wxWidgets-3.1.4_1
+libwx_gtk2u_richtext-3.1.so.4 wxWidgets-3.1.4_1
+libwx_gtk2u_stc-3.1.so.4 wxWidgets-3.1.4_1
+libwx_gtk2u_xrc-3.1.so.4 wxWidgets-3.1.4_1
diff --git a/srcpkgs/wxWidgets/template b/srcpkgs/wxWidgets/template
index 820c9e1133c..b9c55fa6dc7 100644
--- a/srcpkgs/wxWidgets/template
+++ b/srcpkgs/wxWidgets/template
@@ -1,21 +1,25 @@
 # Template file for 'wxWidgets'
 pkgname=wxWidgets
-version=3.0.5.1
+version=3.1.4
 revision=1
-configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack
- --with-libnotify --enable-mediactrl --with-gtk=2 --disable-webview"
 build_style=gnu-configure
+configure_args="--disable-option-checking --disable-webview
+ --enable-mediactrl --enable-unicode
+ --with-gtk=2 --with-libmspack --with-libnotify --with-opengl --with-sdl"
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel libjpeg-turbo-devel tiff-devel libSM-devel libnotify-devel
  libXinerama-devel libmspack-devel SDL2-devel glu-devel
  gstreamer1-devel gst-plugins-base1-devel"
 depends="wxWidgets-common>=${version}"
-short_desc="The wxWidgets GUI toolkit library (version 3)"
+short_desc="WxWidgets GUI toolkit library (version 3)"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="wxWindows"
+license="custom:wxWindows"
 homepage="https://www.wxwidgets.org/"
 distfiles="https://github.com/wxWidgets/wxWidgets/releases/download/v${version}/wxWidgets-${version}.tar.bz2"
-checksum=440f6e73cf5afb2cbf9af10cec8da6cdd3d3998d527598a53db87099524ac807
+checksum=3ca3a19a14b407d0cdda507a7930c2e84ae1c8e74f946e0144d2fa7d881f1a94
+
+_version_suffix=$(cut -f1,2 -d. <<<"$version")
+_config=gtk2-unicode-"$_version_suffix"
 
 post_install() {
 	# remove files that are already in wxWidgets-common
@@ -24,9 +28,10 @@ post_install() {
 	rm -rf ${DESTDIR}/usr/share
 	find ${DESTDIR}/usr/include -type f -not -name tabartgtk.h \
 		-not -name fontdlgg.h -not -name notifmsg.h -exec rm -f {} \;
-	for f in "" generic gtk; do
-		rm ${DESTDIR}/usr/include/wx-3.0/wx/$f/notifmsg.h
-	done
+
+	rm ${DESTDIR}/usr/include/wx-"$_version_suffix"/wx{,/generic}/notifmsg.h
+
+	vlicense docs/licence.txt LICENSE
 }
 
 wxWidgets-devel_package() {
@@ -38,7 +43,7 @@ wxWidgets-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove usr/lib/wx
 
-		ln -sf wx-config-3.0 ${PKGDESTDIR}/usr/bin/wx-config
+		ln -sf wx-config-"$_version_suffix" ${PKGDESTDIR}/usr/bin/wx-config
 
 		# remove all occurrences of $XBPS_CROSS_TRIPLET
 		# wx-config:
@@ -46,10 +51,7 @@ wxWidgets-devel_package() {
 		#   - ignore --host option; breaks configure scripts when
 		#     cross compiling (isn’t necessary in our case anyway)
 		if [ -n "$CROSS_BUILD" ]; then
-			local _config="gtk2-unicode-3.0"
-			mv ${PKGDESTDIR}/usr/lib/wx/include/{${XBPS_CROSS_TRIPLET}-${_config},${_config}}
-
-			rename "${XBPS_CROSS_TRIPLET}-" "" ${PKGDESTDIR}/usr/lib/wx/config/*
+			rename "${XBPS_CROSS_TRIPLET}-" "" ${PKGDESTDIR}/usr/lib/wx/{config,include}/*
 			rename -- "-${XBPS_CROSS_TRIPLET}" "" ${PKGDESTDIR}/usr/lib/*
 
 			sed -i -e "s/${XBPS_CROSS_TRIPLET}-//g" \
@@ -58,7 +60,7 @@ wxWidgets-devel_package() {
 			 -e 's/--\*=\*)/--host=\*) continue;;\n\n    --\*=\*)/' \
 			 ${PKGDESTDIR}/usr/lib/wx/config/${_config}
 
-			ln -sf ../lib/wx/config/${_config} ${PKGDESTDIR}/usr/bin/wx-config-3.0
+			ln -sf ../lib/wx/config/${_config} ${PKGDESTDIR}/usr/bin/wx-config-"$_version_suffix"
 		fi
 	}
 }