wxwidgets3.2: Update to version 3.2.2

This commit is contained in:
Tim Stahlhut
2023-02-10 16:50:08 -05:00
parent 8d2be8ffda
commit d8712a5df3
2 changed files with 4 additions and 53 deletions

View File

@@ -1,43 +0,0 @@
From eeced51b78e1e19772a5876b67841090d3985d43 Mon Sep 17 00:00:00 2001
From: Tim Stahlhut <stahta01@gmail.com>
Date: Tue, 17 May 2022 14:44:56 -0400
Subject: Redo manifest filename logic
---
include/wx/msw/wx.rc | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index 7a6b203f13..a098783908 100644
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -106,11 +106,11 @@ wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp"
#endif
#if !defined(wxUSE_DPI_AWARE_MANIFEST) || wxUSE_DPI_AWARE_MANIFEST == 0
- #define wxMANIFEST_DPI .manifest
+ #define wxMANIFEST_DPI wx/msw/wx.manifest
#elif wxUSE_DPI_AWARE_MANIFEST == 1
- #define wxMANIFEST_DPI _dpi_aware.manifest
+ #define wxMANIFEST_DPI wx/msw/wx_dpi_aware.manifest
#elif wxUSE_DPI_AWARE_MANIFEST == 2
- #define wxMANIFEST_DPI _dpi_aware_pmv2.manifest
+ #define wxMANIFEST_DPI wx/msw/wx_dpi_aware_pmv2.manifest
#endif
#define wxRC_STR(text) wxRC_STR2(text)
@@ -119,10 +119,11 @@ wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp"
#define wxRC_CONCAT2(a, b) a ## b
#ifdef __GNUC__
- #define wxMANIFEST_FILE "wx/msw/wx" wxRC_STR(wxMANIFEST_DPI)
+ #define wxMANIFEST_FILE wxRC_STR(wxMANIFEST_DPI)
#else
- #define wxMANIFEST_FILE wxRC_CONCAT(wx/msw/wx, wxMANIFEST_DPI)
+ #define wxMANIFEST_FILE wxMANIFEST_DPI
#endif
+
wxMANIFEST_ID RT_MANIFEST wxMANIFEST_FILE
#endif // wxUSE_RC_MANIFEST
--

View File

@@ -13,8 +13,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-common"
"${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-gtk3-libs"
"${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-msw"
"${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-gtk3")
pkgver=${_wx_basever}.1
pkgrel=2
pkgver=${_wx_basever}.2
pkgrel=1
pkgdesc="A C++ library that lets developers create applications for Windows, Linux and UNIX (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -42,14 +42,10 @@ source=(
# the wxTeam rejected this patch
005-wxWidgets-3.1.3-Remove-WX_LIBS_STATIC-from-m4.patch
# This is needed to build clang samples in check step
010-wxWidgets-3.1.6-Redo-manifest-filename-logic.patch
)
sha256sums=('c229976bb413eb88e45cb5dfb68b27890d450149c09b331abd751e7ae0f5fa66'
sha256sums=('8edf18672b7bc0996ee6b7caa2bee017a9be604aad1ee471e243df7471f5db5d'
'2b3b183a6a76ad539abc49a41033aa923c13b395c0e55189ba962068781c7135'
'4a4828f0c9cdc638cffde6a30b5dfb14283719acc9e89e19de8ec2d5a80a5aec'
'b30100e03f350e14060923781c3c7979735cc81996a13012bef980a23eb3d20b')
'4a4828f0c9cdc638cffde6a30b5dfb14283719acc9e89e19de8ec2d5a80a5aec')
prepare() {
cd "${srcdir}"/${_realname}-${pkgver}${_wx_buildver}
@@ -59,8 +55,6 @@ prepare() {
# This patch is not really needed; but, WX_LIBS_STATIC does not work correctly under MSys2
# Removed it to see if anything breaks or if anything is fixed.
patch -p1 -i "${srcdir}"/005-wxWidgets-3.1.3-Remove-WX_LIBS_STATIC-from-m4.patch
patch -p1 -i "${srcdir}"/010-wxWidgets-3.1.6-Redo-manifest-filename-logic.patch
}
build() {