From 7c2d7ea6df5c415080da148777fdfcee630cd4fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?=
 =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <mehdi.chinoune@hotmail.com>
Date: Mon, 3 Oct 2022 06:32:49 +0100
Subject: [PATCH] advancecomp: Build on UCRT64 and CLANG64

---
 .../001-fix-building-on-ucrt.patch            | 22 +++++++++++++++++++
 mingw-w64-advancecomp/PKGBUILD                | 13 ++++++-----
 2 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 mingw-w64-advancecomp/001-fix-building-on-ucrt.patch

diff --git a/mingw-w64-advancecomp/001-fix-building-on-ucrt.patch b/mingw-w64-advancecomp/001-fix-building-on-ucrt.patch
new file mode 100644
index 0000000000..f1f8bbacab
--- /dev/null
+++ b/mingw-w64-advancecomp/001-fix-building-on-ucrt.patch
@@ -0,0 +1,22 @@
+--- a/portable.h
++++ b/portable.h
+@@ -146,7 +146,7 @@
+ #endif
+ 
+ /* 64 bit IO */
+-#ifdef __WIN32__
++#if defined(__WIN32__) && !defined(_UCRT)
+ #define off_t off64_t /* This must be after including stdio.h */
+ off64_t rpl_ftello(FILE* f);
+ int rpl_fseeko(FILE* f, off64_t offset, int origin);
+--- a/portable.c
++++ b/portable.c
+@@ -30,7 +30,7 @@
+ 
+ #include "portable.h"
+ 
+-#ifdef __WIN32__
++#if defined(__WIN32__) && !defined(_UCRT)
+ off64_t rpl_ftello(FILE* f)
+ {
+ 	fpos_t fpos;
diff --git a/mingw-w64-advancecomp/PKGBUILD b/mingw-w64-advancecomp/PKGBUILD
index ffd777dba9..0c200f078b 100644
--- a/mingw-w64-advancecomp/PKGBUILD
+++ b/mingw-w64-advancecomp/PKGBUILD
@@ -4,22 +4,25 @@ _realname=advancecomp
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=2.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Recompression utilities for .zip .png .mng and .gz files using the 7-zip algorithm (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
 url='http://www.advancemame.it/comp-readme'
 license=('spdx:GPL-3.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-zlib")
 makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
              "${MINGW_PACKAGE_PREFIX}-cc")
-source=("https://github.com/amadvance/advancecomp/releases/download/v${pkgver}/advancecomp-${pkgver}.tar.gz")
-sha256sums=('811f661dfbbdddefdcb5eaf133e403ca2af99328b850b22c1249f7bebe657578')
+source=("https://github.com/amadvance/advancecomp/releases/download/v${pkgver}/advancecomp-${pkgver}.tar.gz"
+        001-fix-building-on-ucrt.patch)
+sha256sums=('811f661dfbbdddefdcb5eaf133e403ca2af99328b850b22c1249f7bebe657578'
+            '60603d0efedfa8e8433137ed6392b7fcb6d99f23d6c9890d571009614a5d0a04')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
+  patch -p1 -i ${srcdir}/001-fix-building-on-ucrt.patch
+  autoreconf -fiv
 }
 
 build() {