From 9aba11f7b6a291fa70e95cd9ed20488ca5a369ec Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@kth.se>
Date: Sun, 2 Jul 2023 08:05:45 +0200
Subject: Add check for unlisted icons for and correct accordingly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@kth.se>
---
 Makefile                                   |  1 +
 find-unlisted-icons                        | 18 ++++++++++++++++++
 icons.mk                                   |  6 +++++-
 scalable/actions/stock_file-properites.svg |  1 -
 scalable/apps/xfce4-weather.svg            |  2 +-
 5 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100755 find-unlisted-icons
 delete mode 120000 scalable/actions/stock_file-properites.svg

diff --git a/Makefile b/Makefile
index 66c7369..35a942b 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ include $(CONFIGFILE)
 all:
 
 generated.mk: $(CONFIGFILE) icons.mk Makefile
+	$(DEVCHECK) ./find-unlisted-icons
 	$(DEVCHECK) ./check-icons-listing
 	@test ! -e $@ || chmod -- u+w $@
 	printf '\043 %s\n' 'This file is generated from Makefile' > $@
diff --git a/find-unlisted-icons b/find-unlisted-icons
new file mode 100755
index 0000000..f493178
--- /dev/null
+++ b/find-unlisted-icons
@@ -0,0 +1,18 @@
+#!/bin/sh
+set -e
+
+for f in scalable/*/*.svg; do
+	if test -e "$f"; then
+		printf '%s\n' "$f"
+	fi
+done | sed 's/^scalable\/\(.*\)\.svg$/\1/' | sort > "/tmp/pid-$$-a"
+
+sed 's/\\$//' < icons.mk | sed '/^\s*\(#.*\|\)$/d' | sed 1d | tr -d '\t' | sort > "/tmp/pid-$$-b"
+
+unlisted="$(comm -23 "/tmp/pid-$$-a" "/tmp/pid-$$-b")"
+rm "/tmp/pid-$$-a" "/tmp/pid-$$-b"
+
+if test -n "$unlisted"; then
+	printf '%s\n' 'The following icons exist but are not listed in icons.mk' "$unlisted" >&2
+	exit 1
+fi
diff --git a/icons.mk b/icons.mk
index 17c8cd8..7419763 100644
--- a/icons.mk
+++ b/icons.mk
@@ -1809,6 +1809,7 @@ ICONS =\
 		status/stock_weather-few-clouds\
 		apps/weather-indicator\
 			apps/indicator-weather\
+			apps/xfce4-weather\
 	status/weather-few-clouds-unsynced\
 	status/weather-clear-night-000\
 	status/weather-clear-night-010\
@@ -2463,7 +2464,7 @@ ICONS =\
 	actions/document-properties\
 		actions/gtk-properties\
 			actions/gtk-print-report\
-		actions/stock_file-properites\
+		actions/stock_file-properties\
 		actions/stock_properties\
 		actions/gtk-info\
 	actions/document-revert\
@@ -2571,6 +2572,7 @@ ICONS =\
 	actions/dialog-icon-preview\
 	actions/dialog-input-devices\
 	actions/dialog-layers\
+		actions/gimp-layers\
 	actions/dialog-object-properties\
 	actions/dialog-text-and-font\
 		categories/applications-fonts\
@@ -3266,6 +3268,7 @@ ICONS =\
 	status/audio-speakers-disabled\
 	actions/audio-speakers-disable\
 	devices/battery\
+		apps/gnome-power-preferences\
 		devices/gnome-dev-battery\
 		apps/batti\
 	devices/camera-photo\
@@ -4172,6 +4175,7 @@ ICONS =\
 	mimetypes/x-office-spreadsheet\
 		apps/libreoffice-calc\
 			apps/libreoffice32-calc\
+			apps/libreoffice34-calc\
 			apps/openofficeorg-calc\
 				apps/openofficeorg3-calc\
 				apps/openofficeorg-calc-default\
diff --git a/scalable/actions/stock_file-properites.svg b/scalable/actions/stock_file-properites.svg
deleted file mode 120000
index 1718e97..0000000
--- a/scalable/actions/stock_file-properites.svg
+++ /dev/null
@@ -1 +0,0 @@
-document-properties.svg
\ No newline at end of file
diff --git a/scalable/apps/xfce4-weather.svg b/scalable/apps/xfce4-weather.svg
index b62d59b..96d6f1f 120000
--- a/scalable/apps/xfce4-weather.svg
+++ b/scalable/apps/xfce4-weather.svg
@@ -1 +1 @@
-../status/weather-few-clouds.svg
\ No newline at end of file
+weather-indicator.svg
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2