Revert "Build Ubuntu packages with Qt6 support (#2769)"

.github/workflows/linux.yaml

@@ -52,46 +52,106 @@ jobs:
             name: Sources
             path: .tmp
 
+  ubuntu-focal:
+    name: Ubuntu Focal
+    needs: source-bundle
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Download Source Package
+        uses: actions/download-artifact@v2
+        with:
+            name: Sources
+
+      - name: Install Dependencies
+        run: |
+          # Add external PPA, latest version of QT is 5.12.x for Ubuntu 20.04
+          sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-focal -y
+          sudo apt-get install debhelper devscripts equivs -y
+          pip3 install pyyaml
+
+          for file in $(find focal/ -type f); do ln -s $file; done
+          dpkg-source -x mozillavpn_*.dsc
+          sudo mk-build-deps -ir mozillavpn-*/debian/control
+
+      - name: Create package structure
+        shell: bash
+        run: |
+          (cd mozillavpn-* && dpkg-buildpackage --build=binary --no-sign)
+          mkdir packages
+          cp *.deb packages
+
+      - name: Uploading
+        uses: actions/upload-artifact@v1
+        with:
+            name: Focal Build
+            path: packages
+
+  ubuntu-bionic:
+    name: Ubuntu Bionic
+    needs: source-bundle
+    runs-on: ubuntu-18.04
+    steps:
+      - name: Download Source Package
+        uses: actions/download-artifact@v2
+        with:
+            name: Sources
+
+      - name: Install Dependencies
+        run: |
+          # Add external PPA, latest version of QT is 5.12.x for Ubuntu 18.04
+          sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-bionic -y
+          sudo apt-get install debhelper devscripts equivs -y
+          pip3 install pyyaml
+
+          for file in $(find bionic/ -type f); do ln -s $file; done
+          dpkg-source -x mozillavpn_*.dsc
+          sudo mk-build-deps -ir mozillavpn-*/debian/control
+
+      - name: Create package structure
+        shell: bash
+        run: |
+          (cd mozillavpn-* && dpkg-buildpackage --build=binary --no-sign)
+          mkdir packages
+          cp *.deb packages
+
+      - name: Uploading
+        uses: actions/upload-artifact@v1
+        with:
+            name: Bionic Build
+            path: packages
+
+
   ubuntu-pbuilder:
     name: Ubuntu Packages
     needs: source-bundle
     strategy:
       matrix:
         config:
-            - { name: "Bionic", dist: bionic, ppa: "ppa:okirby/qt6-testing" }
-            - { name: "Focal", dist: focal, ppa: "ppa:okirby/qt6-testing" }
-            - { name: "Impish", dist: impish, ppa: "ppa:okirby/qt6-testing" }
-            - { name: "Jammy", dist: jammy, ppa: "" }
+            - { name: "Impish", dist: impish }
+            - { name: "Jammy", dist: jammy }
 
     runs-on: ubuntu-latest
     env:
       BASETGZ: /var/cache/pbuilder/ubuntu-buildd-${{ matrix.config.dist }}.tgz
-      QTPPA: ${{ matrix.config.ppa }}
     steps:
       - name: Download Source Package
         uses: actions/download-artifact@v2
         with:
             name: Sources
-
+      
       - name: Create base ${{ matrix.config.dist }} image
         run: |
           pip3 install pyyaml
           sudo apt-get update
           sudo apt-get install pbuilder debootstrap debhelper devscripts -y
-          sudo pbuilder create --distribution ${{ matrix.config.dist }} --basetgz $BASETGZ \
-              --othermirror "deb http://security.ubuntu.com/ubuntu ${{ matrix.config.dist }}-updates main restricted universe" \
-              --debootstrapopts --variant=buildd --extrapackages "software-properties-common gpg-agent"
-          if [ ! -z "$QTPPA" ]; then
-              echo '#/bin/sh' > ppa-${{ matrix.config.dist }}-install.sh
-              echo "add-apt-repository ${QTPPA} -y" >> ppa-${{ matrix.config.dist }}-install.sh
-              sudo pbuilder execute --basetgz $BASETGZ --save-after-exec -- ppa-${{ matrix.config.dist }}-install.sh
-          fi
+          sudo pbuilder create --distribution ${{ matrix.config.dist }} --basetgz $BASETGZ --debootstrapopts --variant=buildd
 
       - name: Building package
         shell: bash
         run: |
           mkdir packages
-          sudo pbuilder build --basetgz $BASETGZ --buildresult $(pwd)/packages mozillavpn_*-${{matrix.config.dist}}[0-9].dsc
+          for file in $(find ${{matrix.config.dist}} -type f); do ln -s $file; done
+          sudo pbuilder build --basetgz $BASETGZ --buildresult $(pwd)/packages mozillavpn_*.dsc
 
       - name: Uploading
         uses: actions/upload-artifact@v1

.github/workflows/wasm.yaml

@@ -14,8 +14,6 @@ jobs:
   wasmQt6:
     name: Wasm Qt6
     runs-on: ubuntu-20.04
-    env:
-      QTVERSION: 6.2.3
 
     steps:
       - name: Clone repository
@@ -33,17 +31,15 @@ jobs:
         run: |
           python3 -m pip install aqtinstall
           # qt6.2.3 for wasm needs the desktop linux installation
-          python3 -m aqt install-qt -O /opt linux desktop $QTVERSION
-          python3 -m aqt install-qt -O /opt linux desktop $QTVERSION wasm_32 -m qtcharts qtwebsockets qt5compat
+          python3 -m aqt install-qt -O /opt linux desktop 6.2.3
+          python3 -m aqt install-qt -O /opt linux desktop 6.2.3 wasm_32 -m qtcharts qtwebsockets qt5compat
 
       - name: Patching Qt
         shell: bash
         run: |
           # see: https://wiki.qt.io/Qt_6.2_Known_Issues#WebAssembly
