From 397252d66c90baa7a2f9b8f125ee6bc805a6e328 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 26 May 2021 18:51:43 +0200
Subject: [PATCH] explicitly include p7zip in app builds that use it

p7zip is currently installed by default in the stretch buildserver guest.
With the work upgrading the buildserver guest to buster or newer, and the
NDK r10e package being switched to a zipball, p7zip no longer needs to be
included in the base image.

fdroidserver!927
---
 metadata/de.akaflieg_freiburg.enroute.yml |  2 +-
 metadata/net.gcompris.full.yml            |  4 ++--
 metadata/net.sourceforge.kid3.yml         | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/metadata/de.akaflieg_freiburg.enroute.yml b/metadata/de.akaflieg_freiburg.enroute.yml
index bffa0a3f90..b6c81bddd2 100644
--- a/metadata/de.akaflieg_freiburg.enroute.yml
+++ b/metadata/de.akaflieg_freiburg.enroute.yml
@@ -47,7 +47,7 @@ Builds:
     submodules: true
     sudo:
       - apt-get update || apt-get update
-      - apt-get install --yes librsvg2-bin
+      - apt-get install --yes librsvg2-bin p7zip
       - apt-get -t stretch-backports-sloppy install libarchive13
       - apt-get -t stretch-backports install cmake
     patch:
diff --git a/metadata/net.gcompris.full.yml b/metadata/net.gcompris.full.yml
index 5cd61abc07..74d6e5804e 100644
--- a/metadata/net.gcompris.full.yml
+++ b/metadata/net.gcompris.full.yml
@@ -23,7 +23,7 @@ Builds:
     submodules: true
     sudo:
       - apt-get update || apt-get update
-      - apt-get install --yes extra-cmake-modules libncurses5
+      - apt-get install --yes extra-cmake-modules libncurses5 p7zip
     output: android-build/android/bin/GCompris-Android-release-armeabi-v7a-dl-$$VERSION$$.apk
     prebuild: mkdir qt/ android-build/
     scandelete:
@@ -77,7 +77,7 @@ Builds:
     submodules: true
     sudo:
       - apt-get update || apt-get update
-      - apt-get install --yes libncurses5 -t stretch-backports cmake
+      - apt-get install --yes libncurses5 -t stretch-backports cmake p7zip
     output: android-build/android/GCompris-Android-release-armeabi-v7a-dl-$$VERSION$$.apk
     srclibs:
       - extra-cmake-modules@v5.63.0
diff --git a/metadata/net.sourceforge.kid3.yml b/metadata/net.sourceforge.kid3.yml
index a70e960468..89810dbac9 100644
--- a/metadata/net.sourceforge.kid3.yml
+++ b/metadata/net.sourceforge.kid3.yml
@@ -33,7 +33,7 @@ Builds:
     commit: v3.7.1
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y docbook-xsl
+      - apt-get install -y docbook-xsl p7zip
     output: android-build/kid3/android/bin/QtApp-release-unsigned.apk
     target: android-19
     build:
@@ -59,7 +59,7 @@ Builds:
     commit: v3.8.0
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y docbook-xsl
+      - apt-get install -y docbook-xsl p7zip
     output: android-build/kid3/android/build/outputs/apk/release/android-release-unsigned.apk
     target: android-22
     build:
@@ -85,7 +85,7 @@ Builds:
     commit: v3.8.1
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y docbook-xsl
+      - apt-get install -y docbook-xsl p7zip
     output: android-build/kid3/android/build/outputs/apk/release/android-release-unsigned.apk
     target: android-22
     build:
@@ -111,7 +111,7 @@ Builds:
     commit: v3.8.2
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y docbook-xsl
+      - apt-get install -y docbook-xsl p7zip
     output: android-build/kid3/android/build/outputs/apk/release/android-release-unsigned.apk
     target: android-22
     build:
@@ -137,7 +137,7 @@ Builds:
     commit: v3.8.3
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y docbook-xsl
+      - apt-get install -y docbook-xsl p7zip
     output: android-build/kid3/android/build/outputs/apk/release/android-release-unsigned.apk
     target: android-22
     build:
@@ -163,7 +163,7 @@ Builds:
     commit: v3.8.4
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y docbook-xsl
+      - apt-get install -y docbook-xsl p7zip
     output: android-build/kid3/android/build/outputs/apk/release/android-release-unsigned.apk
     target: android-22
     build:
@@ -189,7 +189,7 @@ Builds:
     commit: v3.8.5
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y docbook-xsl
+      - apt-get install -y docbook-xsl p7zip
     output: android-build/kid3/android/build/outputs/apk/release/android-release-unsigned.apk
     target: android-22
     build:
@@ -215,7 +215,7 @@ Builds:
     commit: v3.8.6
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y docbook-xsl
+      - apt-get install -y docbook-xsl p7zip
     output: android-build/kid3/android/build/outputs/apk/release/android-release-unsigned.apk
     target: android-22
     build: