From 73b9059c294782ae36e874b37d175830261d7541 Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Fri, 16 Mar 2018 20:58:41 +0000
Subject: [PATCH] Update library relocations for macOS

---
 zenmap/install_scripts/macosx/make-bundle.sh | 8 --------
 zenmap/install_scripts/macosx/zenmap.bundle  | 4 ++++
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/zenmap/install_scripts/macosx/make-bundle.sh b/zenmap/install_scripts/macosx/make-bundle.sh
index de35be594..7f8b25ff1 100755
--- a/zenmap/install_scripts/macosx/make-bundle.sh
+++ b/zenmap/install_scripts/macosx/make-bundle.sh
@@ -48,14 +48,6 @@ echo "Building using distutils"
 jhbuild run python setup.py build --executable "/usr/bin/env python"
 jhbuild run python setup.py install vanilla --prefix "$BASE/Resources"
 
-# This isn't truly necessary, but it allows us to do a simpler check for problems later.
-echo "Rewriting linker paths to pass checks"
-ESCAPED_LIBBASE=$(echo "$BASE/Resources/" | sed 's/\([\/\\.]\)/\\\1/g')
-find $BASE/Resources/lib -type f -name '*.dylib' | while read so; do
-  dep=$(echo "$so" | sed "s/$ESCAPED_LIBBASE//")
-  install_name_tool -id "@executable_path/../Resources/$dep" "$so"
-done
-
 echo "Renaming main Zenmap executable."
 mv $BASE/MacOS/$APP_NAME $BASE/MacOS/zenmap.bin
 # This is a dummy script, so we'll clean it up:
diff --git a/zenmap/install_scripts/macosx/zenmap.bundle b/zenmap/install_scripts/macosx/zenmap.bundle
index 33bd0a5d8..0843ab242 100644
--- a/zenmap/install_scripts/macosx/zenmap.bundle
+++ b/zenmap/install_scripts/macosx/zenmap.bundle
@@ -115,9 +115,13 @@
   <binary>${prefix}/lib/python2.7/site-packages/glib/*.so</binary>
   <binary>${prefix}/lib/python2.7/site-packages/gobject/*.so</binary>
   <binary>${prefix}/lib/python2.7/site-packages/gtk-2.0/*.so</binary>
+  <binary>${prefix}/lib/python2.7/site-packages/gtk-2.0/gio/*.so</binary>
   <binary>${prefix}/lib/python2.7/site-packages/gtk-2.0/gtk/*.so</binary>
   <binary>${prefix}/lib/python2.7/site-packages/gtkmacintegration/*.so</binary>
   <binary>${prefix}/lib/python2.7/site-packages/gtkosx_application/*.so</binary>
+  <!-- Pending this pull request: https://github.com/GNOME/gtk-mac-bundler/pull/1
+       Without it, this data block will overwrite the binaries above, undoing
+       the work of the run-install-name-tool option. -->
   <data>
     ${prefix}/lib/python2.7/
   </data>