From e0c0678ae2fbdac6f222516a46ad92119d29c372 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 19:30:34 +0100 Subject: [PATCH] rebuilt with wxwidgets 3.2.2.1 [release 3.10.1-2mamba;Sat Sep 30 2023] --- wxformbuilder-3.10.1-md5hh-cinttypes.patch | 11 +++++++ wxformbuilder-3.10.1-wxwidgets-3.2.patch | 34 ++++++++++++++++++++++ wxformbuilder.spec | 14 +++++++-- 3 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 wxformbuilder-3.10.1-md5hh-cinttypes.patch create mode 100644 wxformbuilder-3.10.1-wxwidgets-3.2.patch diff --git a/wxformbuilder-3.10.1-md5hh-cinttypes.patch b/wxformbuilder-3.10.1-md5hh-cinttypes.patch new file mode 100644 index 0000000..6a58c52 --- /dev/null +++ b/wxformbuilder-3.10.1-md5hh-cinttypes.patch @@ -0,0 +1,11 @@ +diff --unified --recursive --text package.orig/src/md5/md5.hh package.new/src/md5/md5.hh +--- package.orig/src/md5/md5.hh 2021-10-22 18:19:37.000000000 +0200 ++++ package.new/src/md5/md5.hh 2023-09-14 10:58:38.273030750 +0200 +@@ -40,6 +40,7 @@ + */ + #pragma once + ++#include + #include + #include + diff --git a/wxformbuilder-3.10.1-wxwidgets-3.2.patch b/wxformbuilder-3.10.1-wxwidgets-3.2.patch new file mode 100644 index 0000000..aa5f873 --- /dev/null +++ b/wxformbuilder-3.10.1-wxwidgets-3.2.patch @@ -0,0 +1,34 @@ +diff --unified --recursive --text a/src/rad/auitabart.h b/src/rad/auitabart.h +--- a/src/rad/auitabart.h 2021-10-22 18:19:37.000000000 +0200 ++++ b/src/rad/auitabart.h 2022-08-13 11:32:26.550275012 +0200 +@@ -3,14 +3,22 @@ + + #include + +-class AuiTabArt : public wxAuiGenericTabArt { ++class AuiTabArt : public wxAuiGenericTabArt ++{ + public: +- wxSize GetTabSize(wxDC& dc, wxWindow* wnd, const wxString& caption, const wxBitmap& bitmap, +- bool active, int close_button_state, int* x_extent) override { +- return wxAuiGenericTabArt::GetTabSize(dc, wnd, caption, bitmap, active, close_button_state, +- x_extent) + +- wxSize(0, 2); +- } +-}; ++#if wxCHECK_VERSION(3, 1, 6) ++ wxSize GetTabSize( ++ wxDC& dc, wxWindow* wnd, const wxString& caption, const wxBitmapBundle& bitmap, bool active, ++ int close_button_state, int* x_extent) override{ ++#else ++ wxSize GetTabSize( ++ wxDC& dc, wxWindow* wnd, const wxString& caption, const wxBitmap& bitmap, bool active, int close_button_state, ++ int* x_extent) override ++ { ++#endif ++ return wxAuiGenericTabArt::GetTabSize(dc, wnd, caption, bitmap, active, close_button_state, x_extent) + ++ wxSize(0, 2); ++} ++}; + + #endif // __AUITABART_H__ diff --git a/wxformbuilder.spec b/wxformbuilder.spec index e788344..dc32635 100644 --- a/wxformbuilder.spec +++ b/wxformbuilder.spec @@ -1,6 +1,6 @@ Name: wxformbuilder Version: 3.10.1 -Release: 1mamba +Release: 2mamba Summary: A RAD tool for wxWidgets GUI design Group: Graphical Desktop/Applications/Development Vendor: openmamba @@ -8,14 +8,17 @@ Distribution: openmamba Packager: Silvan Calarco URL: https://github.com/wxFormBuilder/wxFormBuilder Source: https://github.com/wxFormBuilder/wxFormBuilder.git/v%{version}/wxFormBuilder-%{version}.tar.bz2 +Patch0: wxformbuilder-3.10.1-md5hh-cinttypes.patch +Patch1: wxformbuilder-3.10.1-wxwidgets-3.2.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel BuildRequires: libgcc BuildRequires: libstdc++6-devel -BuildRequires: libwx_baseu-devel -BuildRequires: libwx_gtk3u-devel +BuildRequires: wxwidgets-devel +BuildRequires: wxwidgets-gtk3-devel ## AUTOBUILDREQ-END +BuildRequires: wxwidgets-devel >= 3.2.2.1 %description wxFormBuilder is a RAD tool for wxWidgets GUI design. @@ -33,6 +36,8 @@ Features: %prep %setup -q -n wxFormBuilder-%{version} #sh ./create_build_files5.sh +%patch 0 -p1 -b .md5hh-cinttypes +%patch 1 -p1 -b .wxwidgets-3.2 %build %cmake -d build \ @@ -87,6 +92,9 @@ __OLD %doc LICENSE %changelog +* Sat Sep 30 2023 Silvan Calarco 3.10.1-2mamba +- rebuilt with wxwidgets 3.2.2.1 + * Sun Jan 09 2022 Silvan Calarco 3.10.1-1mamba - update to 3.10.1