From d48bb6fffb122e5d034d491be39f7c2f0810373f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 26 Sep 2022 23:51:37 +0700 Subject: [PATCH 01/38] boinc: not depends on GTK+ anymore --- srcpkgs/boinc/patches/boinc-am_conditional.patch | 4 ++-- srcpkgs/boinc/template | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/boinc/patches/boinc-am_conditional.patch b/srcpkgs/boinc/patches/boinc-am_conditional.patch index 7d59f154340f..a7657d7f1d23 100644 --- a/srcpkgs/boinc/patches/boinc-am_conditional.patch +++ b/srcpkgs/boinc/patches/boinc-am_conditional.patch @@ -1,4 +1,4 @@ -Add objective c++ program and check for gtk2 +Add objective c++ program and check for gtk+3 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ Add objective c++ program and check for gtk2 AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes]) AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so]) -+PKG_CHECK_MODULES([GTK2], [gtk+-2.0]) ++PKG_CHECK_MODULES([GTK3], [gtk+-3.0]) + dnl ====================================================================== dnl some more vodoo required for building portable client-binary (client, clientgui) diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template index 33850b5b0364..0ae75ba3d997 100644 --- a/srcpkgs/boinc/template +++ b/srcpkgs/boinc/template @@ -8,7 +8,7 @@ build_style=gnu-configure hostmakedepends="automake libtool pkg-config xorgproto shared-mime-info" makedepends="glu-devel libfreeglut-devel libcurl-devel libjpeg-turbo-devel libnotify-devel sqlite-devel libxcb-devel - libXmu-devel libXi-devel gtk+-devel webkit2gtk-devel wxWidgets-gtk3-devel" + libXmu-devel libXi-devel webkit2gtk-devel wxWidgets-gtk3-devel" depends="curl ca-certificates" conf_files="/etc/default/boinc-client" short_desc="Berkely Infrastructure for Network Computing" From 90fd77ac2e0ec6f3da25649b6cbee1d3b1bce9a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 27 Sep 2022 00:04:16 +0700 Subject: [PATCH 02/38] codeblocks: no needs GTK+ --- srcpkgs/codeblocks/template | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template index 26487b40f796..02e1e255730d 100644 --- a/srcpkgs/codeblocks/template +++ b/srcpkgs/codeblocks/template @@ -4,10 +4,12 @@ version=20.03 revision=2 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3 --with-contrib-plugins - --with-boost=${XBPS_CROSS_BASE}/usr --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib" + --with-boost=${XBPS_CROSS_BASE}/usr + --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib + ac_cv_exeext=no --with-gnu-ld" hostmakedepends="libtool pkg-config zip" makedepends="gtk+3-devel wxWidgets-gtk3-devel tinyxml-devel hunspell-devel - gamin-devel boost-devel boost-build" + gamin-devel boost-devel boost-build tinyxml-devel" short_desc="Free C, C++ and Fortran IDE" maintainer="Orphaned " license="GPL-3.0-only" @@ -15,11 +17,6 @@ homepage="http://www.codeblocks.org" distfiles="${SOURCEFORGE_SITE}/${pkgname}/Sources/${version}/${pkgname}-${version}.tar.xz" checksum=15eeb3e28aea054e1f38b0c7f4671b4d4d1116fd05f63c07aa95a91db89eaac5 -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" wxWidgets-devel tinyxml-devel" - configure_args+=" ac_cv_exeext=no --with-gnu-ld" -fi - post_install() { vinstall debian/codeblocks.sharedmime 644 /usr/share/mime/packages codeblocks.xml vinstall src/mime/codeblocks.desktop 644 /usr/share/applications From 124c8c06a7a7c0aa89693cfe85a24e57bb5c3bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 27 Sep 2022 00:04:39 +0700 Subject: [PATCH 03/38] golly: move to GTK+3 --- srcpkgs/golly/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/golly/template b/srcpkgs/golly/template index ee2876689ad3..e8a24b9074c0 100644 --- a/srcpkgs/golly/template +++ b/srcpkgs/golly/template @@ -6,11 +6,11 @@ wrksrc="${pkgname}-${version}-src" build_wrksrc="gui-wx" build_style=gnu-makefile make_build_args="-f makefile-gtk GOLLYDIR=/usr/share/golly LUALIB=-llua5.4 - CXXC=\$(CXX)" + CXXC=\$(CXX) WX_CONFIG=wx-config-gtk3" make_install_args="${make_build_args}" hostmakedepends="python3" -makedepends="MesaLib-devel glu-devel lua54-devel python3-devel wxWidgets-devel - zlib-devel SDL2-devel" +makedepends="MesaLib-devel glu-devel lua54-devel python3-devel + wxWidgets-gtk3-devel zlib-devel SDL2-devel" short_desc="Simulator for Conway's Game of Life and other cellular automata" maintainer="Leah Neukirchen " license="GPL-2.0-or-later" From b2a5f23f9af12da8259f128a859d6b1df4130d84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:10:06 +0700 Subject: [PATCH 04/38] wxWidgets: update to 3.2.1 --- common/shlibs | 38 ++++----- .../wxWidgets/patches/attr-deprecated.patch | 13 +++ srcpkgs/wxWidgets/patches/musl.patch | 13 +++ .../patches/nonfatal-abi-check.patch | 23 +++--- .../wxWidgets/patches/wxGTK-collision.patch | 79 ------------------- srcpkgs/wxWidgets/template | 30 ++++--- 6 files changed, 74 insertions(+), 122 deletions(-) create mode 100644 srcpkgs/wxWidgets/patches/attr-deprecated.patch create mode 100644 srcpkgs/wxWidgets/patches/musl.patch delete mode 100644 srcpkgs/wxWidgets/patches/wxGTK-collision.patch diff --git a/common/shlibs b/common/shlibs index c962f0ab7622..3ee63fe201f8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1541,26 +1541,26 @@ 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_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 diff --git a/srcpkgs/wxWidgets/patches/attr-deprecated.patch b/srcpkgs/wxWidgets/patches/attr-deprecated.patch new file mode 100644 index 000000000000..b0be92b16cca --- /dev/null +++ b/srcpkgs/wxWidgets/patches/attr-deprecated.patch @@ -0,0 +1,13 @@ +Index: wxWidgets-3.2.1/include/wx/defs.h +=================================================================== +--- wxWidgets-3.2.1.orig/include/wx/defs.h ++++ wxWidgets-3.2.1/include/wx/defs.h +@@ -605,7 +605,7 @@ typedef short int WXTYPE; + #if __has_cpp_attribute(deprecated) + /* gcc 5 claims to support this attribute, but actually doesn't */ + #if !defined(__GNUC__) || wxCHECK_GCC_VERSION(6, 0) +- #define wxHAS_DEPRECATED_ATTR ++ /* #define wxHAS_DEPRECATED_ATTR */ + #endif + #endif + #endif diff --git a/srcpkgs/wxWidgets/patches/musl.patch b/srcpkgs/wxWidgets/patches/musl.patch new file mode 100644 index 000000000000..234beaca100b --- /dev/null +++ b/srcpkgs/wxWidgets/patches/musl.patch @@ -0,0 +1,13 @@ +Index: wxWidgets-3.2.1/src/unix/uilocale.cpp +=================================================================== +--- wxWidgets-3.2.1.orig/src/unix/uilocale.cpp ++++ wxWidgets-3.2.1/src/unix/uilocale.cpp +@@ -619,7 +619,7 @@ wxString + wxUILocaleImplUnix::GetLocalizedName(wxLocaleName name, wxLocaleForm form) const + { + wxString str; +-#if defined(HAVE_LANGINFO_H) && defined(__LINUX__) ++#if defined(HAVE_LANGINFO_H) && defined(__GLIBC__) + switch (name) + { + case wxLOCALE_NAME_LOCALE: diff --git a/srcpkgs/wxWidgets/patches/nonfatal-abi-check.patch b/srcpkgs/wxWidgets/patches/nonfatal-abi-check.patch index bb93f0a26156..2cdc3a6c0957 100644 --- a/srcpkgs/wxWidgets/patches/nonfatal-abi-check.patch +++ b/srcpkgs/wxWidgets/patches/nonfatal-abi-check.patch @@ -1,18 +1,17 @@ -Taken from -https://github.com/archlinux/svntogit-packages/blob/71ee17d529f8e0dc5c44d2fffb0dfa69b71daa0b/repos/extra-x86_64/make-abicheck-non-fatal.patch - -diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp ---- a/src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100 -+++ b/src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100 -@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con - msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), - lib.c_str(), progName.c_str(), prog.c_str()); +Index: wxWidgets-3.2.1/src/common/appbase.cpp +=================================================================== +--- wxWidgets-3.2.1.orig/src/common/appbase.cpp ++++ wxWidgets-3.2.1/src/common/appbase.cpp +@@ -847,11 +847,8 @@ bool wxAppConsoleBase::CheckBuildOptions + wxString prog = wxString::FromAscii(optionsSignature); + wxString progName = wxString::FromAscii(componentName); -- wxLogFatalError(msg.c_str()); +- wxLogFatalError(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), ++ wxLogWarning(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), + lib, progName, prog); - - // normally wxLogFatalError doesn't return - return false; -+ wxLogWarning(msg.c_str()); } - #undef wxCMP + return true; diff --git a/srcpkgs/wxWidgets/patches/wxGTK-collision.patch b/srcpkgs/wxWidgets/patches/wxGTK-collision.patch deleted file mode 100644 index 5ec31ebaceb1..000000000000 --- a/srcpkgs/wxWidgets/patches/wxGTK-collision.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -Naur Makefile.in Makefile.in ---- a/Makefile.in 2014-10-06 23:33:44.000000000 +0200 -+++ b/Makefile.in 2014-11-19 10:48:18.752319058 +0100 -@@ -15279,9 +15279,11 @@ - - install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install - $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal -- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) -+ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin3.m4) - $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets -- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets) -+ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \ -+ for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \ -+ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done) - $(DYLIB_RPATH_INSTALL) - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx - for f in setup.h $(RCDEFS_H); do \ -@@ -16177,7 +16179,7 @@ - $(INSTALL_DIR) $(DESTDIR)$(bindir) - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config - $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config -- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) -+ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE) || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) - - locale_install: - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale -@@ -16185,7 +16187,7 @@ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ - if test -f $(srcdir)/locale/$$l.mo ; then \ -- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ -+ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ - fi ; \ - done - -@@ -16202,7 +16204,7 @@ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ - if test -f $(srcdir)/locale/msw/$$l.mo ; then \ -- $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw.mo ; \ -+ $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw$(WX_RELEASE_NODOT).mo ; \ - fi ; \ - done - -diff -Naur build/bakefiles/wx.bkl build/bakefiles/wx.bkl ---- a/build/bakefiles/wx.bkl 2014-10-06 23:33:44.000000000 +0200 -+++ b/build/bakefiles/wx.bkl 2014-11-19 10:32:21.692283955 +0100 -@@ -137,7 +137,7 @@ - - - $(SRCDIR)/locale -- wxstd -+ wxstd$(WX_RELEASE_NODOT) - - ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk - zh zh_CN zh_TW -diff -Naur src/common/translation.cpp src/common/translation.cpp ---- a/src/common/translation.cpp 2014-10-06 23:33:44.000000000 +0200 -+++ b/src/common/translation.cpp 2014-11-19 11:02:21.067788665 +0100 -@@ -1471,7 +1471,7 @@ - - bool wxTranslations::AddStdCatalog() - { -- if ( !AddCatalog(wxS("wxstd")) ) -+ if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) ) - return false; - - // there may be a catalog with toolkit specific overrides, it is not -diff -Naur utils/wxrc/Makefile.in utils/wxrc/Makefile.in ---- a/utils/wxrc/Makefile.in 2014-10-06 23:33:44.000000000 +0200 -+++ b/utils/wxrc/Makefile.in 2014-11-19 10:49:55.410110669 +0100 -@@ -125,7 +125,6 @@ - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) - @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) - @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) --@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)) - - @COND_USE_XRC_1@uninstall_wxrc: - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) diff --git a/srcpkgs/wxWidgets/template b/srcpkgs/wxWidgets/template index be85b89243b4..eae89b9b2e8a 100644 --- a/srcpkgs/wxWidgets/template +++ b/srcpkgs/wxWidgets/template @@ -1,32 +1,37 @@ # Template file for 'wxWidgets' pkgname=wxWidgets -version=3.0.5.1 -revision=5 +version=3.2.1 +revision=1 build_style=gnu-configure configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack - --with-libnotify --enable-mediactrl --with-gtk=2 --disable-webview" + --with-libnotify --enable-mediactrl --with-gtk=2 --disable-webview + --with-regex=sys" +# Don't --enable-stl 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" + libXinerama-devel libmspack-devel SDL2-devel glu-devel pcre2-devel + libsecret-devel libcurl-devel gst-plugins-bad1-devel + gstreamer1-devel gst-plugins-base1-devel gspell-devel liblzma-devel" depends="wxWidgets-common>=${version}" -short_desc="WxWidgets GUI toolkit library (version 3)" +short_desc="WxWidgets GUI toolkit library for GTK+2.0" maintainer="Martin Riese " license="WxWindows-exception-3.1" homepage="https://www.wxwidgets.org/" distfiles="https://github.com/wxWidgets/wxWidgets/releases/download/v${version}/wxWidgets-${version}.tar.bz2" -checksum=440f6e73cf5afb2cbf9af10cec8da6cdd3d3998d527598a53db87099524ac807 +checksum=c229976bb413eb88e45cb5dfb68b27890d450149c09b331abd751e7ae0f5fa66 post_install() { - local _config="gtk2-unicode-3.0" + local _pl="${version#*.*.}" + local _version="${version%.$_pl}" + local _config="gtk2-unicode-${_version}" # remove files that are already in wxWidgets-common rm -f ${DESTDIR}/usr/lib/libwx_baseu* rm -rf ${DESTDIR}/usr/bin/wxrc* 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 + for f in "" generic; do + rm ${DESTDIR}/usr/include/wx-${_version}/wx/$f/notifmsg.h done # remove all occurrences of $XBPS_CROSS_TRIPLET # wx-config: @@ -50,8 +55,9 @@ post_install() { -e '/--\*=\*)/i --host=\*) continue;;' \ -e "s,/usr/lib,\${exec_prefix}/lib,g" \ ${DESTDIR}/usr/lib/wx/config/${_config} - ln -sf ../lib/wx/config/${_config} ${PKGDESTDIR}/usr/bin/wx-config-3.0 - ln -sf wx-config-3.0 ${DESTDIR}/usr/bin/wx-config + ln -sf ../lib/wx/config/${_config} \ + ${PKGDESTDIR}/usr/bin/wx-config-$_version + ln -sf wx-config-$_version ${DESTDIR}/usr/bin/wx-config } wxWidgets-devel_package() { From 50d35d4507b2a997b9489a02837e0a6fd444d13a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:10:42 +0700 Subject: [PATCH 05/38] wxWidgets-gtk3: update to 3.2.1. --- common/shlibs | 32 +++++++++---------- .../patches/attr-deprecated.patch | 13 ++++++++ srcpkgs/wxWidgets-gtk3/patches/musl.patch | 13 ++++++++ .../patches/nonfatal-abi-check.patch | 23 +++++++------ srcpkgs/wxWidgets-gtk3/template | 20 ++++++++---- 5 files changed, 66 insertions(+), 35 deletions(-) create mode 100644 srcpkgs/wxWidgets-gtk3/patches/attr-deprecated.patch create mode 100644 srcpkgs/wxWidgets-gtk3/patches/musl.patch diff --git a/common/shlibs b/common/shlibs index 3ee63fe201f8..c10d625d4943 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1539,9 +1539,9 @@ 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_baseu_net-3.0.so.0 wxWidgets-common-3.0.4_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 @@ -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 diff --git a/srcpkgs/wxWidgets-gtk3/patches/attr-deprecated.patch b/srcpkgs/wxWidgets-gtk3/patches/attr-deprecated.patch new file mode 100644 index 000000000000..b0be92b16cca --- /dev/null +++ b/srcpkgs/wxWidgets-gtk3/patches/attr-deprecated.patch @@ -0,0 +1,13 @@ +Index: wxWidgets-3.2.1/include/wx/defs.h +=================================================================== +--- wxWidgets-3.2.1.orig/include/wx/defs.h ++++ wxWidgets-3.2.1/include/wx/defs.h +@@ -605,7 +605,7 @@ typedef short int WXTYPE; + #if __has_cpp_attribute(deprecated) + /* gcc 5 claims to support this attribute, but actually doesn't */ + #if !defined(__GNUC__) || wxCHECK_GCC_VERSION(6, 0) +- #define wxHAS_DEPRECATED_ATTR ++ /* #define wxHAS_DEPRECATED_ATTR */ + #endif + #endif + #endif diff --git a/srcpkgs/wxWidgets-gtk3/patches/musl.patch b/srcpkgs/wxWidgets-gtk3/patches/musl.patch new file mode 100644 index 000000000000..234beaca100b --- /dev/null +++ b/srcpkgs/wxWidgets-gtk3/patches/musl.patch @@ -0,0 +1,13 @@ +Index: wxWidgets-3.2.1/src/unix/uilocale.cpp +=================================================================== +--- wxWidgets-3.2.1.orig/src/unix/uilocale.cpp ++++ wxWidgets-3.2.1/src/unix/uilocale.cpp +@@ -619,7 +619,7 @@ wxString + wxUILocaleImplUnix::GetLocalizedName(wxLocaleName name, wxLocaleForm form) const + { + wxString str; +-#if defined(HAVE_LANGINFO_H) && defined(__LINUX__) ++#if defined(HAVE_LANGINFO_H) && defined(__GLIBC__) + switch (name) + { + case wxLOCALE_NAME_LOCALE: diff --git a/srcpkgs/wxWidgets-gtk3/patches/nonfatal-abi-check.patch b/srcpkgs/wxWidgets-gtk3/patches/nonfatal-abi-check.patch index bb93f0a26156..2cdc3a6c0957 100644 --- a/srcpkgs/wxWidgets-gtk3/patches/nonfatal-abi-check.patch +++ b/srcpkgs/wxWidgets-gtk3/patches/nonfatal-abi-check.patch @@ -1,18 +1,17 @@ -Taken from -https://github.com/archlinux/svntogit-packages/blob/71ee17d529f8e0dc5c44d2fffb0dfa69b71daa0b/repos/extra-x86_64/make-abicheck-non-fatal.patch - -diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp ---- a/src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100 -+++ b/src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100 -@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con - msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), - lib.c_str(), progName.c_str(), prog.c_str()); +Index: wxWidgets-3.2.1/src/common/appbase.cpp +=================================================================== +--- wxWidgets-3.2.1.orig/src/common/appbase.cpp ++++ wxWidgets-3.2.1/src/common/appbase.cpp +@@ -847,11 +847,8 @@ bool wxAppConsoleBase::CheckBuildOptions + wxString prog = wxString::FromAscii(optionsSignature); + wxString progName = wxString::FromAscii(componentName); -- wxLogFatalError(msg.c_str()); +- wxLogFatalError(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), ++ wxLogWarning(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), + lib, progName, prog); - - // normally wxLogFatalError doesn't return - return false; -+ wxLogWarning(msg.c_str()); } - #undef wxCMP + return true; diff --git a/srcpkgs/wxWidgets-gtk3/template b/srcpkgs/wxWidgets-gtk3/template index fe6dc777392b..4d4efbe9aec4 100644 --- a/srcpkgs/wxWidgets-gtk3/template +++ b/srcpkgs/wxWidgets-gtk3/template @@ -1,23 +1,29 @@ # Template file for 'wxWidgets-gtk3' pkgname=wxWidgets-gtk3 -version=3.0.5.1 -revision=5 +version=3.2.1 +revision=1 wrksrc="wxWidgets-${version}" build_style=gnu-configure configure_args="--with-gtk=3 --enable-unicode --with-opengl --with-sdl - --with-libmspack --with-libnotify --enable-mediactrl" + --with-libmspack --with-libnotify --enable-mediactrl --with-regex=sys" +# Don't --enable-stl, OpenCPN uses this internal data structure +# --enable-stl" hostmakedepends="pkg-config" makedepends="SDL2-devel gst-plugins-base1-devel gstreamer1-devel gtk+3-devel - libmspack-devel libnotify-devel tiff-devel webkit2gtk-devel glu-devel" -short_desc="The wxWidgets GUI toolkit library compiled with gtk3 support" + libmspack-devel libnotify-devel tiff-devel webkit2gtk-devel glu-devel + gst-plugins-bad1-devel + libsecret-devel pcre2-devel liblzma-devel gspell-devel libcurl-devel" +short_desc="The wxWidgets GUI toolkit library for GTK+3.0" maintainer="Helmut Pozimski " 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=c229976bb413eb88e45cb5dfb68b27890d450149c09b331abd751e7ae0f5fa66 post_install() { - local _config="gtk3-unicode-3.0" + local _pl="${version#*.*.}" + local _version="${version%.$_pl}" + local _config="gtk3-unicode-${_version}" # remove all occurrences of $XBPS_CROSS_TRIPLET in wx-config: # - mark this build as native build if [ "$CROSS_BUILD" ]; then From 613fe3535d21a5fcac1f8ab91b41323b2762ab91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:51 +0700 Subject: [PATCH 06/38] CubicSDR: rebuild for wxWidget 3.2.1 --- srcpkgs/CubicSDR/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template index 49b9b7b6ed46..e5e26088e7f3 100644 --- a/srcpkgs/CubicSDR/template +++ b/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) From ffef8fb15403924d3b8c7bdc420c5b21fa5e0f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:51 +0700 Subject: [PATCH 07/38] LimeSuite: rebuild for wxWidget 3.2.1 --- srcpkgs/LimeSuite/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/LimeSuite/template b/srcpkgs/LimeSuite/template index f7caba84c2fe..7b8a9dd7ee84 100644 --- a/srcpkgs/LimeSuite/template +++ b/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=" From 3da1a759cafb3201b725a3658b243cc3e0f794a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:51 +0700 Subject: [PATCH 08/38] OpenCPN: rebuild for wxWidget 3.2.1 --- srcpkgs/OpenCPN/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/OpenCPN/template b/srcpkgs/OpenCPN/template index ee67dbaff01c..93aa892056b3 100644 --- a/srcpkgs/OpenCPN/template +++ b/srcpkgs/OpenCPN/template @@ -1,7 +1,7 @@ # Template file for 'OpenCPN' pkgname=OpenCPN version=5.2.0 -revision=2 +revision=3 build_style=cmake build_helper=cmake-wxWidgets-gtk3 configure_args="-DOCPN_BUNDLE_GSHHS=NONE -DOCPN_BUNDLE_TCDATA=ON From 5a09dac4ff89b092c38b8803a169683159c4d2b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:52 +0700 Subject: [PATCH 09/38] PrusaSlicer: rebuild for wxWidget 3.2.1 --- srcpkgs/PrusaSlicer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template index b8dba603326f..204a1cd30532 100644 --- a/srcpkgs/PrusaSlicer/template +++ b/srcpkgs/PrusaSlicer/template @@ -1,7 +1,7 @@ # Template file for 'PrusaSlicer' pkgname=PrusaSlicer version=2.4.2 -revision=2 +revision=3 wrksrc="PrusaSlicer-version_${version}" build_style=cmake build_helper="qemu cmake-wxWidgets-gtk3" @@ -10,7 +10,7 @@ configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3 hostmakedepends="pkg-config" makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel - libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel + libpng-devel nlopt-devel openvdb-devel tbb-devel c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel" short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)" maintainer="Jasper Chan " From 547083d9be8d1ce9ed46275601e9f4eeae750a84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:52 +0700 Subject: [PATCH 10/38] SLADE: rebuild for wxWidget 3.2.1 --- srcpkgs/SLADE/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template index f7c5d5cd9ff8..c71bd40f61de 100644 --- a/srcpkgs/SLADE/template +++ b/srcpkgs/SLADE/template @@ -1,7 +1,7 @@ # Template file for 'SLADE' pkgname=SLADE version=3.1.13 -revision=1 +revision=2 build_style=cmake build_helper=cmake-wxWidgets-gtk3 hostmakedepends="pkg-config p7zip which" From 47f1fb177f2fca20ee174627b24451ff1b2418f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:52 +0700 Subject: [PATCH 11/38] VeraCrypt: rebuild for wxWidget 3.2.1 --- srcpkgs/VeraCrypt/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/VeraCrypt/template b/srcpkgs/VeraCrypt/template index e858493ef880..b71caa4a8ea0 100644 --- a/srcpkgs/VeraCrypt/template +++ b/srcpkgs/VeraCrypt/template @@ -1,7 +1,7 @@ # Template file for 'VeraCrypt' pkgname=VeraCrypt version=1.25.7 -revision=1 +revision=2 wrksrc="${pkgname}_${version}" build_wrksrc=src build_style=gnu-makefile From 8e73b98bfb3460ab74544de9b402448b74cc6a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:52 +0700 Subject: [PATCH 12/38] WoeUSB: rebuild for wxWidget 3.2.1 --- srcpkgs/WoeUSB/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/WoeUSB/template b/srcpkgs/WoeUSB/template index 4b8a4892dec5..1a292d761b48 100644 --- a/srcpkgs/WoeUSB/template +++ b/srcpkgs/WoeUSB/template @@ -1,7 +1,7 @@ # Template file for 'WoeUSB' pkgname=WoeUSB version=3.3.1 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3" hostmakedepends="automake gettext libtool" From 149eb3d03f70cdaef6fff21ae10f7fa50f25884b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:52 +0700 Subject: [PATCH 13/38] audacity: rebuild for wxWidget 3.2.1 --- srcpkgs/audacity/patches/wx-3.2.patch | 26 ++++++++++++++++ .../patches/wx-widget-has-basque.patch | 22 +++++++++++++ srcpkgs/audacity/patches/wxbitmap.patch | 31 +++++++++++++++++++ srcpkgs/audacity/template | 6 ++-- 4 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/audacity/patches/wx-3.2.patch create mode 100644 srcpkgs/audacity/patches/wx-widget-has-basque.patch create mode 100644 srcpkgs/audacity/patches/wxbitmap.patch diff --git a/srcpkgs/audacity/patches/wx-3.2.patch b/srcpkgs/audacity/patches/wx-3.2.patch new file mode 100644 index 000000000000..d42ae09f30f6 --- /dev/null +++ b/srcpkgs/audacity/patches/wx-3.2.patch @@ -0,0 +1,26 @@ +Index: audacity-Audacity-2.4.1/configure +=================================================================== +--- audacity-Audacity-2.4.1.orig/configure ++++ audacity-Audacity-2.4.1/configure +@@ -19918,7 +19918,7 @@ wx_version=`${WX_CONFIG} $wxconfigargs - + $as_echo "$as_me: Checking that the chosen version of wxWidgets is 3.1.x (or 3.0.x)" >&6;} + + case "${wx_version}" in +- 3.1.* | 3.0.*) ++ 3.2.* | 3.1.* | 3.0.*) + echo "Great, you're using wxWidgets ${wx_version}!" + ;; + *) +Index: audacity-Audacity-2.4.1/lib-src/lib-widget-extra/configure +=================================================================== +--- audacity-Audacity-2.4.1.orig/lib-src/lib-widget-extra/configure ++++ audacity-Audacity-2.4.1/lib-src/lib-widget-extra/configure +@@ -16633,7 +16633,7 @@ wx_version=`${WX_CONFIG} $wxconfigargs - + $as_echo "$as_me: Checking that the chosen version of wxWidgets is 3.1.x (or 3.0.x)" >&6;} + + case "${wx_version}" in +- 3.1.* | 3.0.*) ++ 3.2.* | 3.1.* | 3.0.*) + echo "Great, you're using wxWidgets ${wx_version}!" + ;; + *) diff --git a/srcpkgs/audacity/patches/wx-widget-has-basque.patch b/srcpkgs/audacity/patches/wx-widget-has-basque.patch new file mode 100644 index 000000000000..4dd24e79ec8e --- /dev/null +++ b/srcpkgs/audacity/patches/wx-widget-has-basque.patch @@ -0,0 +1,22 @@ +Index: audacity-Audacity-2.4.1/src/AudacityApp.cpp +=================================================================== +--- audacity-Audacity-2.4.1.orig/src/AudacityApp.cpp ++++ audacity-Audacity-2.4.1/src/AudacityApp.cpp +@@ -1102,7 +1102,7 @@ locations of the missing files.").Format + #define WL(lang,sublang) + #endif + +-#if wxCHECK_VERSION(3, 0, 1) ++#if 0 + wxLanguageInfo userLangs[] = + { + // Bosnian is defined in wxWidgets already +@@ -1366,7 +1366,7 @@ bool AudacityApp::OnInit() + // + // TODO: The whole Language initialization really need to be reworked. + // It's all over the place. +-#if wxCHECK_VERSION(3, 0, 1) ++#if 0 + for (size_t i = 0, cnt = WXSIZEOF(userLangs); i < cnt; i++) + { + wxLocale::AddLanguage(userLangs[i]); diff --git a/srcpkgs/audacity/patches/wxbitmap.patch b/srcpkgs/audacity/patches/wxbitmap.patch new file mode 100644 index 000000000000..af18bd1cb652 --- /dev/null +++ b/srcpkgs/audacity/patches/wxbitmap.patch @@ -0,0 +1,31 @@ +From 55383fccd0c281b4f189d9b07699b21bb802c736 Mon Sep 17 00:00:00 2001 +From: Ian McInerney +Date: Fri, 8 Apr 2022 01:27:52 +0100 +Subject: [PATCH] Call the proper wxBitmap constructor for XPM data + +wxBitmap back to at least 3.0.0 did not have a constructor for an XPM +image that took a size parameter, it would only take the XPM data +itself. + +I don't know how this compiled until now, but it doesn't anymore when +the size is included and built against wx 3.1.6 in Fedora. +--- + src/MixerBoard.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + + Technically this patch is under GPLv3+ because it was contributed after + re licensing + +diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp +index 54b5f146cc7..7fe81615474 100644 +--- a/src/MixerBoard.cpp ++++ b/src/MixerBoard.cpp +@@ -1307,7 +1307,7 @@ void MixerBoard::LoadMusicalInstruments() + wxMemoryDC dc; + + for (const auto &data : table) { +- auto bmp = std::make_unique(data.bitmap,24); ++ auto bmp = std::make_unique(data.bitmap); + dc.SelectObject(*bmp); + AColor::Bevel(dc, false, bev); + mMusicalInstruments.push_back(std::make_unique( diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template index 1ddb67966fef..0ea814f77685 100644 --- a/srcpkgs/audacity/template +++ b/srcpkgs/audacity/template @@ -1,7 +1,7 @@ # Template file for 'audacity' pkgname=audacity version=2.4.1 -revision=2 +revision=3 wrksrc="audacity-Audacity-${version}" build_style=gnu-configure configure_args="--with-ffmpeg=system --with-libsndfile=system --with-expat=system @@ -14,7 +14,9 @@ makedepends="jack-devel wxWidgets-gtk3-devel gtk+3-devel depends="desktop-file-utils hicolor-icon-theme" short_desc="Graphical cross-platform audio editor" maintainer="Orphaned " -license="GPL-2.0-or-later" +# relicense to GPL3+ because the imported patch is contributed after +# switching to GPL3+, while the patch is simple, but whatever +license="GPL-3.0-or-later" homepage="https://www.audacityteam.org" distfiles="https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz" checksum=50240f07471373a7e5c2df65cc26eeeaaced9a0850ad1f95cb795f171ea3009f From a124eea0b17103c70e8f61e26edd4dd9217dc560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:53 +0700 Subject: [PATCH 14/38] boinc: rebuild for wxWidget 3.2.1 --- srcpkgs/boinc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template index 0ae75ba3d997..8b0bdf4ec951 100644 --- a/srcpkgs/boinc/template +++ b/srcpkgs/boinc/template @@ -1,7 +1,7 @@ # Template file for 'boinc' pkgname=boinc version=7.16.20 -revision=2 +revision=3 _majorver=${version%.*} wrksrc=boinc-client_release-${_majorver}-${version} build_style=gnu-configure From 2eae07261951df84b6011e2b8bd8d2f6666e219e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:53 +0700 Subject: [PATCH 15/38] codeblocks: rebuild for wxWidget 3.2.1 --- .../{000.v20.03-r12008.patch => r12008.patch} | 0 .../{001.v20.03-r12012.patch => r12012.patch} | 0 srcpkgs/codeblocks/patches/wx-3.2.patch | 21 +++++++++++++++++++ srcpkgs/codeblocks/template | 2 +- 4 files changed, 22 insertions(+), 1 deletion(-) rename srcpkgs/codeblocks/patches/{000.v20.03-r12008.patch => r12008.patch} (100%) rename srcpkgs/codeblocks/patches/{001.v20.03-r12012.patch => r12012.patch} (100%) create mode 100644 srcpkgs/codeblocks/patches/wx-3.2.patch diff --git a/srcpkgs/codeblocks/patches/000.v20.03-r12008.patch b/srcpkgs/codeblocks/patches/r12008.patch similarity index 100% rename from srcpkgs/codeblocks/patches/000.v20.03-r12008.patch rename to srcpkgs/codeblocks/patches/r12008.patch diff --git a/srcpkgs/codeblocks/patches/001.v20.03-r12012.patch b/srcpkgs/codeblocks/patches/r12012.patch similarity index 100% rename from srcpkgs/codeblocks/patches/001.v20.03-r12012.patch rename to srcpkgs/codeblocks/patches/r12012.patch diff --git a/srcpkgs/codeblocks/patches/wx-3.2.patch b/srcpkgs/codeblocks/patches/wx-3.2.patch new file mode 100644 index 000000000000..0400ce634617 --- /dev/null +++ b/srcpkgs/codeblocks/patches/wx-3.2.patch @@ -0,0 +1,21 @@ +Index: codeblocks-20.03/src/sdk/scripting/bindings/sc_wxtypes.cpp +=================================================================== +--- codeblocks-20.03.orig/src/sdk/scripting/bindings/sc_wxtypes.cpp ++++ codeblocks-20.03/src/sdk/scripting/bindings/sc_wxtypes.cpp +@@ -322,6 +322,7 @@ namespace ScriptBindings + typedef bool(wxFileName::*WXFN_SETCWD)(); + #endif + typedef bool(wxFileName::*WXFN_ISFILEWRITEABLE)()const; ++ typedef bool(wxFileName::*WXFN_NORMALIZE)(int, const wxString&, wxPathFormat); + + SqPlus::SQClassDef("wxFileName"). + emptyCtor(). +@@ -354,7 +355,7 @@ namespace ScriptBindings + func(&wxFileName::IsDir, "IsDir"). + func(&wxFileName::MakeAbsolute, "MakeAbsolute"). + func(&wxFileName::MakeRelativeTo, "MakeRelativeTo"). +- func(&wxFileName::Normalize, "Normalize"). ++ func(&wxFileName::Normalize, "Normalize"). + func(&wxFileName::PrependDir, "PrependDir"). + func(&wxFileName::RemoveDir, "RemoveDir"). + func(&wxFileName::RemoveLastDir, "RemoveLastDir"). diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template index 02e1e255730d..1c0a84b8782a 100644 --- a/srcpkgs/codeblocks/template +++ b/srcpkgs/codeblocks/template @@ -1,7 +1,7 @@ # Template file for 'codeblocks' pkgname=codeblocks version=20.03 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3 --with-contrib-plugins --with-boost=${XBPS_CROSS_BASE}/usr From 1983ab5dec9a3ccc79c0c540e404b784ecd4829c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:53 +0700 Subject: [PATCH 16/38] codelite: rebuild for wxWidget 3.2.1 --- srcpkgs/codelite/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template index 3a993a2c0cfb..24e2c879dd45 100644 --- a/srcpkgs/codelite/template +++ b/srcpkgs/codelite/template @@ -1,7 +1,7 @@ # Template file for 'codelite' pkgname=codelite version=15.0.6 -revision=1 +revision=2 build_style=cmake build_helper=cmake-wxWidgets-gtk3 configure_args="-DWITH_PCH=0 -DWITH_WX_CONFIG=wx-config-gtk3 From 11b3d5c29b6e55309762adab6f99b47d3709101d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:53 +0700 Subject: [PATCH 17/38] diff-pdf: rebuild for wxWidget 3.2.1 --- srcpkgs/diff-pdf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/diff-pdf/template b/srcpkgs/diff-pdf/template index d58932a4a0df..ec0772d042a8 100644 --- a/srcpkgs/diff-pdf/template +++ b/srcpkgs/diff-pdf/template @@ -1,7 +1,7 @@ # Template file for 'diff-pdf' pkgname=diff-pdf version=0.5 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3" hostmakedepends="automake pkg-config" From 069d5c4e2aae4718b7593aa3164f715f69859ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:53 +0700 Subject: [PATCH 18/38] erlang: rebuild for wxWidget 3.2.1 --- srcpkgs/erlang/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template index 0dc24369181e..9db1b42ea722 100644 --- a/srcpkgs/erlang/template +++ b/srcpkgs/erlang/template @@ -1,7 +1,7 @@ # Template file for 'erlang' pkgname=erlang version=25.1 -revision=1 +revision=2 create_wrksrc=yes build_wrksrc="otp-OTP-${version}" build_style=gnu-configure From 369068fadf6e2eeb8cb0f9caaa07f5d1c513284e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:54 +0700 Subject: [PATCH 19/38] filezilla: rebuild for wxWidget 3.2.1 --- srcpkgs/filezilla/patches/wxwidgets-3.2.patch | 26 +++++++++++++++++++ srcpkgs/filezilla/template | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/filezilla/patches/wxwidgets-3.2.patch diff --git a/srcpkgs/filezilla/patches/wxwidgets-3.2.patch b/srcpkgs/filezilla/patches/wxwidgets-3.2.patch new file mode 100644 index 000000000000..a941156765e2 --- /dev/null +++ b/srcpkgs/filezilla/patches/wxwidgets-3.2.patch @@ -0,0 +1,26 @@ +Index: filezilla-3.61.0/src/interface/search.h +=================================================================== +--- filezilla-3.61.0.orig/src/interface/search.h ++++ filezilla-3.61.0/src/interface/search.h +@@ -13,7 +13,7 @@ class CQueueView; + class CSearchDialogFileList; + class CWindowStateManager; + +-class CSearchDialog final : protected CFilterConditionsDialog, public CStateEventHandler ++class CSearchDialog final : public CFilterConditionsDialog, public CStateEventHandler + { + friend class CSearchDialogFileList; + public: +Index: filezilla-3.61.0/configure +=================================================================== +--- filezilla-3.61.0.orig/configure ++++ filezilla-3.61.0/configure +@@ -18823,8 +18823,6 @@ $as_echo "no (version $WX_VERSION is not + fi + if test "${WX_VERSION_MAJOR}.${WX_VERSION_MINOR}" = "3.1"; then + as_fn_error $? "You must use wxWidgets 3.0.x, development versions of wxWidgets are not supported." "$LINENO" 5 +- elif test "${WX_VERSION_MAJOR}.${WX_VERSION_MINOR}" != "3.0"; then +- as_fn_error $? "You must use wxWidgets 3.0.x, wxWidgets 3.2 or higher is not yet supported." "$LINENO" 5 + fi + + if test "${WX_VERSION_MAJOR}.${WX_VERSION_MINOR}" = "3.0"; then diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template index d3f536a24245..0b570f127179 100644 --- a/srcpkgs/filezilla/template +++ b/srcpkgs/filezilla/template @@ -1,7 +1,7 @@ # Template file for 'filezilla' pkgname=filezilla version=3.61.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck --with-wx-config=wx-config-gtk3" From a169df3a758443f779747bd576b15641b59afefa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:54 +0700 Subject: [PATCH 20/38] gnuplot: rebuild for wxWidget 3.2.1 --- srcpkgs/gnuplot/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnuplot/template b/srcpkgs/gnuplot/template index 8848a5a34522..e22f966fcb9c 100644 --- a/srcpkgs/gnuplot/template +++ b/srcpkgs/gnuplot/template @@ -1,7 +1,7 @@ # Template file for 'gnuplot' pkgname=gnuplot version=5.4.4 -revision=1 +revision=2 configure_args="--with-readline=builtin" hostmakedepends="pkg-config lua52" makedepends="zlib-devel libX11-devel gd-devel lua52-devel" From b23380272eb04917e62804f6d9d107efa42367e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:54 +0700 Subject: [PATCH 21/38] golly: rebuild for wxWidget 3.2.1 --- srcpkgs/golly/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/golly/template b/srcpkgs/golly/template index e8a24b9074c0..f78c5f2b6584 100644 --- a/srcpkgs/golly/template +++ b/srcpkgs/golly/template @@ -1,7 +1,7 @@ # Template file for 'golly' pkgname=golly version=4.1 -revision=1 +revision=2 wrksrc="${pkgname}-${version}-src" build_wrksrc="gui-wx" build_style=gnu-makefile From fec88b8154dcb50fab8b0c08ce7d7c86a5724375 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:55 +0700 Subject: [PATCH 22/38] mediainfo: rebuild for wxWidget 3.2.1 --- srcpkgs/mediainfo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mediainfo/template b/srcpkgs/mediainfo/template index 3f9e658afd85..ba8a5e05e324 100644 --- a/srcpkgs/mediainfo/template +++ b/srcpkgs/mediainfo/template @@ -1,7 +1,7 @@ # Template file for 'mediainfo' pkgname=mediainfo version=21.09 -revision=1 +revision=2 wrksrc=MediaInfo configure_args="--with-wx-config=wx-config-gtk3" hostmakedepends="automake libtool pkg-config" From 0f5782139d486f92962c9d8e3d1f7c9a8bf3b142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:55 +0700 Subject: [PATCH 23/38] openbabel: rebuild for wxWidget 3.2.1 --- srcpkgs/openbabel/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openbabel/template b/srcpkgs/openbabel/template index 41273c40b736..9ecb5866e9c8 100644 --- a/srcpkgs/openbabel/template +++ b/srcpkgs/openbabel/template @@ -1,7 +1,7 @@ # Template file for 'openbabel' pkgname=openbabel version=2.4.1 -revision=7 +revision=8 _ver=${version//./-} wrksrc=${pkgname}-${pkgname}-${_ver} build_style=cmake From 98d3661c64dee5ac22f70f1fbc54371515bfe148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:55 +0700 Subject: [PATCH 24/38] passwordsafe: rebuild for wxWidget 3.2.1 --- srcpkgs/passwordsafe/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template index c4eab0c120ec..13786d75bc30 100644 --- a/srcpkgs/passwordsafe/template +++ b/srcpkgs/passwordsafe/template @@ -1,7 +1,7 @@ # Template file for 'passwordsafe' pkgname=passwordsafe version=1.13.0 -revision=2 +revision=3 wrksrc="pwsafe-${version}" build_style=cmake build_helper=cmake-wxWidgets-gtk3 From 34c6c0230d0164f94545634bc08531f517da5330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:55 +0700 Subject: [PATCH 25/38] poedit: rebuild for wxWidget 3.2.1 --- srcpkgs/poedit/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template index 15cd4b6bae20..a8f02e3e6089 100644 --- a/srcpkgs/poedit/template +++ b/srcpkgs/poedit/template @@ -1,7 +1,7 @@ # Template file for 'poedit' pkgname=poedit version=3.0.1 -revision=4 +revision=5 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3" hostmakedepends="pkg-config" From 22af2fbe67234dc82ce5f02184de2007135c8f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:56 +0700 Subject: [PATCH 26/38] spek-alternative: rebuild for wxWidget 3.2.1 --- srcpkgs/spek-alternative/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/spek-alternative/template b/srcpkgs/spek-alternative/template index d65086b8f008..72747cbb0a02 100644 --- a/srcpkgs/spek-alternative/template +++ b/srcpkgs/spek-alternative/template @@ -1,7 +1,7 @@ # Template file for 'spek-alternative' pkgname=spek-alternative version=0.8.2.3 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake gettext-devel intltool libtool pkg-config wxWidgets-common" makedepends="ffmpeg-devel wxWidgets-gtk3-devel" From 4c89c1a354c10d93e65e1338bed36581b63d4917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:56 +0700 Subject: [PATCH 27/38] treesheets: rebuild for wxWidget 3.2.1 --- srcpkgs/treesheets/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/treesheets/template b/srcpkgs/treesheets/template index 4cd41afbd932..6dda4ab303ed 100644 --- a/srcpkgs/treesheets/template +++ b/srcpkgs/treesheets/template @@ -1,7 +1,7 @@ # Template file for 'treesheets' pkgname=treesheets version=1.0.2 -revision=1 +revision=2 build_style=cmake build_helper="cmake-wxWidgets-gtk3" makedepends="wxWidgets-gtk3-devel" From b5bad3d021b3ccaadd28f68bbf739efd97447dd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:56 +0700 Subject: [PATCH 28/38] vba-m: rebuild for wxWidget 3.2.1 --- srcpkgs/vba-m/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vba-m/template b/srcpkgs/vba-m/template index 8e6447f5c6f5..d98b4d9fd930 100644 --- a/srcpkgs/vba-m/template +++ b/srcpkgs/vba-m/template @@ -2,7 +2,7 @@ pkgname=vba-m reverts=1292_2 version=2.1.4 -revision=4 +revision=5 wrksrc="visualboyadvance-m-${version}" build_style=cmake configure_args="-DENABLE_GTK=TRUE -DENABLE_FFMPEG=TRUE -DENABLE_LINK=TRUE" From 2bfaab33726f98ff206f291ea61bada31b7d318f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:56 +0700 Subject: [PATCH 29/38] winusb: rebuild for wxWidget 3.2.1 --- srcpkgs/winusb/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/winusb/template b/srcpkgs/winusb/template index 64ec8fce12b0..5ed1b8004884 100644 --- a/srcpkgs/winusb/template +++ b/srcpkgs/winusb/template @@ -1,7 +1,7 @@ # Template file for 'winusb' pkgname=winusb version=1.0.11 -revision=10 +revision=11 archs="i686* x86_64*" build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3" From 4e9ceb4cdab178de10d15b9ec1166f629c02f35a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:57 +0700 Subject: [PATCH 30/38] wxMaxima: rebuild for wxWidget 3.2.1 --- srcpkgs/wxMaxima/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wxMaxima/template b/srcpkgs/wxMaxima/template index 47df00d2e9e7..69a1fce08aed 100644 --- a/srcpkgs/wxMaxima/template +++ b/srcpkgs/wxMaxima/template @@ -1,7 +1,7 @@ # Template file for 'wxMaxima' pkgname=wxMaxima version=20.02.4 -revision=1 +revision=2 wrksrc="wxmaxima-Version-${version}" build_style=cmake configure_args="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3" From c356ac798967975c00ea97eddabcadc8881476ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:57 +0700 Subject: [PATCH 31/38] wxPython: rebuild for wxWidget 3.2.1 --- srcpkgs/wxPython/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wxPython/template b/srcpkgs/wxPython/template index 328fa26459cb..4c2e6a9e481f 100644 --- a/srcpkgs/wxPython/template +++ b/srcpkgs/wxPython/template @@ -1,7 +1,7 @@ # Template file for 'wxPython' pkgname=wxPython version=3.0.2.0 -revision=11 +revision=12 wrksrc="${pkgname}-src-${version}" hostmakedepends="pkg-config" makedepends=" From 75067ca1480eff06fe89e02fe2cb6c08c3ed999f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 22:25:57 +0700 Subject: [PATCH 32/38] xchm: rebuild for wxWidget 3.2.1 --- srcpkgs/xchm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xchm/template b/srcpkgs/xchm/template index 782d4c435869..9290320ee8dd 100644 --- a/srcpkgs/xchm/template +++ b/srcpkgs/xchm/template @@ -1,7 +1,7 @@ # Template file for 'xchm' pkgname=xchm version=1.33 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3" hostmakedepends="automake gettext-devel tar" From 42c37657c62bdb3bf04d70bec1be3a3f16ec721b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 19:56:32 +0700 Subject: [PATCH 33/38] New package: python3-attrdict-2.0.1 --- .../patches/python-3.10.patch | 44 +++++++++++++++++++ srcpkgs/python3-attrdict/template | 16 +++++++ 2 files changed, 60 insertions(+) create mode 100644 srcpkgs/python3-attrdict/patches/python-3.10.patch create mode 100644 srcpkgs/python3-attrdict/template diff --git a/srcpkgs/python3-attrdict/patches/python-3.10.patch b/srcpkgs/python3-attrdict/patches/python-3.10.patch new file mode 100644 index 000000000000..52468a936127 --- /dev/null +++ b/srcpkgs/python3-attrdict/patches/python-3.10.patch @@ -0,0 +1,44 @@ +--- a/attrdict/mapping.py ++++ b/attrdict/mapping.py +@@ -1,7 +1,7 @@ + """ + An implementation of MutableAttr. + """ +-from collections import Mapping ++from collections.abc import Mapping + + import six + +--- a/attrdict/default.py ++++ b/attrdict/default.py +@@ -1,7 +1,7 @@ + """ + A subclass of MutableAttr that has defaultdict support. + """ +-from collections import Mapping ++from collections.abc import Mapping + + import six + +--- a/attrdict/merge.py ++++ b/attrdict/merge.py +@@ -1,7 +1,7 @@ + """ + A right-favoring Mapping merge. + """ +-from collections import Mapping ++from collections.abc import Mapping + + + __all__ = ['merge'] +--- a/attrdict/mixins.py ++++ b/attrdict/mixins.py +@@ -2,7 +2,7 @@ + Mixin Classes for Attr-support. + """ + from abc import ABCMeta, abstractmethod +-from collections import Mapping, MutableMapping, Sequence ++from collections.abc import Mapping, MutableMapping, Sequence + import re + + import six diff --git a/srcpkgs/python3-attrdict/template b/srcpkgs/python3-attrdict/template new file mode 100644 index 000000000000..271e1808ede7 --- /dev/null +++ b/srcpkgs/python3-attrdict/template @@ -0,0 +1,16 @@ +# Template file for 'python3-attrdict' +pkgname=python3-attrdict +version=2.0.1 +revision=1 +wrksrc=attrdict-${version} +build_style=python3-module +hostmakedepends="python3-setuptools python3-six" +depends="python3-six" +checkdepends="python3-six python3-nose python3-coverage" +short_desc="Python 3 dict with attribute-style access" +maintainer="Đoàn Trần Công Danh " +license="MIT" +homepage="https://github.com/bcj/AttrDict" +#changelog="" +distfiles="${PYPI_SITE}/a/attrdict/attrdict-${version}.tar.gz" +checksum=35c90698b55c683946091177177a9e9c0713a0860f0e049febd72649ccd77b70 From 3a27df8f9651a82937538f843fe1e4f7bd15f270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 26 Sep 2022 12:37:11 +0700 Subject: [PATCH 34/38] OpenCPN: update to 5.6.2. --- .../OpenCPN/patches/actually-set-arch.patch | 28 -------------- srcpkgs/OpenCPN/patches/musl.patch | 35 +++++++++-------- srcpkgs/OpenCPN/patches/needs-c++-14.patch | 15 ++++++++ .../patches/no-check-version-wxwidgets.patch | 38 +++++++++++++++++++ srcpkgs/OpenCPN/template | 36 +++++++++++------- srcpkgs/OpenCPN/update | 1 + 6 files changed, 94 insertions(+), 59 deletions(-) delete mode 100644 srcpkgs/OpenCPN/patches/actually-set-arch.patch create mode 100644 srcpkgs/OpenCPN/patches/needs-c++-14.patch create mode 100644 srcpkgs/OpenCPN/patches/no-check-version-wxwidgets.patch create mode 100644 srcpkgs/OpenCPN/update diff --git a/srcpkgs/OpenCPN/patches/actually-set-arch.patch b/srcpkgs/OpenCPN/patches/actually-set-arch.patch deleted file mode 100644 index d152c4092886..000000000000 --- a/srcpkgs/OpenCPN/patches/actually-set-arch.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/cmake/GetArch.cmake 2020-07-15 20:02:29.000000000 +0200 -+++ b/cmake/GetArch.cmake 2020-07-15 20:02:29.000000000 +0200 -@@ -14,6 +14,25 @@ - # default - set (ARCH "i386") - set (LIB_INSTALL_DIR "lib") -+ IF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*") -+ IF (CMAKE_SIZEOF_VOID_P MATCHES "8") -+ SET (ARCH "aarch64") -+ ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8") -+ SET (ARCH "armhf") -+ ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8") -+ ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "ppc*" OR CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc*") -+ IF (CMAKE_SIZEOF_VOID_P MATCHES "8") -+ SET (ARCH "ppc64") -+ ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8") -+ SET (ARCH "powerpc") -+ ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8") -+ ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*") -+ IF (CMAKE_SIZEOF_VOID_P MATCHES "8") -+ SET (ARCH "x86_64") -+ ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8") -+ SET (ARCH "i386") -+ ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8") -+ ENDIF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*") - if (EXISTS /etc/debian_version) - set (PACKAGE_FORMAT "DEB") - set (PACKAGE_RECS "xcalib,xdg-utils") diff --git a/srcpkgs/OpenCPN/patches/musl.patch b/srcpkgs/OpenCPN/patches/musl.patch index 75923e019b2b..9f0c6b6001f1 100644 --- a/srcpkgs/OpenCPN/patches/musl.patch +++ b/srcpkgs/OpenCPN/patches/musl.patch @@ -1,26 +1,18 @@ ---- 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 #else -- #ifndef __WXOSX__ -- #include -- #else -+ #ifdef __WXOSX__ - #include +-#ifndef __WXOSX__ +-#include +-#else ++#ifdef __WXOSX__ + #include #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 #include #include @@ -28,3 +20,10 @@ #include #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 diff --git a/srcpkgs/OpenCPN/patches/needs-c++-14.patch b/srcpkgs/OpenCPN/patches/needs-c++-14.patch new file mode 100644 index 000000000000..011bad8af9aa --- /dev/null +++ b/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 () diff --git a/srcpkgs/OpenCPN/patches/no-check-version-wxwidgets.patch b/srcpkgs/OpenCPN/patches/no-check-version-wxwidgets.patch new file mode 100644 index 000000000000..ffb2e76c9d85 --- /dev/null +++ b/srcpkgs/OpenCPN/patches/no-check-version-wxwidgets.patch @@ -0,0 +1,38 @@ +Index: OpenCPN-Release_5.6.2/CMakeLists.txt +=================================================================== +--- OpenCPN-Release_5.6.2.orig/CMakeLists.txt ++++ OpenCPN-Release_5.6.2/CMakeLists.txt +@@ -748,32 +748,7 @@ if (NOT QT_ANDROID) + message(STATUS " Revised wxWidgets Libraries: ${wxWidgets_LIBRARIES}") + endif (NOT QT_ANDROID) + +-# Handle #1500: Force NDEBUG on gtk3 for wxwidgets < 3.2 (all builds) +-if (GTK3_FOUND) +- set( _VERSPROG [=[ +- #include +- #include +- int main(int argc, char**argv) { +- printf("%d\\n", wxMAJOR_VERSION * 10 + wxMINOR_VERSION); +- } +- ]=]) +- set (TRY_COMPILE +- "echo '${_VERSPROG}' > wx-32.c; cc $(wx-config --cflags) wx-32.c; ./a.out") +- execute_process( +- COMMAND "/bin/sh" "-c" "${TRY_COMPILE}" +- WORKING_DIRECTORY ${CMAKE_BINARY_DIR} +- OUTPUT_VARIABLE _WX_VERSION +- ERROR_VARIABLE _WX_ERRORS +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ) +- if (NOT "${_WX_ERRORS}" STREQUAL "" OR "${_WX_VERSION}" STREQUAL "") +- message(FATAL_ERROR "Cannot run wxWidgets version test (!)") +- elseif ("${_WX_VERSION}" LESS 32) +- add_definitions("-DNDEBUG") +- message(STATUS "Forcing -NDEBUG on gtk3 build (#1500).") +- endif () +-endif () +- ++add_definitions("-DNDEBUG") + + # Make sure that the variable "wxWidgets_VERSION_STRING" is set, even on older CMake versions + # Seems safe to set to "3.0", since OCPN does not support earlier wxWidgets versions diff --git a/srcpkgs/OpenCPN/template b/srcpkgs/OpenCPN/template index 93aa892056b3..411466d044da 100644 --- a/srcpkgs/OpenCPN/template +++ b/srcpkgs/OpenCPN/template @@ -1,7 +1,8 @@ # Template file for 'OpenCPN' pkgname=OpenCPN -version=5.2.0 -revision=3 +version=5.6.2 +revision=1 +wrksrc="OpenCPN-Release_${version}" build_style=cmake build_helper=cmake-wxWidgets-gtk3 configure_args="-DOCPN_BUNDLE_GSHHS=NONE -DOCPN_BUNDLE_TCDATA=ON @@ -11,29 +12,38 @@ configure_args="-DOCPN_BUNDLE_GSHHS=NONE -DOCPN_BUNDLE_TCDATA=ON hostmakedepends="gettext pkg-config" makedepends="gtk+3-devel libcurl-devel portaudio-devel tinyxml-devel wxWidgets-gtk3-devel $(vopt_if exif 'libexif-devel') glu-devel - $(vopt_if libarchive 'libarchive-devel' 'libunarr-devel') $(vopt_if lzma 'liblzma-devel')" + jasper-devel libarchive-devel libunarr-devel sqlite-devel + $(vopt_if lzma 'liblzma-devel')" depends="gpsd hicolor-icon-theme OpenCPN-tcdata-${version}_${revision} OpenCPN-gshhs-crude" short_desc="Concise ChartPlotter/Navigator" maintainer="John " license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.0-or-later, MIT, WxWindows-exception-3.1, JasPer-2.0, BSD-3-Clause, SGI-B-2.0" homepage="https://opencpn.org/" -distfiles="https://github.com/OpenCPN/OpenCPN/archive/v${version}.tar.gz" -checksum=f6ec38989bc38f5a7f63234c5e0230adeb73f5626b4e3d3dfa680f0c240badc7 +distfiles="https://github.com/OpenCPN/OpenCPN/archive/refs/tags/Release_${version}.tar.gz" +checksum=6ca7bedf47915c80e2884c94f01bf7ac5e0eac416b60c18a6ae6d863c68a9435 -build_options="lzma libarchive exif crashreport" -build_options_default="lzma libarchive exif" +build_options="lzma exif crashreport" +build_options_default="lzma exif" desc_option_crashreport="Enable displaying of crashreports" desc_option_lzma="Enable support for reading compressed charts" desc_option_exif="Enable reading of exif data of Images" -desc_option_libarchive="Use libarchive instead of bundled unarr" -case $XBPS_TARGET_MACHINE in - *-musl);; - *) build_options_default+=" crashreport";; -esac +if [ "$XBPS_TARGET_LIBC" != musl ]; then + build_options_default+=" crashreport" +fi + +# CFLAGS="-fcommon" -CFLAGS="-fcommon" +case "$XBPS_TARGET_MACHINE" in + x86_64*) _arch=x86_64 ;; + i686*) _arch=i386 ;; + aarch64*) _arch=aarch64 ;; + arm*) _arch=armhf ;; + ppc64*) _arch=ppc64 ;; + ppc*) _arch=powerpc ;; +esac +configure_args+=" -DOCPN_TARGET_TUPLE=VoidLinux-$_arch;rolling;$_arch" post_install() { vlicense libs/glshim/LICENSE LICENSE.glshim diff --git a/srcpkgs/OpenCPN/update b/srcpkgs/OpenCPN/update new file mode 100644 index 000000000000..d05de8d914a6 --- /dev/null +++ b/srcpkgs/OpenCPN/update @@ -0,0 +1 @@ +pattern="Release_\K[0-9.]+(?=.tar.gz)" From 4227b7616fc4afa012c29b64974e475b03b63364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 26 Sep 2022 21:47:27 +0700 Subject: [PATCH 35/38] SLADE: update to 3.2.1. --- srcpkgs/SLADE/patches/pointer-decay.patch | 29 ---------------- srcpkgs/SLADE/patches/system-dumb.patch | 26 +++++++++++++++ srcpkgs/SLADE/patches/system-libraries.patch | 35 ++++++++++++++------ srcpkgs/SLADE/template | 9 ++--- 4 files changed, 56 insertions(+), 43 deletions(-) delete mode 100644 srcpkgs/SLADE/patches/pointer-decay.patch create mode 100644 srcpkgs/SLADE/patches/system-dumb.patch diff --git a/srcpkgs/SLADE/patches/pointer-decay.patch b/srcpkgs/SLADE/patches/pointer-decay.patch deleted file mode 100644 index 7719471b03f6..000000000000 --- a/srcpkgs/SLADE/patches/pointer-decay.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/src/External/sol/sol.hpp -+++ b/src/External/sol/sol.hpp -@@ -6818,7 +6818,7 @@ - } - - static int push(lua_State* L, const wchar_t(&str)[N], std::size_t sz) { -- return stack::push(L, str, str + sz); -+ return stack::push(L, str + 0, str + sz); - } - }; - -@@ -6829,7 +6829,7 @@ - } - - static int push(lua_State* L, const char16_t(&str)[N], std::size_t sz) { -- return stack::push(L, str, str + sz); -+ return stack::push(L, str + 0, str + sz); - } - }; - -@@ -6840,7 +6840,7 @@ - } - - static int push(lua_State* L, const char32_t(&str)[N], std::size_t sz) { -- return stack::push(L, str, str + sz); -+ return stack::push(L, str + 0, str + sz); - } - }; - diff --git a/srcpkgs/SLADE/patches/system-dumb.patch b/srcpkgs/SLADE/patches/system-dumb.patch new file mode 100644 index 000000000000..8f935fbcedf2 --- /dev/null +++ b/srcpkgs/SLADE/patches/system-dumb.patch @@ -0,0 +1,26 @@ +Index: SLADE-3.2.1/src/Application/App.cpp +=================================================================== +--- SLADE-3.2.1.orig/src/Application/App.cpp ++++ SLADE-3.2.1/src/Application/App.cpp +@@ -60,7 +60,7 @@ + #include "UI/WxUtils.h" + #include "Utility/StringUtils.h" + #include "Utility/Tokenizer.h" +-#include "thirdparty/dumb/dumb.h" ++#include + #include + + using namespace slade; +Index: SLADE-3.2.1/src/Audio/ModMusic.cpp +=================================================================== +--- SLADE-3.2.1.orig/src/Audio/ModMusic.cpp ++++ SLADE-3.2.1/src/Audio/ModMusic.cpp +@@ -32,7 +32,7 @@ + // ----------------------------------------------------------------------------- + #include "Main.h" + #include "ModMusic.h" +-#include "thirdparty/dumb/dumb.h" ++#include + + using namespace slade; + using namespace audio; diff --git a/srcpkgs/SLADE/patches/system-libraries.patch b/srcpkgs/SLADE/patches/system-libraries.patch index d2a0ca72471b..2e0a998ad44f 100644 --- a/srcpkgs/SLADE/patches/system-libraries.patch +++ b/srcpkgs/SLADE/patches/system-libraries.patch @@ -1,17 +1,32 @@ lzma is p7zip not liblzma ---- a/src/External/CMakeLists.txt -+++ b/src/External/CMakeLists.txt -@@ -24,12 +24,10 @@ +Index: SLADE-3.2.1/thirdparty/CMakeLists.txt +=================================================================== +--- SLADE-3.2.1.orig/thirdparty/CMakeLists.txt ++++ SLADE-3.2.1/thirdparty/CMakeLists.txt +@@ -10,7 +10,6 @@ set(BZIP2_LIBRARIES ${BZIP2_LIBRARIES} P + set(EXTERNAL_SOURCES + ) file(GLOB_RECURSE EXTERNAL_SOURCES - *.cpp - *.cxx - dumb/*.c -- lua/*.c lzma/C/LzmaDec.c - ${SLADE_HEADERS} - ) + mus2mid/mus2mid.cpp + zreaders/*.cpp +@@ -29,5 +28,5 @@ add_subdirectory(lunasvg/3rdparty/softwa + add_subdirectory(lunasvg/3rdparty/plutovg) add_library(external STATIC ${EXTERNAL_SOURCES}) - target_link_libraries(external ${ZLIB_LIBRARY}) + target_link_libraries(external ${ZLIB_LIBRARY} lunasvg fmt ${CMAKE_DL_LIBS}) -set(EXTERNAL_LIBRARIES external PARENT_SCOPE) -+set(EXTERNAL_LIBRARIES external dumb lua5.3 PARENT_SCOPE) ++set(EXTERNAL_LIBRARIES external dumb PARENT_SCOPE) +Index: SLADE-3.2.1/src/CMakeLists.txt +=================================================================== +--- SLADE-3.2.1.orig/src/CMakeLists.txt ++++ SLADE-3.2.1/src/CMakeLists.txt +@@ -116,7 +116,6 @@ include_directories( + ${MPG123_INCLUDE_DIR} + . + .. +- ../thirdparty/dumb + ../thirdparty/glad/include + ./Application + ) diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template index c71bd40f61de..ff9fe0e00448 100644 --- a/srcpkgs/SLADE/template +++ b/srcpkgs/SLADE/template @@ -1,20 +1,20 @@ # Template file for 'SLADE' pkgname=SLADE -version=3.1.13 -revision=2 +version=3.2.1 +revision=1 build_style=cmake build_helper=cmake-wxWidgets-gtk3 hostmakedepends="pkg-config p7zip which" makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel gtk+3-devel libcurl-devel wxWidgets-gtk3-devel bzip2-devel zlib-devel - lua53-devel dumb-devel liblzma-devel" + lua53-devel dumb-devel liblzma-devel mpg123-devel" short_desc="Modern editor for Doom-engine based games" maintainer="John " license="GPL-2.0-or-later" homepage="https://github.com/sirjuddington/SLADE" changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}" distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz" -checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7 +checksum=c327fa62ba491ac481d769700261d810128910007297fd9d9dbe26ac0e78bb2c pre_configure() { case $XBPS_TARGET_MACHINE in @@ -22,4 +22,5 @@ pre_configure() { *) vsed -e '/D_USE_SSE/d' -i src/CMakeLists.txt;; esac vsed -e 's/wx-config/wx-config-gtk3/g' -i src/CMakeLists.txt + rm -rf thirdparty/dumb } From aa4351207b945e9ec90c7bc5ba1ef4eaf893a431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 27 Sep 2022 12:59:06 +0700 Subject: [PATCH 36/38] pcsx2: rbuild for wxWidgets --- srcpkgs/pcsx2/patches/wx-3.2.patch | 34 ++++++++++++++++++++++++++++++ srcpkgs/pcsx2/template | 11 +++++----- 2 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/pcsx2/patches/wx-3.2.patch diff --git a/srcpkgs/pcsx2/patches/wx-3.2.patch b/srcpkgs/pcsx2/patches/wx-3.2.patch new file mode 100644 index 000000000000..5408a9a93134 --- /dev/null +++ b/srcpkgs/pcsx2/patches/wx-3.2.patch @@ -0,0 +1,34 @@ +Index: pcsx2-1.6.0/cmake/SearchForStuff.cmake +=================================================================== +--- pcsx2-1.6.0.orig/cmake/SearchForStuff.cmake ++++ pcsx2-1.6.0/cmake/SearchForStuff.cmake +@@ -35,8 +35,6 @@ else() + set(wxWidgets_CONFIG_OPTIONS --unicode=yes) + endif() + +-list(APPEND wxWidgets_CONFIG_OPTIONS --version=3.0) +- + if(GTK3_API AND NOT APPLE) + list(APPEND wxWidgets_CONFIG_OPTIONS --toolkit=gtk3) + elseif(NOT APPLE) +@@ -227,4 +225,4 @@ if((GCC_VERSION VERSION_EQUAL "9.0" OR G + https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=275ab714637a64672c6630cfd744af2c70957d5a + Even with that patch, compiling with LTO may still segfault. Use at your own risk! + This text being in a compile log in an open issue may cause it to be closed.") +-endif() +\ No newline at end of file ++endif() +Index: pcsx2-1.6.0/pcsx2/gui/i18n.cpp +=================================================================== +--- pcsx2-1.6.0.orig/pcsx2/gui/i18n.cpp ++++ pcsx2-1.6.0/pcsx2/gui/i18n.cpp +@@ -37,7 +37,9 @@ static wxString i18n_GetBetterLanguageNa + { + case wxLANGUAGE_CHINESE: return L"Chinese (Traditional)"; + case wxLANGUAGE_CHINESE_TRADITIONAL: return L"Chinese (Traditional)"; ++#if !wxCHECK_VERSION(3, 2, 0) + case wxLANGUAGE_CHINESE_TAIWAN: return L"Chinese (Traditional)"; ++#endif + case wxLANGUAGE_CHINESE_HONGKONG: return L"Chinese (Traditional, Hong Kong)"; + case wxLANGUAGE_CHINESE_MACAU: return L"Chinese (Traditional, Macau)"; + } diff --git a/srcpkgs/pcsx2/template b/srcpkgs/pcsx2/template index 59f8dfcdce71..3eec98633930 100644 --- a/srcpkgs/pcsx2/template +++ b/srcpkgs/pcsx2/template @@ -5,19 +5,20 @@ nopie=yes pkgname=pcsx2 version=1.6.0 -revision=2 +revision=3 build_style=cmake +build_helper="cmake-wxWidgets-gtk3" # store all data that pcsx2 has to access into /usr/lib, so it can be accessed # on multilib setups. when/if pcsx2 supports 64-bit builds, GAMEINDEX_DIR should # be moved to /usr/share/pcsx2 configure_args="-DGLSL_API=1 -DSDL2_API=TRUE -DPACKAGE_MODE=1 -DREBUILD_SHADER=1 - -DXDG_STD=1 -DDISABLE_ADVANCE_SIMD=1 + -DXDG_STD=1 -DDISABLE_ADVANCE_SIMD=1 -DGTK3_API=ON -DPLUGIN_DIR=/usr/lib${XBPS_TARGET_WORDSIZE}/pcsx2 -DGAMEINDEX_DIR=/usr/lib${XBPS_TARGET_WORDSIZE}/pcsx2" -hostmakedepends="pkg-config sparsehash perl" +hostmakedepends="pkg-config sparsehash perl gettext" makedepends="alsa-lib-devel SDL2-devel glu-devel glew-devel libaio-devel - libcanberra-devel libjpeg-turbo-devel wxWidgets-devel portaudio-devel soundtouch-devel - libpcap-devel glib-devel" + libcanberra-devel libjpeg-turbo-devel portaudio-devel soundtouch-devel + wxWidgets-gtk3-devel libpcap-devel glib-devel" depends="desktop-file-utils" short_desc="Sony PlayStation 2 emulator" maintainer="Selfsigned " From 5084b6122286bcd888b0af4e4918cceea22d233b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 27 Sep 2022 21:54:18 +0700 Subject: [PATCH 37/38] wxPython4: update to 4.2.0. --- ...fig-gtk3.0-to-avoid-conflict-with-wx.patch | 52 ------------------- srcpkgs/wxPython4/template | 16 +++--- 2 files changed, 10 insertions(+), 58 deletions(-) delete mode 100644 srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch diff --git a/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch b/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch deleted file mode 100644 index 72a678da7858..000000000000 --- a/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch +++ /dev/null @@ -1,52 +0,0 @@ -From cddbe3b3b237b8e63abd8921fdb20314c20c2c08 Mon Sep 17 00:00:00 2001 -From: Jasper Chan -Date: Sat, 22 Sep 2018 20:59:29 -0700 -Subject: [PATCH] Switch to wx-config-gtk3 to avoid conflict with - wxWidgets-gtk2 - ---- - build.py | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git build.py build.py -index 3cd5b828..57dbd384 100755 ---- a/build.py -+++ b/build.py -@@ -400,7 +400,7 @@ def makeOptionParser(): - ("mac_arch", ("", "Comma separated list of architectures to build on Mac")), - - ("use_syswx", (False, "Try to use an installed wx rather than building the " -- "one in this source tree. The wx-config in {prefix}/bin " -+ "one in this source tree. The wx-config-gtk3 in {prefix}/bin " - "or the first found on the PATH determines which wx is " - "used. Implies --no_magic.")), - ("force_config", (False, "Run configure when building even if the script " -@@ -1271,7 +1271,7 @@ def cmd_build_wx(options, args): - os.path.join(wxDir(), 'configure'), - os.path.join(wxDir(), 'setup.h.in'), - os.path.join(wxDir(), 'version-script.in'), -- os.path.join(wxDir(), 'wx-config.in'), -+ os.path.join(wxDir(), 'wx-config-gtk3.in'), - ] - for dep in dependencies: - if newer(dep, os.path.join(BUILD_DIR, "Makefile")): -@@ -1424,13 +1424,13 @@ def cmd_build_py(options, args): - os.environ['WXPYTHON_RELEASE'] = 'yes' - - if not isWindows: -- WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config') -+ WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config-gtk3') - if options.use_syswx: -- wxcfg = posixjoin(options.prefix, 'bin', 'wx-config') -+ wxcfg = posixjoin(options.prefix, 'bin', 'wx-config-gtk3') - if options.prefix and os.path.exists(wxcfg): - WX_CONFIG = wxcfg - else: -- WX_CONFIG = 'wx-config' # hope it is on the PATH -+ WX_CONFIG = 'wx-config-gtk3' # hope it is on the PATH - - - wafBuildBase = wafBuildDir = getWafBuildBase() --- -2.19.0 - diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template index 6fe82717aca2..249a0e9dd66d 100644 --- a/srcpkgs/wxPython4/template +++ b/srcpkgs/wxPython4/template @@ -1,12 +1,12 @@ # Template file for 'wxPython4' pkgname=wxPython4 -version=4.0.7 -revision=5 +version=4.2.0 +revision=1 wrksrc="wxPython-${version}" build_style=python3-module make_build_args="--skip-build" make_install_args="--skip-build" -hostmakedepends="pkg-config python3-setuptools python3-pathlib2" +hostmakedepends="pkg-config python3-setuptools python3-pathlib2 python3-attrdict" makedepends="python3-devel wxWidgets-gtk3-devel SDL2-devel webkit2gtk-devel gst-plugins-base1-devel" depends="python3 python3-six python3-numpy python3-Pillow" @@ -15,15 +15,19 @@ maintainer="Jasper Chan " license="custom:wxWindows" homepage="http://www.wxpython.org/" distfiles="${PYPI_SITE}/w/wxPython/wxPython-${version}.tar.gz" -checksum=3be608bfdede3063678cc703453850ab0a018b82bafd5ee057302250b18f0233 +checksum=663cebc4509d7e5d113518865fe274f77f95434c5d57bc386ed58d65ceed86c7 +export WXPYTHON_RELEASE=yes if [ "$CROSS_BUILD" ]; then CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include" + export WX_CONFIG=${XBPS_WRAPPERDIR}/wx-config-gtk3 +else + export WX_CONFIG=/usr/bin/wx-config-gtk3 fi -post_extract() { - # need to patch for Python 3.11, extract them now. +xpost_extract() { cd bin + # We needs to patch waf for Python 3.11, extract them now sed '/__name__.*__main__/i sys.exit(0)' waf-* >tmp-waf python3 tmp-waf ln -s .waf3-* .waf3 From 02477e66e0f877def6ec3c9b7354998a8e5e413e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 27 Sep 2022 22:53:09 +0700 Subject: [PATCH 38/38] 0ad: rebuild for wxWidget 3.2.1 --- srcpkgs/0ad/template | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template index c768d057320c..b292ff37cef9 100644 --- a/srcpkgs/0ad/template +++ b/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 " 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() {