poppler:update to 24.11.0 (#22340)

* poppler:update to 24.11.0

* patch inkscape to handle newer poppler

* update to 24.11

* inkscape: add fix for poppler-24.11

* fix poppler bug: missing structtreeroot

* fix patch

* fix poppler bug

* add inkscape patch (clang build error)

---------

Co-authored-by: Biswapriyo Nath <nathbappai@gmail.com>
This commit is contained in:
sunderme
2024-11-22 11:37:18 +01:00
committed by GitHub
parent 339ed5d551
commit fa2eca19d5
6 changed files with 39 additions and 8 deletions

View File

@@ -9,7 +9,7 @@ pkgbase=mingw-w64-${_realname,,}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-python-${_realname}")
pkgver=3.9.3
pkgrel=2
pkgrel=3
pkgdesc="A translator library for raster geospatial data formats (mingw-w64)"
arch=('any')
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')

View File

@@ -4,7 +4,7 @@ _realname=gdcm
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=3.0.24
pkgrel=7
pkgrel=8
pkgdesc="The Grassroots DICOM library (mingw-w64)"
arch=('any')
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')

View File

@@ -6,7 +6,7 @@ _realname=inkscape
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.4
pkgrel=2
pkgrel=3
pkgdesc="Vector graphics editor using the SVG file format (mingw-w64)"
arch=('any')
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -73,10 +73,16 @@ optdepends=(#"${MINGW_PACKAGE_PREFIX}-pstoedit: latex formulas"
#"${MINGW_PACKAGE_PREFIX}-uniconvertor: reading/writing to some proprietary formats"
)
source=("https://media.inkscape.org/dl/resources/file/${_realname}-${pkgver}.tar.xz"
"inkscape-poppler-24.10.patch::https://gitlab.com/inkscape/inkscape/-/commit/22304ae8034d067670a9f95022083a75fac92b4c.patch"
"inkscape-poppler-24.11.patch::https://gitlab.com/inkscape/inkscape/-/commit/0399372ec240d23e0e70548237a541f2b5bf0f34.patch"
"inkscape-gobjectptr.patch::https://gitlab.com/inkscape/inkscape/-/commit/eb6dadcf1a5c660167ba43f3606c8e7cc6529787.patch"
inkscape-1.0.1-unbundle.patch
inkscape-1.0.1-install-layout.patch
007-no-console-clang.patch)
sha256sums=('c59a85453b699addebcd51c1dc07684dd96a10c8aec716b19551db50562e13f5'
'f2ce2d04cfd8b7db046c57cdc2fd4dc8d5946642f7d47b1d8b87ebc2cd6e8ccc'
'ce742fe3c522508eb0faaa36076e13fca876de3bc42117ace0a1ecebda73d78d'
'2c2e04d8524fb75e7758ba43742512ad66447ec0b56f28279f4679b96cd1425f'
'92387251c1740f1a57cde9e587cc673ef1600813617bd2c9db65598c324a24d4'
'131b2e1190637df0554ef1ee8cf46440689584375c117d057ab47d5871c58128'
'c49d38b7c1a66e4b40e1b75fb055b730eb863a67a74d899da6d4d6db6baedcec')
@@ -98,6 +104,9 @@ prepare() {
cd "${srcdir}"/${_realname}-${pkgver}
apply_patch_with_msg \
inkscape-poppler-24.10.patch \
inkscape-poppler-24.11.patch \
inkscape-gobjectptr.patch \
inkscape-1.0.1-unbundle.patch \
inkscape-1.0.1-install-layout.patch \
007-no-console-clang.patch

View File

@@ -4,7 +4,7 @@ _realname=pdf2djvu
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.9.19
pkgrel=11
pkgrel=12
pkgdesc="Creates DjVu files from PDF files (mingw-w64)"
arch=('any')
mingw_arch=('mingw64' 'ucrt64')

View File

@@ -0,0 +1,19 @@
--- CMakeLists.txt 2024-11-15 17:35:15.354633922 +0100
+++ CMakeLists.txt 2024-11-15 17:38:16.349196965 +0100
@@ -713,6 +713,7 @@
poppler/Stream-CCITT.h
poppler/Stream.h
poppler/StructElement.h
+ poppler/StructTreeRoot.h
poppler/UnicodeMap.h
poppler/UnicodeMapFuncs.h
poppler/UnicodeMapTables.h
@@ -755,6 +756,8 @@
splash/SplashBitmap.h
splash/SplashClip.h
splash/SplashErrorCodes.h
+ splash/SplashFTFont.h
+ splash/SplashFont.h
splash/SplashFontEngine.h
splash/SplashFontFile.h
splash/SplashFontFileID.h

View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
$([[ ${CARCH} == i686 ]] || echo \
"${MINGW_PACKAGE_PREFIX}-${_realname}-qt5" \
"${MINGW_PACKAGE_PREFIX}-${_realname}-qt6"))
pkgver=24.09.0
pkgver=24.11.0
pkgrel=1
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -41,17 +41,20 @@ depends=("${MINGW_PACKAGE_PREFIX}-cairo"
"${MINGW_PACKAGE_PREFIX}-zlib")
source=(https://poppler.freedesktop.org/${_realname}-${pkgver}.tar.xz{,.sig}
test::git+https://gitlab.freedesktop.org/poppler/test.git#commit=ff3133cdb6cb496ee1d2c3231bfa35006a5e8410
'0001-nopython-generate-enums.patch')
sha256sums=('ebd857987e2395608c69fdc44009692d5906f13b612c5280beff65a0b75dc255'
'0001-nopython-generate-enums.patch'
'0002-fix-structtreeroot-2411.patch')
sha256sums=('7723d880565211740c13649d24a300257b86ddd7fa2d208187ff7e5cc8dfbd58'
'SKIP'
'0efc9bd1797f0f0dfa514d4109e82c99d7e98c3e95587c70945508493074fcdf'
'315356263b5ebee5431a2e079ac76492a8919a04a798f6c6d53c64f44b433db6')
'315356263b5ebee5431a2e079ac76492a8919a04a798f6c6d53c64f44b433db6'
'4f23caeaf560cb9d82d53143be2eb7a81ea86b2bd9949d6860ab30136398fd2b')
validpgpkeys=('CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7') # "Albert Astals Cid <aacid@kde.org>"
prepare() {
cd ${_realname}-${pkgver}
patch -p1 -i "${srcdir}/0001-nopython-generate-enums.patch"
patch -p0 -i "${srcdir}/0002-fix-structtreeroot-2411.patch"
}
build() {