From 1327c2fa60deb66f1ca3b15d894b25c8a5d89d0e Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Sun, 8 Aug 2021 11:33:10 +0530
Subject: [PATCH] poppler-qt6: Update to 21.08.0

---
 mingw-w64-poppler-qt6/010-clang.patch | 11 -----------
 mingw-w64-poppler-qt6/PKGBUILD        | 21 +++++++++++----------
 2 files changed, 11 insertions(+), 21 deletions(-)
 delete mode 100644 mingw-w64-poppler-qt6/010-clang.patch

diff --git a/mingw-w64-poppler-qt6/010-clang.patch b/mingw-w64-poppler-qt6/010-clang.patch
deleted file mode 100644
index df9e8512ba..0000000000
--- a/mingw-w64-poppler-qt6/010-clang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/glib/poppler-private.h
-+++ b/glib/poppler-private.h
-@@ -150,7 +150,7 @@ GooString *_poppler_convert_date_time_to_pdf_date(GDateTime *datetime);
- #define POPPLER_DEFINE_BOXED_TYPE(TypeName, type_name, copy_func, free_func)                                                                                                                                                                   \
-     GType type_name##_get_type(void)                                                                                                                                                                                                           \
-     {                                                                                                                                                                                                                                          \
--        static volatile gsize g_define_type_id__volatile = 0;                                                                                                                                                                                  \
-+        static gsize g_define_type_id__volatile = 0;                                                                                                                                                                                  \
-         if (g_once_init_enter(&g_define_type_id__volatile)) {                                                                                                                                                                                  \
-             GType g_define_type_id = g_boxed_type_register_static(g_intern_static_string(#TypeName), (GBoxedCopyFunc)copy_func, (GBoxedFreeFunc)free_func);                                                                                    \
-             g_once_init_leave(&g_define_type_id__volatile, g_define_type_id);                                                                                                                                                                  \
diff --git a/mingw-w64-poppler-qt6/PKGBUILD b/mingw-w64-poppler-qt6/PKGBUILD
index 25367fee11..6b0e9e99e7 100644
--- a/mingw-w64-poppler-qt6/PKGBUILD
+++ b/mingw-w64-poppler-qt6/PKGBUILD
@@ -3,14 +3,15 @@
 _realname=poppler
 pkgbase=mingw-w64-${_realname}-qt6
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-qt6"
-pkgver=20.12.1
-pkgrel=3
+pkgver=21.08.0
+pkgrel=1
 pkgdesc="PDF rendering library based on xpdf 3.0 (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://poppler.freedesktop.org/"
 license=("GPL")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+makedepends=("${MINGW_PACKAGE_PREFIX}-boost"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-glib2"
              "${MINGW_PACKAGE_PREFIX}-gobject-introspection"
@@ -32,23 +33,22 @@ depends=("${MINGW_PACKAGE_PREFIX}-poppler=${pkgver}"
          "${MINGW_PACKAGE_PREFIX}-qt6-base")
 options=('strip' 'staticlibs')
 source=(https://poppler.freedesktop.org/${_realname}-${pkgver}.tar.xz{,.sig}
-        '010-clang.patch'
         test::git+https://gitlab.freedesktop.org/poppler/test.git#commit=03a4b9eb854a06a83c465e82de601796c458bbe9)
-sha256sums=('d0aa2586c0a4296c775f0d2045f28bb95a694113fc995f95350faa12930f7b35'
+sha256sums=('e9cf5dc5964bce4bb0264d1c4f8122706c910588b421cfc30abc97d6b23e602d'
             'SKIP'
-            '7189564cfbd9f1ea77604aafa9811a3836912a3c945fe6250a33a710c866e52f'
             'SKIP')
 validpgpkeys=('CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7') # "Albert Astals Cid <aacid@kde.org>"
 
 prepare() {
   cd ${_realname}-${pkgver}
-  patch -Np1 -i "${srcdir}/010-clang.patch"
+
 }
 
 build() {
   [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
   mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
 
+  CXXFLAGS+=" -Wno-deprecated-declarations -Wno-ignored-attributes" \
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   "${MINGW_PREFIX}/bin/cmake.exe" \
     -Wno-dev \
@@ -76,9 +76,9 @@ build() {
 
 check() {
   cd ${srcdir}/build-${MINGW_CHOST}
-  cp libpoppler-105.dll qt6/tests
-  cp cpp/libpoppler-cpp-0.dll qt6/tests
-  cp qt6/src/libpoppler-qt6-1.dll qt6/tests
+  cp -v libpoppler*.dll qt6/tests
+  cp -v cpp/libpoppler-cpp*.dll qt6/tests
+  cp -v qt6/src/libpoppler-qt6*.dll qt6/tests
 
   ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target test || ture
 }
@@ -86,4 +86,5 @@ check() {
 package() {
   cd "${srcdir}/build-${MINGW_CHOST}"
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target qt6/install
+  install -Dm644 poppler-qt6.pc "${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/poppler-qt6.pc"
 }