<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ec8673123d410963d9a488699580e9f2b8385e90">https://github.com/macports/macports-ports/commit/ec8673123d410963d9a488699580e9f2b8385e90</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ec8673123d4 PineFlash: fix app icon
</span>ec8673123d4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ec8673123d410963d9a488699580e9f2b8385e90
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Sun Apr 14 18:50:55 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> PineFlash: fix app icon
</span>---
sysutils/PineFlash/Portfile | 4 ++--
sysutils/PineFlash/files/patch-icon.diff | 27 +++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/PineFlash/Portfile b/sysutils/PineFlash/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0da1697a2d7..23fd68bdfb1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/PineFlash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/PineFlash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup cargo 1.0
</span> PortGroup app 1.1
github.setup Spagett1 PineFlash 0.5.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories sysutils aqua
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,9 @@ depends_lib-append port:curl \
</span> depends_run-append port:dfu-util \
port:blisp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-icon.diff
</span> post-patch {
reinplace "s|pine64logo.ico|pine64logo.png|" ${worksrcpath}/src/main.rs
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\(32\)|\(128\)|g" ${worksrcpath}/src/main.rs
</span> reinplace "s|MacOs|macOS|" ${worksrcpath}/src/main.rs
reinplace "s|/usr/local/sbin:|${prefix}/bin$${prefix}/sbin:/usr/local/sbin:|" ${worksrcpath}/src/submodules/main_panel.rs
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/PineFlash/files/patch-icon.diff b/sysutils/PineFlash/files/patch-icon.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6f3f8012a01
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/PineFlash/files/patch-icon.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/main.rs.old 2024-04-14 17:28:52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/main.rs 2024-04-14 18:44:56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -503,20 +503,10 @@
</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;'>+ fn main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- let options = eframe::NativeOptions::default();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // let options = eframe::NativeOptions {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // decorated: true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // follow_system_theme: true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // icon_data: Some(eframe::IconData {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // rgba: (ICON.to_vec()),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // width: (32),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // height: (32),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // }),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // resizable: true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // initial_window_size: Some(emath::Vec2 { x: 780., y: 680. }),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // min_window_size: Some(emath::Vec2 { x: 780., y: 280. }),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // ..Default::default()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ let options = eframe::NativeOptions {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ viewport: egui::ViewportBuilder::default().with_icon(egui::IconData::default()),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ..Default::default()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ match eframe::run_native(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "PineFlash",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ options,
</span></pre><pre style='margin:0'>
</pre>