-          sed '/sse/,+5 d' /opt/$QTVERSION/wasm_32/mkspecs/features/wasm/wasm.prf > /tmp/wasm.prf
-          mv /tmp/wasm.prf /opt/$QTVERSION/wasm_32/mkspecs/features/wasm/wasm.prf
-          ln -s /opt/$QTVERSION/gcc_64/bin/lconvert /opt/$QTVERSION/wasm_32/bin/
-          ln -s /opt/$QTVERSION/gcc_64/bin/lupdate /opt/$QTVERSION/wasm_32/bin/
+          sed '/sse/,+5 d' /opt/6.2.3/wasm_32/mkspecs/features/wasm/wasm.prf > /tmp/wasm.prf
+          mv /tmp/wasm.prf /opt/6.2.3/wasm_32/mkspecs/features/wasm/wasm.prf
 
       - name: Install python dependencies
         shell: bash
@@ -56,7 +52,7 @@ jobs:
       - name: Compiling
         shell: bash
         run: |
-          export PATH=/opt/$QTVERSION/wasm_32/bin:/opt/$QTVERSION/gcc_64/bin:$PATH
+          export PATH=/opt/6.2.3/wasm_32/bin:/opt/6.2.3/gcc_64/bin:$PATH
           ./scripts/wasm/compile.sh
 
       - name: Uploading

linux/debian/control.beineri → linux/debian/control.bionic

@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 9.20160709),
                cdbs,
                quilt,
                flex,
-               golang (>=2:1.13~) | golang-1.13,
+               golang-1.13,
                cargo,
                python3-yaml,
                qt515base (>=5.15.2-1basyskom4),
@@ -37,7 +37,7 @@ Build-Depends: debhelper (>= 9.20160709),
                libxcb-xfixes0-dev,
                libxrender-dev,
                libxcb-shape0-dev,
-               libasound2-dev [linux-any],
+               libasound2-dev,
                libaudio-dev,
                libcups2-dev,
                libdbus-1-dev,
@@ -78,7 +78,9 @@ Architecture: any
 Depends: libpolkit-gobject-1-0 (>=0.105-20),
          wireguard (>=1.0.20200513-1~18.04.2),
          wireguard-tools (>=1.0.20200513-1~18.04.2),
+         libicu60 (>=60.2-3ubuntu3),
          libxcb-xinerama0 (>=1.13-1),
+         resolvconf (>=1.79ubuntu10),
          qt515base (>=5.15.2-1basyskom4),
          qt515charts-no-lgpl (>=5.15.2-1basyskom1),
          qt515declarative (>= 5.15.2-1basyskom1),

linux/debian/control.qt5 → linux/debian/control.impish

@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 9.20160709),
                cdbs,
                quilt,
                flex,
-               golang (>=2:1.13~) | golang-1.13,
+               golang (>=1.13),
                cargo,
                python3-yaml,
                libqt5charts5-dev (>=5.15.2),

linux/debian/rules.qt6 → linux/debian/rules.bionic

@@ -1,22 +1,20 @@
 #!/usr/bin/make -f
 
 export DH_VERBOSE=1
+export QTDIR := /opt/qt515
+export GODIR := /usr/lib/go-1.13
+export PATH := $(QTDIR)/bin:$(GODIR)/bin:$(PATH)
+export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_VERSION ?= $(shell dpkg-parsechangelog -SVersion)
 
-GOLANG_NATIVE_VERSION := $(shell dpkg-query --showformat='${Version}' --show golang 2>/dev/null || echo 0)
-ifneq (ok,$(dpkg --compare-versions $(GOLANG_NATIVE_VERSION) ge 2:1.13 && echo ok))
-	export GODIR := /usr/lib/go-1.13
-	export PATH := $(GODIR)/bin:$(PATH)
-endif
-
 %:
 	dh $@ --with=systemd --warn-missing
 
 override_dh_auto_configure:
 	python3 scripts/utils/import_languages.py
-	qmake6 CONFIG-=debug CONFIG+=release CONFIG-=debug_and_release BUILD_ID=$(DEB_VERSION) CONFIG+=webextension
+	qmake CONFIG-=debug CONFIG+=release CONFIG-=debug_and_release QT+=svg BUILD_ID=$(DEB_VERSION)
 
 override_dh_installdocs:
 

linux/debian/rules.beineri → linux/debian/rules.focal

@@ -8,12 +8,6 @@ export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_VERSION ?= $(shell dpkg-parsechangelog -SVersion)
 
-GOLANG_NATIVE_VERSION := $(shell dpkg-query --showformat='${Version}' --show golang 2>/dev/null || echo 0)
-ifneq (ok,$(dpkg --compare-versions $(GOLANG_NATIVE_VERSION) ge 2:1.13 && echo ok))
-	export GODIR := /usr/lib/go-1.13
-	export PATH := $(GODIR)/bin:$(PATH)
-endif
-
 %:
 	dh $@ --with=systemd --warn-missing
 

linux/debian/rules.qt5 → linux/debian/rules.impish

@@ -5,12 +5,6 @@ export DH_VERBOSE=1
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_VERSION ?= $(shell dpkg-parsechangelog -SVersion)
 
-GOLANG_NATIVE_VERSION := $(shell dpkg-query --showformat='${Version}' --show golang 2>/dev/null || echo 0)
-ifneq (ok,$(dpkg --compare-versions $(GOLANG_NATIVE_VERSION) ge 2:1.13 && echo ok))
-	export GODIR := /usr/lib/go-1.13
-	export PATH := $(GODIR)/bin:$(PATH)
-endif
-
 %:
 	dh $@ --with=systemd --warn-missing