[arch-commits] Commit in poppler/repos/extra-x86_64 (3 files)
Evangelos Foutras
foutrelis at archlinux.org
Tue Apr 6 07:13:06 UTC 2021
Date: Tuesday, April 6, 2021 @ 07:13:06
Author: foutrelis
Revision: 411543
archrelease: copy trunk to extra-x86_64
Added:
poppler/repos/extra-x86_64/PKGBUILD
(from rev 411542, poppler/trunk/PKGBUILD)
poppler/repos/extra-x86_64/export-SplashFont-symbols-used-by-Scribus.patch
(from rev 411542, poppler/trunk/export-SplashFont-symbols-used-by-Scribus.patch)
Deleted:
poppler/repos/extra-x86_64/PKGBUILD
-------------------------------------------------+
PKGBUILD | 194 +++++++++++-----------
export-SplashFont-symbols-used-by-Scribus.patch | 78 ++++++++
2 files changed, 178 insertions(+), 94 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-04-06 07:13:01 UTC (rev 411542)
+++ PKGBUILD 2021-04-06 07:13:06 UTC (rev 411543)
@@ -1,94 +0,0 @@
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=poppler
-pkgname=('poppler' 'poppler-glib' 'poppler-qt5' 'poppler-qt6')
-pkgver=21.04.0
-pkgrel=1
-arch=(x86_64)
-license=('GPL')
-makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg2' 'gtk3' 'pkgconfig' 'lcms2'
- 'gobject-introspection' 'icu' 'qt5-base' 'qt6-base' 'git' 'nss' 'gtk-doc' 'curl' 'poppler-data'
- 'cmake' 'python' 'boost')
-options=('!emptydirs')
-url="https://poppler.freedesktop.org/"
-# https://gitlab.freedesktop.org/poppler/poppler
-source=(https://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz{,.sig}
- test::git+https://anongit.freedesktop.org/git/poppler/test/#commit=03a4b9eb854a06a83c465e82de601796c458bbe9)
-sha256sums=('5e2219656c6bbd36154133fef2e12b7d0938464518827098b29a10b1697ea79c'
- 'SKIP'
- 'SKIP')
-validpgpkeys=('CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7') # "Albert Astals Cid <aacid at kde.org>"
-
-prepare() {
- mkdir build
-}
-
-build() {
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DCMAKE_INSTALL_LIBDIR=/usr/lib \
- -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
- -DENABLE_GTK_DOC=ON
- make
-}
-
-check() {
- cd build
- LANG=en_US.UTF8 make test
-}
-
-package_poppler() {
- pkgdesc="PDF rendering library based on xpdf 3.0"
- depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg2' 'lcms2' 'nss' 'curl')
- optdepends=('poppler-data: highly recommended encoding data to display PDF documents with certain encodings and characters')
- provides=('libpoppler.so' 'libpoppler-cpp.so')
- conflicts=("poppler-qt3<${pkgver}" "poppler-qt4<${pkgver}")
-
- cd build
- make DESTDIR="${pkgdir}" install
-
- # cleanup for splitted build
- rm -vrf "${pkgdir}"/usr/include/poppler/{glib,qt5,qt6}
- rm -vf "${pkgdir}"//usr/lib/libpoppler-{glib,qt5,qt6}.*
- rm -vf "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt5}.pc
- rm -vrf "${pkgdir}"/usr/{lib,share}/gir*
- rm -vrf "${pkgdir}"/usr/share/gtk-doc
-}
-
-package_poppler-glib() {
- pkgdesc="Poppler glib bindings"
- depends=("poppler=${pkgver}" 'glib2')
- provides=('libpoppler-glib.so')
-
- cd build
-
- make -C glib DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
- install -m644 poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/"
- rm -vf "${pkgdir}"/usr/lib/libpoppler.*
- rm -vf "${pkgdir}/usr/bin/poppler-glib-demo"
-}
-
-package_poppler-qt5() {
- pkgdesc="Poppler Qt5 bindings"
- depends=("poppler=${pkgver}" 'qt5-base')
- provides=('libpoppler-qt5.so')
-
- cd build
- make -C qt5 DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
- install -m644 poppler-qt5.pc "${pkgdir}/usr/lib/pkgconfig/"
-}
-
-package_poppler-qt6() {
- pkgdesc="Poppler Qt6 bindings"
- depends=("poppler=${pkgver}" 'qt6-base')
- provides=('libpoppler-qt6.so')
-
- cd build
- make -C qt6 DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-}
Copied: poppler/repos/extra-x86_64/PKGBUILD (from rev 411542, poppler/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-04-06 07:13:06 UTC (rev 411543)
@@ -0,0 +1,100 @@
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=poppler
+pkgname=('poppler' 'poppler-glib' 'poppler-qt5' 'poppler-qt6')
+pkgver=21.04.0
+pkgrel=2
+arch=(x86_64)
+license=('GPL')
+makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg2' 'gtk3' 'pkgconfig' 'lcms2'
+ 'gobject-introspection' 'icu' 'qt5-base' 'qt6-base' 'git' 'nss' 'gtk-doc' 'curl' 'poppler-data'
+ 'cmake' 'python' 'boost')
+options=('!emptydirs')
+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'
+ '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() {
+ cd build
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
+ -DENABLE_GTK_DOC=ON
+ make
+}
+
+check() {
+ cd build
+ LANG=en_US.UTF8 make test
+}
+
+package_poppler() {
+ pkgdesc="PDF rendering library based on xpdf 3.0"
+ depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg2' 'lcms2' 'nss' 'curl')
+ optdepends=('poppler-data: highly recommended encoding data to display PDF documents with certain encodings and characters')
+ provides=('libpoppler.so' 'libpoppler-cpp.so')
+ conflicts=("poppler-qt3<${pkgver}" "poppler-qt4<${pkgver}")
+
+ cd build
+ make DESTDIR="${pkgdir}" install
+
+ # cleanup for splitted build
+ rm -vrf "${pkgdir}"/usr/include/poppler/{glib,qt5,qt6}
+ rm -vf "${pkgdir}"//usr/lib/libpoppler-{glib,qt5,qt6}.*
+ rm -vf "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt5}.pc
+ rm -vrf "${pkgdir}"/usr/{lib,share}/gir*
+ rm -vrf "${pkgdir}"/usr/share/gtk-doc
+}
+
+package_poppler-glib() {
+ pkgdesc="Poppler glib bindings"
+ depends=("poppler=${pkgver}" 'glib2')
+ provides=('libpoppler-glib.so')
+
+ cd build
+
+ make -C glib DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
+ install -m644 poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/"
+ rm -vf "${pkgdir}"/usr/lib/libpoppler.*
+ rm -vf "${pkgdir}/usr/bin/poppler-glib-demo"
+}
+
+package_poppler-qt5() {
+ pkgdesc="Poppler Qt5 bindings"
+ depends=("poppler=${pkgver}" 'qt5-base')
+ provides=('libpoppler-qt5.so')
+
+ cd build
+ make -C qt5 DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
+ install -m644 poppler-qt5.pc "${pkgdir}/usr/lib/pkgconfig/"
+}
+
+package_poppler-qt6() {
+ pkgdesc="Poppler Qt6 bindings"
+ depends=("poppler=${pkgver}" 'qt6-base')
+ provides=('libpoppler-qt6.so')
+
+ cd build
+ make -C qt6 DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
+}
Copied: poppler/repos/extra-x86_64/export-SplashFont-symbols-used-by-Scribus.patch (from rev 411542, poppler/trunk/export-SplashFont-symbols-used-by-Scribus.patch)
===================================================================
--- export-SplashFont-symbols-used-by-Scribus.patch (rev 0)
+++ export-SplashFont-symbols-used-by-Scribus.patch 2021-04-06 07:13:06 UTC (rev 411543)
@@ -0,0 +1,78 @@
+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();
More information about the arch-commits
mailing list