Build with gtk3

.github/workflows/codeql.yml

@@ -52,7 +52,7 @@ jobs:
 
     - name: Build app
       run: |
-        sudo apt-get update && sudo apt-get install -y libglib2.0-dev ghostscript man jq libgtk2.0-dev
+        sudo apt-get update && sudo apt-get install -y libglib2.0-dev ghostscript man jq libgtk-3-dev
         ./configure --with-werror
         nproc && make -j$(nproc)
       env:

.github/workflows/make-dist.sh

@@ -27,12 +27,6 @@ echo "appimage is <$archive>"
 mkdir -p dist/locale
 cp -vr locale/*/ dist/locale/
 if [ "$os" != "linux64" ]; then
-  if [ "$GUI" = 1 ]; then
-    mkdir -p dist/share/themes dist/lib/gtk-2.0
-    cp -vr $MINGW_PREFIX/share/themes/MS-Windows dist/share/themes/
-    cp -vr $MINGW_PREFIX/lib/gtk-2.0/* dist/lib/gtk-2.0/
-    rm -rf dist/lib/gtk-2.0/include
-  fi
   mkdir -p dist/lib
   ntldd -R dvdisaster
   for i in $(ntldd -R dvdisaster | awk '/mingw/ {print $3}' | tr \\\\ / | grep -Eo '[^/]+$')

.github/workflows/release.yml

@@ -26,7 +26,7 @@ jobs:
         if: matrix.ui == 'gui'
         env:
           HOMEBREW_NO_INSTALL_CLEANUP: 1
-        run: brew install gtk+
+        run: brew install gtk+3
       - name: configure
         run: |
           set +x
@@ -82,7 +82,7 @@ jobs:
           install: git diffutils make pkg-config mingw-w64-${{ matrix.arch }}-glib2 mingw-w64-${{ matrix.arch }}-gcc mingw-w64-${{ matrix.arch }}-ghostscript mingw-w64-${{ matrix.arch }}-ntldd-git man zip
       - name: install GUI prereqs
         if: matrix.ui == 'gui'
-        run: pacman -S --noconfirm mingw-w64-${{ matrix.arch }}-gtk2
+        run: pacman -S --noconfirm mingw-w64-${{ matrix.arch }}-gtk3
       - name: git config
         run: git config --global core.autocrlf input
         shell: bash
@@ -159,7 +159,7 @@ jobs:
           mkdir -p /tmp/dist
           docker run --device /dev/fuse --privileged --name uu -d -v $PWD:/code -v /tmp/dist:/dist ubuntu:14.04 sleep 1800
       - name: install prerequisites in docker
-        run: docker exec uu sh -c 'sudo apt update && sudo apt install -y libglib2.0-dev ghostscript man libgtk2.0-dev gtk2-engines-pixbuf gtk2-engines libgail-common pkg-config gnome-themes-standard fuse'
+        run: docker exec uu sh -c 'sudo apt update && sudo apt install -y libglib2.0-dev ghostscript man libgtk3-dev libgail-common pkg-config gnome-themes-standard fuse'
       - name: configure in docker
         run: docker exec uu sh -c 'cd /code && ./configure --prefix=/usr'
       - name: make in docker

.github/workflows/tests.yml

@@ -26,7 +26,7 @@ jobs:
       if: matrix.ui == 'gui'
       env:
         HOMEBREW_NO_INSTALL_CLEANUP: 1
-      run: brew install gtk+
+      run: brew install gtk+3
     - name: configure
       run: |
           set +x
@@ -85,7 +85,7 @@ jobs:
         install: git diffutils make pkg-config mingw-w64-${{ matrix.arch }}-glib2 mingw-w64-${{ matrix.arch }}-gcc mingw-w64-${{ matrix.arch }}-ghostscript mingw-w64-${{ matrix.arch }}-ntldd-git man zip
     - name: install GUI prereqs
       if: matrix.ui == 'gui'
-      run: pacman -S --noconfirm mingw-w64-${{ matrix.arch }}-gtk2
+      run: pacman -S --noconfirm mingw-w64-${{ matrix.arch }}-gtk3
     - name: git config
       run: git config --global core.autocrlf input
       shell: bash
@@ -146,7 +146,7 @@ jobs:
       if: matrix.ui == 'gui'
       env:
         DEBIAN_FRONTEND: noninteractive
-      run: sudo apt-get install -y libgtk2.0-dev
+      run: sudo apt-get install -y libgtk-3-dev
     - name: configure
       run: |
           echo ./configure ${{ matrix.clionly }} ${{ matrix.debugprintf }} --with-werror