Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jun 7, 2023

Conversation

jacobgkau
Copy link
Member

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 #191.

@jacobgkau jacobgkau requested review from a team June 7, 2023 00:05
@jacobgkau jacobgkau marked this pull request as draft June 7, 2023 00:15
@jacobgkau jacobgkau marked this pull request as ready for review June 7, 2023 00:46
@jacobgkau
Copy link
Member Author

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
Copy link
Contributor

n3m0-22 commented Jun 7, 2023

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

Copy link
Contributor

@13r0ck 13r0ck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch, thank you

@leviport leviport merged commit 2b71b60 into master Jun 7, 2023
@leviport leviport deleted the windows-icons branch June 7, 2023 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Missing correct binaries for 1.3.3 and 1.3.4
4 participants