在macOS arm64上使用tkinterdnd2-osxarm64

#18
TransparentLC · Mar 16, 2023 · 740cd52 · 740cd52
1 parent 84dbe5d
commit 740cd52
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/pyi-hooks/hook-tkinterdnd2.py b/pyi-hooks/hook-tkinterdnd2.py
@@ -12,17 +12,17 @@
 
 s = platform.system()
 p = {
-    'Windows': ('win64', {'tkdnd_unix.tcl', 'tkdnd_macosx.tcl'}),
-    'Linux': ('linux64', {'tkdnd_windows.tcl', 'tkdnd_macosx.tcl'}),
-    'Darwin': ('osx64', {'tkdnd_windows.tcl', 'tkdnd_unix.tcl'}),
+    'Windows': ({'win64'}, {'tkdnd_unix.tcl', 'tkdnd_macosx.tcl'}),
+    'Linux': ({'linux64'}, {'tkdnd_windows.tcl', 'tkdnd_macosx.tcl'}),
+    'Darwin': ({'osx64', 'osx64arm'}, {'tkdnd_windows.tcl', 'tkdnd_unix.tcl'}),
 }
 if s in p:
     datas = set([
         x for x in (
             *collect_data_files('tkinterdnd2'),
             *collect_dynamic_libs('tkinterdnd2'),
         )
-        if os.path.split(x[1])[1] == p[s][0] and os.path.split(x[0])[1] not in p[s][1]
+        if os.path.split(x[1])[1] in p[s][0] and os.path.split(x[0])[1] not in p[s][1]
     ])
 else:
     raise RuntimeError(f'TkinterDnD2 is not supported on platform "{s}".')
diff --git a/requirements.txt b/requirements.txt
@@ -2,4 +2,5 @@ darkdetect == 0.8.*
 notify-py == 0.3.*
 pillow == 9.*
 tkinterdnd2 == 0.3.*; sys_platform != 'darwin' or platform_machine != 'arm64'
-git+https://github.com/blacklein/tkinterdnd2@master; sys_platform == 'darwin' and platform_machine == 'arm64'
+# https://github.com/TransparentLC/realesrgan-gui/issues/18#issuecomment-1469605298
+tkinterdnd2-osxarm64 == 0.3.*; sys_platform == 'darwin' and platform_machine == 'arm64'