revised icon loading on Windows and packaging again

* We don't need the PNG icons on Windows as the compiled-in ICO should suffice
* Ship the dependencies of the SVG pixbuf loader.
* The PNG pixbuf loader is still distributed, as we at least need it
  for loading the icon theme.
* Install a loaders.cache - without it, the pixbuf loaders won't be found.
  This file can be generated by gdk-pixbuf-query-loaders but apparently has
  to be modified by hand.
* Regenerate the icon cache using gtk-update-icon-cache.
* Icon themes are found now.
  Unfortunately, we have to distribute the entire Adwaita icon theme
  as distributing only the scalable (SVG) icons does not work for some
  strange reason (FIXME).

2 files changed, 34 insertions, 26 deletions

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6b5f329..5cd9843 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,10 +1,6 @@
 name: Continuous Integration
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [push, pull_request]
 
 jobs:
   ubuntu:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index bbbbda2..dcab877 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -125,7 +125,7 @@ jobs:
     - name: Archive Windows Distribution (PDCurses)
       uses: actions/upload-artifact@v2
       with:
-        name: SciTECO nightly packages on ${{ steps.date.outputs.date }} (Win32, PDCurses)
+        name: SciTECO nightly build on ${{ steps.date.outputs.date }} (Win32, PDCurses)
         path: temp-bin/*
 
   # NOTE: There is a lot of redundancy with win32-curses.
@@ -183,37 +183,49 @@ jobs:
 
     - name: Prepare Distribution Directory
       run: |
-        mkdir -p temp-bin/bin
-        cp /mingw32/bin/{sciteco.exe,grosciteco.tes,tedoc.tes} temp-bin/bin/
-        cp -r /mingw32/share/sciteco/{lib,*.tmac,*.png} temp-bin/bin/
-        cp /mingw32/share/sciteco/sample.teco_ini temp-bin/bin/.teco_ini
-        cp /mingw32/share/sciteco/fallback.css temp-bin/bin/.teco_css
-        mkdir -p temp-bin/doc
-        cp -r /mingw32/share/doc/sciteco/* temp-bin/doc/
-        cp COPYING ChangeLog temp-bin/doc/
-        cp /mingw32/bin/gspawn-win32-helper*.exe temp-bin/bin/
-        cp /mingw32/bin/{libglib-2.0-0,libpcre-1,libintl-8,libiconv-2,libwinpthread-1,libgcc_s_dw2-1}.dll temp-bin/bin/
-        cp /mingw32/bin/{libgtk-3-0,libgdk-3-0,libgdk_pixbuf-2.0-0,libatk-1.0-0}.dll temp-bin/bin/
-        cp /mingw32/bin/{libgobject-2.0-0,libgmodule-2.0-0,libgio-2.0-0,libffi-7}.dll temp-bin/bin/
-        cp /mingw32/bin/{libpango-1.0-0,libpangocairo-1.0-0,libpangowin32-1.0-0,libpangoft2-1.0-0}.dll temp-bin/bin/
-        cp /mingw32/bin/{libthai-0,libdatrie-1,libharfbuzz-0,libgraphite2,libfribidi-0,libepoxy-0}.dll temp-bin/bin/
-        cp /mingw32/bin/{libfontconfig-1,libexpat-1}.dll temp-bin/bin/
-        cp /mingw32/bin/{libfreetype-6,libpng16-16,libbrotlidec,libbrotlicommon,libbz2-1,zlib1}.dll temp-bin/bin/
-        cp /mingw32/bin/{libcairo-2,libcairo-gobject-2,libpixman-1-0,libstdc++-6}.dll temp-bin/bin/
+        mkdir -p temp-bin
+        cp /mingw32/bin/{sciteco.exe,grosciteco.tes,tedoc.tes} temp-bin/
+        cp -r /mingw32/share/sciteco/{lib,*.tmac} temp-bin/
+        # FIXME: Maybe there should be a separate win32/.teco_ini with
+        # a few pre-enabled settings?
+        cp /mingw32/share/sciteco/sample.teco_ini temp-bin/.teco_ini
+        cp /mingw32/share/sciteco/fallback.css temp-bin/.teco_css
+        cp -r /mingw32/share/doc/sciteco/* temp-bin/
+        cp COPYING ChangeLog temp-bin/
+        cp /mingw32/bin/gspawn-win32-helper*.exe temp-bin/
+        cp /mingw32/bin/{libglib-2.0-0,libpcre-1,libintl-8,libiconv-2,libwinpthread-1,libgcc_s_dw2-1}.dll temp-bin/
+        cp /mingw32/bin/{libgtk-3-0,libgdk-3-0,libgdk_pixbuf-2.0-0,libatk-1.0-0}.dll temp-bin/
+        cp /mingw32/bin/{libgobject-2.0-0,libgmodule-2.0-0,libgio-2.0-0,libffi-7}.dll temp-bin/
+        cp /mingw32/bin/{libpango-1.0-0,libpangocairo-1.0-0,libpangowin32-1.0-0,libpangoft2-1.0-0}.dll temp-bin/
+        cp /mingw32/bin/{libthai-0,libdatrie-1,libharfbuzz-0,libgraphite2,libfribidi-0,libepoxy-0}.dll temp-bin/
+        cp /mingw32/bin/{libfontconfig-1,libexpat-1}.dll temp-bin/
+        cp /mingw32/bin/{libfreetype-6,libbrotlidec,libbrotlicommon,libbz2-1,zlib1}.dll temp-bin/
+        cp /mingw32/bin/{libcairo-2,libcairo-gobject-2,libpixman-1-0,libstdc++-6}.dll temp-bin/
+        cp /mingw32/bin/{libpng16-16,librsvg-2-2,libxml2-2}.dll temp-bin/
         #mkdir -p temp-bin/share
         #cp /mingw32/share/loader.cache temp-bin/share/
         #glib-compile-schemas /mingw32/share/glib-2.0/schemas
         #mkdir -p temp-bin/share/glib-2.0
         #cp /mingw32/share/glib-2.0/gschemas.compiled temp-bin/share/glib-2.0/
         mkdir -p temp-bin/share/icons/Adwaita
-        cp -r /mingw32/share/icons/Adwaita/{scalable,icon-theme.cache,index.theme} temp-bin/share/icons/Adwaita/
+        # FIXME: It should be sufficient to package the SVG icons,
+        # but I cannot get it to work. Perhaps index.theme would have to be tweaked.
+        # We could also try to include a pure scalable icon theme.
+        #cp -r /mingw32/share/icons/Adwaita/{scalable*,index.theme} temp-bin/share/icons/Adwaita/
+        cp -r /mingw32/share/icons/Adwaita/* temp-bin/share/icons/Adwaita/
+        gtk-update-icon-cache-3.0 temp-bin/share/icons/Adwaita/
+        # FIXME: It's possible to change the location of loaders.cache via $GDK_PIXBUF_MODULE_FILE.
+        # If we did that, we could avoid "reusing" the lib/ directory.
+        # This is important when somebody changes $SCITECOPATH.
         mkdir -p temp-bin/lib/gdk-pixbuf-2.0/2.10.0/loaders/
-        cp /mingw32/lib/gdk-pixbuf-2.0/2.10.0/loaders/{libpixbufloader-svg.dll,libpixbufloader-png.dll} temp-bin/lib/gdk-pixbuf-2.0/2.10.0/loaders/
+        cp /mingw32/lib/gdk-pixbuf-2.0/2.10.0/loaders/{libpixbufloader-svg.dll,libpixbufloader-png.dll} \
+           temp-bin/lib/gdk-pixbuf-2.0/2.10.0/loaders/
+        cp win32/loaders.cache temp-bin/lib/gdk-pixbuf-2.0/2.10.0/
     - name: Get Current Date
       id: date
       run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
     - name: Archive Windows Distribution (GTK+ 3)
       uses: actions/upload-artifact@v2
       with:
-        name: SciTECO nightly packages on ${{ steps.date.outputs.date }} (Win32, GTK+ 3)
+        name: SciTECO nightly build on ${{ steps.date.outputs.date }} (Win32, GTK+ 3)
         path: temp-bin/*