[gimp-macos-build/wip/lukaso/tests] Improvements to build



commit 6698fce273ca222fa119cfa632bddde454107ffd
Author: Lukas Oberhuber <lukaso gmail com>
Date:   Tue Oct 12 23:36:06 2021 +0100

    Improvements to build

 package/build299.sh      | 14 +-------------
 package/gimp-2.99.bundle | 15 ---------------
 2 files changed, 1 insertion(+), 28 deletions(-)
---
diff --git a/package/build299.sh b/package/build299.sh
index be00021..f953950 100755
--- a/package/build299.sh
+++ b/package/build299.sh
@@ -57,18 +57,6 @@ do
    | bash
 done
 
-echo "Installing LC_RPATH for plugins"
-# Unclear why plugins need their own rpath, however they appear to be independent executables
-PLUGINS=$(
-  find ${PACKAGE_DIR}/GIMP-2.99.app/Contents/Resources/lib/gimp/2.99/plug-ins -perm +111 -type f \
-   | xargs file \
-   | grep ' Mach-O '|awk -F ':' '{print $1}'
-)
-printf "%s\n" "$PLUGINS" | while IFS= read -r line
-do
-  install_name_tool -add_rpath @executable_path/../../../../ $line
-done
-
 if [[ "$1" == "debug" ]]; then
   echo "Generating debug symbols"
   find  ${PACKAGE_DIR}/GIMP-2.99.app/ -type f -perm +111 \
@@ -93,7 +81,7 @@ echo "adding @rpath to the plugins"
 find  ${PACKAGE_DIR}/GIMP-2.99.app/Contents/Resources/lib/gimp/2.99/plug-ins/ -perm +111 -type f \
    | xargs file \
    | grep ' Mach-O '|awk -F ':' '{print $1}' \
-   | xargs -n1 install_name_tool -add_rpath @executable_path/../../../
+   | xargs -n1 install_name_tool -add_rpath @executable_path/../../../../
 
 echo "fixing pixmap cache"
 sed -i.old 's|@executable_path/../Resources/lib/||' \
diff --git a/package/gimp-2.99.bundle b/package/gimp-2.99.bundle
index 209daa3..43091e4 100644
--- a/package/gimp-2.99.bundle
+++ b/package/gimp-2.99.bundle
@@ -226,21 +226,6 @@
   <!-- <binary>${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/loaders/*.so</binary> -->
   <binary>${prefix}/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so</binary>
   <binary dest="${bundle}/Contents/MacOS">${prefix}/bin/gdk-pixbuf-query-loaders</binary>
-  <!-- Additional binaries for plugins -->
-  <binary>${prefix}/lib/libgimp-3.*.dylib</binary>
-  <binary>${prefix}/lib/libgimpui-3.*.dylib</binary>
-  <!-- Needed for file-wmf -->
-  <binary>${prefix}/lib/libwmf-0.*.dylib</binary>
-  <binary>${prefix}/lib/libwmflite-0.*.dylib</binary>
-  <!-- Needed for file-webp -->
-  <binary>${prefix}/lib/libwebpmux.3.dylib</binary>
-  <binary>${prefix}/lib/libwebpdemux.2.dylib</binary>
-  <!-- Needed for file-ps -->
-  <binary>${prefix}/lib/libgs.dylib.9.50</binary>
-  <!-- Needed for file-mng -->
-  <binary>${prefix}/lib/libmng.2.dylib</binary>
-  <!-- Needed for file-jp2-load -->
-  <!-- <binary>${prefix}/lib/libopenjp2.7.dylib</binary> -->
   <!-- Translation filenames-->
   <translations name="gtk30">
     ${prefix}/share/locale


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