rebuilt with wxwidgets 3.2.2.1 [release 3.10.1-2mamba;Sat Sep 30 2023]

This commit is contained in:
Silvan Calarco 2024-01-05 19:30:34 +01:00
parent abe27e55c2
commit e0c0678ae2
3 changed files with 56 additions and 3 deletions

View File

@ -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 <cinttypes>
#include <cstdio>
#include <istream>

View File

@ -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 <wx/aui/auibook.h>
-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__

View File

@ -1,6 +1,6 @@
Name: wxformbuilder Name: wxformbuilder
Version: 3.10.1 Version: 3.10.1
Release: 1mamba Release: 2mamba
Summary: A RAD tool for wxWidgets GUI design Summary: A RAD tool for wxWidgets GUI design
Group: Graphical Desktop/Applications/Development Group: Graphical Desktop/Applications/Development
Vendor: openmamba Vendor: openmamba
@ -8,14 +8,17 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://github.com/wxFormBuilder/wxFormBuilder URL: https://github.com/wxFormBuilder/wxFormBuilder
Source: https://github.com/wxFormBuilder/wxFormBuilder.git/v%{version}/wxFormBuilder-%{version}.tar.bz2 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 License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: libgcc BuildRequires: libgcc
BuildRequires: libstdc++6-devel BuildRequires: libstdc++6-devel
BuildRequires: libwx_baseu-devel BuildRequires: wxwidgets-devel
BuildRequires: libwx_gtk3u-devel BuildRequires: wxwidgets-gtk3-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: wxwidgets-devel >= 3.2.2.1
%description %description
wxFormBuilder is a RAD tool for wxWidgets GUI design. wxFormBuilder is a RAD tool for wxWidgets GUI design.
@ -33,6 +36,8 @@ Features:
%prep %prep
%setup -q -n wxFormBuilder-%{version} %setup -q -n wxFormBuilder-%{version}
#sh ./create_build_files5.sh #sh ./create_build_files5.sh
%patch 0 -p1 -b .md5hh-cinttypes
%patch 1 -p1 -b .wxwidgets-3.2
%build %build
%cmake -d build \ %cmake -d build \
@ -87,6 +92,9 @@ __OLD
%doc LICENSE %doc LICENSE
%changelog %changelog
* Sat Sep 30 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 3.10.1-2mamba
- rebuilt with wxwidgets 3.2.2.1
* Sun Jan 09 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 3.10.1-1mamba * Sun Jan 09 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 3.10.1-1mamba
- update to 3.10.1 - update to 3.10.1