From 492934955557a156b62323c8954476da29b3dffe Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 6 Feb 2017 14:59:15 +0100
Subject: [PATCH 1/4] buildserver: add openjdk-8-jdk-headless depends from
 backports

---
 buildserver/provision-apt-get-install | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/buildserver/provision-apt-get-install b/buildserver/provision-apt-get-install
index a60cdb99..5338dfd5 100644
--- a/buildserver/provision-apt-get-install
+++ b/buildserver/provision-apt-get-install
@@ -37,6 +37,7 @@ packages="
  autopoint
  bison
  bzr
+ ca-certificates-java/jessie-backports
  cmake
  curl
  expect
@@ -68,6 +69,7 @@ packages="
  mercurial
  nasm
  nodejs
+ openjdk-8-jre-headless
  openjdk-8-jdk-headless
  optipng
  p7zip

From 36272656fc35de8a14d1beecd095c1bc2c7a0452 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 6 Feb 2017 17:28:07 +0100
Subject: [PATCH 2/4] gitlab-ci: workaround "ImportError: No module named
 'packaging'"

https://github.com/pypa/setuptools/issues/937

fdroid/ci-images#1
---
 .gitlab-ci.yml          | 2 ++
 tests/complete-ci-tests | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a730e39e..0d1713c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,8 @@ image: fdroid/ci:server-20161223
 test:
   script:
     - mkdir -p /usr/lib/python3.4/site-packages/
+    # workaround https://github.com/pypa/setuptools/issues/937
+    - pip3 install setuptools==33.1.1
     - pip3 install -e .
     - cd tests
     - ./complete-ci-tests
diff --git a/tests/complete-ci-tests b/tests/complete-ci-tests
index 9f7e146f..558427e3 100755
--- a/tests/complete-ci-tests
+++ b/tests/complete-ci-tests
@@ -56,6 +56,8 @@ python3 setup.py sdist
 rm -rf $WORKSPACE/env
 pyvenv $WORKSPACE/env
 . $WORKSPACE/env/bin/activate
+# workaround https://github.com/pypa/setuptools/issues/937
+pip3 install setuptools==33.1.1
 pip3 install dist/fdroidserver-*.tar.gz
 
 # run tests in new pip+pyvenv install
@@ -68,6 +70,8 @@ cd $WORKSPACE
 rm -rf $WORKSPACE/env
 pyvenv $WORKSPACE/env
 . $WORKSPACE/env/bin/activate
+# workaround https://github.com/pypa/setuptools/issues/937
+pip3 install setuptools==33.1.1
 pip3 install -e $WORKSPACE
 python3 setup.py install
 

From 1eb65c7087c788dc5658d1d453029bcfe00eb883 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 7 Feb 2017 10:47:20 +0100
Subject: [PATCH 3/4] buildserver: use automake and cmake from jessie-backports

These should be reasonably backwards compatible, and there is already
automake1.11 for those that need a version that old.  As for cmake, there
are five apps that seem to it:

com.amaze.filemanager
org.dolphinemu.dolphinemu
org.navitproject.navit
org.yabause.android
org.videolan.vlc

It looks like VLC is the only app that is currently building and using
cmake in the most recent releases.  Some of them used to use cmake, but no
longer.
---
 buildserver/provision-apt-get-install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildserver/provision-apt-get-install b/buildserver/provision-apt-get-install
index 5338dfd5..8edefb50 100644
--- a/buildserver/provision-apt-get-install
+++ b/buildserver/provision-apt-get-install
@@ -32,13 +32,13 @@ packages="
  ant-contrib
  autoconf
  autoconf2.13
- automake
+ automake/testing
  automake1.11
  autopoint
  bison
  bzr
  ca-certificates-java/jessie-backports
- cmake
+ cmake/jessie-backports
  curl
  expect
  faketime

From 6debb3ebbf0fdbfeb49f80891fd8ba38cea72cd7 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 7 Feb 2017 11:05:18 +0100
Subject: [PATCH 4/4] jenkins-build-makebuildserver: include VLC as a test
 build

---
 jenkins-build-makebuildserver | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jenkins-build-makebuildserver b/jenkins-build-makebuildserver
index ed8f0404..f54f4443 100755
--- a/jenkins-build-makebuildserver
+++ b/jenkins-build-makebuildserver
@@ -71,3 +71,5 @@ echo "build_server_always = True" > config.py
 ../fdroid build --verbose --stop info.guardianproject.checkey:101
 # building old versions should still work
 ../fdroid build --verbose --stop org.fdroid.fdroid:96150
+# VLC is important, and uses cmake
+../fdroid build --verbose --stop org.videolan.vlc:12000604