From 646766db501b41392f100032dba95fb139cd2d1e Mon Sep 17 00:00:00 2001
From: Frederik Carlier <frederik.carlier@keysight.com>
Date: Sun, 4 Feb 2024 17:13:32 +0100
Subject: [PATCH 1/3] libobjc2: New package

---
 mingw-w64-libobjc2/.gitignore |  1 +
 mingw-w64-libobjc2/PKGBUILD   | 61 +++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 mingw-w64-libobjc2/.gitignore
 create mode 100644 mingw-w64-libobjc2/PKGBUILD

diff --git a/mingw-w64-libobjc2/.gitignore b/mingw-w64-libobjc2/.gitignore
new file mode 100644
index 0000000000000..d4bfff0f70aac
--- /dev/null
+++ b/mingw-w64-libobjc2/.gitignore
@@ -0,0 +1 @@
+libobjc2-*/
diff --git a/mingw-w64-libobjc2/PKGBUILD b/mingw-w64-libobjc2/PKGBUILD
new file mode 100644
index 0000000000000..1288c69e81f2a
--- /dev/null
+++ b/mingw-w64-libobjc2/PKGBUILD
@@ -0,0 +1,61 @@
+# Maintainer: Frederik Carlier <frederik.carlier@keysight.com>
+
+_realname=libobjc2
+pkgbase=mingw-w64-${_realname}
+pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
+pkgver=2.2
+pkgrel=1
+pkgdesc="Objective-C runtime library intended for use with Clang. (mingw-w64)"
+arch=('any')
+mingw_arch=('mingw64' 'ucrt64')
+url="https://github.com/gnustep/libobjc2"
+license=('spdx:MIT')
+makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-clang"
+             "${MINGW_PACKAGE_PREFIX}-lld"
+             'git')
+source=("${_realname}-${pkgver}::git+https://github.com/gnustep/$_realname.git#tag=v${pkgver}")
+sha256sums=('SKIP')
+
+prepare() {
+  cd ${srcdir}/${_realname}-${pkgver}
+}
+
+build() {
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
+  declare -a extra_config
+  if check_option "debug" "n"; then
+    extra_config+=("-DCMAKE_BUILD_TYPE=Release")
+  else
+    extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
+  fi
+
+  export LDFLAGS="-fuse-ld=lld -lstdc++ -lgcc_s"
+
+  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
+    "${MINGW_PREFIX}"/bin/cmake.exe \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
+      -DCMAKE_C_COMPILER="clang" \
+      -DCMAKE_CXX_COMPILER="clang++" \
+      -DTESTS=ON \
+      "${extra_config[@]}" \
+      ../${_realname}-${pkgver}
+
+  "${MINGW_PREFIX}"/bin/cmake.exe --build .
+}
+
+check() {
+  cd "${srcdir}/build-${MSYSTEM}"
+
+  "${MINGW_PREFIX}"/bin/cmake.exe --build . --target test
+}
+
+package() {
+  cd "${srcdir}/build-${MSYSTEM}"
+
+  DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install .
+
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
+}

From 8eeaa3de360e2f2f4846b8809eb146b670149c1b Mon Sep 17 00:00:00 2001
From: Frederik Carlier <frederik.carlier@keysight.com>
Date: Mon, 5 Feb 2024 22:10:37 +0100
Subject: [PATCH 2/3] PR feedback

---
 mingw-w64-libobjc2/PKGBUILD | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/mingw-w64-libobjc2/PKGBUILD b/mingw-w64-libobjc2/PKGBUILD
index 1288c69e81f2a..f2f94c500bb26 100644
--- a/mingw-w64-libobjc2/PKGBUILD
+++ b/mingw-w64-libobjc2/PKGBUILD
@@ -14,11 +14,15 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-clang"
              "${MINGW_PACKAGE_PREFIX}-lld"
              'git')
-source=("${_realname}-${pkgver}::git+https://github.com/gnustep/$_realname.git#tag=v${pkgver}")
-sha256sums=('SKIP')
+source=("https://github.com/gnustep/${_realname}/archive/refs/tags/v${pkgver}.zip"
+        "https://github.com/gnustep/libobjc2/pull/275/commits/1632fc6027687735051bee7e6fe263f8e5000715.patch")
+sha256sums=('3f72ea4955e3e4671d64c64c339f4947b6112b1b2dd02377c5c982057bbeda04'
+            '4c2d02352f38114d8d9cdac6496137ee8ce7c903c36970f6e266d91c93896493')
 
 prepare() {
   cd ${srcdir}/${_realname}-${pkgver}
+
+  patch -p1 -i ${srcdir}/1632fc6027687735051bee7e6fe263f8e5000715.patch
 }
 
 build() {
@@ -57,5 +61,6 @@ package() {
 
   DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install .
 
+  mv ${pkgdir}${MINGW_PREFIX}/lib/objc.lib ${pkgdir}${MINGW_PREFIX}/lib/objc.dll.a
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
 }

From ca3416d2a565a2b310146e86a28fed4127ad65e2 Mon Sep 17 00:00:00 2001
From: Frederik Carlier <frederik.carlier@keysight.com>
Date: Tue, 6 Feb 2024 12:06:03 +0100
Subject: [PATCH 3/3] Update patch

---
 mingw-w64-libobjc2/PKGBUILD | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mingw-w64-libobjc2/PKGBUILD b/mingw-w64-libobjc2/PKGBUILD
index f2f94c500bb26..56aadbcf80e73 100644
--- a/mingw-w64-libobjc2/PKGBUILD
+++ b/mingw-w64-libobjc2/PKGBUILD
@@ -15,14 +15,15 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-lld"
              'git')
 source=("https://github.com/gnustep/${_realname}/archive/refs/tags/v${pkgver}.zip"
-        "https://github.com/gnustep/libobjc2/pull/275/commits/1632fc6027687735051bee7e6fe263f8e5000715.patch")
+        # Install runtime files in CMAKE_INSTALL_BINDIR when GNUstep is not installed
+        "https://github.com/gnustep/libobjc2/commit/639c676bb8033422539e19a2e2888bdbd06507e5.patch")
 sha256sums=('3f72ea4955e3e4671d64c64c339f4947b6112b1b2dd02377c5c982057bbeda04'
-            '4c2d02352f38114d8d9cdac6496137ee8ce7c903c36970f6e266d91c93896493')
+            'aaa23146b3c2ec442b5dbf20606020bddd15230041ad738ef3a06e92d13605c3')
 
 prepare() {
   cd ${srcdir}/${_realname}-${pkgver}
 
-  patch -p1 -i ${srcdir}/1632fc6027687735051bee7e6fe263f8e5000715.patch
+  patch -p1 -i ${srcdir}/639c676bb8033422539e19a2e2888bdbd06507e5.patch
 }
 
 build() {