Robin Candau pushed to branch main at Arch Linux / Packaging / Packages /
libreoffice-still
Commits:
fab22e0b by Robin Candau at 2024-12-17T20:19:09+01:00
upgpkg: 24.2.7-4: Poppler 24.12 rebuild
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + poppler24.12-buildfix.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,6 +1,6 @@
pkgbase = libreoffice-still
pkgver = 24.2.7
- pkgrel = 3
+ pkgrel = 4
url = https://www.libreoffice.org/
arch = x86_64
license = MPL-2.0
@@ -152,6 +152,7 @@ pkgbase = libreoffice-still
source =
https://dev-www.libreoffice.org/extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
source = 623ea5c.diff
source = libreoffice-7.5.8.2-icu-74-compatibility.patch
+ source = poppler24.12-buildfix.patch
source = soffice-template.desktop.in
source = libreoffice-still.sh
source = libreoffice-still.csh
@@ -185,6 +186,7 @@ pkgbase = libreoffice-still
sha256sums =
f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140
sha256sums =
440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5
sha256sums =
d7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599
+ sha256sums =
cb23909b693dbf32dc8dcd964f0f2ea84b3f8b2c21f718474a553ce90e0751fe
sha256sums =
d0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879
sha256sums =
9fb33dbc3ffeb6af2ea7341b58242142d4eca903584c21c5f4b44ff27fbf5b5f
sha256sums =
512355b5ef646791089da8c2b35cf8b019673c0c8a58685962af3b5d9eb5d6bb
=====================================
PKGBUILD
=====================================
@@ -12,7 +12,7 @@ pkgbase=libreoffice-still
pkgname=('libreoffice-still-sdk' 'libreoffice-still')
_LOver=24.2.7.2
pkgver=24.2.7
-pkgrel=3
+pkgrel=4
arch=('x86_64')
license=('MPL-2.0' 'LGPL-3.0-or-later')
url="https://www.libreoffice.org/";
@@ -64,6 +64,7 @@
source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
${_additional_source_url2}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
623ea5c.diff
libreoffice-7.5.8.2-icu-74-compatibility.patch
+ poppler24.12-buildfix.patch
soffice-template.desktop.in
libreoffice-still.sh libreoffice-still.csh)
noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -118,6 +119,7 @@
sha256sums=('f5e9b12cedea211d60fb7cce21bed80483c43321d81977dc76e01fedca4310e5'
'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140'
'440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5'
'd7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599'
+ 'cb23909b693dbf32dc8dcd964f0f2ea84b3f8b2c21f718474a553ce90e0751fe'
'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
'9fb33dbc3ffeb6af2ea7341b58242142d4eca903584c21c5f4b44ff27fbf5b5f'
'512355b5ef646791089da8c2b35cf8b019673c0c8a58685962af3b5d9eb5d6bb')
@@ -142,6 +144,9 @@ prepare() {
# remove breaking test breaking rule
sed -i "109d" i18npool/source/breakiterator/data/sent.txt
+ # fix build with Poppler 24.12 (LFS patch)
+ patch -Np1 -i "${srcdir}"/poppler24.12-buildfix.patch
+
#use the CFLAGS but remove the LibO overridden ones
for i in $CFLAGS; do
case "$i" in
=====================================
poppler24.12-buildfix.patch
=====================================
@@ -0,0 +1,14 @@
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index 2517618e1..e62353cce 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -1037,7 +1037,8 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*,
Stream* str,
+
+ int bitsPerComponent = 1;
+ StreamColorSpaceMode csMode = streamCSNone;
+- str->getImageParams( &bitsPerComponent, &csMode );
++ bool hasAlpha = false;
++ str->getImageParams( &bitsPerComponent, &csMode, &hasAlpha );
+ if( bitsPerComponent == 1 && (csMode == streamCSNone || csMode ==
streamCSDeviceGray) )
+ {
+ GfxRGB oneColor = { dblToCol( 1.0 ), dblToCol( 1.0 ), dblToCol( 1.0 )
};
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/commit/fab22e0b1802181f8f501d98d497a1120ebb1ec8
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/commit/fab22e0b1802181f8f501d98d497a1120ebb1ec8
You're receiving this email because of your account on gitlab.archlinux.org.
