enchant: update to 2.8.2

mingw-w64-enchant/PKGBUILD

@@ -4,13 +4,13 @@
 _realname=enchant
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.6.7
-pkgrel=2
+pkgver=2.8.2
+pkgrel=1
 pkgdesc="Enchanting Spell Checking Library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
-url="https://abiword.github.io/enchant/"
-msys2_repository_url="https://github.com/AbiWord/enchant/"
+url="https://rrthomas.github.io/enchant/"
+msys2_repository_url="https://github.com/rrthomas/enchant/"
 msys2_references=(
   'archlinux: enchant'
 )
@@ -26,14 +26,11 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-autotools"
              "groff")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-unittest-cpp")
-source=("https://github.com/AbiWord/enchant/releases/download/v${pkgver}/enchant-${pkgver}.tar.gz"
-        001_fix_relocation.patch)
-sha256sums=('a1c2e5b59acca000bbfb24810af4a1165733d407f2154786588e076c8cd57bfc'
-            '2eaee551887a4dcd9b47fa3fc31db8955c51b323b89b9a6a4f096b7dca135942')
+source=("https://github.com/rrthomas/enchant/releases/download/v${pkgver}/enchant-${pkgver}.tar.gz")
+sha256sums=('8f19535adb5577b83b00e02f330fe9b9eb40dd21f19e2899636fc4d3a7696375')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
-  patch -p1 -i ${srcdir}/001_fix_relocation.patch
 
   autoreconf -fiv
 }
@@ -45,6 +42,8 @@ build() {
     --prefix=${MINGW_PREFIX} \
     --enable-relocatable \
     --with-aspell \
+    --with-hunspell \
+    --with-nuspell \
     --with-voikko \
     --without-hspell \
     --without-zemberek
@@ -62,5 +61,6 @@ package() {
   cd "${srcdir}/build-${MSYSTEM}"
   # MSYS2_ARG_CONV_EXCL="-DENCHANT_USPELL_DICT_DIR=;-DENCHANT_MYSPELL_DICT_DIR=;-DENCHANT_ISPELL_DICT_DIR=;-DENCHANT_PREFIX_DIR=;-DENCHANT_GLOBAL_MODULE_DIR=;-DENCHANT_GLOBAL_ORDERING=;-DENCHANT_BIN_DIR="
   make DESTDIR="${pkgdir}" install
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING.LIB" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.LIB"
+  install -Dm644 "${srcdir}"/${_realname}-${pkgver}/COPYING.LIB \
+    "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.LIB
 }

mingw-w64-geany-plugins/PKGBUILD

@@ -9,7 +9,7 @@ _realpkgver=2.0.0
 pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=${_realpkgver%.*}
-pkgrel=2
+pkgrel=3
 pkgdesc='Plugins for Geany (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -20,15 +20,16 @@ msys2_references=(
 )
 license=('spdx:GPL-2.0-or-later AND GPL-3.0-or-later AND BSD-2-Clause')
 depends=("${MINGW_PACKAGE_PREFIX}-geany>=${pkgver}"
-         "${MINGW_PACKAGE_PREFIX}-discount"
-         "${MINGW_PACKAGE_PREFIX}-gtkspell3"
          "${MINGW_PACKAGE_PREFIX}-ctpl"
+         "${MINGW_PACKAGE_PREFIX}-discount"
+         "${MINGW_PACKAGE_PREFIX}-enchant"
          "${MINGW_PACKAGE_PREFIX}-gpgme"
-         "${MINGW_PACKAGE_PREFIX}-lua51"
+         "${MINGW_PACKAGE_PREFIX}-gtk-update-icon-cache"
          "${MINGW_PACKAGE_PREFIX}-gtk3"
+         "${MINGW_PACKAGE_PREFIX}-gtkspell3"
+         "${MINGW_PACKAGE_PREFIX}-hicolor-icon-theme"
          "${MINGW_PACKAGE_PREFIX}-libgit2"
-         "${MINGW_PACKAGE_PREFIX}-gtk-update-icon-cache"
-         "${MINGW_PACKAGE_PREFIX}-hicolor-icon-theme")
+         "${MINGW_PACKAGE_PREFIX}-lua51")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-autotools"
              "${MINGW_PACKAGE_PREFIX}-vala"
