From 1797660727ca15ec7a7a9f1fa4368cfa08910b14 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Mon, 20 Mar 2023 19:05:13 -0300
Subject: [PATCH] Using converted icon to avoid requirements of inkscape and convert on build action.

---
 .github/workflows/winpkg.yml |  3 +--
 Makefile.in                  | 32 +++++++-------------------------
 branding/Makefile.in         | 25 ++++++++++++++-----------
 branding/pw3270.ico          | Bin 0 -> 335286 bytes
 configure.ac                 |  1 -
 locale/pw3270.pot            |  2 +-
 pw3270.ico                   | Bin 335286 -> 0 bytes
 7 files changed, 23 insertions(+), 40 deletions(-)
 create mode 100644 branding/pw3270.ico
 delete mode 100644 pw3270.ico

diff --git a/.github/workflows/winpkg.yml b/.github/workflows/winpkg.yml
index 1f262a7..166feea 100644
--- a/.github/workflows/winpkg.yml
+++ b/.github/workflows/winpkg.yml
@@ -26,8 +26,7 @@ jobs:
           update: true
           install: xz mingw-w64-x86_64-gcc automake autoconf make git pkgconf
             mingw-w64-x86_64-gettext gettext-devel mingw-w64-x86_64-openssl
-            libtool mingw-w64-x86_64-gtk3 mingw-w64-x86_64-imagemagick
-            mingw-w64-x86_64-optipng mingw-w64-x86_64-inkscape
+            libtool mingw-w64-x86_64-gtk3 mingw-w64-x86_64-optipng
       - uses: robinraju/release-downloader@v1.7
         with:
           repository: PerryWerneck/lib3270
diff --git a/Makefile.in b/Makefile.in
index d5b43a2..ea45ba9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -72,7 +72,6 @@ MSGCAT=@MSGCAT@
 WINDRES=@WINDRES@
 AR=@AR@
 VALGRIND=@VALGRIND@
-CONVERT=@CONVERT@
 STRIP=@STRIP@
 
 #---[ Build Paths ]----------------------------------------------------------------------
@@ -127,6 +126,13 @@ $(OBJDBG)/%.o: \
 		-DDEBUG=1 \
 		-o $@ -c $<
 
+%.ico: \
+	$(srcdir)/branding/%.ico
+
+	@echo $< ...
+	@$(MKDIR) $(@D)
+	@cp "$<" "$@"
+
 $(OBJDBG)/%.o: \
 	%.rc \
 	$(PRODUCT_NAME).ico
@@ -218,30 +224,6 @@ install-%: \
 		prefix=$(prefix) \
 		install
 
-%.ico: \
-	$(srcdir)/branding/%.svg
-
-	@echo $@ ...
-	@$(MKDIR) $(@D)
-	@$(CONVERT) \
-		-density 384 \
-		-background transparent \
-		$< \
-		-define icon:auto-resize \
-		-colors 256 \
-		$@
-
-%.png: \
-	$(srcdir)/branding/%.svg
-
-	@echo $@ ...
-	@$(MKDIR) $(@D)
-	@$(CONVERT) \
-		+antialias \
-		-background transparent \
-		$< \
-		$@
-
 #---[ Main Target ]----------------------------------------------------------------------
 
 all: \
diff --git a/branding/Makefile.in b/branding/Makefile.in
index 961794f..0f7f3b0 100644
--- a/branding/Makefile.in
+++ b/branding/Makefile.in
@@ -43,19 +43,20 @@ MKDIR=@MKDIR_P@
 INSTALL=@INSTALL@
 INSTALL_DATA=@INSTALL_DATA@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
-CONVERT=@CONVERT@
 DESKTOP_INSTALL=@DESKTOP_INSTALL@
 SCOUR=@SCOUR@
 APPSTREAMCLI=@APPSTREAMCLI@
 
-#---[ Rules ]----------------------------------------------------------------------------
+# CONVERT=@CONVERT@
 
-%.ico: \
-	$(PRODUCT_NAME).svg
+#---[ Rules ]----------------------------------------------------------------------------
 
-	@echo $@ ...
-	@$(MKDIR) `dirname $@`
-	@$(CONVERT) -density 384 -background transparent $< -define icon:auto-resize -colors 256 $@
+#%.ico: \
+#	%.svg
+#
+#	@echo $@ ...
+#	@$(MKDIR) `dirname $@`
+#	@$(CONVERT) -density 384 -background transparent $< -define icon:auto-resize -colors 256 $@
 
 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/%.svg: \
 	$(srcdir)/%.svg
@@ -101,11 +102,10 @@ endif
 
 validate:
 
-ifneq ($(SCOUR),no)
+ifneq ($(APPSTREAMCLI),no)
 	@$(APPSTREAMCLI) validate metainfo.xml
 endif
 
-
 install: \
 	install-@OSNAME@
 
@@ -159,7 +159,10 @@ install-macos: \
 
 install-windows: \
 	$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME).svg \
-	$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME)-logo.svg \
-	$(DESTDIR)$(bindir)/$(PRODUCT_NAME).ico
+	$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME)-logo.svg
+	
+	@$(INSTALL_DATA) \
+		$(PRODUCT_NAME).ico \
+		$(DESTDIR)$(bindir)/$(PRODUCT_NAME).ico
 
 
diff --git a/branding/pw3270.ico b/branding/pw3270.ico
new file mode 100644
index 0000000..1564b79
Binary files /dev/null and b/branding/pw3270.ico differ
diff --git a/configure.ac b/configure.ac
index 2157c7c..9f18265 100644
--- a/configure.ac
+++ b/configure.ac
@@ -143,7 +143,6 @@ dnl ---------------------------------------------------------------------------
 
 AC_PATH_TOOL([AR], [ar], [ar])
 AC_PATH_TOOL([CONVERT], [convert], [no])
-AC_PATH_TOOL([OPTIPNG],[optipng],[no])
 AC_PATH_TOOL([ZIP],[zip],[no])
 AC_PATH_TOOL([DLLTOOL],[dlltool],[no])
 AC_PATH_TOOL([WINDRES], [windres], [no])
diff --git a/locale/pw3270.pot b/locale/pw3270.pot
index a03bb64..e0e7de7 100644
--- a/locale/pw3270.pot
+++ b/locale/pw3270.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-01-31 11:13-0300\n"
+"POT-Creation-Date: 2023-03-20 19:00-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/pw3270.ico b/pw3270.ico
deleted file mode 100644
index 1564b79..0000000
Binary files a/pw3270.ico and /dev/null differ
--
libgit2 0.21.2