[arch-commits] Commit in poppler/trunk (2 files)

[Andreas Radke]

    Date: Monday, May 3, 2021 @ 11:34:06
  Author: andyrtr
Revision: 414224

upgpkg: poppler 21.05.0-1: upstream update 21.05.0

Modified:
  poppler/trunk/PKGBUILD
Deleted:
  poppler/trunk/export-SplashFont-symbols-used-by-Scribus.patch

-------------------------------------------------+
 PKGBUILD                                        |   12 ---
 export-SplashFont-symbols-used-by-Scribus.patch |   78 ----------------------
 2 files changed, 3 insertions(+), 87 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-03 11:16:07 UTC (rev 414223)
+++ PKGBUILD	2021-05-03 11:34:06 UTC (rev 414224)
@@ -3,8 +3,8 @@
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt5' 'poppler-qt6')
-pkgver=21.04.0
-pkgrel=2
+pkgver=21.05.0
+pkgrel=1
 arch=(x86_64)
 license=('GPL')
 makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg2' 'gtk3' 'pkgconfig' 'lcms2' 
@@ -14,20 +14,14 @@
 url="https://poppler.freedesktop.org/"
 # https://gitlab.freedesktop.org/poppler/poppler
 source=(https://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz{,.sig}
-        export-SplashFont-symbols-used-by-Scribus.patch
         test::git+https://anongit.freedesktop.org/git/poppler/test/#commit=03a4b9eb854a06a83c465e82de601796c458bbe9)
-sha256sums=('5e2219656c6bbd36154133fef2e12b7d0938464518827098b29a10b1697ea79c'
+sha256sums=('dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c'
             'SKIP'
-            'be2ed7e6981e37f40d4c31d2a4aebeaf4a97884590c8a56c251e8a8ed428dedf'
             'SKIP')
 validpgpkeys=('CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7') # "Albert Astals Cid <aacid at kde.org>"
 
 prepare() {
   mkdir build
-
-  # https://bugs.archlinux.org/task/70307
-  # https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/839
-  patch -Np1 -d ${pkgbase}-${pkgver} <export-SplashFont-symbols-used-by-Scribus.patch
 }
 
 build() {

Deleted: export-SplashFont-symbols-used-by-Scribus.patch
===================================================================
--- export-SplashFont-symbols-used-by-Scribus.patch	2021-05-03 11:16:07 UTC (rev 414223)
+++ export-SplashFont-symbols-used-by-Scribus.patch	2021-05-03 11:34:06 UTC (rev 414224)
@@ -1,78 +0,0 @@
-From d7aa275b0bca86ae174e7e504dd269df2a0234cf Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos at foutrelis.com>
-Date: Tue, 6 Apr 2021 09:56:55 +0300
-Subject: [PATCH] Export SplashFont* symbols used by Scribus
-
-Scribus 1.5.6.1 compiled against poppler 21.04.0 was unable to load its
-PDF importer plugin without these classes being exported by libpoppler:
-
-- SplashFontFileID
-- SplashFontEngine
-- SplashFontSrc
----
- splash/SplashFontEngine.h | 3 ++-
- splash/SplashFontFile.h   | 3 ++-
- splash/SplashFontFileID.h | 4 +++-
- 3 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/splash/SplashFontEngine.h b/splash/SplashFontEngine.h
-index becc0d9c..3e5458c0 100644
---- a/splash/SplashFontEngine.h
-+++ b/splash/SplashFontEngine.h
-@@ -30,6 +30,7 @@
- #include <array>
- 
- #include "SplashTypes.h"
-+#include "poppler_private_export.h"
- 
- class SplashT1FontEngine;
- class SplashFTFontEngine;
-@@ -44,7 +45,7 @@ class SplashFontSrc;
- // SplashFontEngine
- //------------------------------------------------------------------------
- 
--class SplashFontEngine
-+class POPPLER_PRIVATE_EXPORT SplashFontEngine
- {
- public:
-     // Create a font engine.
-diff --git a/splash/SplashFontFile.h b/splash/SplashFontFile.h
-index 598fd832..539bd307 100644
---- a/splash/SplashFontFile.h
-+++ b/splash/SplashFontFile.h
-@@ -23,6 +23,7 @@
- #define SPLASHFONTFILE_H
- 
- #include "SplashTypes.h"
-+#include "poppler_private_export.h"
- 
- class GooString;
- class SplashFontEngine;
-@@ -33,7 +34,7 @@ class SplashFontFileID;
- // SplashFontFile
- //------------------------------------------------------------------------
- 
--class SplashFontSrc
-+class POPPLER_PRIVATE_EXPORT SplashFontSrc
- {
- public:
-     SplashFontSrc();
-diff --git a/splash/SplashFontFileID.h b/splash/SplashFontFileID.h
-index 02b528aa..c127dd87 100644
---- a/splash/SplashFontFileID.h
-+++ b/splash/SplashFontFileID.h
-@@ -21,11 +21,13 @@
- #ifndef SPLASHFONTFILEID_H
- #define SPLASHFONTFILEID_H
- 
-+#include "poppler_private_export.h"
-+
- //------------------------------------------------------------------------
- // SplashFontFileID
- //------------------------------------------------------------------------
- 
--class SplashFontFileID
-+class POPPLER_PRIVATE_EXPORT SplashFontFileID
- {
- public:
-     SplashFontFileID();