wxWidget 3.2.1 wxPython4 4.2.0

common/shlibs

@@ -1539,28 +1539,28 @@ libofx.so.7 libofx-0.10.1_1
 libsigsegv.so.2 libsigsegv-2.10_2
 libfprint.so.0 libfprint0-1.0_1
 libfprint-2.so.2 libfprint-1.90.7_1
-libwx_baseu_xml-3.0.so.0 wxWidgets-common-3.0.4_1
-libwx_baseu-3.0.so.0 wxWidgets-common-3.0.4_1
-libwx_gtk2_adv-3.0.so.0 wxWidgets-3.0.0_1
-libwx_base_xml-3.0.so.0 wxWidgets-3.0.0_1
-libwx_gtk2_html-3.0.so.0 wxWidgets-3.0.0_1
-libwx_gtk2_aui-3.0.so.0 wxWidgets-3.0.0_1
-libwx_gtk2_core-3.0.so.0 wxWidgets-3.0.0_1
-libwx_base_net-3.0.so.0 wxWidgets-3.0.0_1
-libwx_base-3.0.so.0 wxWidgets-3.0.0_1
-libwx_gtk2u_gl-3.0.so.0 wxWidgets-3.0.0_1
-libwx_gtk2u_stc-3.0.so.0 wxWidgets-3.0.0_1
-libwx_gtk2u_adv-3.0.so.0 wxWidgets-3.0.0_1
-libwx_gtk2u_qa-3.0.so.0 wxWidgets-3.0.0_1
-libwx_baseu_net-3.0.so.0 wxWidgets-common-3.0.4_1
-libwx_gtk2u_core-3.0.so.0 wxWidgets-3.0.0_1
-libwx_gtk2u_richtext-3.0.so.0 wxWidgets-3.0.0_1
-libwx_gtk2u_propgrid-3.0.so.0 wxWidgets-3.0.0_1
-libwx_gtk2u_html-3.0.so.0 wxWidgets-3.0.0_1
-libwx_gtk2u_xrc-3.0.so.0 wxWidgets-3.0.0_1
-libwx_gtk2u_aui-3.0.so.0 wxWidgets-3.0.0_1
-libwx_gtk2u_ribbon-3.0.so.0 wxWidgets-3.0.0_1
-libwx_gtk2u_media-3.0.so.0 wxWidgets-3.0.1_1
+libwx_baseu_xml-3.2.so.0 wxWidgets-common-3.2.1_1
+libwx_baseu-3.2.so.0 wxWidgets-common-3.2.1._1
+libwx_baseu_net-3.2.so.0 wxWidgets-common-3.2.1_1
+libwx_gtk2_adv-3.2.so.0 wxWidgets-3.2.1_1
+libwx_base_xml-3.2.so.0 wxWidgets-3.2.1_1
+libwx_gtk2_html-3.2.so.0 wxWidgets-3.2.1_1
+libwx_gtk2_aui-3.2.so.0 wxWidgets-3.2.1_1
+libwx_gtk2_core-3.2.so.0 wxWidgets-3.2.1_1
+libwx_base_net-3.2.so.0 wxWidgets-3.2.1_1
+libwx_base-3.2.so.0 wxWidgets-3.2.1_1
+libwx_gtk2u_gl-3.2.so.0 wxWidgets-3.2.1_1
+libwx_gtk2u_stc-3.2.so.0 wxWidgets-3.2.1_1
+libwx_gtk2u_adv-3.2.so.0 wxWidgets-3.2.1_1
+libwx_gtk2u_qa-3.2.so.0 wxWidgets-3.2.1_1
+libwx_gtk2u_core-3.2.so.0 wxWidgets-3.2.1_1
+libwx_gtk2u_richtext-3.2.so.0 wxWidgets-3.2.1_1
+libwx_gtk2u_propgrid-3.2.so.0 wxWidgets-3.2.1_1
+libwx_gtk2u_html-3.2.so.0 wxWidgets-3.2.1_1
+libwx_gtk2u_xrc-3.2.so.0 wxWidgets-3.2.1_1
+libwx_gtk2u_aui-3.2.so.0 wxWidgets-3.2.1_1
+libwx_gtk2u_ribbon-3.2.so.0 wxWidgets-3.2.1_1
+libwx_gtk2u_media-3.2.so.0 wxWidgets-3.2.1_1
 libmspack.so.0 libmspack-0.4alpha_1
 libslim.so.1.3.6 slim-1.3.6_1
 libmediaart-2.0.so.0 libmediaart-1.9.1_1
