[arch-commits] Commit in poppler/repos/extra-x86_64 (3 files)
Andreas Radke
andyrtr at archlinux.org
Fri Jun 4 06:07:32 UTC 2021
Date: Friday, June 4, 2021 @ 06:07:31
Author: andyrtr
Revision: 417086
archrelease: copy trunk to extra-x86_64
Added:
poppler/repos/extra-x86_64/PKGBUILD
(from rev 417085, poppler/trunk/PKGBUILD)
Deleted:
poppler/repos/extra-x86_64/0001-glib-Fix-type-in-poppler_rectangle_free.patch
poppler/repos/extra-x86_64/PKGBUILD
----------------------------------------------------+
0001-glib-Fix-type-in-poppler_rectangle_free.patch | 28 --
PKGBUILD | 194 +++++++++----------
2 files changed, 94 insertions(+), 128 deletions(-)
Deleted: 0001-glib-Fix-type-in-poppler_rectangle_free.patch
===================================================================
--- 0001-glib-Fix-type-in-poppler_rectangle_free.patch 2021-06-04 06:07:16 UTC (rev 417085)
+++ 0001-glib-Fix-type-in-poppler_rectangle_free.patch 2021-06-04 06:07:31 UTC (rev 417086)
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 1 Jun 2021 22:00:00 +0000
-Subject: [PATCH] glib: Fix type in poppler_rectangle_free
-
-e3fed321f230 changed the allocation to use PopplerRectangleExtended. We
-need to change the free to match, otherwise the slice allocator can get
-confused.
-
-Fixes https://gitlab.freedesktop.org/poppler/poppler/-/issues/1087
----
- glib/poppler-page.cc | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
-index 7536cfcb..e81c1e12 100644
---- a/glib/poppler-page.cc
-+++ b/glib/poppler-page.cc
-@@ -1663,7 +1663,8 @@ PopplerRectangle *poppler_rectangle_copy(PopplerRectangle *rectangle)
- */
- void poppler_rectangle_free(PopplerRectangle *rectangle)
- {
-- g_slice_free(PopplerRectangle, rectangle);
-+ auto ext_rectangle = reinterpret_cast<PopplerRectangleExtended *>(rectangle);
-+ g_slice_free(PopplerRectangleExtended, ext_rectangle);
- }
-
- /**
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-06-04 06:07:16 UTC (rev 417085)
+++ PKGBUILD 2021-06-04 06:07:31 UTC (rev 417086)
@@ -1,100 +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.06.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}
- 0001-glib-Fix-type-in-poppler_rectangle_free.patch
- test::git+https://anongit.freedesktop.org/git/poppler/test/#commit=03a4b9eb854a06a83c465e82de601796c458bbe9)
-sha256sums=('4b440708eafdf07a1405e06744c66ac54a5af51a0e38ab17a46fbaff47278342'
- 'SKIP'
- '9b7059cf64fb8562ceb27f16c0fd40d33c65db3341a0d6eb45facfaa6647c98f'
- 'SKIP')
-validpgpkeys=('CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7') # "Albert Astals Cid <aacid at kde.org>"
-
-prepare() {
- mkdir build
- cd ${pkgbase}-${pkgver}
-
- # https://bugs.archlinux.org/task/70909
- patch -Np1 -i ../0001-glib-Fix-type-in-poppler_rectangle_free.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/PKGBUILD (from rev 417085, poppler/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-06-04 06:07:31 UTC (rev 417086)
@@ -0,0 +1,94 @@
+# 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.06.1
+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=('86b09e5a02de40081a3916ef8711c5128eaf4b1fc59d5f87d0ec66f04f595db4'
+ '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"
+}
More information about the arch-commits
mailing list