Github messages for voidlinux
 help / color / mirror / Atom feed
From: ahesford <ahesford@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] New package: wxFormBuilder-3.10.1
Date: Fri, 06 Oct 2023 21:17:29 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46491@inbox.vuxu.org> (raw)

[-- 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

             reply	other threads:[~2023-10-06 19:17 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-06 19:17 ahesford [this message]
2023-10-10 15:28 ` [PR PATCH] [Closed]: " ahesford
2023-10-10 15:28 ` ahesford

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46491@inbox.vuxu.org \
    --to=ahesford@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).