Skip to content

Commit 9689caf

Browse files
committed
Improve Flatpak icon handling and build robustness
- Added fallback SVG icon creation when PNG icons are not available - Simplified icon installation logic to handle missing files gracefully - Ensures Flatpak build works in all environments (local and CI) - Fixed AppStream metadata validation issues - All released Flatpak packages now use correct dynamic version
1 parent eec60e4 commit 9689caf

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

flatpak/org.routeplanner.RoutePlanner.yml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,22 @@ modules:
4242
- mkdir -p /app/share/icons/hicolor/64x64/apps
4343
- mkdir -p /app/share/icons/hicolor/128x128/apps
4444
- |
45-
# Use existing icon if available, otherwise copy from project root
45+
# Copy icons if they exist, otherwise create a basic SVG icon
4646
if [ -f "icons/org.routeplanner.RoutePlanner-64.png" ]; then
4747
cp icons/org.routeplanner.RoutePlanner-64.png /app/share/icons/hicolor/64x64/apps/org.routeplanner.RoutePlanner.png
4848
cp icons/org.routeplanner.RoutePlanner-128.png /app/share/icons/hicolor/128x128/apps/org.routeplanner.RoutePlanner.png
49-
elif [ -f "icon.ico" ]; then
50-
# Convert ICO to PNG if ImageMagick is available
51-
if command -v convert >/dev/null 2>&1; then
52-
convert icon.ico[0] -resize 64x64 /app/share/icons/hicolor/64x64/apps/org.routeplanner.RoutePlanner.png
53-
convert icon.ico[0] -resize 128x128 /app/share/icons/hicolor/128x128/apps/org.routeplanner.RoutePlanner.png
54-
else
55-
# Copy the ICO file as fallback (some systems can handle it)
56-
cp icon.ico /app/share/icons/hicolor/64x64/apps/org.routeplanner.RoutePlanner.png
57-
cp icon.ico /app/share/icons/hicolor/128x128/apps/org.routeplanner.RoutePlanner.png
58-
fi
49+
echo "PNG icons installed successfully"
5950
else
60-
# Create a minimal placeholder icon
61-
echo "Creating placeholder icon..."
62-
touch /app/share/icons/hicolor/64x64/apps/org.routeplanner.RoutePlanner.png
63-
touch /app/share/icons/hicolor/128x128/apps/org.routeplanner.RoutePlanner.png
51+
# Create a basic SVG icon as fallback
52+
mkdir -p /app/share/icons/hicolor/scalable/apps
53+
cat > /app/share/icons/hicolor/scalable/apps/org.routeplanner.RoutePlanner.svg << 'SVGEOF'
54+
<?xml version="1.0" encoding="UTF-8"?>
55+
<svg width="64" height="64" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
56+
<rect width="64" height="64" fill="#2196F3" rx="8"/>
57+
<text x="32" y="40" font-family="Arial, sans-serif" font-size="24" fill="white" text-anchor="middle">RP</text>
58+
</svg>
59+
SVGEOF
60+
echo "Basic SVG icon created as fallback"
6461
fi
6562
- mkdir -p /app/share/metainfo
6663
- |

0 commit comments

Comments
 (0)