pop-os / keyboard-configurator

Keyboard configuration UI
GNU General Public License v3.0
259 stars 45 forks source link

fix: Update Adwaita icon directories in Windows build script #193

Closed jacobgkau closed 1 year ago

jacobgkau commented 1 year ago

The Windows build is currently failing:

Copy ../data/icons/scalable -> out/share/icons/Adwaita/scalable
Copy D:\a\_temp\msys64\mingw32/share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml -> out/share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
Copy D:\a\_temp\msys64\mingw32/share/icons/hicolor/index.theme -> out/share/icons/hicolor/index.theme
Copy D:\a\_temp\msys64\mingw32/lib/p11-kit -> out/lib/p11-kit
Copy D:\a\_temp\msys64\mingw32/lib/gdk-pixbuf-2.0 -> out/lib/gdk-pixbuf-2.0
Copy D:\a\_temp\msys64\mingw32/share/icons/Adwaita/index.theme -> out/share/icons/Adwaita/index.theme
Copy D:\a\_temp\msys64\mingw32/share/icons/Adwaita/scalable/actions/open-menu-symbolic.svg -> out/share/icons/Adwaita/scalable/actions/open-menu-symbolic.svg
Traceback (most recent call last):
  File "D:\a\keyboard-configurator\keyboard-configurator\windows\build.py", line 111, in <module>
    copy(mingw_dir, 'out', i)
  File "D:\a\keyboard-configurator\keyboard-configurator\windows\build.py", line 88, in copy
    shutil.copy(src, dest)
  File "D:/a/_temp/msys64/mingw32/lib/python3.10/shutil.py", line 417, in copy
    copyfile(src, dst, follow_symlinks=follow_symlinks)
  File "D:/a/_temp/msys64/mingw32/lib/python3.10/shutil.py", line 254, in copyfile
    with open(src, 'rb') as fsrc:
FileNotFoundError: [Errno 2] No such file or directory: 'D:\\a\\_temp\\msys64\\mingw32/share/icons/Adwaita/scalable/actions/open-menu-symbolic.svg'
Error: Process completed with exit code 1.

Looking at the Adwaita icon theme repo, it looks like the icons in use have been moved to a different directory (or replaced with ones in a different directory.) The macOS build script already points to the symbolic directory, but the Windows script is currently still pointing towards scalable, so this updates the Windows script to point to symbolic.

May fix https://github.com/pop-os/keyboard-configurator/issues/191.

jacobgkau commented 1 year ago

Looks like all CI is passing now. It might be good to test on Windows to make sure the icons still show up.

n3m0-22 commented 1 year ago

Tested by updating the install on Win10 and a new install of the app on Win11. It looks fine on both.