Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: wxFormBuilder-3.10.1
@ 2023-10-06 19:17 ahesford
  2023-10-10 15:28 ` [PR PATCH] [Closed]: " ahesford
  2023-10-10 15:28 ` ahesford
  0 siblings, 2 replies; 3+ messages in thread
From: ahesford @ 2023-10-06 19:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 402 bytes --]

There is a new pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages wxFormBuilder
https://github.com/void-linux/void-packages/pull/46491

New package: wxFormBuilder-3.10.1
#### Testing the changes
- I tested the changes in this PR: **in progress**

A patch file from https://github.com/void-linux/void-packages/pull/46491.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wxFormBuilder-46491.patch --]
[-- Type: text/x-diff, Size: 2997 bytes --]

From 3423c2ffc7cdcf49279bfce0ff9a788b20ad6e07 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Oct 2023 15:16:40 -0400
Subject: [PATCH] New package: wxFormBuilder-3.10.1

---
 srcpkgs/wxFormBuilder/patches/wx-3.2.patch | 32 ++++++++++++++++++++++
 srcpkgs/wxFormBuilder/template             | 14 ++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 srcpkgs/wxFormBuilder/patches/wx-3.2.patch
 create mode 100644 srcpkgs/wxFormBuilder/template

diff --git a/srcpkgs/wxFormBuilder/patches/wx-3.2.patch b/srcpkgs/wxFormBuilder/patches/wx-3.2.patch
new file mode 100644
index 0000000000000..16f66bc03ff14
--- /dev/null
+++ b/srcpkgs/wxFormBuilder/patches/wx-3.2.patch
@@ -0,0 +1,32 @@
+From 8042f487aed39c287bb308e09fa3ea38bd9dfef4 Mon Sep 17 00:00:00 2001
+From: Steffen Olszewski <steffen.olszewski@gero-mess.de>
+Date: Sat, 12 Feb 2022 00:49:28 +0100
+Subject: [PATCH] Fix compilation of AuiTabArt for wxWidgets 3.1.6
+
+Use wxBitmapBundle for that version.
+---
+ src/rad/auitabart.h | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/rad/auitabart.h b/src/rad/auitabart.h
+index 130dbd882..d8a1c2279 100644
+--- a/src/rad/auitabart.h
++++ b/src/rad/auitabart.h
+@@ -5,11 +5,12 @@
+ 
+ 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);
+ 	}
+ };
+ 
diff --git a/srcpkgs/wxFormBuilder/template b/srcpkgs/wxFormBuilder/template
new file mode 100644
index 0000000000000..7cb9345eacb03
--- /dev/null
+++ b/srcpkgs/wxFormBuilder/template
@@ -0,0 +1,14 @@
+# Template file for 'wxFormBuilder'
+pkgname=wxFormBuilder
+version=3.10.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="wxWidgets-devel"
+short_desc="wxWidgets GUI builder"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/wxFormBuilder/wxFormBuilder"
+changelog="https://raw.githubusercontent.com/wxFormBuilder/wxFormBuilder/master/Changelog.txt"
+distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}-source-full.tar.gz"
+checksum=1b1bdef794eb16cdbfbddc3d7b840b4d2346c4f0bc558833270b743d64325169

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: New package: wxFormBuilder-3.10.1
  2023-10-06 19:17 [PR PATCH] New package: wxFormBuilder-3.10.1 ahesford
  2023-10-10 15:28 ` [PR PATCH] [Closed]: " ahesford
@ 2023-10-10 15:28 ` ahesford
  1 sibling, 0 replies; 3+ messages in thread
From: ahesford @ 2023-10-10 15:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 183 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/46491#issuecomment-1755691511

Comment:
6854fd39e2e9d6fe82b21e3d2d82e6eefd39a950

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Closed]: New package: wxFormBuilder-3.10.1
  2023-10-06 19:17 [PR PATCH] New package: wxFormBuilder-3.10.1 ahesford
@ 2023-10-10 15:28 ` ahesford
  2023-10-10 15:28 ` ahesford
  1 sibling, 0 replies; 3+ messages in thread
From: ahesford @ 2023-10-10 15:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 243 bytes --]

There's a closed pull request on the void-packages repository

New package: wxFormBuilder-3.10.1
https://github.com/void-linux/void-packages/pull/46491

Description:
#### Testing the changes
- I tested the changes in this PR: **in progress**

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-10-10 15:28 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-06 19:17 [PR PATCH] New package: wxFormBuilder-3.10.1 ahesford
2023-10-10 15:28 ` [PR PATCH] [Closed]: " ahesford
2023-10-10 15:28 ` ahesford

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).