wxgtk: remove x11, fix strftime crash

This commit is contained in:
Gerasim Troeglazov
2022-11-29 14:43:12 +10:00
parent b76be715bc
commit 4bd0d13266
2 changed files with 30 additions and 3 deletions

View File

@@ -0,0 +1,28 @@
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

View File

@@ -9,10 +9,11 @@ open-source and mature."
HOMEPAGE="https://www.wxwidgets.org/"
COPYRIGHT="1998-2022 Julian Smart, Robert Roebling et al"
LICENSE="GNU LGPL v2"
REVISION="4"
REVISION="5"
SOURCE_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v$portVersion/wxWidgets-$portVersion.tar.bz2"
CHECKSUM_SHA256="c229976bb413eb88e45cb5dfb68b27890d450149c09b331abd751e7ae0f5fa66"
SOURCE_DIR="wxWidgets-$portVersion"
PATCHES="wxgtk-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
@@ -59,7 +60,6 @@ REQUIRES="
lib:libSDL$secondaryArchSuffix
lib:libSM$secondaryArchSuffix
lib:libtiff$secondaryArchSuffix
lib:libX11$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
@@ -121,7 +121,6 @@ BUILD_REQUIRES="
devel:libSDL$secondaryArchSuffix
devel:libSM$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
devel:libX11$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="