-
Notifications
You must be signed in to change notification settings - Fork 97
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
tdegraphics: bump REL due to poppler update to 1:25.02.0
- Loading branch information
1 parent
8b53b28
commit 4ea25a9
Showing
2 changed files
with
6 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
VER=14.1.2 | ||
REL=1 | ||
REL=2 | ||
SRCS="tbl::https://mirror.ppa.trinitydesktop.org/trinity/releases/R$VER/main/core/tdegraphics-trinity-$VER.tar.xz" | ||
CHKSUMS="sha256::8771c5c80156dd2a3747f2138d98c6a2d63fe11dc008d52022293946dd4ebe2f" | ||
CHKUPDATE="anitya::id=16065" |
24 changes: 5 additions & 19 deletions
24
runtime-gis/gdal/autobuild/patches/0001-Build-fix-build-against-Poppler-25.02.00.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,32 +1,18 @@ | ||
From 236cc24575c4dfd014fdc976c5f15182e2ddc10f Mon Sep 17 00:00:00 2001 | ||
From: Even Rouault <[email protected]> | ||
Date: Thu, 6 Feb 2025 14:41:52 +0100 | ||
From 052e427dcddaa6837292390fe7432bc33ce0d20b Mon Sep 17 00:00:00 2001 | ||
From: Kaiyang Wu <[email protected]> | ||
Date: Mon, 10 Feb 2025 21:07:30 -0800 | ||
Subject: [PATCH] Build: fix build against Poppler 25.02.00 | ||
|
||
Fixes #11804 | ||
Signed-off-by: Kaiyang Wu <[email protected]> | ||
--- | ||
autotest/gdrivers/pdf.py | 2 +- | ||
frmts/pdf/pdfdataset.cpp | 41 ++++++++++++++++++++++++++---- | ||
frmts/pdf/pdfio.cpp | 17 +++++++++++++ | ||
frmts/pdf/pdfio.h | 12 +++++++++ | ||
frmts/pdf/pdfobject.cpp | 6 ++--- | ||
frmts/pdf/pdfobject.h | 2 +- | ||
frmts/pdf/pdfsdk_headers_poppler.h | 9 +++++-- | ||
7 files changed, 77 insertions(+), 12 deletions(-) | ||
6 files changed, 76 insertions(+), 11 deletions(-) | ||
|
||
diff --git a/autotest/gdrivers/pdf.py b/autotest/gdrivers/pdf.py | ||
index 7b74e9b538..373604068e 100755 | ||
--- a/autotest/gdrivers/pdf.py | ||
+++ b/autotest/gdrivers/pdf.py | ||
@@ -1524,7 +1524,7 @@ def test_pdf_extra_rasters(poppler_or_pdfium): | ||
"LAYER_01_NAME=subbyte", | ||
], "did not get expected layers" | ||
if pdf_is_poppler(): | ||
- assert cs in (7926, 8177, 8174, 8165, 8172) | ||
+ assert cs in (7926, 8177, 8174, 8165, 8172, 8193) | ||
|
||
|
||
############################################################################### | ||
diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp | ||
index cb57e2a967..d6d0af9181 100644 | ||
--- a/frmts/pdf/pdfdataset.cpp | ||
|