@@ -66,9 +67,6 @@ build() {
   CFLAGS+=" -Wno-deprecated-declarations" \
   CXXFLAGS+=" -Wno-deprecated-declarations" \
   ../${_realname}-${pkgver}/configure \
-    --host=${MINGW_CHOST} \
-    --target=${MINGW_CHOST} \
-    --build=${MINGW_CHOST} \
     --prefix=${MINGW_PREFIX} \
     --libexecdir=${MINGW_PREFIX}/lib \
     --with-geany-libdir=${MINGW_PREFIX}/lib \

mingw-w64-gnome-text-editor/PKGBUILD

@@ -4,7 +4,7 @@ _realname=gnome-text-editor
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=47.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple text editor for the GNOME desktop (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -14,19 +14,18 @@ msys2_references=(
 )
 license=('spdx:GPL-3.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-editorconfig-core-c"
-         "${MINGW_PACKAGE_PREFIX}-enchant"
          "${MINGW_PACKAGE_PREFIX}-glib2"
          "${MINGW_PACKAGE_PREFIX}-gtk4"
          "${MINGW_PACKAGE_PREFIX}-gtksourceview5"
-         "${MINGW_PACKAGE_PREFIX}-libspelling"
          "${MINGW_PACKAGE_PREFIX}-icu"
-         "${MINGW_PACKAGE_PREFIX}-libadwaita")
+         "${MINGW_PACKAGE_PREFIX}-libadwaita"
+         "${MINGW_PACKAGE_PREFIX}-libspelling")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-meson"
              "${MINGW_PACKAGE_PREFIX}-pkgconf"
              "${MINGW_PACKAGE_PREFIX}-gobject-introspection"
              "${MINGW_PACKAGE_PREFIX}-gtk-doc"
-             "${MINGW_PACKAGE_PREFIX}-gettext"
+             "${MINGW_PACKAGE_PREFIX}-gettext-tools"
              "${MINGW_PACKAGE_PREFIX}-itstool")
 source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz)
 sha256sums=('7d04039b16174ec5fd65fea2f447f3febd9fdf2aa36e9997abc6ff992cc31e38')
