From bc44b3b405e49b85a1cfab93e09c98cb7b5a8571 Mon Sep 17 00:00:00 2001
From: Konstantin Dmitriev <ksee.zelgadis@gmail.com>
Date: Aug 10 2021 23:46:16 +0000
Subject: Fixes to allow build Synfig 1.5.0


---

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 3752fba..7d69d85 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,8 +1,8 @@
 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"
+    DEPS_NATIVE="$DEPS_NATIVE fontconfig-2.12.6"
 else
-    DEPS="$DEPS fontconfig-2.11.0"
+    DEPS="$DEPS fontconfig-2.12.6"
 fi
 
 
diff --git a/env-builder-data/build/script/packet/fontconfig-2.12.6.sh b/env-builder-data/build/script/packet/fontconfig-2.12.6.sh
new file mode 100644
index 0000000..7a57767
--- /dev/null
+++ b/env-builder-data/build/script/packet/fontconfig-2.12.6.sh
@@ -0,0 +1,13 @@
+DEPS="freetype-2.8.1 expat-2.2.5"
+DEPS_NATIVE="gperf-3.1"
+
+PK_DIRNAME="fontconfig-2.12.6"
+PK_ARCHIVE="$PK_DIRNAME.tar.gz"
+PK_URL="https://www.freedesktop.org/software/fontconfig/release/$PK_ARCHIVE"
+
+source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh
+
+pkhook_prebuild() {
+    rm -rf test
+    ln -s src test
+}
diff --git a/env-builder-data/build/script/packet/gperf-3.1.sh b/env-builder-data/build/script/packet/gperf-3.1.sh
new file mode 100644
index 0000000..ef77cef
--- /dev/null
+++ b/env-builder-data/build/script/packet/gperf-3.1.sh
@@ -0,0 +1,7 @@
+DEPS=""
+
+PK_DIRNAME="gperf-3.1"
+PK_ARCHIVE="$PK_DIRNAME.tar.gz"
+PK_URL="http://ftp.gnu.org/pub/gnu/gperf/$PK_ARCHIVE"
+
+source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh
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 120b052..cea2c04 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,8 +1,8 @@
 DEPS="glib-2.50.0"
 if [ "$PLATFORM" = "linux" ]; then
-    DEPS_NATIVE="$DEPS_NATIVE fontconfig-2.11.0"
+    DEPS_NATIVE="$DEPS_NATIVE fontconfig-2.12.6"
 else
-    DEPS="$DEPS fontconfig-2.11.0"
+    DEPS="$DEPS fontconfig-2.12.6"
 fi
 
 PK_DIRNAME="harfbuzz-1.3.2"
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 547ae44..216d662 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,9 +1,9 @@
 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"
+    DEPS_NATIVE="$DEPS_NATIVE fontconfig-2.12.6"
 else
-    DEPS="$DEPS fontconfig-2.11.0"
+    DEPS="$DEPS fontconfig-2.12.6"
 fi
 
 PK_DIRNAME="pango-1.40.3"
diff --git a/env-builder-data/build/script/packet/synfigstudio-appimage.sh b/env-builder-data/build/script/packet/synfigstudio-appimage.sh
index d715e00..3cbf292 100644
--- a/env-builder-data/build/script/packet/synfigstudio-appimage.sh
+++ b/env-builder-data/build/script/packet/synfigstudio-appimage.sh
@@ -31,9 +31,14 @@ pkinstall_release() {
     copy "$ENVDEPS_RELEASE_PACKET_DIR" "$APPDIR/usr" || return 1
     
     mkdir -p "$APPDIR/usr/share/icons/default/128x128/apps/"
-    cp "$ENVDEPS_RELEASE_PACKET_DIR/share/pixmaps/synfig_icon.png" "$APPDIR/usr/share/icons/default/128x128/apps/synfigstudio.png" || return 1
     mkdir -p "$APPDIR/usr/share/icons/default/128x128/mimetypes/"
-    cp "$ENVDEPS_RELEASE_PACKET_DIR/share/pixmaps/sif_icon.png" "$APPDIR/usr/share/icons/default/128x128/mimetypes/application-x-sif.png" || return 1
+    if [ -d "$ENVDEPS_RELEASE_PACKET_DIR/share/synfig/icons/classic/" ]; then
+        cp "$ENVDEPS_RELEASE_PACKET_DIR/share/synfig/icons/classic/synfig_icon.png" "$APPDIR/usr/share/icons/default/128x128/apps/synfigstudio.png" || return 1
+        cp "$ENVDEPS_RELEASE_PACKET_DIR/share/synfig/icons/classic/sif_icon.png" "$APPDIR/usr/share/icons/default/128x128/mimetypes/application-x-sif.png" || return 1
+    else
+        cp "$ENVDEPS_RELEASE_PACKET_DIR/share/pixmaps/synfig_icon.png" "$APPDIR/usr/share/icons/default/128x128/apps/synfigstudio.png" || return 1
+        cp "$ENVDEPS_RELEASE_PACKET_DIR/share/pixmaps/sif_icon.png" "$APPDIR/usr/share/icons/default/128x128/mimetypes/application-x-sif.png" || return 1
+    fi
 
     # clean bin
     #rm -f "$APPDIR/usr/bin/"* || return 1