From ed4b48bbd5f479f2b2bc788aa50a42f979263d7b 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, 19 Feb 2024 11:58:56 +0100
Subject: [PATCH] xpdf: update to 4.05

---
 .../006-hack-argument-list-under-win.patch    | 13 -----
 mingw-w64-xpdf/PKGBUILD                       | 55 ++++++++++++-------
 2 files changed, 36 insertions(+), 32 deletions(-)
 delete mode 100644 mingw-w64-xpdf/006-hack-argument-list-under-win.patch

diff --git a/mingw-w64-xpdf/006-hack-argument-list-under-win.patch b/mingw-w64-xpdf/006-hack-argument-list-under-win.patch
deleted file mode 100644
index c5a1206a63..0000000000
--- a/mingw-w64-xpdf/006-hack-argument-list-under-win.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- xpdf-4.01.01/cmake-config.txt.orig	2019-06-24 11:42:52.480382800 +0300
-+++ xpdf-4.01.01/cmake-config.txt	2019-06-24 11:43:20.390421900 +0300
-@@ -208,8 +208,8 @@
-       set(QT_LIBRARIES Qt5::Widgets Qt5::Network Qt5::PrintSupport)
-     endif ()
-   else ()
--    set(QT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS}")
--    set(QT_DEFINITIONS "${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS}")
-+    set(QT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS};${Qt5Network_INCLUDE_DIRS}")
-+    set(QT_DEFINITIONS "${Qt5Widgets_DEFINITIONS};${Qt5Network_DEFINITIONS}")
-     set(QT_LIBRARIES Qt5::Widgets Qt5::Network)
-   endif ()
-   if (XPDFWIDGET_PRINTING)
diff --git a/mingw-w64-xpdf/PKGBUILD b/mingw-w64-xpdf/PKGBUILD
index cb56bd9ad0..8e040a2712 100644
--- a/mingw-w64-xpdf/PKGBUILD
+++ b/mingw-w64-xpdf/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=xpdf
 pkgbase="mingw-w64-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=4.04
-pkgrel=2
+pkgver=4.05
+pkgrel=1
 pkgdesc="Utilities for PDF files (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -13,45 +13,62 @@ license=('spdx:GPL-2.0-only OR GPL-3.0-only')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-qt5-tools")
-depends=("${MINGW_PACKAGE_PREFIX}-freetype"
-         "${MINGW_PACKAGE_PREFIX}-libjpeg-turbo"
+             "${MINGW_PACKAGE_PREFIX}-qt6-tools")
+depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
+         "${MINGW_PACKAGE_PREFIX}-fontconfig"
+         "${MINGW_PACKAGE_PREFIX}-freetype"
          "${MINGW_PACKAGE_PREFIX}-libpaper"
          "${MINGW_PACKAGE_PREFIX}-libpng"
-         "${MINGW_PACKAGE_PREFIX}-libtiff"
-         "${MINGW_PACKAGE_PREFIX}-qt5-base"
-         "${MINGW_PACKAGE_PREFIX}-qt5-svg"
-         "${MINGW_PACKAGE_PREFIX}-zlib")
+         "${MINGW_PACKAGE_PREFIX}-qt6-base")
 source=(https://dl.xpdfreader.com/xpdf-${pkgver}.tar.gz{,.sig}
         002-xpdf-4.00-64bit.patch
-        005-xpdf-4.00-permissions.patch
-        006-hack-argument-list-under-win.patch)
-sha256sums=('63ce23fcbf76048f524c40be479ac3840d7a2cbadb6d1e0646ea77926656bade'
+        005-xpdf-4.00-permissions.patch)
+sha256sums=('92707ed5acb6584fbd73f34091fda91365654ded1f31ba72f0970022cf2a5cea'
             'SKIP'
             '75f5d7ae4bb83d2c380dfc9f65bad78574ac3f038fdd6be73c29fc9ea817e715'
-            '22e0afda66f036cea8643252762e1391ed078102dd5f76f8cf862976b4b37089'
-            'c2af0cd7fde36e7ba3f3935e3fa919b65ac157fd13bcca46338b3a00d5b74673')
+            '22e0afda66f036cea8643252762e1391ed078102dd5f76f8cf862976b4b37089')
 validpgpkeys=('A56006CA75CF8B13FA2F120DF4825F5397271342')
 
+apply_patch_with_msg() {
+  for _patch in "$@"
+  do
+    msg2 "Applying ${_patch}"
+    patch -Nbp1 -i "${srcdir}/${_patch}"
+  done
+}
+
 prepare() {
   cd ${_realname}-${pkgver}
-  patch -p1 -i ${srcdir}/002-xpdf-4.00-64bit.patch
-  patch -p1 -i ${srcdir}/005-xpdf-4.00-permissions.patch
-  patch -p1 -i ${srcdir}/006-hack-argument-list-under-win.patch
+  apply_patch_with_msg \
+    002-xpdf-4.00-64bit.patch \
+    005-xpdf-4.00-permissions.patch
 }
 
 build() {
   mkdir -p 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
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX" \
   ${MINGW_PREFIX}/bin/cmake.exe \
     -GNinja \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+    -DA4_PAPER=ON \
     -DMULTITHREADED=ON \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_VERBOSE_MAKEFILE=OFF \
+    -DOPI_SUPPORT=ON \
+    -DSPLASH_CMYK=ON \
+    -DXPDFWIDGET_PRINTING=ON \
+    "${_extra_config[@]}" \
     ../${_realname}-${pkgver}
 
+  # Copy xpdf-icon.ico to build directory to fix building with GCC
+  cp ../${_realname}-${pkgver}/xpdf-qt/xpdf-icon.ico .
+
   ${MINGW_PREFIX}/bin/cmake --build .
 }