wxwidgets3.3: update to 3.3.1

mingw-w64-wxmacmolplt/PKGBUILD

@@ -6,7 +6,7 @@ _realname=wxmacmolplt
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=7.7.3
-pkgrel=2
+pkgrel=3
 pkgdesc="An open-source gui for preparing, submitting and visualizing input and output for the GAMESS quantum chemistry package. (mingw-w64)"
 arch=('any')
 mingw_arch=('ucrt64' 'clang64' 'clangarm64')
@@ -20,7 +20,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-cc-libs"
          "${MINGW_PACKAGE_PREFIX}-glew"
          "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-msw-libs")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
-             "${MINGW_PACKAGE_PREFIX}-pkgconf"  
+             "${MINGW_PACKAGE_PREFIX}-pkgconf"
              "${MINGW_PACKAGE_PREFIX}-autotools"
              "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-msw")
 source=("https://github.com/brettbode/wxmacmolplt/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
@@ -61,5 +61,6 @@ package() {
 
   make install DESTDIR="${pkgdir}"
 
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
+  install -Dm644 "${srcdir}"/${_realname}-${pkgver}/LICENSE \
+    "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
 }

mingw-w64-wxwidgets3.3/002-do-not-use-MSVC_NAMING-on-mingw.patch

@@ -1,11 +0,0 @@
---- a/build/cmake/functions.cmake
-+++ b/build/cmake/functions.cmake
-@@ -14,7 +14,7 @@
- 
- # Use the MSVC/makefile naming convention, or the configure naming convention,
- # this is the same check as used in FindwxWidgets.
--if(WIN32 AND NOT CYGWIN AND NOT MSYS AND NOT CMAKE_CROSSCOMPILING)
-+if(WIN32 AND NOT CYGWIN AND NOT MSYS AND NOT MINGW AND NOT CMAKE_CROSSCOMPILING)
-     set(WIN32_MSVC_NAMING 1)
- else()
-     set(WIN32_MSVC_NAMING 0)

mingw-w64-wxwidgets3.3/003-install-dlls-on-bin.patch

@@ -1,11 +0,0 @@
---- a/build/cmake/functions.cmake
-+++ b/build/cmake/functions.cmake
-@@ -500,7 +500,7 @@
-         set_target_properties(${name} PROPERTIES PROJECT_LABEL ${name_short})
- 
-         # Setup install
--        if(MSYS OR CYGWIN)
-+        if(MSYS OR CYGWIN OR MINGW)
-             # configure puts the .dll in the bin directory
-             set(runtime_default_dir "bin")
-         else()

mingw-w64-wxwidgets3.3/004-use-copy-instead-of-symlink-on-windows.patch

@@ -11,7 +11,7 @@
          set(COPY_CMD create_symlink)
 --- a/build/cmake/install.cmake
 +++ b/build/cmake/install.cmake
-@@ -61,10 +61,15 @@
+@@ -61,9 +61,14 @@
                      WORLD_EXECUTE WORLD_READ
          )
  
@@ -23,15 +23,13 @@
      install(DIRECTORY DESTINATION "bin")
      install(CODE "execute_process( \
 -        COMMAND ${CMAKE_COMMAND} -E create_symlink \
--        \"${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID}\" \
 +        COMMAND ${CMAKE_COMMAND} -E ${COPY_CMD} \
-+        \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID}\" \
+         \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID}\" \
          \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \
          )"
-     )
 --- a/build/cmake/utils/CMakeLists.txt
 +++ b/build/cmake/utils/CMakeLists.txt
-@@ -37,10 +37,15 @@
+@@ -37,9 +37,14 @@
              set(EXE_SUFFIX ${CMAKE_EXECUTABLE_SUFFIX})
          endif()
  
@@ -43,9 +41,7 @@
          # Don't use wx_install() here to preserve escaping.
          install(CODE "execute_process( \
 -            COMMAND ${CMAKE_COMMAND} -E create_symlink \
--            \"${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \
 +            COMMAND ${CMAKE_COMMAND} -E ${COPY_CMD} \
-+            \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \
+             \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \
              \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \
              )"
-         )

mingw-w64-wxwidgets3.3/PKGBUILD

@@ -15,8 +15,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-common"
          "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-gtk3"
          "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-qt-libs"
          "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-qt")
-pkgver=${_wx_basever}.0
-pkgrel=2
+pkgver=${_wx_basever}.1
+pkgrel=1
 pkgdesc="A C++ library that lets developers create applications for Windows, Linux and UNIX (mingw-w64)"
 arch=('any')
 mingw_arch=('ucrt64' 'clang64' 'clangarm64')
@@ -49,15 +49,11 @@ makedepends=(
 source=(
   https://github.com/wxWidgets/wxWidgets/releases/download/v${pkgver}${_wx_buildver}/${_realname}-${pkgver}${_wx_buildver}.tar.bz2
   001-wxWidgets-3.0.2-relocate-prefix-in-bin-wx-config.patch
-  002-do-not-use-MSVC_NAMING-on-mingw.patch
-  003-install-dlls-on-bin.patch
   004-use-copy-instead-of-symlink-on-windows.patch
 )
-sha256sums=('492f5eb8a58715f2602f31025c3eaa20d71a3ec8e052c7a9d33153966b4badca'
+sha256sums=('f936c8d694f9c49a367a376f99c751467150a4ed7cbf8f4723ef19b2d2d9998d'
             '5160ce46b7dc0958691ea2c5d6da50179152d580e80bc0aab63751cef192f285'
-            'f570ae8602c8280a9c4a46d38c65b7eb9bc4425953676a51bee6d83c2755de59'
-            '43773166a27ead78fe8c44a338a7c23c00dc537a4a6b8e9f68a7e47432d387c2'
-            '7c7c14acd8785a3b346e159dd09cfe3084786c4445067f9cc5f5b17efb4f197b')
+            '99012dfafda3ef9fcd14a123e1bc9c23818d9d82e64d774d1e40752b75413447')
 
 apply_patch_with_msg() {
   for _patch in "$@"
@@ -75,8 +71,6 @@ prepare() {
     001-wxWidgets-3.0.2-relocate-prefix-in-bin-wx-config.patch
 
   apply_patch_with_msg \
-    002-do-not-use-MSVC_NAMING-on-mingw.patch \
-    003-install-dlls-on-bin.patch \
     004-use-copy-instead-of-symlink-on-windows.patch
 }
 
@@ -116,6 +110,7 @@ build() {
     -DCMAKE_CXX_STANDARD=17
     -DwxBUILD_INSTALL_PLATFORM_SUBDIR=OFF
     -DwxBUILD_INSTALL=ON
+    -DwxBUILD_WIN32_MSVC_NAMING=OFF
     -DwxUSE_IFF=ON
     -DwxUSE_GRAPHICS_CONTEXT=ON
     -DwxUSE_GRAPHICS_DIRECT2D=ON