[gimp-macos-build/wip/lukaso/tests: 5/9] Fix packaging errors
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp-macos-build/wip/lukaso/tests: 5/9] Fix packaging errors
- Date: Sun, 10 Oct 2021 10:00:43 +0000 (UTC)
commit b3376414849ff53aa72281727d58881b6ac222fc
Author: Lukas Oberhuber <lukaso gmail com>
Date: Sat Oct 9 00:40:26 2021 +0100
Fix packaging errors
package/build299.sh | 18 ++++++++++++++++++
package/gimp-2.99.bundle | 4 ++--
2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/package/build299.sh b/package/build299.sh
index c99f784..d0dc59e 100755
--- a/package/build299.sh
+++ b/package/build299.sh
@@ -43,6 +43,13 @@ pushd ${HOME}/gtk/inst/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?)"
+
+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/
+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
@@ -64,6 +71,17 @@ do
| bash
done
+echo "Installing LC_RPATH for plugins"
+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}'
+)
+while IFS= read -r line
+do
+ install_name_tool -add_rpath @executable_path/../../../../ $line
+done < <(printf '%s\n' "$PLUGINS")
+
if [[ "$1" == "debug" ]]; then
echo "Generating debug symbols"
find ${PACKAGE_DIR}/GIMP-2.99.app/ -type f -perm +111 \
diff --git a/package/gimp-2.99.bundle b/package/gimp-2.99.bundle
index 9b1ddcd..17080cd 100644
--- a/package/gimp-2.99.bundle
+++ b/package/gimp-2.99.bundle
@@ -97,8 +97,8 @@
<!-- Name of main gimp binary -->
<main-binary>${prefix}/bin/gimp-2.99</main-binary>
- <!-- Copy in gimp plugins -->
- <binary>${prefix}/lib/gimp/2.99/plug-ins/*</binary>
+ <!-- Copy in gimp plugins - does not preserve directory structure -->
+ <!-- <binary>${prefix}/lib/gimp/2.99/plug-ins/*</binary> -->
<!-- Copy in gimp modules -->
<binary>${prefix}/lib/gimp/2.99/modules/*.so</binary>
<!-- Copy in gimp python modules -->
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]