Skip to content

Commit 96f6972

Browse files
authored
poppler: Update to 26.01.0 (#27405)
* poppler: Update to 26.01.0 * poppler rebuilds * dia: poppler API changes * gdal: poppler build fixes backport * poppler: update patch * inkscape backports * scribus: poppler build fix backport
1 parent 1006bb2 commit 96f6972

File tree

7 files changed

+46
-17
lines changed

7 files changed

+46
-17
lines changed

mingw-w64-dia/0001-poppler-fix.patch

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,19 @@
2424
DiaObject *obj;
2525
gchar *utf8 = NULL;
2626
DiaFont *font;
27+
--- dia/plug-ins/pdf/pdf-import.cpp.orig 2026-01-20 19:12:47.612762200 +0100
28+
+++ dia/plug-ins/pdf/pdf-import.cpp 2026-01-20 19:14:40.751100100 +0100
29+
@@ -846,8 +846,12 @@
30+
int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
31+
unsigned char *pixels = gdk_pixbuf_get_pixels (pixbuf);
32+
int y;
33+
-
34+
+#if (POPPLER_VERSION_MAJOR > 26) || \
35+
+ (POPPLER_VERSION_MAJOR == 26 && POPPLER_VERSION_MINOR >= 1)
36+
+ imgStr.rewind();
37+
+#else
38+
imgStr.reset(); // otherwise getLine() is crashing right away
39+
+#endif
40+
line = imgStr.getLine ();
41+
for (y = 0; y < height && line; ++y) {
42+
unsigned char *dest = pixels + y * rowstride;

mingw-w64-dia/PKGBUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _realname=dia
44
pkgbase=mingw-w64-${_realname}
55
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
66
pkgver=0.97.0.r2610.g9fcced5ed
7-
pkgrel=24
7+
pkgrel=25
88
pkgdesc="A gtk+ based diagram creation program (mingw-w64)"
99
arch=('any')
1010
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -39,7 +39,7 @@ _commit="9fcced5edb5a10faae5e5965658aec9732cd7f5a"
3939
source=("${_realname}"::"git+https://gitlab.gnome.org/GNOME/dia.git#commit=${_commit}"
4040
"0001-poppler-fix.patch")
4141
sha256sums=('d922dff53a4938208d6c4c4741b4fc3e9283b75d35c93d456c7616ba2e114528'
42-
'831034ea81855e89edc14ade628d5cedfdcd790a1ed6970db22fffed6caa4520')
42+
'704ecdde71124d692345bd4decc15eec1b7515d3cb855bc7b5e4c2f1e719ad11')
4343

4444
pkgver() {
4545
cd "${_realname}"

mingw-w64-gdal/PKGBUILD

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,12 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
8181
"${MINGW_PACKAGE_PREFIX}-xsimd")
8282
source=(https://github.com/OSGeo/gdal/releases/download/v${pkgver}/gdal-${pkgver}.tar.gz
8383
001-fix-bindings-install-path.patch
84-
002-remove-manual-soversion.patch)
84+
002-remove-manual-soversion.patch
85+
https://github.com/OSGeo/gdal/commit/979604d97720287416742ef264977f0e53a84aa8.patch)
8586
sha256sums=('266cbadf8534d1de831db8834374afd95603e0a6af4f53d0547ae0d46bd3d2d1'
8687
'bfb0b42c8562bd45ae5cff71d42b042e398dff9a9c1f5bb08d8717a7753d4f3f'
87-
'fc815a58fe229db3c44bae15f405cafbeb82de91ec3f35564569c5bbecb1c3d7')
88+
'fc815a58fe229db3c44bae15f405cafbeb82de91ec3f35564569c5bbecb1c3d7'
89+
'4257bcd9da2537ac5829bd2f3ba651064928328eec47de118b3ce0108455ded6')
8890

