From 09df1ab06b4eeca4cb4456721bd45611861bed2d Mon Sep 17 00:00:00 2001
From: Sol Fisher Romanoff <sol@solfisher.com>
Date: Sun, 12 Sep 2021 18:06:39 +0300
Subject: [PATCH] Use wxWidgets 3.0 in Arch and Alpine builds

Signed-off-by: Sol Fisher Romanoff <sol@solfisher.com>
---
 .builds/alpine.yml    | 19 +++----------------
 .builds/archlinux.yml | 33 ++++++++++++---------------------
 2 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/.builds/alpine.yml b/.builds/alpine.yml
index bf86a5ce7..e98108966 100644
--- a/.builds/alpine.yml
+++ b/.builds/alpine.yml
@@ -12,24 +12,11 @@ packages:
   - soundtouch-dev
   - soxr-dev
   - sqlite-dev
-
-  - expat-dev
-  - gtk+3.0-dev
-  - libjpeg-turbo-dev
-  - libpng-dev
-  - tiff-dev
-  - zlib-dev
+  - wxgtk3-dev
+environment:
+  WX_CONFIG: /usr/bin/wx-config-gtk3
 sources:
   - https://git.sr.ht/~tenacity/tenacity
 tasks:
-  - wxwidgets3-1: |
-      git clone https://github.com/wxWidgets/wxWidgets.git
-      cd wxWidgets
-      git checkout v3.1.5
-      git submodule update --init 3rdparty/catch
-      mkdir buildgtk && cd buildgtk
-      ../configure --with-gtk --disable-xlocale
-      make -j2
-      sudo make install
   - configure: cmake -G Ninja -S tenacity -B build
   - build: cmake --build build
diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml
index e55ae9278..ed13dc2e9 100644
--- a/.builds/archlinux.yml
+++ b/.builds/archlinux.yml
@@ -1,40 +1,31 @@
 image: archlinux
 packages:
   - cmake
-  - ninja
-
-  - expat
-  - gcc-libs
-  - gdk-pixbuf2
-  - glibc
+  - ffmpeg
   - flac
+  - gdk-pixbuf2
   - gtk3
-  - glib2
   - libid3tag
-  - lilv
   - libmad
   - libogg
+  - libsndfile
+  - libsoxr
+  - libvorbis
+  - lilv
+  - ninja
   - portaudio
   - portmidi
   - portsmf
-  - libsndfile
-  - libsoxr
+  - soundtouch
   - suil
   - twolame
   - vamp-plugin-sdk
-  - libvorbis
-  - soundtouch
-  - ffmpeg
-
+  - webkit2gtk
+  - wxgtk3
+environment:
+  WX_CONFIG: /usr/bin/wx-config-gtk3
 sources:
   - https://git.sr.ht/~tenacity/tenacity
 tasks:
-  - wxwidgets3-1: |
-      git clone https://github.com/wxWidgets/wxWidgets.git
-      cd wxWidgets
-      git checkout v3.1.5
-      cmake -G Ninja -S . -B cmake_build
-      cmake --build cmake_build
-      sudo cmake --install cmake_build
   - configure: cmake -G Ninja -S tenacity -B build
   - build: cmake --build build