From 4f2551ec98ec7f0cdc895f5937e33269ecdd67aa Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Tue, 27 Jul 2021 23:33:13 +0530
Subject: [PATCH] gedit: Add install scripts according to MSYSTEM variable

---
 mingw-w64-gedit/PKGBUILD                         | 16 ++++++++--------
 ...{gedit-i686.install => gedit-CLANG32.install} |  2 +-
 ...edit-x86_64.install => gedit-CLANG64.install} |  2 +-
 mingw-w64-gedit/gedit-CLANGARM64.install         | 11 +++++++++++
 mingw-w64-gedit/gedit-MINGW32.install            | 11 +++++++++++
 mingw-w64-gedit/gedit-MINGW64.install            | 11 +++++++++++
 mingw-w64-gedit/gedit-UCRT64.install             | 11 +++++++++++
 7 files changed, 54 insertions(+), 10 deletions(-)
 rename mingw-w64-gedit/{gedit-i686.install => gedit-CLANG32.install} (58%)
 rename mingw-w64-gedit/{gedit-x86_64.install => gedit-CLANG64.install} (58%)
 create mode 100644 mingw-w64-gedit/gedit-CLANGARM64.install
 create mode 100644 mingw-w64-gedit/gedit-MINGW32.install
 create mode 100644 mingw-w64-gedit/gedit-MINGW64.install
 create mode 100644 mingw-w64-gedit/gedit-UCRT64.install

diff --git a/mingw-w64-gedit/PKGBUILD b/mingw-w64-gedit/PKGBUILD
index 32ec4a932a..cb80fead49 100644
--- a/mingw-w64-gedit/PKGBUILD
+++ b/mingw-w64-gedit/PKGBUILD
@@ -4,7 +4,7 @@ _realname=gedit
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.38.1
-pkgrel=2
+pkgrel=3
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
 pkgdesc="A text editor for GNOME (mingw-w64)"
@@ -18,13 +18,11 @@ depends=("${MINGW_PACKAGE_PREFIX}-adwaita-icon-theme"
          "${MINGW_PACKAGE_PREFIX}-gspell"
          "${MINGW_PACKAGE_PREFIX}-gobject-introspection-runtime"
          "${MINGW_PACKAGE_PREFIX}-tepl5")
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
-             "${MINGW_PACKAGE_PREFIX}-gobject-introspection"
+makedepends=("${MINGW_PACKAGE_PREFIX}-gobject-introspection"
              "${MINGW_PACKAGE_PREFIX}-gtk-doc"
              "${MINGW_PACKAGE_PREFIX}-gettext"
              "${MINGW_PACKAGE_PREFIX}-itstool"
              "${MINGW_PACKAGE_PREFIX}-meson"
-             "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-pkg-config"
              "${MINGW_PACKAGE_PREFIX}-python"
              "${MINGW_PACKAGE_PREFIX}-vala"
@@ -32,7 +30,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
 options=('strip' 'staticlibs')
 license=("GPL")
 url="https://www.gnome.org"
-install=${_realname}-${CARCH}.install
+install=${_realname}-${MSYSTEM}.install
 source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz
         "0001-workaround-no-delayed-loading.patch")
 sha256sums=('0053853d2cd59cad8a1662f5b4fdcfab47b4c0940063bacd6790a9948642844d'
@@ -52,17 +50,19 @@ build() {
   mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
-  ${MINGW_PREFIX}/bin/meson \
+  ${MINGW_PREFIX}/bin/meson.exe \
     --prefix=${MINGW_PREFIX} \
+    --wrap-mode=nodownload \
+    --default-library=both \
     --buildtype=plain \
     "../${_realname}-${pkgver}"
 
-  ninja
+  ${MINGW_PREFIX}/bin/meson.exe compile
 }
 
 package() {
   cd "${srcdir}/build-${MINGW_CHOST}"
-  DESTDIR="${pkgdir}" ninja install
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson.exe install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
 }
diff --git a/mingw-w64-gedit/gedit-i686.install b/mingw-w64-gedit/gedit-CLANG32.install
similarity index 58%
rename from mingw-w64-gedit/gedit-i686.install
rename to mingw-w64-gedit/gedit-CLANG32.install
index 375e708c36..6915b240cd 100644
--- a/mingw-w64-gedit/gedit-i686.install
+++ b/mingw-w64-gedit/gedit-CLANG32.install
@@ -1,5 +1,5 @@
 post_install() {
-    mingw32/bin/glib-compile-schemas /mingw32/share/glib-2.0/schemas
+    clang32/bin/glib-compile-schemas clang32/share/glib-2.0/schemas
 }
 
 post_upgrade() {
diff --git a/mingw-w64-gedit/gedit-x86_64.install b/mingw-w64-gedit/gedit-CLANG64.install
similarity index 58%
rename from mingw-w64-gedit/gedit-x86_64.install
rename to mingw-w64-gedit/gedit-CLANG64.install
index d43ee14ce7..74145205c0 100644
--- a/mingw-w64-gedit/gedit-x86_64.install
+++ b/mingw-w64-gedit/gedit-CLANG64.install
@@ -1,5 +1,5 @@
 post_install() {
-    mingw64/bin/glib-compile-schemas /mingw64/share/glib-2.0/schemas
+    clang64/bin/glib-compile-schemas clang64/share/glib-2.0/schemas
 }
 
 post_upgrade() {
diff --git a/mingw-w64-gedit/gedit-CLANGARM64.install b/mingw-w64-gedit/gedit-CLANGARM64.install
new file mode 100644
index 0000000000..aa6587b3ff
--- /dev/null
+++ b/mingw-w64-gedit/gedit-CLANGARM64.install
@@ -0,0 +1,11 @@
+post_install() {
+    clangarm64/bin/glib-compile-schemas clangarm64/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    post_install $1
+}
diff --git a/mingw-w64-gedit/gedit-MINGW32.install b/mingw-w64-gedit/gedit-MINGW32.install
new file mode 100644
index 0000000000..17b09a6b33
--- /dev/null
+++ b/mingw-w64-gedit/gedit-MINGW32.install
@@ -0,0 +1,11 @@
+post_install() {
+    mingw32/bin/glib-compile-schemas mingw32/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    post_install $1
+}
diff --git a/mingw-w64-gedit/gedit-MINGW64.install b/mingw-w64-gedit/gedit-MINGW64.install
new file mode 100644
index 0000000000..704e577a4a
--- /dev/null
+++ b/mingw-w64-gedit/gedit-MINGW64.install
@@ -0,0 +1,11 @@
+post_install() {
+    mingw64/bin/glib-compile-schemas mingw64/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    post_install $1
+}
diff --git a/mingw-w64-gedit/gedit-UCRT64.install b/mingw-w64-gedit/gedit-UCRT64.install
new file mode 100644
index 0000000000..c25c231070
--- /dev/null
+++ b/mingw-w64-gedit/gedit-UCRT64.install
@@ -0,0 +1,11 @@
+post_install() {
+    ucrt64/bin/glib-compile-schemas ucrt64/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    post_install $1
+}