From f085beec2a6be9b1045ed4f609156ea54ad37d82 Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Wed, 10 Feb 2021 21:45:18 +0100
Subject: [PATCH] [pkg] add build deps
---
Makefile | 7 +++++--
debian/control | 8 ++++++--
debian/rules | 1 +
docker/Dockerfile | 6 ++----
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index d3ae5f50..2ee11d28 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# Multiplatform build and packaging recipes for BitmaskVPN
-# (c) LEAP Encryption Access Project, 2019-2020
+# (c) LEAP Encryption Access Project, 2019-2021
#########################################################################
.PHONY: all get build icon locales generate_locales clean check_qtifw HAS-qtifw relink_vendor
@@ -11,7 +11,10 @@ VENDOR_PATH ?= providers
APPNAME ?= $(shell VENDOR_PATH=${VENDOR_PATH} branding/scripts/getparam appname | tail -n 1)
TARGET ?= $(shell VENDOR_PATH=${VENDOR_PATH} branding/scripts/getparam binname | tail -n 1)
PROVIDER ?= $(shell grep ^'provider =' ${VENDOR_PATH}/vendor.conf | cut -d '=' -f 2 | tr -d "[:space:]")
-VERSION ?= $(shell git describe)
+VERSION ?= $(shell git describe 2> /dev/null)
+ifeq ($(VERSION),)
+ VERSION := "unknown"
+endif
WINCERTPASS ?= pass
OSXAPPPASS ?= pass
OSXMORDORUID ?= uid
diff --git a/debian/control b/debian/control
index 1a2266ab..595033d6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: riseup-vpn
Section: net
Priority: extra
Maintainer: LEAP Encryption Access Project <debian@leap.se>
-Build-Depends: debhelper-compat (= 12), golang-go (>= 2:1.9), make, pkg-config, g++
+Build-Depends: debhelper-compat (= 12), golang-go (>= 2:1.9), make, pkg-config, g++, git,
+ qt5-qmake, qttools5-dev-tools, libqt5qml5, libqt5quick5, qtdeclarative5-dev,
+ qtbase5-dev
Standards-Version: 4.4.1
Homepage: https://0xacab.org/leap/bitmask-vpn
#Vcs-Browser: https://0xacab.org/leap/bitmask-vpn
@@ -11,7 +13,9 @@ Homepage: https://0xacab.org/leap/bitmask-vpn
Package: riseup-vpn
Architecture: any
Enhances: openvpn
-Depends: ${shlibs:Depends}, ${misc:Depends}, openvpn, policykit-1-gnome | polkit-1-auth-agent, python3
+Depends: ${shlibs:Depends}, ${misc:Depends}, openvpn, policykit-1-gnome | polkit-1-auth-agent, python3,
+ qml-module-qtquick2, qml-module-qtquick-controls, qml-module-qtquick-dialogs,
+ qml-module-qtquick-extras, qml-module-qt-labs-platform
Description: Easy, fast, and secure VPN service from riseup.net.
.
The service does not require a user account, keep logs, or track you in any
diff --git a/debian/rules b/debian/rules
index fdc68bdc..2ecf3086 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
# See debhelper(7) (uncomment to enable)
# output every command that modifies files on the build system.
export DH_VERBOSE = 1
+export VERBOSE = 1
export DH_OPTIONS
export GO111MODULE=on
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 82ea94e2..29ade5b3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,8 +1,6 @@
-# An image to build and package the Bitmask Lite (RiseupVPN and other branded builds)
-# (c) LEAP Encryption Access Project 2018-2019
+# An image to build and package the BitmaskVPN (RiseupVPN and other branded builds)
+# (c) LEAP Encryption Access Project 2018-2021
-# we start with 18.04 (bionic) to match the core18 used in the snap
-# but we will have to install a couple of extras on top...
FROM ubuntu:20.04 as builder
MAINTAINER LEAP Encryption Access Project <info@leap.se>
--
GitLab