From 3d58566d51312d3acdf2093fa7a6d238f4a4b412 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Fri, 11 Sep 2020 09:32:21 -0300
Subject: [PATCH] Installing svg icon.

---
 .gitignore           |  1 +
 branding/Makefile.in | 20 ++++++++++++++++++--
 configure.ac         |  2 ++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1c11f64..fe933bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,6 +57,7 @@ src/include/lib3270
 vgcore.*
 gschemas.compiled
 *.gschema.xml
+appdata.xml
 *.3270
 macos/**/*.app
 mime.xml
diff --git a/branding/Makefile.in b/branding/Makefile.in
index a157e90..6db933e 100644
--- a/branding/Makefile.in
+++ b/branding/Makefile.in
@@ -44,6 +44,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@
 CONVERT=@CONVERT@
 OPTIPNG=@OPTIPNG@
 DESKTOP_INSTALL=@DESKTOP_INSTALL@
+SCOUR=@SCOUR@
 
 #---[ Rules ]----------------------------------------------------------------------------
 
@@ -107,6 +108,20 @@ $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/%.png: \
 	@$(MKDIR) `dirname $@`
 	@$(INSTALL_DATA) $< $@
 
+$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/%.svg: \
+	%.svg
+
+	@echo $@ ...
+	@$(MKDIR) `dirname $@`
+
+ifeq ($(SCOUR),no)
+	@$(INSTALL_DATA) $< $@
+else
+	@$(SCOUR) -i $< -o $@
+endif
+
+	@chmod 644 $@
+
 $(DESTDIR)$(datarootdir)/pixmaps/%.png: \
 	$(BINDIR)/%.png
 
@@ -119,6 +134,7 @@ install: \
 
 install-linux: \
 	$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME).png \
+	$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME).svg \
 	$(DESTDIR)$(datarootdir)/pixmaps/$(PRODUCT_NAME).png \
 	$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME)-logo.png
 
@@ -138,11 +154,11 @@ install-linux: \
 		mime.xml \
 		$(DESTDIR)$(datarootdir)/mime/packages/$(PRODUCT_NAME).xml
 
-	@$(MKDIR) $(DESTDIR)$(datarootdir)/metainfo
+	@$(MKDIR) $(DESTDIR)$(datarootdir)/appdata
 
 	@$(INSTALL_DATA) \
 		appdata.xml \
-		$(DESTDIR)$(datarootdir)/metainfo/$(PRODUCT_NAME).appdata.xml
+		$(DESTDIR)$(datarootdir)/appdata/$(PRODUCT_NAME).appdata.xml
 
 install-windows: \
 	$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME).png \
diff --git a/configure.ac b/configure.ac
index 74a2710..8244cbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,6 +141,8 @@ AC_PATH_TOOL([MSGMERGE], [msgmerge], [no])
 AC_PATH_TOOL([MSGFMT], [msgfmt], [no])
 AC_PATH_TOOL([VALGRIND], [valgrind], [no])
 
+AC_PATH_TOOL([SCOUR], [scour], [no])
+
 AC_PATH_TOOL([DESKTOP_INSTALL],[desktop-file-install],[no])
 
 PKG_CHECK_EXISTS
--
libgit2 0.21.2