-
Notifications
You must be signed in to change notification settings - Fork 145
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into fix/node-type-style-issues
- Loading branch information
Showing
153 changed files
with
1,525 additions
and
1,263 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,4 +23,4 @@ | |
| <key>LSMinimumSystemVersion</key> | ||
| <string>10.15</string> | ||
| </dict> | ||
| </plist> | ||
| </plist> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| #!/bin/sh | ||
|
|
||
| if test "x$GTK_DEBUG_LAUNCHER" != x; then | ||
| set -x | ||
| fi | ||
|
|
||
| if test "x$GTK_DEBUG_GDB" != x; then | ||
| EXEC="gdb --args" | ||
| else | ||
| EXEC=exec | ||
| fi | ||
|
|
||
| name=`basename "$0"` | ||
| tmp="$0" | ||
| tmp=`dirname "$tmp"` | ||
| tmp=`dirname "$tmp"` | ||
| bundle=`dirname "$tmp"` | ||
| bundle_contents="$bundle"/Contents | ||
| bundle_res="$bundle_contents"/Resources | ||
| bundle_lib="$bundle_res"/lib | ||
| bundle_bin="$bundle_res"/bin | ||
| bundle_data="$bundle_res"/share | ||
| bundle_etc="$bundle_res"/etc | ||
|
|
||
| export DYLD_FALLBACK_LIBRARY_PATH="$bundle_lib" | ||
| export XDG_CONFIG_DIRS="$bundle_etc"/xdg | ||
| export XDG_DATA_DIRS="$bundle_data" | ||
| export GTK_DATA_PREFIX="$bundle_res" | ||
| export GTK_EXE_PREFIX="$bundle_res" | ||
| export GTK_PATH="$bundle_res" | ||
|
|
||
| export GDK_PIXBUF_MODULE_FILE="$bundle_lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" | ||
| if [ `uname -r | cut -d . -f 1` -ge 10 ]; then | ||
| export GTK_IM_MODULE_FILE="$bundle_lib/gtk-3.0/3.0.0/immodules.cache" | ||
| fi | ||
|
|
||
| APP=$name | ||
|
|
||
| # Strip out the argument added by the OS. | ||
| if /bin/expr "x$1" : '^x-psn_' > /dev/null; then | ||
| shift 1 | ||
| fi | ||
|
|
||
| $EXEC "$bundle_contents/MacOS/$name-bin" "$@" $EXTRA_ARGS |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,114 @@ | ||
| <?xml version="1.0" standalone="no"?> | ||
| <?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> | ||
| <app-bundle> | ||
|
|
||
| <meta> | ||
| <prefix name="default">${env:PREFIX}</prefix> | ||
| <!-- Where to pick up the GTK+ installation, icon themes, | ||
| etc. Note that "${env:JHBUILD_PREFIX}" is evaluated to the | ||
| value of the environment variable JHBUILD_PREFIX. You can | ||
| define additional prefixes and refer to them in paths | ||
| throughout this file on the form "${prefix:name}". This is | ||
| useful for installing certain libraries or even the | ||
| application itself separately. Note that JHBUILD_PREFIX is | ||
| defined by jhbuild, so it you are not using jhbuild you can | ||
| either define your own or just hardcode the path here. | ||
| --> | ||
| <prefix name="default">${env:LIB_HOME}</prefix> | ||
|
|
||
| <prefix name="bundle">${env:GUI_BUNDLE}</prefix> | ||
| <!-- The project directory is the default location of the created | ||
| app. If you leave out the path, the current directory is | ||
| used. Note the usage of an environment variable here again. | ||
| --> | ||
| <destination overwrite="yes">${env:ROOT_DIR}</destination> | ||
|
|
||
| <image> | ||
| <!-- Not implemented yet (DMG image). --> | ||
| </image> | ||
|
|
||
| <!-- Comment this out to keep the install names in binaries --> | ||
| <run-install-name-tool/> | ||
|
|
||
| <!-- Optionally specify a launcher script to use. If the | ||
| application sets up everything needed itself, like | ||
| environment variable, linker paths, etc, a launcher script is | ||
| not needed. If the source path is left out, the default | ||
| script will be used. | ||
| --> | ||
| <launcher-script>${project}/gtk3-launcher.sh</launcher-script > | ||
|
|
||
| <!-- Not implemented: Optional runtime, could be python or mono | ||
| for example. | ||
| --> | ||
| <!-- runtime copy="yes">/usr/bin/python</runtime --> | ||
| <!-- Indicate the active gtk version to use. This is needed only | ||
| for gtk+-3.0 projects. --> | ||
| <gtk>gtk+-3.0</gtk> | ||
| </meta> | ||
| <plist>${prefix:bundle}/Info.plist</plist> | ||
|
|
||
| <!-- The special macro "${project}" refers to the directory where | ||
| this bundle file is located. The application name and bundle | ||
| identifier are taken from the plist file. | ||
| --> | ||
| <plist>${project}/Info.plist</plist> | ||
|
|
||
| <main-binary>${prefix:bundle}/pactus-gui</main-binary> | ||
|
|
||
| <!-- Copy in the input methods. Dunno if they actually work with | ||
| OSX. Note the ${gtkdir} macro, which expands to the correct | ||
| library subdirectory for the specified gtk version. --> | ||
| <binary> | ||
| ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/*.so | ||
| </binary> | ||
|
|
||
| <!-- And the print backends --> | ||
| <!-- <binary> | ||
| ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so | ||
| </binary> --> | ||
|
|
||
| <!-- Starting with 2.24, gdk-pixbuf installs into its own directory. --> | ||
| <binary> | ||
| ${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/loaders/*.so | ||
| </binary> | ||
|
|
||
| </app-bundle> | ||
| <binary> | ||
| ${prefix}/lib/gio/modules/libgiognutls.so | ||
| </binary> | ||
|
|
||
| <!-- Translation filenames, one for each program or library that you | ||
| want to copy in to the bundle. The "dest" attribute is | ||
| optional, as usual. Bundler will find all translations of that | ||
| library/program under the indicated directory and copy them.--> | ||
| <!-- <translations name="gtk30"> | ||
| ${prefix}/share/locale | ||
| </translations> --> | ||
|
|
||
|
|
||
| <!-- Data to copy in, usually Glade/UI files, images, sounds files | ||
| etc. The destination inside the bundle can be specified if the | ||
| files should end up at a different location, by using the | ||
| "dest" property. The destination must then start with the macro | ||
| "${bundle}", which refers to the bundle root directory. | ||
| --> | ||
| <!-- data> | ||
| ${prefix}/share/gtk3-demo | ||
| </data --> | ||
|
|
||
| <!-- Copy in the themes data. You may want to trim this to save space | ||
| in your bundle. --> | ||
| <data> | ||
| ${prefix}/share/themes | ||
| </data> | ||
|
|
||
| <data> | ||
| ${prefix}/share/icons | ||
| </data> | ||
|
|
||
| <!-- Copy icons. Note that the .icns file is an Apple format which | ||
| contains up to 4 sizes of icon. You can use | ||
| /Developer/Applications/Utilities/Icon Composer.app to import | ||
| artwork and create the file. --> | ||
| <data dest="${bundle}/Contents/Resources"> | ||
| ${prefix:bundle}/pactus.icns | ||
| </data> | ||
|
|
||
| </app-bundle> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| #!/bin/sh | ||
|
|
||
| if [ $# -lt 3 ]; then | ||
| echo "Usage: $0 library old_prefix new_prefix action" | ||
| exit 1 | ||
| fi | ||
|
|
||
| LIBRARY=$1 | ||
| WRONG_PREFIX=$2 | ||
| RIGHT_PREFIX="@executable_path/../$3" | ||
| ACTION=$4 | ||
|
|
||
| chmod u+w $LIBRARY | ||
|
|
||
| if [ "x$ACTION" = "xchange" ]; then | ||
| libs="`otool -L $LIBRARY 2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep $WRONG_PREFIX | sort | uniq`" | ||
| for lib in $libs; do | ||
| if ! echo $lib | grep --silent "@executable_path" ; then | ||
| if echo $lib | grep --silent "${LIB_HOME}/Cellar/"; then | ||
| fixed=`echo $lib | sed -e "s|${LIB_HOME}/Cellar/\([^/]*\)/[^/]*/|@executable_path/../Resources/opt/\1/|"` | ||
| else | ||
| fixed=`echo $lib | sed -e s,\${WRONG_PREFIX},\${RIGHT_PREFIX},` | ||
| fi | ||
| echo $lib $fixed $LIBRARY | ||
| install_name_tool -change $lib $fixed $LIBRARY | ||
| fi | ||
| done; | ||
| elif [ "x$ACTION" = "xid" ]; then | ||
| # echo "$LIBRARY $WRONG_PREFIX to $RIGHT_PREFIX" | ||
| lib=$(otool -D "$LIBRARY" 2>/dev/null | grep ^"$WRONG_PREFIX" | sed s,"$WRONG_PREFIX",,) | ||
| if [ -n "$lib" ]; then | ||
| # echo "Rewrite $lib" | ||
| install_name_tool -id "${RIGHT_PREFIX}/${lib}" $LIBRARY; | ||
| # else | ||
| # path=$(otool -D "$LIBRARY" 2>/dev/null | sed -n 2p) | ||
| # echo "Empty Result $path" | ||
| fi | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.