8991
apply_patch_with_msg() {
9092
for _patch in "$@"
@@ -98,7 +100,8 @@ prepare() {
98100
cd "${srcdir}"/${_realname}-${pkgver}
99101
apply_patch_with_msg \
100102
001-fix-bindings-install-path.patch \
101-
002-remove-manual-soversion.patch
103+
002-remove-manual-soversion.patch \
104+
979604d97720287416742ef264977f0e53a84aa8.patch
102105
}
103106

104107
build() {

mingw-w64-gdcm/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _realname=gdcm
44
pkgbase=mingw-w64-${_realname}
55
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
66
pkgver=3.0.24
7-
pkgrel=19
7+
pkgrel=20
88
pkgdesc="The Grassroots DICOM library (mingw-w64)"
99
arch=('any')
1010
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')

mingw-w64-inkscape/PKGBUILD

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ _realname=inkscape
66
pkgbase=mingw-w64-${_realname}
77
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
88
pkgver=1.4.3
9-
pkgrel=1
9+
pkgrel=2
1010
pkgdesc="Vector graphics editor using the SVG file format (mingw-w64)"
1111
arch=('any')
1212
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -74,11 +74,13 @@ optdepends=(#"${MINGW_PACKAGE_PREFIX}-pstoedit: latex formulas"
7474
source=("https://media.inkscape.org/dl/resources/file/${_realname}-${pkgver}.tar.xz"
7575
inkscape-1.0.1-unbundle.patch
7676
inkscape-1.0.1-install-layout.patch
77-
007-no-console-clang.patch)
77+
007-no-console-clang.patch
78+
https://gitlab.com/inkscape/inkscape/-/commit/3a528728ebe33e10bb44d152f47cfedfddbfe18a.patch)
7879
sha256sums=('e83a2c3db570b6c5a1ff0fccfe7098837b3f6bd74b133567937c8a91710ed1d1'
7980
'92387251c1740f1a57cde9e587cc673ef1600813617bd2c9db65598c324a24d4'
8081
'131b2e1190637df0554ef1ee8cf46440689584375c117d057ab47d5871c58128'
81-
'c49d38b7c1a66e4b40e1b75fb055b730eb863a67a74d899da6d4d6db6baedcec')
82+
'c49d38b7c1a66e4b40e1b75fb055b730eb863a67a74d899da6d4d6db6baedcec'
83+
'e93457f932b6661ad52d1743f4ebb8a478440f8097ffbbb3b384bbad2963df25')
8284
noextract=("${_realname}-${pkgver}.tar.xz")
8385

8486
apply_patch_with_msg() {
@@ -99,7 +101,8 @@ prepare() {
99101
apply_patch_with_msg \
100102
inkscape-1.0.1-unbundle.patch \
101103
inkscape-1.0.1-install-layout.patch \
102-
007-no-console-clang.patch
104+
007-no-console-clang.patch \
105+
3a528728ebe33e10bb44d152f47cfedfddbfe18a.patch
103106
}
104107

105108
build() {

mingw-w64-poppler/PKGBUILD

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
66
$([[ ${CARCH} == i686 ]] || echo \
77
"${MINGW_PACKAGE_PREFIX}-${_realname}-qt5" \
88
"${MINGW_PACKAGE_PREFIX}-${_realname}-qt6"))
9-
pkgver=25.12.0
9+
pkgver=26.01.0
1010
pkgrel=1
1111
arch=('any')
1212
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -42,17 +42,20 @@ depends=("${MINGW_PACKAGE_PREFIX}-cairo"
4242
"${MINGW_PACKAGE_PREFIX}-zlib")
4343
source=(https://poppler.freedesktop.org/${_realname}-${pkgver}.tar.xz{,.sig}
4444
test::git+https://gitlab.freedesktop.org/poppler/test.git#commit=ff3133cdb6cb496ee1d2c3231bfa35006a5e8410
45-
'0001-nopython-generate-enums.patch')
46-
sha256sums=('c18b40eb36b1a0c5b86e29ca054bf0770304583da4f2cdd42fe86eca6a20de48'
45+
'0001-nopython-generate-enums.patch'
46+
'https://gitlab.freedesktop.org/poppler/poppler/-/commit/074050be803550ad941e46759704be11a7efbc03.patch')
47+
sha256sums=('1cb944a4b88847f5fb6551683bc799db59f04990f5d8be07aba2acbf38601089'
4748
'SKIP'
4849
'0efc9bd1797f0f0dfa514d4109e82c99d7e98c3e95587c70945508493074fcdf'
49-
'315356263b5ebee5431a2e079ac76492a8919a04a798f6c6d53c64f44b433db6')
50+
'315356263b5ebee5431a2e079ac76492a8919a04a798f6c6d53c64f44b433db6'
51+
'1c68e46938a824c42910e75d10771c4f5c646dbe65e2612b8ab9b8f38ea5b619')
5052
validpgpkeys=('CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7') # "Albert Astals Cid <aacid@kde.org>"
5153

5254
prepare() {
5355
cd ${_realname}-${pkgver}
5456

5557
patch -p1 -i "${srcdir}/0001-nopython-generate-enums.patch"
58+
patch -p1 -i "${srcdir}/074050be803550ad941e46759704be11a7efbc03.patch"
5659
}
5760

5861
build() {

mingw-w64-scribus/PKGBUILD

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ _realname=scribus
33
pkgbase=mingw-w64-${_realname}
44
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
55
pkgver=1.6.5
6-
pkgrel=2
6+
pkgrel=3
77
pkgdesc="Desktop publishing software (mingw-w64)"
88
arch=('any')
99
mingw_arch=('ucrt64' 'clang64' 'clangarm64')
@@ -54,7 +54,8 @@ source=("https://sourceforge.net/projects/scribus/files/scribus/${pkgver}/scribu
5454
"007-plugin-link-order.patch"
5555
"008-missing-plugins-deps.patch"
5656
"009-win32-paths.patch"
57-
"010-win32-mingw-icon.patch")
57+
"010-win32-mingw-icon.patch"
58+
"https://github.com/scribusproject/scribus/commit/8dc2b21936e05cc5eb3398f7da06733ff0794934.patch")
5859
sha256sums=('09bdb736a8ff8a437191458a36d847cc0adeca0fc059cf696474e0ba6f59ac6a'
5960
'11a2e32aba600fe9c7017a12f34410ebc0dca58d275a06f7e225a373e4f9f654'
6061
'79a852cb2116d8a9801e42f160d4ba58f98fa9d98b1ee961e2f21136095a9800'
@@ -66,7 +67,8 @@ sha256sums=('09bdb736a8ff8a437191458a36d847cc0adeca0fc059cf696474e0ba6f59ac6a'
6667
'e7341b837fd365c152d51691418f84674631531e852baf8a0114a4b5b9f76879'
6768
'1faaadad889b1a734751511d1c3424df1483a377c54f6631965aa7bb079a3ac0'
6869
'eff90615d87df9624f2d14bbe43687dd12b5b06e125022141aad5fe44333e6f9'
69-
'6fe9b7805ef988947d3e3c0fd3f1cc1118a3c0e954e826b6c045745ab2d6b800')
70+
'6fe9b7805ef988947d3e3c0fd3f1cc1118a3c0e954e826b6c045745ab2d6b800'
71+
'38ae4feaedabaedc0a58c2231a37b06678c7e63c44ca85ef383ab388f984a33a')
7072
#options=('!strip' 'debug')
7173

7274
apply_patch_with_msg() {
@@ -97,6 +99,8 @@ prepare() {
9799
008-missing-plugins-deps.patch \
98100
009-win32-paths.patch \
99101
010-win32-mingw-icon.patch
102+
103+
patch -Nbp1 --binary -i "${srcdir}/8dc2b21936e05cc5eb3398f7da06733ff0794934.patch"
100104
}
101105

102106
build() {

0 commit comments

Comments
 (0)