From 290cd623477a2c817a88fea9c2a694015f3036b6 Mon Sep 17 00:00:00 2001
From: Ivan Mahonin <bh@icystar.com>
Date: Dec 24 2016 13:04:29 +0000
Subject: fix docker/fedora-cross-win


---

diff --git a/docker-builder-data/build/script/packet/synfigstudio-appimage.files/launch.sh b/docker-builder-data/build/script/packet/synfigstudio-appimage.files/launch.sh
index 237da48..922f62d 100755
--- a/docker-builder-data/build/script/packet/synfigstudio-appimage.files/launch.sh
+++ b/docker-builder-data/build/script/packet/synfigstudio-appimage.files/launch.sh
@@ -39,21 +39,24 @@ if [ -e ${BASE_DIR}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache.in ]; then
 	sed "s?@ROOTDIR@/loaders?${BASE_DIR}/lib/gdk-pixbuf-2.0/2.10.0/loaders?" < ${BASE_DIR}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache.in > $GDK_PIXBUF_MODULE_FILE
 fi
 
-cd "$BASE_DIR/bin"
+export APPIMAGE_ROOT="$BASE_DIR"
+if [ ! -z "$APPIMAGE_WORKDIR" ]; then
+	if ! cd "$APPIMAGE_WORKDIR"; then
+		echo "Cannot change directory to \"$APPIMAGE_WORKDIR\" (APPIMAGE_WORKDIR)"
+		exit 1
+	fi
+fi
+
 if [ "$1" = "--appimage-exec" ]; then
 	if ! "${@:2}"; then
-		cd "$OLDDIR"
 		exit 1
 	fi
 elif [ -z "$2" ]; then
 	if ! "$BASE_DIR/bin/synfigstudio.wrapper" "$@"; then
-		cd "$OLDDIR"
 		exit 1
 	fi
 else
 	if ! "$BASE_DIR/bin/synfig" "$@"; then
-		cd "$OLDDIR"
 		exit 1
 	fi
 fi
-cd "$OLDDIR"
diff --git a/docker/fedora-cross-win/Dockerfile b/docker/fedora-cross-win/Dockerfile
index e25ea58..9511156 100644
--- a/docker/fedora-cross-win/Dockerfile
+++ b/docker/fedora-cross-win/Dockerfile
@@ -1,35 +1,41 @@
-FROM fedora:22
+FROM fedora:21
 MAINTAINER Konstantin Dmitriev <ksee.zelgadis@gmail.com>
 
 #VOLUME /synfig-buildroot
 
-#RUN dnf -y update
+#RUN yum -y update
 
-RUN dnf -y install git sudo
+RUN yum -y install git sudo
 
-RUN dnf -y install intltool autoconf automake libtool libtool-ltdl-devel
+RUN yum -y install intltool autoconf automake libtool libtool-ltdl-devel
 
-RUN dnf -y install mingw32-gcc-c++ mingw32-cpp 
+RUN yum -y install mingw32-gcc-c++ mingw32-cpp 
 
-RUN dnf -y install mingw32-adwaita-icon-theme mingw32-hicolor-icon-theme mingw32-libxml++ mingw32-cairo mingw32-pango mingw32-boost mingw32-libjpeg-turbo mingw32-gtkmm30 mingw32-glibmm24 mingw32-libltdl mingw32-dlfcn mingw32-SDL mingw32-fftw
+RUN yum -y install mingw32-adwaita-icon-theme mingw32-hicolor-icon-theme mingw32-libxml++ mingw32-cairo mingw32-pango mingw32-boost mingw32-libjpeg-turbo mingw32-gtkmm30 mingw32-glibmm24 mingw32-libltdl mingw32-dlfcn mingw32-SDL mingw32-fftw
 
-RUN dnf -y install mingw64-gcc-c++ mingw64-cpp
+RUN yum -y install mingw64-gcc-c++ mingw64-cpp
 
-RUN dnf -y install mingw64-adwaita-icon-theme mingw64-hicolor-icon-theme mingw64-libxml++ mingw64-cairo mingw64-pango mingw64-boost mingw64-libjpeg-turbo mingw64-gtkmm30 mingw64-glibmm24 mingw64-libltdl mingw64-dlfcn mingw64-SDL mingw64-fftw
+RUN yum -y install mingw64-adwaita-icon-theme mingw64-hicolor-icon-theme mingw64-libxml++ mingw64-cairo mingw64-pango mingw64-boost mingw64-libjpeg-turbo mingw64-gtkmm30 mingw64-glibmm24 mingw64-libltdl mingw64-dlfcn mingw64-SDL mingw64-fftw
 
-RUN dnf -y install mingw32-nsis
+RUN yum -y install mingw32-nsis
 
-RUN dnf -y install p7zip ImageMagick
+RUN yum -y install p7zip ImageMagick
 
-RUN dnf -y install make wget xz which
+RUN yum -y install make wget xz which
 
-#RUN dnf -y install synfig
+#RUN yum -y install synfig
 
 RUN cd /opt && git clone https://gitlab.com/morevnaproject-builds/synfig-linux64
 COPY files/synfig /usr/local/bin/synfig
 RUN chmod +x /usr/local/bin/synfig
 
-RUN dnf -y install unzip
+RUN yum -y install unzip
+
+RUN yum -y install dejavu-sans-fonts  dejavu-sans-mono-fonts dejavu-serif-fonts
+
+# deps for synfig appimage
+RUN yum -y install fuse fuse-libs bzip2 bzip2-libs libXdmcp
+RUN ln -s /usr/lib64/libbz2.so.1 /usr/lib64/libbz2.so.1.0
 
 #RUN groupadd -g 1111 konstantin && useradd -u 1111 -g konstantin konstantin
 
diff --git a/docker/fedora-cross-win/files/synfig b/docker/fedora-cross-win/files/synfig
index 9a0acfc..50c7d12 100644
--- a/docker/fedora-cross-win/files/synfig
+++ b/docker/fedora-cross-win/files/synfig
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-/opt/synfig-linux64/synfig "$@"
+APPIMAGE_WORKDIR=$PWD /build/packet/linux-x64/synfigstudio-appimage/install_release/synfigstudio.appimage "$@"
diff --git a/docker/run.sh b/docker/run.sh
index b1c0284..38e70b4 100755
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -43,7 +43,7 @@ docker run -it \
     $DOCKER_RUN_OPTIONS \
     -v "${PACKET_BUILD_DIR}:/build/packet" \
     -v "${SCRIPT_BUILD_DIR}:/build/script" \
-    -e ARCH \
-    -e PLATFORM \
+    -e ARCH="$ARCH" \
+    -e PLATFORM="$PLATFORM" \
     morevna/${IMAGE} \
     "$@"