From da62771d4f31d35308b039464ac1fb8a45ede731 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Tue, 14 Dec 2021 21:40:48 +0530
Subject: [PATCH] libraqm: update to 0.8.0

Use meson instead of autotools.
---
 mingw-w64-libraqm/PKGBUILD                    | 81 +++++++++----------
 mingw-w64-libraqm/libraqm-enable-shared.patch | 10 ---
 2 files changed, 36 insertions(+), 55 deletions(-)
 delete mode 100644 mingw-w64-libraqm/libraqm-enable-shared.patch

diff --git a/mingw-w64-libraqm/PKGBUILD b/mingw-w64-libraqm/PKGBUILD
index 3043bbd88d..c78513cbfa 100644
--- a/mingw-w64-libraqm/PKGBUILD
+++ b/mingw-w64-libraqm/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=libraqm
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=0.7.2
+pkgver=0.8.0
 pkgrel=1
 pkgdesc="A library that encapsulates the logic for complex text layout (mingw-w64)"
 arch=('any')
@@ -11,61 +11,52 @@ mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://github.com/HOST-Oman/libraqm"
 depends=("${MINGW_PACKAGE_PREFIX}-freetype"
          "${MINGW_PACKAGE_PREFIX}-glib2"
-         "${MINGW_PACKAGE_PREFIX}-harfbuzz" 
+         "${MINGW_PACKAGE_PREFIX}-harfbuzz"
          "${MINGW_PACKAGE_PREFIX}-fribidi")
-makedepends=("${MINGW_PACKAGE_PREFIX}-gtk-doc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-gtk-doc"
+             "${MINGW_PACKAGE_PREFIX}-meson"
+             "${MINGW_PACKAGE_PREFIX}-pkg-config")
 license=('MIT')
-source=("${_realname}-$pkgver".tar.gz::"https://github.com/HOST-Oman/libraqm/archive/v${pkgver}.tar.gz"
-        "libraqm-enable-shared.patch")
-noextract=("${_realname}-$pkgver.tar.gz")
-sha256sums=('eeccbb0bf23ef77d8ff2be24a9c6c1547cc8e443d3d6b57814d73d44758d95c2'
-            '9809d2d5a451b8b512cf535bfad5e5ccd0771b285c7475eca5ead75833af8409')
-
-# Helper macros to help make tasks easier #
-apply_patch_with_msg() {
-  for _patch in "$@"
-  do
-    msg2 "Applying $_patch"
-    patch -Nbp1 -i "${srcdir}/$_patch"
-  done
-}
-
-del_file_exists() {
-  for _fname in "$@"
-  do
-    if [ -f $_fname ]; then
-      rm -rf $_fname
-    fi
-  done
-}
-# =========================================== #
+source=("${_realname}-$pkgver".tar.gz::"https://github.com/HOST-Oman/libraqm/archive/v${pkgver}.tar.gz")
+sha256sums=('6429e35f69f5e7d514877624fb73ae6d07a7e9ac746ae6a1cf2bf1277bb5b68d')
 
 prepare() {
-  tar -xzf "${_realname}-$pkgver.tar.gz" || true # somehow extracting README fails
   cd ${srcdir}/${_realname}-${pkgver}
-  apply_patch_with_msg libraqm-enable-shared.patch
-  ./autogen.sh
+
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
-  ../${_realname}-${pkgver}/configure \
-    --prefix=${MINGW_PREFIX} \
-    --build=${MINGW_CHOST} \
-    --host=${MINGW_CHOST} \
-    --target=${MINGW_CHOST} \
-    --enable-static=yes \
-    --enable-shared=yes \
-    --enable-fast-install=yes \
-    --enable-gtk-doc=yes
-  make
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
+  declare -a extra_config
+  if check_option "debug" "n"; then
+    extra_config+=("--buildtype=release")
+  else
+    extra_config+=("--buildtype=debug")
+  fi
+
+  MSYS2_ARG_CONV_EXCL="--prefix=" \
+  ${MINGW_PREFIX}/bin/meson.exe \
+    --prefix="${MINGW_PREFIX}" \
+    "${extra_config[@]}" \
+    --wrap-mode=nodownload \
+    --default-library=both \
+    --auto-features=enabled \
+    -Ddocs=true \
+    "../${_realname}-${pkgver}"
+
+  ${MINGW_PREFIX}/bin/meson.exe compile
 }
 
-#tests require chcp 65001
+check() {
+  cd "${srcdir}/build-${MSYSTEM}"
+  ${MINGW_PREFIX}/bin/meson.exe test || true
+}
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
-  make install DESTDIR="${pkgdir}"
+  cd "${srcdir}/build-${MSYSTEM}"
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson.exe install
+
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }
diff --git a/mingw-w64-libraqm/libraqm-enable-shared.patch b/mingw-w64-libraqm/libraqm-enable-shared.patch
deleted file mode 100644
index c7ee82d6fd..0000000000
--- a/mingw-w64-libraqm/libraqm-enable-shared.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libraqm-0.4.0/src/Makefile.am.orig	2018-02-19 09:14:15.278422700 -0400
-+++ libraqm-0.4.0/src/Makefile.am	2018-02-19 09:15:40.108614900 -0400
-@@ -27,6 +27,7 @@
-     $(NULL)
- 
- libraqm_la_LDFLAGS = \
-+    -no-undefined \
-     -version-info $(RAQM_LIBTOOL_VERSION) \
-     $(NULL)
-