From 67e1d4aad8cbf7a42cc9978cdd361b2ea658fd91 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Fri, 12 Jan 2018 20:16:38 -0500 Subject: [PATCH] remove apparent clipboard vomit --- Makefile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index c863aeb2b..1868782b4 100644 --- a/Makefile +++ b/Makefile @@ -12,34 +12,34 @@ dist: distclean pyinstaller \ \ `# pyinstaller misses these two` \ - --add-binary /usr/lib/x86_64-linux-gnu/gio/modules/libgiolibproxy.so:. \https://github.com/pyinstaller/pyinstaller/blob/61b1c75c2b0469b32d114298a63bf60b8d597e37/PyInstaller/hooks/hook-shapely.py#L34 + --add-binary /usr/lib/x86_64-linux-gnu/gio/modules/libgiolibproxy.so:. \ --add-binary /usr/lib/x86_64-linux-gnu/libproxy.so.1:. \ \ - \https://github.com/pyinstaller/pyinstaller/blob/61b1c75c2b0469b32d114298a63bf60b8d597e37/PyInstaller/hooks/hook-shapely.py#L34 - `# This one's tricky. ink/stitch doesn't actually _use_ gi.repository.Gtk, ` \https://github.com/pyinstaller/pyinstaller/blob/61b1c75c2b0469b32d114298a63bf60b8d597e37/PyInstaller/hooks/hook-shapely.py#L34 + \ + `# This one's tricky. ink/stitch doesn't actually _use_ gi.repository.Gtk, ` \ `# but it does use GTK (through wxPython). pyinstaller has some special ` \ - `# logic to handle GTK apps that is engaged when you import ` \https://github.com/pyinstaller/pyinstaller/blob/61b1c75c2b0469b32d114298a63bf60b8d597e37/PyInstaller/hooks/hook-shapely.py#L34 - `# gi.repository.Gtk that pulls in things like themes, icons, etc. Without ` \https://github.com/pyinstaller/pyinstaller/blob/61b1c75c2b0469b32d114298a63bf60b8d597e37/PyInstaller/hooks/hook-shapely.py#L34https://github.com/pyinstaller/pyinstaller/blob/61b1c75c2b0469b32d114298a63bf60b8d597e37/PyInstaller/hooks/hook-shapely.py#L34 + `# logic to handle GTK apps that is engaged when you import ` \ + `# gi.repository.Gtk that pulls in things like themes, icons, etc. Without ` \ `# that, the Params dialog is unthemed and barely usable. This hidden ` \ `# import option is actually the only reason we had to install python-gi ` \ - `# above! ` \https://github.com/pyinstaller/pyinstaller/blob/61b1c75c2b0469b32d114298a63bf60b8d597e37/PyInstaller/hooks/hook-shapely.py#L34 + `# above! ` \ --hidden-import gi.repository.Gtk \ \ - `# This lets pyinstaller see inkex.py, etc. ` \https://github.com/pyinstaller/pyinstaller/blob/61b1c75c2b0469b32d114298a63bf60b8dhttps://github.com/pyinstaller/pyinstaller/blob/61b1c75c2b0469b32d114298a63bf60b8d597e37/PyInstaller/hooks/hook-shapely.py#L34597e37/PyInstaller/hooks/hook-shapely.py#L34 - -p /usr/share/inkscape/extensions \https://github.com/pyinstaller/pyinstaller/blob/61b1c75c2b0469b32d114298a63bf60b8d597e37/PyInstaller/hooks/hook-shapely.py#L34https://github.com/pyinstaller/pyinstaller/blob/61b1c75c2b0469b32d114298a63bf60b8d597e37/PyInstaller/hooks/hook-shapely.py#L34https://github.com/pyinstaller/pyinstaller/blob/61b1c75c2b0469b32d114298a63bf60b8d597e37/PyInstaller/hooks/hook-shapely.py#L34 - $${extension}.py; \https://github.com/pyinstaller/pyinstaller/blob/61b1c75c2b0469b32d114298a63bf60b8d597e37/PyInstaller/hooks/hook-shapely.py#L34https://github.com/pyinstaller/pyinstaller/blob/61b1c75c2b0469b32d114298a63bf60b8d597e37/PyInstaller/hooks/hook-shapely.py#L34https://github.com/pyinstaller/pyinstaller/blob/61b1c75c2b0469b32d114298a63bf60b8d597e37/PyInstaller/hooks/hook-shapely.py#L34 + `# This lets pyinstaller see inkex.py, etc. ` \ + -p /usr/share/inkscape/extensions \ + $${extension}.py; \ \ `# By default, pyinstaller will treat each of ink/stitch's extensions ` \ `# separately. This means it packages a lot of the same shared libraries (like ` \ `# wxPython) multiple times. Turns out that we can just copy the contents of ` \ -https://github.com/pyinstaller/pyinstaller/blob/61b1c75c2b0469b32d114298a63bf60b8d597e37/PyInstaller/hooks/hook-shapely.py#L34 `# the directories pyinstaller creates into one and it works fine, eliminating ` \ + `# the directories pyinstaller creates into one and it works fine, eliminating ` \ `# the duplication. This significantly decreases the size of the inkstitch ` \ `# tarball/zip. ` \ - cp -a dist/$${extension}/* dist/inkstitch/bin; \https://github.com/pyinstaller/pyinstaller/blob/61b1c75c2b0469b32d114298a63bf60b8d597e37/PyInstaller/hooks/hook-shapely.py#L34 + cp -a dist/$${extension}/* dist/inkstitch/bin; \ rm -rf dist/$${extension}; \ - \https://github.com/pyinstaller/pyinstaller/blob/61b1c75c2b0469b32d114298a63bf60b8d597e37/PyInstaller/hooks/hook-shapely.py#L34 + \ `# Inkscape doesn't let us run native binaries as extensions(?!). Instead we ` \ - `# add this stub script which executes the binaries that pyinstaller creates. ` \https://github.com/pyinstaller/pyinstaller/blob/61b1c75c2b0469b32d114298a63bf60b8d597e37/PyInstaller/hooks/hook-shapely.py#L34 + `# add this stub script which executes the binaries that pyinstaller creates. ` \ cp stub.py dist/$${extension}.py; \ done; cp *.inx dist