From 064ca413286618fd1c89c4976f00e265623d038d Mon Sep 17 00:00:00 2001
From: "lb@lb520" <lb@lb520>
Date: Mon, 9 Apr 2018 14:00:35 +0200
Subject: [PATCH] pysolfc update to 2.2.0

---
 metadata/org.lufebe16.pysolfc.txt | 52 ++++++++++++++++++++++++++-----
 1 file changed, 45 insertions(+), 7 deletions(-)

diff --git a/metadata/org.lufebe16.pysolfc.txt b/metadata/org.lufebe16.pysolfc.txt
index 53fa13596e..acdd2b05d6 100644
--- a/metadata/org.lufebe16.pysolfc.txt
+++ b/metadata/org.lufebe16.pysolfc.txt
@@ -1,8 +1,8 @@
 Categories:Games
 License:GPL-3.0
-Web Site:https://bitbucket.org/lufebe16/pysolfc
-Source Code:https://bitbucket.org/lufebe16/pysolfc/src
-Issue Tracker:https://bitbucket.org/lufebe16/pysolfc/issues
+Web Site:https://github.com/shlomif/PySolFC
+Source Code:https://github.com/shlomif/PySolFC
+Issue Tracker:https://github.com/shlomif/PySolFC/issues
 
 Summary:A collection of solitaire card games
 Description:
@@ -16,8 +16,8 @@ A new user interface has been developed using the kivy framework to meet
 requirements of touch screens devices.
 .
 
-Repo Type:hg
-Repo:https://bitbucket.org/lufebe16/pysolfc
+Repo Type:git
+Repo:https://github.com/shlomif/PySolFC.git
 
 Build:0.8,8
     commit=b95e3d84d597
@@ -57,7 +57,45 @@ Build:0.8,8
     build=./mkp4a.unsigned $$SDK$$ $$NDK$$
     ndk=r12b
 
+Build:2.2.0,20200
+    commit=574178a16b4fb86cf5e5b1ec29e1bf1659fe9e81
+    sudo=(apt-get install -y cython cython3 python3-pip python3-tk virtualenv && \
+        apt-get install -y libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev) || echo "something failed"
+    output=android/PySolFC-$$VERSION$$-release-unsigned.apk
+    prebuild=python3 -m pip install --user clint && \
+        python3 -m pip install --user random2 && \
+        (cd android; ./mkp4a.cleanall) && \
+        export P4ADIR=$HOME/.local/share/python-for-android/packages && \
+        mkdir -p $P4ADIR/kivy && \
+        (cd $P4ADIR/kivy; wget -nv https://github.com/kivy/kivy/archive/1.10.0.zip && \
+        touch .mark-1.10.0.zip) && \
+        mkdir -p $P4ADIR/pyjnius && \
+        (cd $P4ADIR/pyjnius; wget -nv https://github.com/kivy/pyjnius/archive/1.1.0.zip; mv 1.1.0.zip master.zip; touch .mark-master.zip) && \
+        mkdir -p $P4ADIR/six && \
+        (cd $P4ADIR/six; wget -nv https://pypi.python.org/packages/source/s/six/six-1.9.0.tar.gz; touch .mark-six-1.9.0.tar.gz) && \
+        mkdir -p $P4ADIR/sdl2 && \
+        (cd $P4ADIR/sdl2; wget -nv https://www.libsdl.org/release/SDL2-2.0.4.tar.gz; touch .mark-SDL2-2.0.4.tar.gz) && \
+        mkdir -p $P4ADIR/sdl2_image && \
+        (cd $P4ADIR/sdl2_image; wget -nv https://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.1.tar.gz; touch .mark-SDL2_image-2.0.1.tar.gz) && \
+        mkdir -p $P4ADIR/sdl2_ttf && \
+        (cd $P4ADIR/sdl2_ttf; wget -nv https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.14.tar.gz; touch .mark-SDL2_ttf-2.0.14.tar.gz) && \
+        mkdir -p $P4ADIR/sdl2_mixer && \
+        (cd $P4ADIR/sdl2_mixer; wget -nv https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.1.tar.gz; touch .mark-SDL2_mixer-2.0.1.tar.gz) && \
+        mkdir -p $P4ADIR/python2 && \
+        (cd $P4ADIR/python2; wget -nv http://python.org/ftp/python/2.7.2/Python-2.7.2.tar.bz2; touch .mark-Python-2.7.2.tar.bz2) && \
+        (cd $P4ADIR; ln -s python2 hostpython2) && \
+        (cd android; wget -nv https://netix.dl.sourceforge.net/project/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.0/PySolFC-Cardsets-2.0.tar.bz2) && \
+        (cd android; ./mkcards) && \
+        (cd android; rm -rf PySolFC-Cardsets-2.0.tar.bz2) && \
+        (cd android; wget -nv https://github.com/kivy/python-for-android/archive/0.5.3.zip)
+    build=make all_games_html && \
+        make rules && \
+        make mo && \
+        (cd android; ./mkp4a.init $$SDK$$ $$NDK$$ 1 && \
+        ./mkp4a.unsigned $$SDK$$ $$NDK$$)
+    ndk=r12b
+
 Auto Update Mode:None
 Update Check Mode:None
-Current Version:0.8
-Current Version Code:8
+Current Version:2.2.0
+Current Version Code:20200