[gimp-macos-build/wip/lukaso/tests] Clean up workaround

[Jehan <jehanp src gnome org>]

commit 0433092a73b206c4a07aa1a9885de2e624720225
Author: Lukas Oberhuber <lukaso gmail com>
Date:   Sun Oct 10 11:24:53 2021 +0100

    Clean up workaround

 package/build299.sh      | 19 +------------------
 package/gimp-2.99.bundle | 13 +++++++++++++
 2 files changed, 14 insertions(+), 18 deletions(-)
---
diff --git a/package/build299.sh b/package/build299.sh
index 7200058..4ffa329 100755
--- a/package/build299.sh
+++ b/package/build299.sh
@@ -36,30 +36,13 @@ pushd ${PACKAGE_DIR}/GIMP-2.99.app/Contents/Resources/share/icons
  cp -r hicolor ../gimp/2.99/icons
 popd
 
-echo "Copy plugins"
+echo "Copy plugins (TODO: add capability to preserve subdirectories)"
 
 pushd ${HOME}/gtk/inst/lib/gimp/2.99/plug-ins/
   mkdir -p ${PACKAGE_DIR}/GIMP-2.99.app/Contents/Resources/lib/gimp/2.99/plug-ins/
   cp -r * ${PACKAGE_DIR}/GIMP-2.99.app/Contents/Resources/lib/gimp/2.99/plug-ins/
 popd
 
-echo "Copy missing libraries (TODO: why are they not copied during regular installation?)"
-
-pushd ${HOME}/gtk/inst/lib/
-  cp libgimp-3.*.dylib ${PACKAGE_DIR}/GIMP-2.99.app/Contents/Resources/lib/
-  cp libgimpui-3.*.dylib ${PACKAGE_DIR}/GIMP-2.99.app/Contents/Resources/lib/
-  # Needed for file-wmf
-  cp libwmf-0.*.dylib ${PACKAGE_DIR}/GIMP-2.99.app/Contents/Resources/lib/
-  cp libwmflite-0.*.dylib ${PACKAGE_DIR}/GIMP-2.99.app/Contents/Resources/lib/
-  # Needed for file-webp
-  cp libwebpmux.3.dylib ${PACKAGE_DIR}/GIMP-2.99.app/Contents/Resources/lib/
-  cp libwebpdemux.2.dylib ${PACKAGE_DIR}/GIMP-2.99.app/Contents/Resources/lib/
-  # Needed for file-ps
-  cp libgs.dylib.9.50 ${PACKAGE_DIR}/GIMP-2.99.app/Contents/Resources/lib/
-  # Needed for file-mng
-  cp libmng.2.dylib ${PACKAGE_DIR}/GIMP-2.99.app/Contents/Resources/lib/
-popd
-
 echo "Removing pathnames from the libraries and binaries"
 # fix permission for some libs
 find  ${PACKAGE_DIR}/GIMP-2.99.app/Contents/Resources/lib -name '*.dylib' -type f | xargs chmod 755
diff --git a/package/gimp-2.99.bundle b/package/gimp-2.99.bundle
index 0201667..ad53001 100644
--- a/package/gimp-2.99.bundle
+++ b/package/gimp-2.99.bundle
@@ -120,6 +120,19 @@
   <!-- <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>
   <!-- Translation filenames-->
   <translations name="gtk30">
     ${prefix}/share/locale