From aeac9872946c0172457077e644da40c1f93db8a5 Mon Sep 17 00:00:00 2001
From: Dominika Liberda <ja@sdomi.pl>
Date: Sun, 10 Oct 2021 12:17:38 +0200
Subject: [PATCH] + changing CI to void?

---
 .gitlab-ci.yml                    |  2 +-
 scripts/1_Install_Dependencies.sh | 98 +++++++++++--------------------
 2 files changed, 35 insertions(+), 65 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 467fc12..fc745bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ variables:
       - "LibreWolf-${pkgver}-${pkgrel}.${CARCH}.tar.bz2"
 
 tarball_x86_64:
-  image: ubuntu:18.04
+  image: voidlinux/voidlinux:latest
   <<: *carch_x86_64
   <<: *tarball_build_config
   only:
diff --git a/scripts/1_Install_Dependencies.sh b/scripts/1_Install_Dependencies.sh
index 52ec91c..920a202 100755
--- a/scripts/1_Install_Dependencies.sh
+++ b/scripts/1_Install_Dependencies.sh
@@ -4,70 +4,40 @@ printf "\n\n-------------------------------------- DEPENDENCY INSTALLATION -----
 set -e
 
 # Setup Script Variables
-_DEPENDENCIES="wget git xvfb \
- xz-utils \
- gettext-base \
- curl python3 libjack-dev \
- python3-psutil python-psutil python3-dev python-dev \
-        autotools-dev \
-        autoconf2.13 \
-        zip \
-        libx11-dev \
-        libx11-xcb-dev \
-        libxt-dev \
-        libxext-dev \
-        libgtk-3-dev  \
-        libglib2.0-dev  \
-        libpango1.0-dev  \
-        libfontconfig1-dev \
-        libfreetype6-dev  \
-        libstartup-notification0-dev \
-        libasound2-dev \
-        libcurl4-openssl-dev \
-        libdbus-glib-1-dev \
-        lsb-release \
-        libiw-dev \
-        mesa-common-dev \
-        libnotify-dev \
-        libxrender-dev \
-        libpulse-dev \
-        libssl-dev \
-        yasm \
-        unzip \
-        dbus-x11 \
-        python \
-        libffi-dev \
-        nodejs-mozilla \
-        cargo \
-        rustc \
-        nasm-mozilla"
-
-        # cargo \
-        # rustc \
-
-export DEBIAN_FRONTEND=noninteractive
+_DEPENDENCIES="wget git xorg-server-xvfb \
+         xz \
+         gettext \
+         curl python3 libjack \
+         python3-psutil python3-devel python-devel \
+                automake \
+                autoconf \
+                zip \
+                libX11-devel \
+                libXt-devel \
+                libXext-devel \
+                gtk+3-devel  \
+                libglib-devel  \
+                pango-devel  \
+                fontconfig-devel \
+                freetype-devel \
+                libcurl-devel \
+                MesaLib-devel \
+                libnotify-devel \
+                libXrender-devel \
+                pulseaudio-devel \
+                openssl-devel \
+                yasm \
+                unzip \
+                dbus-x11 \
+                python \
+                libffi-devel \
+                nodejs \
+                cargo \
+                rust \
+                nasm \
+                clang \
+                llvm"
 
 # Installs Dependencies
 printf "\nInstalling dependencies: $_DEPENDENCIES\n";
-apt-get -qq update;
-apt-get -y -qq install $_DEPENDENCIES;
-
-if [[ $CARCH == 'x86_64' ]];then
-    # Installs (non-ancient) clang
-    apt install -y software-properties-common apt-transport-https ca-certificates
-    wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add
-    apt-add-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-13 main"
-    apt-get update
-    apt-get -y install clang-13 libclang-13-dev
-else
-    apt install -y software-properties-common apt-transport-https ca-certificates
-    wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add
-    apt-add-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main"
-    apt-get update
-    apt-get -y install clang-10 libclang-10-dev
-fi
-
-# we need a more recent rust
-# curl https://sh.rustup.rs -o rustup.sh
-# bash rustup.sh -y
-# source /root/.cargo/env
+xbps-install -Sy $_DEPENDENCIES