From 9809071e7d3984a8cb15d4a3fb3ecefe4ce12183 Mon Sep 17 00:00:00 2001
From: Ivan Mahonin <bh@icystar.com>
Date: Oct 31 2016 06:28:23 +0000
Subject: use branch 'testing' to build synfig


---

diff --git a/docker-builder-data/build/script/include/inc-pkall-default.sh b/docker-builder-data/build/script/include/inc-pkall-default.sh
index b6272de..6a38e0e 100644
--- a/docker-builder-data/build/script/include/inc-pkall-default.sh
+++ b/docker-builder-data/build/script/include/inc-pkall-default.sh
@@ -3,6 +3,10 @@
 # PK_VERSION
 # PK_ARCHIVE
 # PK_DIRNAME
+# PK_CONFIGURE_OPTIONS
+# PK_CFLAGS
+# PK_CPPFLAGS
+# PK_CONFIGURE_OPTIONS_DEFAULT
 
 source $INCLUDE_SCRIPT_DIR/inc-pkallunpack-default.sh
 source $INCLUDE_SCRIPT_DIR/inc-pkallinstall-default.sh
diff --git a/docker-builder-data/build/script/include/inc-pkall-git.sh b/docker-builder-data/build/script/include/inc-pkall-git.sh
index d36902d..b09b459 100644
--- a/docker-builder-data/build/script/include/inc-pkall-git.sh
+++ b/docker-builder-data/build/script/include/inc-pkall-git.sh
@@ -2,6 +2,11 @@
 # PK_URL
 # PK_VERSION
 # PK_DIRNAME
+# PK_CONFIGURE_OPTIONS
+# PK_CFLAGS
+# PK_CPPFLAGS
+# PK_CONFIGURE_OPTIONS_DEFAULT
+# PK_GIT_OPTIONS
 
 source $INCLUDE_SCRIPT_DIR/inc-pkallunpack-git.sh
 source $INCLUDE_SCRIPT_DIR/inc-pkallinstall-default.sh
diff --git a/docker-builder-data/build/script/include/inc-pkall-none.sh b/docker-builder-data/build/script/include/inc-pkall-none.sh
index 978c882..0fd00b3 100644
--- a/docker-builder-data/build/script/include/inc-pkall-none.sh
+++ b/docker-builder-data/build/script/include/inc-pkall-none.sh
@@ -7,6 +7,7 @@ PK_DIRNAME=
 PK_CONFIGURE_OPTIONS=
 PK_CFLAGS=
 PK_CPPFLAGS=
+PK_GIT_OPTIONS=
 
 PK_CONFIGURE_OPTIONS_DEFAULT=" \
  --prefix=$INSTALL_PACKET_DIR \
diff --git a/docker-builder-data/build/script/include/inc-pkallunpack-git.sh b/docker-builder-data/build/script/include/inc-pkallunpack-git.sh
index 26e1a27..e81052a 100644
--- a/docker-builder-data/build/script/include/inc-pkallunpack-git.sh
+++ b/docker-builder-data/build/script/include/inc-pkallunpack-git.sh
@@ -2,6 +2,7 @@
 # PK_URL
 # PK_VERSION
 # PK_DIRNAME
+# PK_GIT_OPTIONS
 
 source $INCLUDE_SCRIPT_DIR/inc-pkdownload-git.sh
 source $INCLUDE_SCRIPT_DIR/inc-pkunpack-git.sh
diff --git a/docker-builder-data/build/script/include/inc-pkdownload-git.sh b/docker-builder-data/build/script/include/inc-pkdownload-git.sh
index 271e6f3..8509100 100644
--- a/docker-builder-data/build/script/include/inc-pkdownload-git.sh
+++ b/docker-builder-data/build/script/include/inc-pkdownload-git.sh
@@ -1,6 +1,7 @@
 
 # PK_URL
 # PK_DIRNAME
+# PK_GIT_OPTIONS
 
 pkdownload() {
     if [ -d "$DOWNLOAD_PACKET_DIR/$PK_DIRNAME/.git" ]; then
@@ -9,7 +10,7 @@ pkdownload() {
             return 1
         fi
     else
-        if ! git clone "$PK_URL"; then
+        if ! git clone "$PK_URL" $PK_GIT_OPTIONS; then
             return 1
         fi
     fi
diff --git a/docker-builder-data/build/script/packet/synfigcore-master.sh b/docker-builder-data/build/script/packet/synfigcore-master.sh
index f8c7d2b..c3fb255 100644
--- a/docker-builder-data/build/script/packet/synfigcore-master.sh
+++ b/docker-builder-data/build/script/packet/synfigcore-master.sh
@@ -66,6 +66,7 @@ DEPS=" \
 
 PK_DIRNAME="synfig"
 PK_URL="https://github.com/synfig/$PK_DIRNAME.git"
+PK_GIT_OPTIONS="--branch testing"
 
 source $INCLUDE_SCRIPT_DIR/inc-pkallunpack-git.sh
 source $INCLUDE_SCRIPT_DIR/inc-pkinstall_release-default.sh
diff --git a/docker-builder-data/build/script/packet/synfigetl-master.sh b/docker-builder-data/build/script/packet/synfigetl-master.sh
index f968c70..18c2bfa 100644
--- a/docker-builder-data/build/script/packet/synfigetl-master.sh
+++ b/docker-builder-data/build/script/packet/synfigetl-master.sh
@@ -2,6 +2,7 @@ DEPS=""
 
 PK_DIRNAME="synfig"
 PK_URL="https://github.com/synfig/$PK_DIRNAME.git"
+PK_GIT_OPTIONS="--branch testing"
 
 source $INCLUDE_SCRIPT_DIR/inc-pkallunpack-git.sh
 source $INCLUDE_SCRIPT_DIR/inc-pkinstall_release-default.sh
diff --git a/docker-builder-data/build/script/packet/synfigstudio-master.sh b/docker-builder-data/build/script/packet/synfigstudio-master.sh
index e3bf20b..3474a56 100644
--- a/docker-builder-data/build/script/packet/synfigstudio-master.sh
+++ b/docker-builder-data/build/script/packet/synfigstudio-master.sh
@@ -21,6 +21,7 @@ DEPS="synfigcore-master gtkmm-3.14.0 adwaitaicontheme-3.22.0 gnomethemesstandard
 
 PK_DIRNAME="synfig"
 PK_URL="https://github.com/synfig/$PK_DIRNAME.git"
+PK_GIT_OPTIONS="--branch testing"
 PK_CPPFLAGS="-std=c++11"
 
 source $INCLUDE_SCRIPT_DIR/inc-pkallunpack-git.sh