@@ -40,7 +39,6 @@ build() {
     --wrap-mode=nodownload \
     --default-library=both \
     --buildtype=plain \
-    -Denchant=enabled \
     -Dbugreport_url=https://github.com/msys2/MINGW-packages/issues \
     "../${_realname}-${pkgver}"
 
@@ -51,5 +49,6 @@ package() {
   cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson.exe install
 
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
+  install -Dm644 "${srcdir}"/${_realname}-${pkgver}/COPYING \
+    "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/COPYING
 }

mingw-w64-gspell/PKGBUILD

@@ -4,15 +4,15 @@ _realname=gspell
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.14.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Spell-checking library for GTK applications (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://gitlab.gnome.org/GNOME/gspell"
 license=('spdx:LGPL-2.1-or-later')
-depends=("${MINGW_PACKAGE_PREFIX}-gtk3"
-         "${MINGW_PACKAGE_PREFIX}-icu"
-         "${MINGW_PACKAGE_PREFIX}-enchant")
+depends=("${MINGW_PACKAGE_PREFIX}-enchant"
+         "${MINGW_PACKAGE_PREFIX}-gtk3"
+         "${MINGW_PACKAGE_PREFIX}-icu")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-meson"
              "${MINGW_PACKAGE_PREFIX}-ninja"
@@ -22,10 +22,6 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
 source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz)
 sha256sums=('64ea1d8e9edc1c25b45a920e80daf67559d1866ffcd7f8432fecfea6d0fe8897')
 
-prepare() {
-  cd "${srcdir}"/${_realname}-${pkgver}
-}
-
 build() {
   MSYS2_ARG_CONV_EXCL="--prefix=" \
     meson setup \
@@ -43,5 +39,6 @@ build() {
 package() {
   meson install -C "build-${MSYSTEM}" --destdir "${pkgdir}"
 
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}"/LICENSES/* -t "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}"
+  install -Dm644 "${srcdir}"/${_realname}-${pkgver}/LICENSES/* \
+    -t "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}
 }

mingw-w64-gtkspell/PKGBUILD

@@ -6,13 +6,13 @@ _realname=gtkspell
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.0.16
-pkgrel=9
+pkgrel=10
 pkgdesc="Provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://gtkspell.sourceforge.io/"
 msys2_repository_url="https://sourceforge.net/p/gtkspell/gtkspell/ci/master/tree"
-license=(GPL2)
+license=(spdx:GPL-2.0-or-later)
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-autotools"
              "${MINGW_PACKAGE_PREFIX}-gtk-doc"
@@ -35,16 +35,14 @@ prepare() {
   patch -p1 -i ${srcdir}/enchant-2.diff
 
   gtkdocize
-  WANT_AUTOMAKE=latest autoreconf -fi
+  WANT_AUTOMAKE=latest autoreconf -fiv
 }
 
 build() {
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
-    --build=${MINGW_CHOST} \
-    --host=${MINGW_CHOST} \
     --enable-shared \
     --disable-static
 
@@ -54,5 +52,6 @@ build() {
 package() {
   cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
+  install -Dm644 "${srcdir}"/${_realname}-${pkgver}/COPYING \
+    "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/COPYING
 }

mingw-w64-gtkspell3/PKGBUILD

@@ -4,18 +4,18 @@ _realname=gtkspell3
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.0.10
-pkgrel=3
+pkgrel=4
 pkgdesc="Provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://gtkspell.sourceforge.io/"
-license=("GPL")
+license=("spdx:GPL-2.0-or-later")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-autotools"
              "${MINGW_PACKAGE_PREFIX}-gobject-introspection"
              "${MINGW_PACKAGE_PREFIX}-iso-codes"
-             "${MINGW_PACKAGE_PREFIX}-autotools"
              "${MINGW_PACKAGE_PREFIX}-vala"
-             "${MINGW_PACKAGE_PREFIX}-gtk-doc"
+             #"${MINGW_PACKAGE_PREFIX}-gtk-doc" fails to build
              "intltool")
 depends=("${MINGW_PACKAGE_PREFIX}-gtk3"
          "${MINGW_PACKAGE_PREFIX}-enchant")
@@ -28,26 +28,27 @@ prepare() {
   cd ${_realname}-${pkgver}
   patch -p1 -i ${srcdir}/001-win.patch
 
-  WANT_AUTOMAKE=latest autoreconf -fi
+  WANT_AUTOMAKE=latest autoreconf -fiv
 }
 
 build() {
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
+  export lt_cv_deplibs_check_method='pass_all'
+
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
-    --build=${MINGW_CHOST} \
-    --host=${MINGW_CHOST} \
     --enable-shared \
     --disable-static \
     --disable-gtk2 \
-    --enable-gtk-doc
+    --disable-gtk-doc
 
   make
 }
 
 package() {
   cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
+  install -Dm644 "${srcdir}"/${_realname}-${pkgver}/COPYING \
+    "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/COPYING
 }

mingw-w64-libspelling/PKGBUILD

@@ -4,18 +4,18 @@ _realname=libspelling
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.4.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A GNOME library for spellchecking (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://gnome.pages.gitlab.gnome.org/libspelling/libspelling-1/'
 msys2_repository_url="https://gitlab.gnome.org/GNOME/libspelling"
 license=("spdx:LGPL-2.1-or-later")
 depends=(
+  "${MINGW_PACKAGE_PREFIX}-enchant"
   "${MINGW_PACKAGE_PREFIX}-gtk4"
   "${MINGW_PACKAGE_PREFIX}-gtksourceview5"
   "${MINGW_PACKAGE_PREFIX}-icu"
-  "${MINGW_PACKAGE_PREFIX}-enchant"
   )
 makedepends=(
   "${MINGW_PACKAGE_PREFIX}-cc"
@@ -46,5 +46,6 @@ build() {
 package() {
   ${MINGW_PREFIX}/bin/meson.exe install -C "${srcdir}/build-${MSYSTEM}" --destdir "${pkgdir}"
 
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
+  install -Dm644 "${srcdir}"/${_realname}-${pkgver}/COPYING \
+    "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/COPYING
 }