diff --git a/x11-libs/wxgtk/patches/wxgtk-3.2.2.1.patchset b/x11-libs/wxgtk/patches/wxgtk-3.2.2.1.patchset deleted file mode 100644 index 14d04054c..000000000 --- a/x11-libs/wxgtk/patches/wxgtk-3.2.2.1.patchset +++ /dev/null @@ -1,28 +0,0 @@ -From 3000d826ad4938bf9132bf2312cee1c7d03836b9 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Tue, 29 Nov 2022 14:31:25 +1000 -Subject: replace date formats, fix crash - - -diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp -index 64168b5..9f873b0 100644 ---- a/src/common/datetime.cpp -+++ b/src/common/datetime.cpp -@@ -281,7 +281,14 @@ wxString wxCallStrftime(const wxString& format, const tm* tm) - // http://sourceforge.net/tracker/?func=detail&atid=102435&aid=1046059&group_id=2435 - wxString s; - -+#ifdef __HAIKU__ -+ wxString _format = format; -+ _format.Replace(wxT("%x"),wxT("%D")); -+ _format.Replace(wxT("%X"),wxT("%T")); -+ if ( !wxStrftime(buf, WXSIZEOF(buf), _format, tm) ) -+#else - if ( !wxStrftime(buf, WXSIZEOF(buf), format, tm) ) -+#endif - { - // There is one special case in which strftime() can return 0 without - // indicating an error: "%p" may give empty string depending on the --- -2.37.3 - diff --git a/x11-libs/wxgtk/patches/wxgtk-3.2.6.patchset b/x11-libs/wxgtk/patches/wxgtk-3.2.6.patchset new file mode 100644 index 000000000..ef07962cc --- /dev/null +++ b/x11-libs/wxgtk/patches/wxgtk-3.2.6.patchset @@ -0,0 +1,61 @@ +From c361c4fc6c358c5681e2cd760ec9d7d0c36d6a44 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Tue, 29 Nov 2022 14:31:25 +1000 +Subject: replace date formats, fix crash + + +diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp +index 934eccd..00bd0c6 100644 +--- a/src/common/datetime.cpp ++++ b/src/common/datetime.cpp +@@ -283,7 +283,14 @@ wxString wxCallStrftime(const wxString& format, const tm* tm) + // http://sourceforge.net/tracker/?func=detail&atid=102435&aid=1046059&group_id=2435 + wxString s; + ++#ifdef __HAIKU__ ++ wxString _format = format; ++ _format.Replace(wxT("%x"),wxT("%D")); ++ _format.Replace(wxT("%X"),wxT("%T")); ++ if ( !wxStrftime(buf, WXSIZEOF(buf), _format, tm) ) ++#else + if ( !wxStrftime(buf, WXSIZEOF(buf), format, tm) ) ++#endif + { + // There is one special case in which strftime() can return 0 without + // indicating an error: "%p" may give empty string depending on the +-- +2.48.1 + + +From 7682bc093ad70e8d46faaf1f91d246abe2113df0 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Mon, 3 Mar 2025 19:08:15 +1000 +Subject: Don't link with X11 + + +diff --git a/configure b/configure +index cb08494..e4575fd 100755 +--- a/configure ++++ b/configure +@@ -4114,7 +4114,8 @@ case "${host}" in + USE_HAIKU=1 + $as_echo "#define __HAIKU__ 1" >>confdefs.h + +- DEFAULT_DEFAULT_wxUSE_QT=1 ++ DEFAULT_DEFAULT_wxUSE_GTK=1 ++ DEFAULT_DEFAULT_wxUSE_X11=0 + ;; + + *) +@@ -29143,7 +29144,7 @@ rm -f core conftest.err conftest.$ac_objext \ + if test -z "$wx_cv_lib_gtk"; then + wx_cv_lib_gtk=none + else +- if test "$USE_WIN32" != 1 ; then ++ if (test "$USE_WIN32" != 1) && (test "$USE_HAIKU" != 1) ; then + GTK_LIBS="$GTK_LIBS -lX11" + fi + +-- +2.48.1 + diff --git a/x11-libs/wxgtk/wxgtk-3.2.2.1.recipe b/x11-libs/wxgtk/wxgtk-3.2.6.recipe similarity index 69% rename from x11-libs/wxgtk/wxgtk-3.2.2.1.recipe rename to x11-libs/wxgtk/wxgtk-3.2.6.recipe index 6828865ca..3dc6f342e 100644 --- a/x11-libs/wxgtk/wxgtk-3.2.2.1.recipe +++ b/x11-libs/wxgtk/wxgtk-3.2.6.recipe @@ -7,18 +7,18 @@ applications a truly native look and feel because it uses the platform's \ native API rather than emulating the GUI. It's also extensive, free, \ open-source and mature." HOMEPAGE="https://www.wxwidgets.org/" -COPYRIGHT="1998-2023 Julian Smart, Robert Roebling et al" +COPYRIGHT="1998-2024 Julian Smart, Robert Roebling et al" LICENSE="GNU LGPL v2" -REVISION="3" +REVISION="1" SOURCE_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v$portVersion/wxWidgets-$portVersion.tar.bz2" -CHECKSUM_SHA256="dffcb6be71296fff4b7f8840eb1b510178f57aa2eb236b20da41182009242c02" +CHECKSUM_SHA256="939e5b77ddc5b6092d1d7d29491fe67010a2433cf9b9c0d841ee4d04acb9dce7" SOURCE_DIR="wxWidgets-$portVersion" PATCHES="wxgtk-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="0.2.1" +libVersion="0.3.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -29,25 +29,41 @@ PROVIDES=" lib:libwx_gtk3u_adv_3.2$secondaryArchSuffix = $libVersionCompat lib:libwx_gtk3u_aui_3.2$secondaryArchSuffix = $libVersionCompat lib:libwx_gtk3u_core_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_gtk3u_gl_3.2$secondaryArchSuffix = $libVersionCompat lib:libwx_gtk3u_html_3.2$secondaryArchSuffix = $libVersionCompat lib:libwx_gtk3u_propgrid_3.2$secondaryArchSuffix = $libVersionCompat lib:libwx_gtk3u_qa_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_gtk3u_media_3.2$secondaryArchSuffix = $libVersionCompat lib:libwx_gtk3u_ribbon_3.2$secondaryArchSuffix = $libVersionCompat lib:libwx_gtk3u_richtext_3.2$secondaryArchSuffix = $libVersionCompat lib:libwx_gtk3u_stc_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_gtk3u_webview_3.2$secondaryArchSuffix = $libVersionCompat lib:libwx_gtk3u_xrc_3.2$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix lib:libatk_1.0$secondaryArchSuffix lib:libcairo$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libEGL$secondaryArchSuffix lib:libexecinfo$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libfontconfig$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libGLU$secondaryArchSuffix lib:libgdk_3$secondaryArchSuffix lib:libgdk_pixbuf_2.0$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix + lib:libgstapp_1.0$secondaryArchSuffix + lib:libgstaudio_1.0$secondaryArchSuffix + lib:libgstbase_1.0$secondaryArchSuffix + lib:libgstpbutils_1.0$secondaryArchSuffix + lib:libgstreamer_1.0$secondaryArchSuffix + lib:libgsttag_1.0$secondaryArchSuffix + lib:libgstvideo_1.0$secondaryArchSuffix + lib:libgstfft_1.0$secondaryArchSuffix + lib:libgstwebrtc_1.0$secondaryArchSuffix lib:libgtk_3$secondaryArchSuffix lib:libharfbuzz$secondaryArchSuffix lib:libiconv$secondaryArchSuffix @@ -58,9 +74,14 @@ REQUIRES=" lib:libpcre2_32$secondaryArchSuffix lib:libpng16$secondaryArchSuffix lib:libSDL_1.2$secondaryArchSuffix + lib:libsecret_1$secondaryArchSuffix + lib:libsoup_3.0$secondaryArchSuffix lib:libSM$secondaryArchSuffix lib:libtiff$secondaryArchSuffix - lib:libX11$secondaryArchSuffix + lib:libwayland_client$secondaryArchSuffix + lib:libwayland_egl$secondaryArchSuffix + lib:libwebkit2gtk_4.1$secondaryArchSuffix + lib:libxkbcommon$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -75,12 +96,15 @@ PROVIDES_devel=" devel:libwx_gtk3u_adv_3.2$secondaryArchSuffix = $libVersionCompat devel:libwx_gtk3u_aui_3.2$secondaryArchSuffix = $libVersionCompat devel:libwx_gtk3u_core_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_gtk3u_gl_3.2$secondaryArchSuffix = $libVersionCompat devel:libwx_gtk3u_html_3.2$secondaryArchSuffix = $libVersionCompat devel:libwx_gtk3u_propgrid_3.2$secondaryArchSuffix = $libVersionCompat devel:libwx_gtk3u_qa_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_gtk3u_media_3.2$secondaryArchSuffix = $libVersionCompat devel:libwx_gtk3u_ribbon_3.2$secondaryArchSuffix = $libVersionCompat devel:libwx_gtk3u_richtext_3.2$secondaryArchSuffix = $libVersionCompat devel:libwx_gtk3u_stc_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_gtk3u_webview_3.2$secondaryArchSuffix = $libVersionCompat devel:libwx_gtk3u_xrc_3.2$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" @@ -92,37 +116,67 @@ REQUIRES_devel=" devel:libjpeg$secondaryArchSuffix devel:libpng16$secondaryArchSuffix devel:libtiff$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libgio_2.0$secondaryArchSuffix + lib:libglib_2.0$secondaryArchSuffix + lib:libgobject_2.0$secondaryArchSuffix lib:libexecinfo$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libiconv$secondaryArchSuffix + lib:libintl$secondaryArchSuffix lib:libpcre2_32$secondaryArchSuffix + lib:libsecret_1$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:liblzma$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + lib:libglib_networking_2.0$secondaryArchSuffix + devel:libappstream_glib$secondaryArchSuffix devel:libatk_1.0$secondaryArchSuffix + devel:libbrotlidec$secondaryArchSuffix devel:libcairo$secondaryArchSuffix + devel:libcurl$secondaryArchSuffix devel:libexecinfo$secondaryArchSuffix devel:libexpat$secondaryArchSuffix + devel:libGL$secondaryArchSuffix + devel:libGLU$secondaryArchSuffix devel:libfontconfig$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libgdk_3$secondaryArchSuffix devel:libgdk_pixbuf_2.0$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix + devel:libgstapp_1.0$secondaryArchSuffix + devel:libgstaudio_1.0$secondaryArchSuffix + devel:libgstbadaudio_1.0$secondaryArchSuffix + devel:libgstbase_1.0$secondaryArchSuffix + devel:libgstpbutils_1.0$secondaryArchSuffix + devel:libgstreamer_1.0$secondaryArchSuffix + devel:libgstvideo_1.0$secondaryArchSuffix + devel:libgstwebrtc_1.0$secondaryArchSuffix devel:libgtk_3$secondaryArchSuffix devel:libharfbuzz$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:liblzma$secondaryArchSuffix + devel:libnettle$secondaryArchSuffix + devel:libnghttp2$secondaryArchSuffix devel:libpango_1.0$secondaryArchSuffix + devel:libpsl$secondaryArchSuffix + devel:libsecret_1$secondaryArchSuffix devel:libpng16$secondaryArchSuffix devel:libSDL_1.2$secondaryArchSuffix devel:libSM$secondaryArchSuffix + devel:libsoup_3.0$secondaryArchSuffix + devel:libsqlite3$secondaryArchSuffix devel:libtiff$secondaryArchSuffix >= 6 - devel:libX11$secondaryArchSuffix + devel:libwayland_client$secondaryArchSuffix + devel:libwayland_egl$secondaryArchSuffix + devel:libwayland_server$secondaryArchSuffix + devel:libwebkit2gtk_4.1$secondaryArchSuffix + devel:libxkbcommon$secondaryArchSuffix devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -132,6 +186,7 @@ BUILD_PREREQUIRES=" cmd:grep cmd:ld$secondaryArchSuffix cmd:make + cmd:orcc$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix " @@ -142,25 +197,40 @@ defineDebugInfoPackage wxgtk$secondaryArchSuffix \ "$libDir"/libwx_gtk3u_adv-3.2.so.$libVersion \ "$libDir"/libwx_gtk3u_aui-3.2.so.$libVersion \ "$libDir"/libwx_gtk3u_core-3.2.so.$libVersion \ + "$libDir"/libwx_gtk3u_gl-3.2.so.$libVersion \ "$libDir"/libwx_gtk3u_html-3.2.so.$libVersion \ "$libDir"/libwx_gtk3u_propgrid-3.2.so.$libVersion \ "$libDir"/libwx_gtk3u_qa-3.2.so.$libVersion \ + "$libDir"/libwx_gtk3u_media-3.2.so.$libVersion \ "$libDir"/libwx_gtk3u_ribbon-3.2.so.$libVersion \ "$libDir"/libwx_gtk3u_richtext-3.2.so.$libVersion \ "$libDir"/libwx_gtk3u_stc-3.2.so.$libVersion \ + "$libDir"/libwx_gtk3u_webview-3.2.so.$libVersion \ "$libDir"/libwx_gtk3u_xrc-3.2.so.$libVersion BUILD() { + export CFLAGS=-D_BSD_SOURCE + export CXXFLAGS=-D_BSD_SOURCE + runConfigure ./configure \ --with-cxx=11 \ --with-gtk \ + --with-libcurl \ + --with-opengl \ + --with-sdl \ --enable-shared \ --enable-printfposparam \ --enable-unicode \ --enable-sound \ - --disable-fswatcher \ - --with-sdl + --enable-mediactrl \ + --enable-webview \ + --enable-webviewwebkit \ + --enable-webrequest \ + --enable-glcanvasegl \ + --disable-detect_sm \ + --disable-debug_flag \ + --disable-fswatcher make $jobArgs } @@ -176,12 +246,15 @@ INSTALL() libwx_gtk3u_adv-3.2 \ libwx_gtk3u_aui-3.2 \ libwx_gtk3u_core-3.2 \ + libwx_gtk3u_gl-3.2 \ libwx_gtk3u_html-3.2 \ libwx_gtk3u_propgrid-3.2 \ libwx_gtk3u_qa-3.2 \ + libwx_gtk3u_media-3.2 \ libwx_gtk3u_ribbon-3.2 \ libwx_gtk3u_richtext-3.2 \ libwx_gtk3u_stc-3.2 \ + libwx_gtk3u_webview-3.2 \ libwx_gtk3u_xrc-3.2 # Install a header file that's been missed by make install?.