@@ -3480,19 +3480,19 @@ libmozjs-91.so.0 mozjs91-91.5.0_1
 libebur128.so.1 libebur128-1.2.4_1
 libgtksourceview-4.so.0 gtksourceview4-4.0.2_1
 libgtksourceview-5.so.0 gtksourceview5-5.2.0_1
-libwx_gtk3u_propgrid-3.0.so.0 wxWidgets-gtk3-3.0.4_1
-libwx_gtk3u_qa-3.0.so.0 wxWidgets-gtk3-3.0.4_1
-libwx_gtk3u_core-3.0.so.0 wxWidgets-gtk3-3.0.4_1
-libwx_gtk3u_html-3.0.so.0 wxWidgets-gtk3-3.0.4_1
-libwx_gtk3u_adv-3.0.so.0 wxWidgets-gtk3-3.0.4_1
-libwx_gtk3u_richtext-3.0.so.0 wxWidgets-gtk3-3.0.4_1
-libwx_gtk3u_xrc-3.0.so.0 wxWidgets-gtk3-3.0.4_1
-libwx_gtk3u_webview-3.0.so.0 wxWidgets-gtk3-3.0.4_1
-libwx_gtk3u_aui-3.0.so.0 wxWidgets-gtk3-3.0.4_1
-libwx_gtk3u_media-3.0.so.0 wxWidgets-gtk3-3.0.4_1
-libwx_gtk3u_ribbon-3.0.so.0 wxWidgets-gtk3-3.0.4_1
-libwx_gtk3u_gl-3.0.so.0 wxWidgets-gtk3-3.0.4_1
-libwx_gtk3u_stc-3.0.so.0 wxWidgets-gtk3-3.0.4_1
+libwx_gtk3u_propgrid-3.2.so.0 wxWidgets-gtk3-3.2.1_1
+libwx_gtk3u_qa-3.2.so.0 wxWidgets-gtk3-3.2.1_1
+libwx_gtk3u_core-3.2.so.0 wxWidgets-gtk3-3.2.1_1
+libwx_gtk3u_html-3.2.so.0 wxWidgets-gtk3-3.2.1_1
+libwx_gtk3u_adv-3.2.so.0 wxWidgets-gtk3-3.2.1_1
+libwx_gtk3u_richtext-3.2.so.0 wxWidgets-gtk3-3.2.1_1
+libwx_gtk3u_xrc-3.2.so.0 wxWidgets-gtk3-3.2.1_1
+libwx_gtk3u_webview-3.2.so.0 wxWidgets-gtk3-3.2.1_1
+libwx_gtk3u_aui-3.2.so.0 wxWidgets-gtk3-3.2.1_1
+libwx_gtk3u_media-3.2.so.0 wxWidgets-gtk3-3.2.1_1
+libwx_gtk3u_ribbon-3.2.so.0 wxWidgets-gtk3-3.2.1_1
+libwx_gtk3u_gl-3.2.so.0 wxWidgets-gtk3-3.2.1_1
+libwx_gtk3u_stc-3.2.so.0 wxWidgets-gtk3-3.2.1_1
 libtepl-6.so.0 tepl-6.00.0_1
 libnomacsCore.so.3 nomacs-3.10.2_4
 libaudit.so.1 libaudit-2.8.4_1

