[gtk-osx] Patch graphviz to use full install-name-dir instead of rpath.



commit a636de41dc9cd957af87fc4785a03b53014b7711
Author: John Ralls <jralls ceridwen us>
Date:   Thu Jul 29 15:10:55 2021 -0700

    Patch graphviz to use full install-name-dir instead of rpath.

 modulesets-stable/gtk-osx-random.modules   |  4 ++-
 modulesets-unstable/gtk-osx-random.modules |  4 ++-
 modulesets/gtk-osx-random.modules          |  4 ++-
 patches/graphviz-remove-rpath.patch        | 55 ++++++++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 3 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index d97e6d24..6a927201 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -24,7 +24,9 @@
   <cmake id="graphviz">
     <branch module="2.47.0/graphviz-2.47.0.tar.bz2" version="2.47.0"
             repo="graphviz" 
-            hash="sha256:dade5b374ce483bf28f2e535baef02280ba8ab86fbe6e93252ab0de48396b714"/>
+            hash="sha256:dade5b374ce483bf28f2e535baef02280ba8ab86fbe6e93252ab0de48396b714">
+      <patch file="graphviz-remove-rpath.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="pango"/>
       <dep package="librsvg"/>
diff --git a/modulesets-unstable/gtk-osx-random.modules b/modulesets-unstable/gtk-osx-random.modules
index c9feeb3f..ad22532b 100644
--- a/modulesets-unstable/gtk-osx-random.modules
+++ b/modulesets-unstable/gtk-osx-random.modules
@@ -26,7 +26,9 @@
   <cmake id="graphviz">
     <branch module="2.47.0/graphviz-2.47.0.tar.bz2" version="2.47.0"
             repo="graphviz" 
-            hash="sha256:dade5b374ce483bf28f2e535baef02280ba8ab86fbe6e93252ab0de48396b714"/>
+            hash="sha256:dade5b374ce483bf28f2e535baef02280ba8ab86fbe6e93252ab0de48396b714">
+      <patch file="graphviz-remove-rpath.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="pango"/>
       <dep package="librsvg"/>
diff --git a/modulesets/gtk-osx-random.modules b/modulesets/gtk-osx-random.modules
index 75d9463d..54c218dc 100644
--- a/modulesets/gtk-osx-random.modules
+++ b/modulesets/gtk-osx-random.modules
@@ -25,7 +25,9 @@
    <cmake id="graphviz">
     <branch module="2.47.0/graphviz-2.47.0.tar.bz2" version="2.47.0"
             repo="graphviz" 
-            hash="sha256:dade5b374ce483bf28f2e535baef02280ba8ab86fbe6e93252ab0de48396b714"/>
+            hash="sha256:dade5b374ce483bf28f2e535baef02280ba8ab86fbe6e93252ab0de48396b714">
+      <patch file="graphviz-remove-rpath.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="pango"/>
       <dep package="librsvg"/>
diff --git a/patches/graphviz-remove-rpath.patch b/patches/graphviz-remove-rpath.patch
new file mode 100644
index 00000000..857165b9
--- /dev/null
+++ b/patches/graphviz-remove-rpath.patch
@@ -0,0 +1,55 @@
+--- a/CMakeLists.txt   2021-03-15 17:04:01.000000000 -0700
++++ b/CMakeLists.txt   2021-07-29 13:42:38.000000000 -0700
+@@ -72,6 +72,8 @@
+ # Name of the config file used by Graphviz
+ set(GVPLUGIN_CONFIG_FILE config${GRAPHVIZ_PLUGIN_VERSION})
+ 
++set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${LIBRARY_INSTALL_DIR}")
++
+ # ============================ Library dependencies ============================
+ if (WIN32)
+     list(APPEND CMAKE_PREFIX_PATH ${WINDOWS_DEPENDENCY_DIR})
+--- a/plugin/core/CMakeLists.txt       2021-03-15 17:04:01.000000000 -0700
++++ b/plugin/core/CMakeLists.txt       2021-07-29 13:42:09.000000000 -0700
+@@ -53,6 +53,8 @@
+     ARCHIVE DESTINATION ${LIBRARY_INSTALL_DIR}
+ )
+ 
++set_target_properties(gvplugin_core PROPERTIES INSTALL_NAME_DIR 
"${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}")
++
+ # Specify library version and soversion
+ set_target_properties(gvplugin_core PROPERTIES
+     VERSION ${GRAPHVIZ_PLUGIN_VERSION}.0.0
+--- a/plugin/pango/CMakeLists.txt      2021-03-15 17:04:01.000000000 -0700
++++ b/plugin/pango/CMakeLists.txt      2021-07-29 13:43:13.000000000 -0700
+@@ -40,6 +40,8 @@
+     ARCHIVE DESTINATION ${LIBRARY_INSTALL_DIR}
+ )
+ 
++set_target_properties(gvplugin_pango PROPERTIES INSTALL_NAME_DIR 
"${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}")
++
+ # Include DLLs with this library on Windows
+ if (WIN32)
+     install(
+--- a/plugin/neato_layout/CMakeLists.txt       2021-03-15 17:04:01.000000000 -0700
++++ b/plugin/neato_layout/CMakeLists.txt       2021-07-29 13:42:57.000000000 -0700
+@@ -45,6 +45,8 @@
+     ARCHIVE DESTINATION ${LIBRARY_INSTALL_DIR}
+ )
+ 
++set_target_properties(gvplugin_neato_layout PROPERTIES INSTALL_NAME_DIR 
"${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}")
++
+ # Specify library version and soversion
+ set_target_properties(gvplugin_neato_layout PROPERTIES
+     VERSION ${GRAPHVIZ_PLUGIN_VERSION}.0.0
+--- a/plugin/dot_layout/CMakeLists.txt 2021-03-15 17:04:01.000000000 -0700
++++ b/plugin/dot_layout/CMakeLists.txt 2021-07-29 13:42:28.000000000 -0700
+@@ -30,6 +30,8 @@
+     ARCHIVE DESTINATION ${LIBRARY_INSTALL_DIR}
+ )
+ 
++set_target_properties(gvplugin_dot_layout PROPERTIES INSTALL_NAME_DIR 
"${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}")
++
+ # Specify library version and soversion
+ set_target_properties(gvplugin_dot_layout PROPERTIES
+     VERSION ${GRAPHVIZ_PLUGIN_VERSION}.0.0


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]