<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/05eb3c742f9aaa43c72314bffe8f32bcd0de6e7d">https://github.com/macports/macports-ports/commit/05eb3c742f9aaa43c72314bffe8f32bcd0de6e7d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 05eb3c742f9aaa43c72314bffe8f32bcd0de6e7d
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sun May 12 15:28:11 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> notekit: new port
</span>---
gnome/notekit/Portfile | 65 ++++++++++++++++++++++
gnome/notekit/files/clang-build.patch | 38 +++++++++++++
.../notekit/files/patch-gtk_update_icon_cache.diff | 16 ++++++
gnome/notekit/files/patch-use-correct-path.diff | 11 ++++
4 files changed, 130 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/notekit/Portfile b/gnome/notekit/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..aa0b159f0c5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/notekit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,65 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup blackhole89 notekit ff37a8b9115bd3a023ca8c6d80ad923af8d9df8f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2024.03.14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories gnome sysutils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license MIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description GTK3 hierarchical markdown note-taking application
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description} with tablet support.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4e56fc48e614e3cfd507466cac4a062da93949b4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b1068d5c9207153833f9b2dce5538e4424d789bb65a6a9ce9ba29b790495be97 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2911104
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:desktop-file-utils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fontconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtkmm3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtksourceviewmm3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/harfbuzz.pc:harfbuzz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jsoncpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:MicroTeX \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Used to provide wrappers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.redirect_bins ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/blackhole89/notekit/issues/158
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Clang needs this patch; GCC does not fail without it, but still complains:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# warning: capture of variable 'mainwindow' with non-automatic storage duration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# So use it for both.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append clang-build.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Find resources:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-use-correct-path.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Meson fails to find a version from GTK3.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# But we do not need it, since we do it manually below.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-gtk_update_icon_cache.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|" ${worksrcpath}/mainwindow.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2020
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dclatexmath=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Port installs hicolor icons, desktop application file and gschemas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/notekit/files/clang-build.patch b/gnome/notekit/files/clang-build.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f2038eb60c0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/notekit/files/clang-build.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From ea003311a6137abe7bd5737900b9d9babfd0a299 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: sp1rit <sp1rit@disroot.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 30 Jan 2023 19:52:53 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] tweaks to llvm clang build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: sp1rit <sp1rit@disroot.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meson.build | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 3 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/main.cpp b/main.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 98b67a7..43904bc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- main.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ main.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,8 +23,8 @@ int main (int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Glib::RefPtr<Gtk::Application> app = Gtk::Application::create(argc, argv, "com.github.blackhole89.notekit");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- app->signal_activate().connect( [app,&mainwindow]() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mainwindow=new CMainWindow(app);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ app->signal_activate().connect( [app]() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ auto mainwindow=new CMainWindow(app);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app->add_window(*mainwindow);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/meson.build b/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6720b25..c43cee1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ project('notekit', 'cpp',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version : '0.3.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- default_options : ['warning_level=3', 'cpp_std=c++14']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ default_options : ['warning_level=3', 'cpp_std=c++17']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ has_devenv = meson.version().version_compare('>=0.58.0')
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/notekit/files/patch-gtk_update_icon_cache.diff b/gnome/notekit/files/patch-gtk_update_icon_cache.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a38e3b4a4f1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/notekit/files/patch-gtk_update_icon_cache.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gnome/meson.build 2024-03-14 09:08:54
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnome/meson.build 2024-05-12 16:42:20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,13 +8,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if meson.version().version_compare('>=0.59.0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gnome.post_install(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glib_compile_schemas: true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gtk_update_icon_cache: true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ update_desktop_database: true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gnome.post_install(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glib_compile_schemas: true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gtk_update_icon_cache: true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/notekit/files/patch-use-correct-path.diff b/gnome/notekit/files/patch-use-correct-path.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9976adf885b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/notekit/files/patch-use-correct-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mainwindow.cpp 2024-03-14 09:08:54
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mainwindow.cpp 2024-05-12 06:19:17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -269,7 +269,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *data_dirs = getenv("XDG_DATA_DIRS");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(!data_dirs || !*data_dirs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- data_dirs=strdup("/usr/local/share:/usr/share");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ data_dirs=strdup("@PREFIX@/share");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data_dirs=strdup(data_dirs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>