srcpkgs/0ad/patches/no-build-mozjs-debug.patch

@@ -0,0 +1,13 @@
+Index: 0ad-0.0.26-alpha/libraries/source/spidermonkey/build.sh
+===================================================================
+--- 0ad-0.0.26-alpha.orig/libraries/source/spidermonkey/build.sh
++++ 0ad-0.0.26-alpha/libraries/source/spidermonkey/build.sh
+@@ -129,7 +129,7 @@ else
+ fi
+
+ # Debug version of SM is broken on FreeBSD.
+-if [ "$(uname -s)" != "FreeBSD" ]; then
++if false; then
+   mkdir -p build-debug
+   cd build-debug
+   # SM configure checks for autoconf, but we don't actually need it.

srcpkgs/0ad/patches/python-3.11.patch

@@ -0,0 +1,116 @@
+Index: 0ad-0.0.26-alpha/libraries/source/spidermonkey/patch.sh
+===================================================================
+--- 0ad-0.0.26-alpha.orig/libraries/source/spidermonkey/patch.sh
++++ 0ad-0.0.26-alpha/libraries/source/spidermonkey/patch.sh
+@@ -75,6 +75,14 @@ patch -p1 < ../FixRpiUnalignedFpAccess.d
+ # Note that this isn't quite the upstream patch to match our version.
+ patch -p1 < ../FixRust150.diff
+
++patch -p1 <../python-3.11.diff
++
++rm -rf third_party/python/virtualenv
++# mkdir third_party/python/virtualenv/
++bsdtar -C third_party/python \
++	-xf ../virtualenv-20.0.31.tar.gz \
++	--strip-components=2 virtualenv-20.0.31/src
++
+ # Patch those separately, as they might interfere with normal behaviour.
+ if [ "$(uname -s)" = "FreeBSD" ];
+ then
+Index: 0ad-0.0.26-alpha/libraries/source/spidermonkey/python-3.11.diff
+===================================================================
+--- /dev/null
++++ 0ad-0.0.26-alpha/libraries/source/spidermonkey/python-3.11.diff
+@@ -0,0 +1,92 @@
++Index: mozjs-78.6.0/python/mozbuild/mozbuild/util.py
++===================================================================
++--- mozjs-78.6.0.orig/python/mozbuild/mozbuild/util.py
+++++ mozjs-78.6.0/python/mozbuild/mozbuild/util.py
++@@ -220,7 +220,7 @@ class FileAvoidWrite(BytesIO):
++     still occur, as well as diff capture if requested.
++     """
++ 
++-    def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
+++    def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
++         BytesIO.__init__(self)
++         self.name = filename
++         assert type(capture_diff) == bool
++Index: mozjs-78.6.0/python/mozbuild/mozbuild/action/process_define_files.py
++===================================================================
++--- mozjs-78.6.0.orig/python/mozbuild/mozbuild/action/process_define_files.py
+++++ mozjs-78.6.0/python/mozbuild/mozbuild/action/process_define_files.py
++@@ -36,7 +36,7 @@ def process_define_file(output, input):
++             not config.substs.get('JS_STANDALONE'):
++         config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
++ 
++-    with open(path, 'rU') as input:
+++    with open(path, 'r') as input:
++         r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
++         for l in input:
++             m = r.match(l)
++Index: mozjs-78.6.0/python/mozbuild/mozbuild/backend/base.py
++===================================================================
++--- mozjs-78.6.0.orig/python/mozbuild/mozbuild/backend/base.py
+++++ mozjs-78.6.0/python/mozbuild/mozbuild/backend/base.py
++@@ -265,7 +265,7 @@ class BuildBackend(LoggingMixin):
++         return status
++ 
++     @contextmanager
++-    def _write_file(self, path=None, fh=None, readmode='rU'):
+++    def _write_file(self, path=None, fh=None, readmode='r'):
++         """Context manager to write a file.
++ 
++         This is a glorified wrapper around FileAvoidWrite with integration to
++Index: mozjs-78.6.0/python/mozbuild/mozbuild/preprocessor.py
++===================================================================
++--- mozjs-78.6.0.orig/python/mozbuild/mozbuild/preprocessor.py
+++++ mozjs-78.6.0/python/mozbuild/mozbuild/preprocessor.py
++@@ -517,7 +517,7 @@ class Preprocessor:
++ 
++         if args:
++             for f in args:
++-                with io.open(f, 'rU', encoding='utf-8') as input:
+++                with io.open(f, 'r', encoding='utf-8') as input:
++                     self.processFile(input=input, output=out)
++             if depfile:
++                 mk = Makefile()
++@@ -807,7 +807,7 @@ class Preprocessor:
++                     args = self.applyFilters(args)
++                 if not os.path.isabs(args):
++                     args = os.path.join(self.curdir, args)
++-                args = io.open(args, 'rU', encoding='utf-8')
+++                args = io.open(args, 'r', encoding='utf-8')
++             except Preprocessor.Error:
++                 raise
++             except Exception:
++@@ -862,7 +862,7 @@ def preprocess(includes=[sys.stdin], def
++     pp = Preprocessor(defines=defines,
++                       marker=marker)
++     for f in includes:
++-        with io.open(f, 'rU', encoding='utf-8') as input:
+++        with io.open(f, 'r', encoding='utf-8') as input:
++             pp.processFile(input=input, output=output)
++     return pp.includes
++ 
++Index: mozjs-78.6.0/python/mozbuild/mozpack/files.py
++===================================================================
++--- mozjs-78.6.0.orig/python/mozbuild/mozpack/files.py
+++++ mozjs-78.6.0/python/mozbuild/mozpack/files.py
++@@ -558,7 +558,7 @@ class PreprocessedFile(BaseFile):
++         pp = Preprocessor(defines=self.defines, marker=self.marker)
++         pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
++ 
++-        with _open(self.path, 'rU') as input:
+++        with _open(self.path, 'r') as input:
++             with _open(os.devnull, 'w') as output:
++                 pp.processFile(input=input, output=output)
++ 
++@@ -615,7 +615,7 @@ class PreprocessedFile(BaseFile):
++         pp = Preprocessor(defines=self.defines, marker=self.marker)
++         pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
++ 
++-        with _open(self.path, 'rU') as input:
+++        with _open(self.path, 'r') as input:
++             pp.processFile(input=input, output=dest, depfile=deps_out)
++ 
++         dest.close()

srcpkgs/0ad/template

@@ -1,22 +1,25 @@
 # Template file for '0ad'
 pkgname=0ad
 version=0.0.26
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
 hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
 makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel
  libopenal-devel libpng-devel libsodium-devel libxml2-devel miniupnpc-devel
- nspr-devel wxWidgets-gtk3-devel fmt-devel mozjs78-devel freetype-devel"
+ nspr-devel wxWidgets-gtk3-devel fmt-devel freetype-devel"
 depends="${pkgname}-data"
 short_desc="Historically-based real-time strategy game"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
-distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
+distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
+ ${PYPI_SITE}/v/virtualenv/virtualenv-20.0.31.tar.gz"
+checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
+ 43add625c53c596d38f971a465553f6318decc39d98512bc100fa1b1e839c8dc"
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
+skip_extraction="virtualenv-20.0.31.tar.gz"
 
 CXXFLAGS="-fpermissive"
 # Use BFD linker to avoid erroneous detection of llvm pr8927 with *-musl
@@ -28,6 +31,11 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" libexecinfo-devel"
 fi
 
+post_extract() {
+	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/$skip_extraction \
+		libraries/source/spidermonkey
+}
+
 post_patch() {
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 		echo "TARGET_LINK_LIBRARIES(nvcore execinfo)" >> \
@@ -40,7 +48,8 @@ do_configure() {
 	cd ${wrksrc}/build/workspaces
 	./clean-workspaces.sh
 	./update-workspaces.sh --bindir=/usr/bin --libdir=/usr/lib/0ad \
-	--datadir=/usr/share/${pkgname}/data
+		--datadir=/usr/share/${pkgname}/data \
+		# --with-system-mozjs
 }
 
 do_build() {

srcpkgs/CubicSDR/template

@@ -1,7 +1,7 @@
 # Template file for 'CubicSDR'
 pkgname=CubicSDR
 version=0.2.7
-revision=1
+revision=2
 build_style=cmake
 build_helper="cmake-wxWidgets-gtk3"
 configure_args="-DUSE_HAMLIB=1 $(vopt_bool alsa USE_AUDIO_ALSA)

srcpkgs/LimeSuite/template

@@ -1,7 +1,7 @@
 # Template file for 'LimeSuite'
 pkgname=LimeSuite
 version=22.09.0
-revision=1
+revision=2
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 configure_args="

srcpkgs/OpenCPN/patches/musl.patch

@@ -1,30 +1,29 @@
---- a/include/zeroconf-detail.hpp	2020-07-15 20:02:29.000000000 +0200
-+++ b/include/zeroconf-detail.hpp	2020-07-15 20:02:29.000000000 +0200
-@@ -20,9 +20,7 @@
+Index: OpenCPN-Release_5.6.2/include/zeroconf-detail.hpp
+===================================================================
+--- OpenCPN-Release_5.6.2.orig/include/zeroconf-detail.hpp
++++ OpenCPN-Release_5.6.2/include/zeroconf-detail.hpp
+@@ -20,15 +20,14 @@
  #define WIN32_LEAN_AND_MEAN
  #include <winsock2.h>
  #else
--    #ifndef __WXOSX__
--        #include <error.h>
--    #else    
-+    #ifdef __WXOSX__
-         #include <mach/error.h> 
+-#ifndef __WXOSX__
+-#include <error.h>
+-#else
++#ifdef __WXOSX__
+ #include <mach/error.h>
  #endif
 
-@@ -424,4 +422,4 @@
-     }
- }
-
--#endif // ZEROCONF_DETAIL_HPP
-\ No newline at end of file
-+#endif // ZEROCONF_DETAIL_HPP
---- a/include/zeroconf-detail.hpp	2020-07-25 18:05:08.714098962 +0200
-+++ b/include/zeroconf-detail.hpp	2020-07-25 18:05:08.714098962 +0200
-@@ -27,6 +27,7 @@
  #include <string.h>
  #include <unistd.h>
  #include <sys/socket.h>
 +#include <sys/time.h>
  #include <netinet/in.h>
  #endif
 
+@@ -385,4 +384,4 @@ inline bool Resolve(const std::string& s
+ }  // namespace Detail
+ }  // namespace Zeroconf
+
+-#endif  // ZEROCONF_DETAIL_HPP
+\ No newline at end of file
++#endif  // ZEROCONF_DETAIL_HPP

srcpkgs/OpenCPN/patches/needs-c++-14.patch

@@ -0,0 +1,15 @@
+Index: OpenCPN-Release_5.6.2/CMakeLists.txt
+===================================================================
+--- OpenCPN-Release_5.6.2.orig/CMakeLists.txt
++++ OpenCPN-Release_5.6.2/CMakeLists.txt
+@@ -293,8 +293,8 @@ include(GetArch)
+ getarch()
+ message(STATUS "*** Host Build Architecture is ${ARCH}")
+
+-set(CMAKE_CXX_STANDARD 11)
+-message(STATUS "Setting C++11 standard via cmake standard mechanism")
++set(CMAKE_CXX_STANDARD 14)
++message(STATUS "Setting C++14 standard via cmake standard mechanism")
+ if (NOT MSVC)
+   set(OBJ_VISIBILITY "-fvisibility=hidden")
+ endif ()