fish: Misc test cleanups

.github/workflows/msys-build.yml

@@ -19,7 +19,6 @@ jobs:
             mingw-w64-x86_64-python3-cffi
             mingw-w64-x86_64-meson
             mingw-w64-x86_64-gtk2
-            mingw-w64-x86_64-enchant
             mingw-w64-x86_64-luajit
             mingw-w64-x86_64-desktop-file-utils
 

.github/workflows/windows-build.yml

@@ -2,8 +2,41 @@ name: Windows Build
 on: [push, pull_request]
 
 jobs:
+  build-gtk:
+    runs-on: windows-2019
+    strategy:
+      matrix:
+        platform: [x64, win32]
+        arch: [x64, x86]
+        exclude:
+          - platform: x64
+            arch: x86
+          - platform: win32
+            arch: x64
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          repository: wingtk/gvsbuild
+          ref: 9b10978a8c5aa539f4280feeaa69bc5cc8bf9fbf
+
+      - uses: actions/cache@v2
+        with:
+          path: C:\gtk-build
+          key: 9b10978a8c5aa539f4280feeaa69bc5cc8bf9fbf
+
+      - name: Build
+        run: |
+          C:/hostedtoolcache/windows/Python/3.6.8/${{ matrix.arch }}/python.exe .\build.py build --python-dir="C:/hostedtoolcache/windows/Python/3.6.8/${{ matrix.arch }}" -p ${{ matrix.arch }} --vs-ver=16 gtk lgi openssl
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Build Files ${{ matrix.arch }}
+          path: C:\gtk-build\gtk\${{ matrix.platform }}\release
+
   build:
     runs-on: windows-2019
+    needs: build-gtk
     strategy:
       matrix:
         platform: [x64, win32]

meson.build

@@ -85,18 +85,11 @@ configure_file(output: 'config.h', configuration: config_h)
 config_h_include = include_directories('.')
 
 if host_machine.system() == 'windows'
-  add_languages('cpp')
-
   add_project_arguments(
     '-DWIN32',
-    '-DNTDDI_VERSION=NTDDI_WIN8',
-    '-D_WIN32_WINNT=_WIN32_WINNT_WIN8',
+    '-DNTDDI_VERSION=NTDDI_WIN7',
+    '-D_WIN32_WINNT=_WIN32_WINNT_WIN7',
      language: 'c')
-  add_project_arguments(
-    '-DWIN32',
-    '-DNTDDI_VERSION=NTDDI_WIN8',
-    '-D_WIN32_WINNT=_WIN32_WINNT_WIN8',
-     language: 'cpp')
 endif
 
 

src/libenchant_win8/meson.build

@@ -1,7 +0,0 @@
-shared_module('enchant_win8',
-  sources: 'win8_provider.cpp',
-  dependencies: [libgio_dep, dependency('enchant-2')],
-  include_directories: config_h_include,
-  install: true,
-  install_dir: get_option('libdir') / 'enchant-2',
-)

src/libenchant_win8/win8_provider.cpp

@@ -22,15 +22,14 @@
 
 #include "config.h"
 
-#ifdef _MSC_VER
-#include "typedef.h" // for ssize_t
-#endif
-
-#include <spellcheck.h>
+#include <Spellcheck.h>
 #include <glib.h>
 
+#include "typedef.h" // for ssize_t
 #include <enchant-provider.h>
 
+ENCHANT_PLUGIN_DECLARE ("win8")
+
 /* --------- Utils ----------*/
 
 static char *
@@ -233,6 +232,12 @@ win8_provider_list_dicts (EnchantProvider *provider, size_t *out_n_dicts)
 	return enumstring_to_chararray (dicts, out_n_dicts, TRUE);
 }
 
+static void
+win8_provider_free_string_list (EnchantProvider *provider, char **str_list)
+{
+	g_strfreev (str_list);
+}
+
 static void
 win8_provider_dispose (EnchantProvider *provider)
 {
@@ -278,6 +283,7 @@ init_enchant_provider (void)
 	provider->identify = win8_provider_identify;
 	provider->describe = win8_provider_describe;
 	provider->list_dicts = win8_provider_list_dicts;
+	provider->free_string_list = win8_provider_free_string_list;
 
 	provider->user_data = factory;
 

src/meson.build

@@ -2,10 +2,6 @@ subdir('common')
 
 if get_option('gtk-frontend')
   subdir('fe-gtk')
-
-  if host_machine.system() == 'windows'
-    subdir('libenchant_win8')
-  endif
 endif
 
 if get_option('text-frontend')