From 8c144a196c6b58830925c1be116172a252461e98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 10 May 2021 22:55:23 -0300
Subject: [PATCH] poppler: update to 21.05.0.

---
 common/shlibs                            |  2 +-
 srcpkgs/{libpoppler102 => libpoppler110} |  0
 srcpkgs/poppler/patches/fix-cflags.patch | 14 +++++++-------
 srcpkgs/poppler/template                 | 13 ++++++-------
 4 files changed, 14 insertions(+), 15 deletions(-)
 rename srcpkgs/{libpoppler102 => libpoppler110} (100%)

diff --git a/common/shlibs b/common/shlibs
index b12756eb91..421d9f677e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -340,7 +340,7 @@ libMagickCore-6.Q16.so.7 libmagick6-6.9.11.61_1
 libMagickWand-6.Q16.so.7 libmagick6-6.9.11.61_1
 libMagick++-6.Q16.so.9 libmagick6-6.9.12.1_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.102 libpoppler102-20.09.0_1
+libpoppler.so.110 libpoppler110-21.05.0_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
diff --git a/srcpkgs/libpoppler102 b/srcpkgs/libpoppler110
similarity index 100%
rename from srcpkgs/libpoppler102
rename to srcpkgs/libpoppler110
diff --git a/srcpkgs/poppler/patches/fix-cflags.patch b/srcpkgs/poppler/patches/fix-cflags.patch
index 9e62b11010..f1a408d03c 100644
--- a/srcpkgs/poppler/patches/fix-cflags.patch
+++ b/srcpkgs/poppler/patches/fix-cflags.patch
@@ -1,13 +1,13 @@
-Index: cmake/modules/PopplerMacros.cmake
-===================================================================
---- cmake/modules/PopplerMacros.cmake.orig
-+++ cmake/modules/PopplerMacros.cmake
-@@ -123,14 +123,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
+index fe1182d..6013bd2 100644
+--- a/cmake/modules/PopplerMacros.cmake
++++ b/cmake/modules/PopplerMacros.cmake
+@@ -104,14 +104,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
    set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
  
    set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
--  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
-+  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
++  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}")
    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
    set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
    set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index 1aebd7f7e1..72a961b246 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -3,8 +3,8 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
 #
 pkgname=poppler
-version=20.09.0
-revision=3
+version=21.05.0
+revision=1
 build_style=cmake
 build_helper="gir"
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
@@ -18,13 +18,14 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 distfiles="${homepage}/${pkgname}-${version}.tar.xz"
-checksum=4ed6eb5ddc4c37f2435c9d78ff9c7c4036455aea3507d1ce8400070aab745363
+checksum=dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c
+patch_args=-Np1
 
 # Package build options
 build_options="gir"
 build_options_default="gir"
 
-libpoppler102_package() {
+libpoppler110_package() {
 	depends="poppler-data"
 	short_desc+=" - poppler runtime library"
 	pkg_install() {
@@ -50,7 +51,7 @@ poppler-cpp_package() {
 }
 
 poppler-devel_package() {
-	depends="libglib-devel libpoppler102>=${version}_${revision}"
+	depends="libglib-devel libpoppler110>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove "usr/include/poppler/*.h"
@@ -59,7 +60,6 @@ poppler-devel_package() {
 		vmove usr/include/poppler/goo
 		vmove usr/lib/libpoppler.so
 		vmove usr/lib/pkgconfig/poppler.pc
-		vmove usr/lib/pkgconfig/poppler-splash.pc
 	}
 }
 
@@ -72,7 +72,6 @@ poppler-glib-devel_package() {
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
-		vmove usr/lib/pkgconfig/poppler-cairo.pc
 		vmove usr/lib/pkgconfig/poppler-glib.pc
 	}
 }