From bcb2323668067ee2a56f62bb6f00bc139d690134 Mon Sep 17 00:00:00 2001 From: Artem Egorkine Date: Mon, 2 Dec 2024 00:51:19 +0200 Subject: [PATCH] Fix missing dialog-ok icon * Update resources to a version that has a dialog-ok icon; * Update `collect-gtk.sh` to list missing icons; fixes #61 --- build/collect-gtk.sh | 20 ++++++++++++++++---- build/resources | 2 +- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/build/collect-gtk.sh b/build/collect-gtk.sh index f938243..27f17c9 100755 --- a/build/collect-gtk.sh +++ b/build/collect-gtk.sh @@ -9,7 +9,7 @@ ICONS_SRC_DIR=$SRC_DIR/icons DIR=$1 GTK_THEME="Arc-Darker-solid" -ICON_THEME="Paper" +ICON_THEME="Papirus" ICONS=( # gtk # collected from gtk 3.24 source tree: @@ -87,12 +87,24 @@ mkdir -p $DIR/share/themes cp -r $THEMES_SRC_DIR/$GTK_THEME $DIR/share/themes/ echo "2. icons" -ICONS=$(IFS="|"; echo "${ICONS[*]}") +ICONS_PATTERN=$(IFS="|"; echo "${ICONS[*]}") mkdir -p $DIR/share/icons/$ICON_THEME T=$(realpath $DIR/share/icons/$ICON_THEME) cp $ICONS_SRC_DIR/$ICON_THEME/index.theme $T -(cd $ICONS_SRC_DIR/$ICON_THEME; - find . -type f | egrep "/($ICONS)\." | cpio -pdm $T) +(cd $ICONS_SRC_DIR/$ICON_THEME; + find . -type f | grep -E "/($ICONS_PATTERN)\." | cpio -pdm $T) +# Validate that we actually copied at least one image for every mentioned icon +(cd $T + for i in "${ICONS[@]}"; do + find . -name "$i.*" -print -quit | grep . -q + [[ $? -eq 0 ]] || { + echo "ICON NOT FOUND: $i" + } + done +) + + + $UPDATE_ICON_CACHE $T echo "3. settings" diff --git a/build/resources b/build/resources index 82ae332..ee86ab4 160000 --- a/build/resources +++ b/build/resources @@ -1 +1 @@ -Subproject commit 82ae332ecc6d66c2062ad4a1f2d55062bee2866e +Subproject commit ee86ab409f3a39dad5bd2a16d19b1799e41a59d6