emacs: update to 30.2 (#13622)

also handle BObjectList API change
This commit is contained in:
Christof Meerwald
2026-01-14 05:33:59 +01:00
committed by GitHub
parent 6e592086ad
commit 88bec13816
2 changed files with 43 additions and 2 deletions

View File

@@ -13,9 +13,9 @@ news reader, debugger interface, calendar, and more.
HOMEPAGE="https://gnu.org/s/emacs/"
COPYRIGHT="2001-2025 Free Software Foundation, Inc."
LICENSE="GNU GPL v3"
REVISION="2"
REVISION="1"
SOURCE_URI="http://ftpmirror.gnu.org/emacs/emacs-$portVersion.tar.gz"
CHECKSUM_SHA256="54404782ea5de37e8fcc4391fa9d4a41359a4ba9689b541f6bc97dd1ac283f6c"
CHECKSUM_SHA256="1d79a4ba4d6596f302a7146843fe59cf5caec798190bcc07c907e7ba244b076d"
ADDITIONAL_FILES="emacs.rdef.in"
PATCHES="emacs-$portVersion.patchset"

View File

@@ -144,3 +144,44 @@ index 782e9a3..64abb2e 100644
--
2.45.2
From a8e79f9bb89e7863bd968b630cf4af45664190ed Mon Sep 17 00:00:00 2001
From: Christof Meerwald <cmeerw@cmeerw.org>
Date: Tue, 13 Jan 2026 19:09:12 +0000
Subject: [PATCH] BObjectList API change
diff --git a/src/haiku_support.cc b/src/haiku_support.cc
index 64abb2e..3234d69 100644
--- a/src/haiku_support.cc
+++ b/src/haiku_support.cc
@@ -2903,8 +2903,13 @@ class EmacsFontSelectionDialog : public BWindow
BScrollView font_family_scroller;
BScrollView font_style_scroller;
TripleLayoutView style_view;
+#if B_HAIKU_VERSION > B_HAIKU_VERSION_1_BETA_5
+ BObjectList<BStringItem, true> all_families;
+ BObjectList<BStringItem, true> all_styles;
+#else
BObjectList<BStringItem> all_families;
BObjectList<BStringItem> all_styles;
+#endif
BButton cancel_button, ok_button;
BTextControl size_entry;
port_id comm_port;
@@ -3167,8 +3172,13 @@ class EmacsFontSelectionDialog : public BWindow
B_SUPPORTS_LAYOUT, false, true),
style_view (&font_style_scroller, &antialias_checkbox,
&preview_checkbox),
+#if B_HAIKU_VERSION > B_HAIKU_VERSION_1_BETA_5
+ all_families (20),
+ all_styles (20),
+#else
all_families (20, true),
all_styles (20, true),
+#endif
cancel_button ("Cancel", "Cancel",
new BMessage (B_CANCEL)),
ok_button ("OK", "OK", new BMessage (B_OK)),
--
2.52.0