From fc73c35f4d899f4997f7cff379702c55cabbd5d9 Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Thu, 9 Feb 2023 21:10:06 +0000
Subject: [PATCH] Use a Makefile for Windows build (run from MSYS2-mingw64
 shell)

---
 zenmap/install_scripts/windows/Makefile    | 11 +++++++++
 zenmap/install_scripts/windows/styrene.cfg | 27 +++++-----------------
 2 files changed, 17 insertions(+), 21 deletions(-)
 create mode 100755 zenmap/install_scripts/windows/Makefile

diff --git a/zenmap/install_scripts/windows/Makefile b/zenmap/install_scripts/windows/Makefile
new file mode 100755
index 000000000..1707e074b
--- /dev/null
+++ b/zenmap/install_scripts/windows/Makefile
@@ -0,0 +1,11 @@
+all: dist/zenmap-w64-deletelog.txt mingw-w64-x86_64-python-zenmap-%.pkg.tar.zst
+	./build.sh
+
+mingw-w64-x86_64-python-zenmap-%.pkg.tar.zst: PKGBUILD
+	makepkg-mingw -RdfL
+
+dist/zenmap-w64-deletelog.txt: styrene.cfg
+	styrene -p . -o $@ styrene.cfg --no-exe --no-zip
+
+clean:
+	rm -rf pkg/ src/ dist/ mingw-w64-*-package.log* mingw-w64-*.zst
diff --git a/zenmap/install_scripts/windows/styrene.cfg b/zenmap/install_scripts/windows/styrene.cfg
index ba63cb940..75c74de6c 100755
--- a/zenmap/install_scripts/windows/styrene.cfg
+++ b/zenmap/install_scripts/windows/styrene.cfg
@@ -37,7 +37,6 @@ description = Nmap GUI
 # or an equivalent section below.
 launchers =
 	zenmap.desktop
-	ndiff-launcher
 
 # Additional icons to explicitly convert.
 # These will be converted from the bundle's FreeDesktop.org PNG icons.
@@ -58,20 +57,12 @@ delete = *
 
 nodelete =
     # The postinst scripts that GTK needs, followed by their binaries.
-    var/lib/pacman/local/mingw-w64-*-glib2-*-*/install
-    mingw*/bin/glib-compile-schemas*.exe
     mingw*/share/glib*/schemas
 
-    var/lib/pacman/local/mingw-w64-*-gdk-pixbuf2-*-*/install
-    mingw*/bin/gdk-pixbuf-query-loaders*.exe
-
-    var/lib/pacman/local/mingw-w64-*-gtk3-*-*/install
-    mingw*/bin/gtk-query-immodules*.exe
     mingw*/bin/gtk-update-icon-cache*.exe
     usr/bin/mkdir.exe
     usr/bin/msys-2*.dll
-
-    var/lib/pacman/local/mingw-w64-*-adwaita-icon-theme-*-*/install
+    usr/share/libalpm
 
     var/lib/pacman/local/mingw-w64-*-hicolor-icon-theme-*-*/install
 
@@ -81,21 +72,17 @@ nodelete =
 
     mingw*/lib/gtk-3.0
     mingw*/lib/gdk-pixbuf-2.0
-    mingw*/share/applications
 
 
-    # This is the most minimal subset for GTK. Breaks many demos.
-    mingw*/share/icons/**/window-*.symbolic.png   ; window surrounds
-    mingw*/share/icons/**/pan-*.symbolic.png  ; foldouts & arrows
-    mingw*/share/icons/**/process-working*  ; spinner (SVG)
-    mingw*/share/icons/**/index.theme
-    # Or to be certain, include all symbolic PNGS
-    mingw*/share/icons/**/*.symbolic.png
+    mingw*/share/icons/hicolor/index.theme
 
     # python-gobject stuff
     mingw*/lib/girepository-*
     mingw*/lib/python3.*
+    # To avoid terminal window, use pythonw.exe
     mingw*/bin/pythonw.exe
+    # For debugging use python.exe
+    #mingw*/bin/python.exe
     mingw*/bin/libpython*.dll
     # Zenmap's files (mostly in site-packages above)
     mingw*/share/zenmap
@@ -112,6 +99,4 @@ exec = pythonw.exe -c 'from zenmapGUI.App import run; run()'
 icon = {msystem_subdir}/share/zenmap/pixmaps/zenmap.png
 ; For debugging:
 ;Terminal = true
-;exec = pythonw.exe -c 'from zenmapGUI.App import run; run()' -vvvvv
-[ndiff-launcher]
-exec = python.exe ../ndiff.py %F
+;exec = python.exe -c 'from zenmapGUI.App import run; run()' -vvvvv