From 7731c8d64fc988fb325bf02804e6294b2cf8c49e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Tue, 14 May 2024 06:53:51 +0100 Subject: [PATCH] wxwidgets3.2: update to 3.2.5 --- mingw-w64-wxwidgets3.2/PKGBUILD | 72 ++++++++++++++------------------- 1 file changed, 31 insertions(+), 41 deletions(-) diff --git a/mingw-w64-wxwidgets3.2/PKGBUILD b/mingw-w64-wxwidgets3.2/PKGBUILD index 3d056797bb..8bf1f7972c 100644 --- a/mingw-w64-wxwidgets3.2/PKGBUILD +++ b/mingw-w64-wxwidgets3.2/PKGBUILD @@ -10,15 +10,17 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-common" "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-msw-cb_headers" "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-common-libs" "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-msw-libs" - "${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}.4 + $([[ ${CARCH} == i686 ]] || echo \ + "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-gtk3-libs" \ + "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-gtk3")) +pkgver=${_wx_basever}.5 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') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://wxwidgets.org/" +msys2_repository_url="https://github.com/wxWidgets/wxWidgets" msys2_references=( "cpe: cpe:/a:wxwidgets:wxwidgets" ) @@ -35,8 +37,7 @@ makedepends=( "${MINGW_PACKAGE_PREFIX}-libnotify" "${MINGW_PACKAGE_PREFIX}-pcre2" ) -options=('strip' 'staticlibs' 'buildflags' '!debug') -#options=('!strip' 'staticlibs' 'buildflags' 'debug') # Best options for debugging CodeLite crashes +#options=('!strip' 'debug') # Best options for debugging CodeLite crashes source=( https://github.com/wxWidgets/wxWidgets/releases/download/v${pkgver}${_wx_buildver}/${_realname}-${pkgver}${_wx_buildver}.tar.bz2 @@ -46,7 +47,7 @@ source=( # the wxTeam rejected this patch 005-wxWidgets-3.1.3-Remove-WX_LIBS_STATIC-from-m4.patch ) -sha256sums=('0640e1ab716db5af2ecb7389dbef6138d7679261fbff730d23845ba838ca133e' +sha256sums=('0ad86a3ad3e2e519b6a705248fc9226e3a09bbf069c6c692a02acf7c2d1c6b51' '2b3b183a6a76ad539abc49a41033aa923c13b395c0e55189ba962068781c7135' '4a4828f0c9cdc638cffde6a30b5dfb14283719acc9e89e19de8ec2d5a80a5aec') prepare() { @@ -96,32 +97,31 @@ build() { CXXFLAGS=${CXXFLAGS/-Og } CXXFLAGS=${CXXFLAGS/-O2 } CXXFLAGS=${CXXFLAGS/-ggdb } + CXXFLAGS+=" -Wno-ignored-attributes" CFLAGS=${CFLAGS/-Og } CFLAGS=${CFLAGS/-O2 } CFLAGS=${CFLAGS/-ggdb } fi - local -a _debug_options=() + local -a _extra_config=() if check_option "debug" "y"; then - _debug_options+=("--enable-debug=yes") - _debug_options+=("--enable-debug_gdb") + _extra_config+=("--enable-debug=yes") + _extra_config+=("--enable-debug_gdb") else - _debug_options+=("--enable-optimise") + _extra_config+=("--enable-optimise") fi - #echo "_debug_options := ${_debug_options[@]}" + #echo "_extra_config := ${_extra_config[@]}" + + if [[ ${CARCH} != i686 ]]; then - [[ -d "${srcdir}"/build-gtk3-${MSYSTEM}-shared ]] && rm -rf "${srcdir}"/build-gtk3-${MSYSTEM}-shared mkdir -p "${srcdir}"/build-gtk3-${MSYSTEM}-shared && cd "${srcdir}"/build-gtk3-${MSYSTEM}-shared ../${_realname}-${pkgver}${_wx_buildver}/configure \ --prefix=${MINGW_PREFIX} \ - --host=${MINGW_CHOST} \ - --target=${MINGW_CHOST} \ - --build=${MINGW_CHOST} \ - "${_debug_options[@]}" \ + "${_extra_config[@]}" \ --without-xtest \ --enable-shared \ --enable-stl \ @@ -145,21 +145,16 @@ build() { make #VERBOSE=1 - [[ -d "${srcdir}"/install-gtk3-${MSYSTEM}-shared ]] && rm -rf "${srcdir}"/install-gtk3-${MSYSTEM}-shared mkdir -p "${srcdir}"/install-gtk3-${MSYSTEM}-shared make DESTDIR="${srcdir}/install-gtk3-${MSYSTEM}-shared" install - [[ -d "${srcdir}"/build-gtk3-${MSYSTEM}-static ]] && rm -rf "${srcdir}"/build-gtk3-${MSYSTEM}-static mkdir -p "${srcdir}"/build-gtk3-${MSYSTEM}-static && cd "${srcdir}"/build-gtk3-${MSYSTEM}-static ../${_realname}-${pkgver}${_wx_buildver}/configure \ --prefix=${MINGW_PREFIX} \ - --host=${MINGW_CHOST} \ - --target=${MINGW_CHOST} \ - --build=${MINGW_CHOST} \ - "${_debug_options[@]}" \ + "${_extra_config[@]}" \ --without-xtest \ --disable-shared \ --enable-stl \ @@ -183,21 +178,18 @@ build() { make #VERBOSE=1 -j1 - [[ -d "${srcdir}"/install-gtk3-${MSYSTEM}-static ]] && rm -rf "${srcdir}"/install-gtk3-${MSYSTEM}-static mkdir -p "${srcdir}"/install-gtk3-${MSYSTEM}-static make DESTDIR="${srcdir}/install-gtk3-${MSYSTEM}-static" install + fi + - [[ -d "${srcdir}"/build-msw-${MSYSTEM}-shared ]] && rm -rf "${srcdir}"/build-msw-${MSYSTEM}-shared mkdir -p "${srcdir}"/build-msw-${MSYSTEM}-shared && cd "${srcdir}"/build-msw-${MSYSTEM}-shared ../${_realname}-${pkgver}${_wx_buildver}/configure \ --prefix=${MINGW_PREFIX} \ - --host=${MINGW_CHOST} \ - --target=${MINGW_CHOST} \ - --build=${MINGW_CHOST} \ - "${_debug_options[@]}" \ + "${_extra_config[@]}" \ --enable-shared \ --enable-stl \ --enable-iff \ @@ -221,21 +213,16 @@ build() { make #VERBOSE=1 - [[ -d "${srcdir}"/install-msw-${MSYSTEM}-shared ]] && rm -rf "${srcdir}"/install-msw-${MSYSTEM}-shared mkdir -p "${srcdir}/install-msw-${MSYSTEM}-shared" make DESTDIR="${srcdir}/install-msw-${MSYSTEM}-shared" install - [[ -d "${srcdir}"/build-msw-${MSYSTEM}-static ]] && rm -rf "${srcdir}"/build-msw-${MSYSTEM}-static mkdir -p "${srcdir}"/build-msw-${MSYSTEM}-static && cd "${srcdir}"/build-msw-${MSYSTEM}-static ../${_realname}-${pkgver}${_wx_buildver}/configure \ --prefix=${MINGW_PREFIX} \ - --host=${MINGW_CHOST} \ - --target=${MINGW_CHOST} \ - --build=${MINGW_CHOST} \ - "${_debug_options[@]}" \ + "${_extra_config[@]}" \ --disable-shared \ --enable-stl \ --enable-iff \ @@ -259,7 +246,6 @@ build() { make #VERBOSE=1 -j1 - [[ -d "${srcdir}"/install-msw-${MSYSTEM}-static ]] && rm -rf "${srcdir}"/install-msw-${MSYSTEM}-static mkdir -p "${srcdir}/install-msw-${MSYSTEM}-static" make DESTDIR="${srcdir}/install-msw-${MSYSTEM}-static" install @@ -408,9 +394,11 @@ package_wxwidgets3.2-common() { cp -a --recursive "${srcdir}/install-msw-${MSYSTEM}-shared${MINGW_PREFIX}/share/" \ ${pkgdir}${MINGW_PREFIX}/ - mkdir -p ${pkgdir}${MINGW_PREFIX}/include - cp -a --recursive "${srcdir}/install-gtk3-${MSYSTEM}-shared${MINGW_PREFIX}/include/" \ - ${pkgdir}${MINGW_PREFIX}/ + if [[ ${CARCH} != i686 ]]; then + mkdir -p ${pkgdir}${MINGW_PREFIX}/include + cp -a --recursive "${srcdir}/install-gtk3-${MSYSTEM}-shared${MINGW_PREFIX}/include/" \ + ${pkgdir}${MINGW_PREFIX}/ + fi mkdir -p ${pkgdir}${MINGW_PREFIX}/include cp -a --recursive "${srcdir}/install-msw-${MSYSTEM}-shared${MINGW_PREFIX}/include/" \ @@ -420,8 +408,10 @@ package_wxwidgets3.2-common() { cp -a ${srcdir}/install-msw-${MSYSTEM}-shared${MINGW_PREFIX}/bin/wxrc*.* ${pkgdir}${MINGW_PREFIX}/bin/ mkdir -p ${pkgdir}${MINGW_PREFIX}/lib - cp -a ${srcdir}/install-gtk3-${MSYSTEM}-static${MINGW_PREFIX}/lib/*.a ${pkgdir}${MINGW_PREFIX}/lib/ - cp -a ${srcdir}/install-gtk3-${MSYSTEM}-shared${MINGW_PREFIX}/lib/*.a ${pkgdir}${MINGW_PREFIX}/lib/ + if [[ ${CARCH} != i686 ]]; then + cp -a ${srcdir}/install-gtk3-${MSYSTEM}-static${MINGW_PREFIX}/lib/*.a ${pkgdir}${MINGW_PREFIX}/lib/ + cp -a ${srcdir}/install-gtk3-${MSYSTEM}-shared${MINGW_PREFIX}/lib/*.a ${pkgdir}${MINGW_PREFIX}/lib/ + fi cp -a ${srcdir}/install-msw-${MSYSTEM}-static${MINGW_PREFIX}/lib/*.a ${pkgdir}${MINGW_PREFIX}/lib/ cp -a ${srcdir}/install-msw-${MSYSTEM}-shared${MINGW_PREFIX}/lib/*.a ${pkgdir}${MINGW_PREFIX}/lib/ }