From 86e24a42a32241d3a8fb0b818cd7d0b6898bafcd Mon Sep 17 00:00:00 2001
From: Konstantin Dmitriev <ksee.zelgadis@gmail.com>
Date: May 14 2021 05:10:08 +0000
Subject: Do not include fontconfig and freetype in Appimage. Fixes https://github.com/synfig/synfig/issues/1849.


---

diff --git a/env-builder-data/build/script/common/manager.sh b/env-builder-data/build/script/common/manager.sh
index b4342ca..3830cfa 100755
--- a/env-builder-data/build/script/common/manager.sh
+++ b/env-builder-data/build/script/common/manager.sh
@@ -310,7 +310,7 @@ $TC_LD_LIBRARY_PATH"
     export CFLAGS="-I$ENVDEPS_PACKET_DIR/include $TC_CFLAGS"
     export CPPFLAGS="-I$ENVDEPS_PACKET_DIR/include $TC_CPPFLAGS"
     export CXXFLAGS="-I$ENVDEPS_PACKET_DIR/include $TC_CXXFLAGS"
-    export PKG_CONFIG_PATH="$ENVDEPS_PACKET_DIR/lib/pkgconfig:$ENVDEPS_PACKET_DIR/lib64/pkgconfig:$ENVDEPS_PACKET_DIR/share/pkgconfig:$TC_PKG_CONFIG_PATH"
+    export PKG_CONFIG_PATH="$ENVDEPS_PACKET_DIR/lib/pkgconfig:$ENVDEPS_PACKET_DIR/lib64/pkgconfig:$ENVDEPS_PACKET_DIR/share/pkgconfig:$ENVDEPS_NATIVE_PACKET_DIR/lib/pkgconfig:$TC_PKG_CONFIG_PATH"
     export PKG_CONFIG_LIBDIR="$ENVDEPS_PACKET_DIR/lib:$ENVDEPS_PACKET_DIR/lib64:$TC_PKG_CONFIG_LIBDIR"
     export PKG_CONFIG_SYSROOT_DIR="/"
     export XDG_DATA_DIRS="$ENVDEPS_PACKET_DIR/share:$TC_XDG_DATA_DIRS"
diff --git a/env-builder-data/build/script/packet/cairo-1.15.4.sh b/env-builder-data/build/script/packet/cairo-1.15.4.sh
index d96d6ad..3752fba 100644
--- a/env-builder-data/build/script/packet/cairo-1.15.4.sh
+++ b/env-builder-data/build/script/packet/cairo-1.15.4.sh
@@ -1,4 +1,10 @@
-DEPS="png-1.6.26 pixman-0.34.0 fontconfig-2.11.0 glib-2.50.0"
+DEPS="png-1.6.26 pixman-0.34.0 glib-2.50.0"
+if [ "$PLATFORM" = "linux" ]; then
+    DEPS_NATIVE="$DEPS_NATIVE fontconfig-2.11.0"
+else
+    DEPS="$DEPS fontconfig-2.11.0"
+fi
+
 
 PK_DIRNAME="cairo-1.15.4"
 PK_ARCHIVE="$PK_DIRNAME.tar.xz"
diff --git a/env-builder-data/build/script/packet/harfbuzz-1.3.2.sh b/env-builder-data/build/script/packet/harfbuzz-1.3.2.sh
index 7ea5786..120b052 100644
--- a/env-builder-data/build/script/packet/harfbuzz-1.3.2.sh
+++ b/env-builder-data/build/script/packet/harfbuzz-1.3.2.sh
@@ -1,4 +1,9 @@
-DEPS="fontconfig-2.11.0 glib-2.50.0"
+DEPS="glib-2.50.0"
+if [ "$PLATFORM" = "linux" ]; then
+    DEPS_NATIVE="$DEPS_NATIVE fontconfig-2.11.0"
+else
+    DEPS="$DEPS fontconfig-2.11.0"
+fi
 
 PK_DIRNAME="harfbuzz-1.3.2"
 PK_ARCHIVE="$PK_DIRNAME.tar.bz2"
diff --git a/env-builder-data/build/script/packet/pango-1.40.3.sh b/env-builder-data/build/script/packet/pango-1.40.3.sh
index 5281763..547ae44 100644
--- a/env-builder-data/build/script/packet/pango-1.40.3.sh
+++ b/env-builder-data/build/script/packet/pango-1.40.3.sh
@@ -1,5 +1,10 @@
-DEPS="harfbuzz-1.3.2 fontconfig-2.11.0 glib-2.50.0 cairo-1.15.4"
+DEPS="harfbuzz-1.3.2 glib-2.50.0 cairo-1.15.4"
 #DEPS_NATIVE="gobjectintrospection-1.50.0"
+if [ "$PLATFORM" = "linux" ]; then
+    DEPS_NATIVE="$DEPS_NATIVE fontconfig-2.11.0"
+else
+    DEPS="$DEPS fontconfig-2.11.0"
+fi
 
 PK_DIRNAME="pango-1.40.3"
 PK_ARCHIVE="$PK_DIRNAME.tar.xz"
diff --git a/env-builder-data/build/script/packet/synfigstudio-appimage.sh b/env-builder-data/build/script/packet/synfigstudio-appimage.sh
index 9b8877f..d715e00 100644
--- a/env-builder-data/build/script/packet/synfigstudio-appimage.sh
+++ b/env-builder-data/build/script/packet/synfigstudio-appimage.sh
@@ -52,16 +52,16 @@ pkinstall_release() {
     cp "$ENVDEPS_RELEASE_PACKET_DIR/lib/libboost_system."*          "$APPDIR/usr/lib/" || return 1
 
     # fix FONTCONFIG errors
-    TARGET_DIR=../../../share/fontconfig/conf.avail
-    pushd . >/dev/null 2>&1
-    cd $APPDIR/usr/etc/fonts/conf.d
-    rm -f ./*.conf
+    #TARGET_DIR=../../../share/fontconfig/conf.avail
+    #pushd . >/dev/null 2>&1
+    #cd $APPDIR/usr/etc/fonts/conf.d
+    #rm -f ./*.conf
 
-    for f in $TARGET_DIR/*.conf
-    do
-      ln -s -f $TARGET_DIR/${f##*/} ./${f##*/}
-    done
-    popd >/dev/null 2>&1
+    #for f in $TARGET_DIR/*.conf
+    #do
+    #  ln -s -f $TARGET_DIR/${f##*/} ./${f##*/}
+    #done
+    #popd >/dev/null 2>&1
 
     # clean examples
     rm -rf "$APPDIR/share/synfig/examples" || return 1