git: 8547c10e2dea - main - editors/markmywords: the port had been improved (+)

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8547c10e2deaf30678523f599bc233d410a60d57

commit 8547c10e2deaf30678523f599bc233d410a60d57
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2026-10-16 12:39:58 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2026-10-16 12:39:58 +0000

    editors/markmywords: the port had been improved (+)
    
    - Update the build scripts for upcoming CMake 4.x
    - Fix discrepancies between *.ui XML and Vala code
      which also gets rid of GTK start-up assertions
    - Adjust "About" window proportions for nicer look
---
 editors/markmywords/Makefile                       | 10 +++--
 editors/markmywords/files/patch-CMakeLists.txt     |  9 +++--
 .../files/patch-src_Widgets_Window.vala            | 46 ++++++++++++++++++++++
 3 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/editors/markmywords/Makefile b/editors/markmywords/Makefile
index 86712d76572a..40b2c7794923 100644
--- a/editors/markmywords/Makefile
+++ b/editors/markmywords/Makefile
@@ -24,9 +24,11 @@ GH_PROJECT=	MarkMyWords
 GH_TAGNAME=	970b459
 
 post-patch:
-# Set a displayable icon to something close to "document export"
-	@${REINPLACE_CMD} -e 's,document-export,document-revert,' \
-		${WRKSRC}/resources/headerbar.ui \
-		${WRKSRC}/resources/toolbar.ui
+	@${REINPLACE_CMD} -e '/add_custom_command/ \
+	    s,TARGET pot,& POST_BUILD,' \
+		${WRKSRC}/cmake/Translations.cmake
+# 3:2 (450x300) "About" window looks much better
+	@${REINPLACE_CMD} -e '/set_default_size/s,500,300,' \
+		${WRKSRC}/src/Widgets/AboutDialog.vala
 
 .include <bsd.port.mk>
diff --git a/editors/markmywords/files/patch-CMakeLists.txt b/editors/markmywords/files/patch-CMakeLists.txt
index f830cf4c46f6..093a9eb86ad4 100644
--- a/editors/markmywords/files/patch-CMakeLists.txt
+++ b/editors/markmywords/files/patch-CMakeLists.txt
@@ -1,9 +1,12 @@
 --- CMakeLists.txt.orig	2020-07-22 18:10:30 UTC
 +++ CMakeLists.txt
-@@ -2,26 +2,6 @@ project(MarkMyWords)
- 
- cmake_minimum_required(VERSION 2.6)
+@@ -1,27 +1,7 @@
++cmake_minimum_required(VERSION 2.6...9.9)
++
+ project(MarkMyWords)
  
+-cmake_minimum_required(VERSION 2.6)
+-
 -# build the markdown lib
 -include(ExternalProject)
 -set(DISCOUNT_DEP_PATH ${CMAKE_SOURCE_DIR}/deps/discount)
diff --git a/editors/markmywords/files/patch-src_Widgets_Window.vala b/editors/markmywords/files/patch-src_Widgets_Window.vala
new file mode 100644
index 000000000000..f474b9b7bea3
--- /dev/null
+++ b/editors/markmywords/files/patch-src_Widgets_Window.vala
@@ -0,0 +1,46 @@
+--- src/Widgets/Window.vala.orig	2020-07-22 18:10:30 UTC
++++ src/Widgets/Window.vala
+@@ -227,6 +227,8 @@ public class Window : Gtk.ApplicationWindow {
+         box.expand = true;
+ 
+         Gtk.Builder builder;
++        Gtk.MenuToolButton? pref_menu = null, export_menu = null;
++
+         if (prefs.use_headerbar) {
+             builder = new Gtk.Builder.from_resource ("/com/voldyman/markmywords/ui/headerbar.ui");
+             headerbar = (Gtk.HeaderBar) builder.get_object ("headerbar");
+@@ -240,27 +242,27 @@ public class Window : Gtk.ApplicationWindow {
+ 
+             layout.pack_start (box, false);
+             add (layout);
++
++            pref_menu = (Gtk.MenuToolButton) builder.get_object ("prefMenu");
++            export_menu = (Gtk.MenuToolButton) builder.get_object ("exportMenu");
+         }
+ 
+         Gtk.IconTheme icon_theme = Gtk.IconTheme.get_default ();
+-        var pref_menu = (Gtk.MenuToolButton) builder.get_object ("prefMenu");
+-        var export_menu = (Gtk.MenuToolButton) builder.get_object ("exportMenu");
++        Gtk.Image menu_icon = (Gtk.Image) builder.get_object ("menuIcon");
++        Gtk.Image export_icon = (Gtk.Image) builder.get_object ("exportIcon");
+ 
+-        Gtk.Image menu_icon = (Gtk.Image) builder.get_object ("menu-icon");
+-        Gtk.Image export_icon = (Gtk.Image) builder.get_object ("export-icon");
+-
+         if (!icon_theme.has_icon ("open-menu")) {
+             var alternate_icon = "preferences-system";
+             if (!icon_theme.has_icon (alternate_icon)) {
+                 alternate_icon = "gtk-preferences";
+             }
+             menu_icon.set_from_icon_name (alternate_icon, Gtk.IconSize.LARGE_TOOLBAR);
+-            pref_menu.icon_name = alternate_icon;
++            if (pref_menu != null) pref_menu.icon_name = alternate_icon;
+         }
+ 
+         if (!icon_theme.has_icon ("document-export")) {
+             export_icon.set_from_icon_name ("document-revert-rtl", Gtk.IconSize.LARGE_TOOLBAR);
+-            export_menu.icon_name = "document-revert-rtl";
++            if (export_menu != null) export_menu.icon_name = "document-revert-rtl";
+         }
+ 
+         int width;