openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

update to 26.2.2.2

Browse Source
This commit is contained in:
robert
2026-04-17 08:27:49 +00:00
parent 08e2e428a5
commit e9fbafca21
5 changed files with 15 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editors/libreoffice/Makefile
+1 -1
View File
@@ -23,7 +23,7 @@ SHARED_LIBS += wpg-0.3-lo 3.4 # 3.4
SHARED_LIBS += wps-0.4-lo 4.14 # 4.14
BV= 26.2
VERSION= ${BV}.1.2
VERSION= ${BV}.2.2
DISTNAME= libreoffice-${VERSION}
WRKDIST= ${WRKDIR}/libreoffice-${VERSION}
CATEGORIES= editors productivity
editors/libreoffice/distinfo
+8 -8
View File
@@ -71,10 +71,10 @@ SHA256 (libreoffice/liborcus-0.21.0.tar.xz) = HG5HPWuKY9YdDmh0oXYtbw4OeDONdj5IrJ
SHA256 (libreoffice/libpagemaker-0.0.4.tar.xz) = Zq2s1wWn0ZiV4I6sRtHoUTMq3y5zbFZr7xFk56RCUZ0=
SHA256 (libreoffice/libqxp-0.0.2.tar.xz) = 4Te2sRASClLJjt0C69xAle4I0NUpWpQxapgXUAlalFw=
SHA256 (libreoffice/libre-hebrew-1.0.tar.gz) = 9ZYlfB23Bs41eVsY1/ZqTbmdQncl8g6ThJFLU0FCV5o=
SHA256 (libreoffice/libreoffice-26.2.1.2.tar.xz) = GM4iX3P7KjdxCzziJGpvq5+yXvELxpYKxXtZS/Xo/Cg=
SHA256 (libreoffice/libreoffice-dictionaries-26.2.1.2.tar.xz) = AvKkXA8/8jV+y56BZc5kdDyJLqm1rMJMrgyWXFI4KRM=
SHA256 (libreoffice/libreoffice-help-26.2.1.2.tar.xz) = 2ieSMcGy6yEjhBHx6OCVJ7tbfBfM6Zk7r2Yk20/ZJWg=
SHA256 (libreoffice/libreoffice-translations-26.2.1.2.tar.xz) = THjd6R4E5QCQyGGWSSOwaV/CHfE3bLu1AMjN9DWqkUM=
SHA256 (libreoffice/libreoffice-26.2.2.2.tar.xz) = 5a8pq8HxyJYXh3AP9QvGKj1ptyk+IKloxKNS/TIVX9c=
SHA256 (libreoffice/libreoffice-dictionaries-26.2.2.2.tar.xz) = DhrCdvsopgEJbbhy1qbpPQH4kVnt8G3/X4RK0FFIqwc=
SHA256 (libreoffice/libreoffice-help-26.2.2.2.tar.xz) = u0R04BLI6xuhq4PrAapsKUifRBw2o5pB0YRAhUEGBGs=
SHA256 (libreoffice/libreoffice-translations-26.2.2.2.tar.xz) = TiHKQsfJ8jiZE+x0al338BXvgFqR4r9UzIPhFRKDB3g=
SHA256 (libreoffice/libstaroffice-0.0.7.tar.xz) = +U+wrYIW+XEnvt7xY6RYhrQ8Yt6sXlsPXmKOI0IgyNs=
SHA256 (libreoffice/libvisio-0.1.10.tar.xz) = np7/dREtTZLZImKtf8JZnCHib4/FulSQDv3IPAUB5HI=
SHA256 (libreoffice/libwpg-0.3.4.tar.xz) = tV/alEDR4HBjDrJIfYuGl89BLCFKJ8runfac7HwATeM=
@@ -163,10 +163,10 @@ SIZE (libreoffice/liborcus-0.21.0.tar.xz) = 2267752
SIZE (libreoffice/libpagemaker-0.0.4.tar.xz) = 306496
SIZE (libreoffice/libqxp-0.0.2.tar.xz) = 341760
SIZE (libreoffice/libre-hebrew-1.0.tar.gz) = 531276
SIZE (libreoffice/libreoffice-26.2.1.2.tar.xz) = 291237196
SIZE (libreoffice/libreoffice-dictionaries-26.2.1.2.tar.xz) = 62085744
SIZE (libreoffice/libreoffice-help-26.2.1.2.tar.xz) = 58404220
SIZE (libreoffice/libreoffice-translations-26.2.1.2.tar.xz) = 234684880
SIZE (libreoffice/libreoffice-26.2.2.2.tar.xz) = 291588336
SIZE (libreoffice/libreoffice-dictionaries-26.2.2.2.tar.xz) = 62166188
SIZE (libreoffice/libreoffice-help-26.2.2.2.tar.xz) = 58403080
SIZE (libreoffice/libreoffice-translations-26.2.2.2.tar.xz) = 234977960
SIZE (libreoffice/libstaroffice-0.0.7.tar.xz) = 707920
SIZE (libreoffice/libvisio-0.1.10.tar.xz) = 2041876
SIZE (libreoffice/libwpg-0.3.4.tar.xz) = 340428
editors/libreoffice/patches/patch-external_skia_UnpackedTarball_skia_mk
+2 -2
View File
@@ -1,10 +1,10 @@
Index: external/skia/UnpackedTarball_skia.mk
--- external/skia/UnpackedTarball_skia.mk.orig
+++ external/skia/UnpackedTarball_skia.mk
@@ -44,6 +44,7 @@ skia_patches := \
0004-loong64-Fix-the-remaining-implicit-vector-casts.patch \
@@ -45,6 +45,7 @@ skia_patches := \
msvc-unknown-attributes.patch.1 \
fix-semaphore-include.patch.1 \
fix-xputimage-depth.patch.1 \
+ openbsd.patch.2 \
ifneq ($(MSYSTEM),)
editors/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
+2 -72
View File
@@ -1,67 +1,9 @@
Fix build with poppler-26.02.0 and 26.04.0.
First one from upstream commit 3c29b709cd2b5b18776b3c15638b66bd8a7dcb07.
Fix build with 26.04.0.
Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -711,13 +711,17 @@ void PDFOutDev::restoreState(GfxState*)
printf( "restoreState\n" );
}
-#if POPPLER_CHECK_VERSION(0, 71, 0)
+#if POPPLER_CHECK_VERSION(26, 2, 0)
+void PDFOutDev::setDefaultCTM(const std::array<double, 6> &pMat)
+#elif POPPLER_CHECK_VERSION(0, 71, 0)
void PDFOutDev::setDefaultCTM(const double *pMat)
#else
void PDFOutDev::setDefaultCTM(double *pMat)
#endif
{
+#if !POPPLER_CHECK_VERSION(26, 2, 0)
assert(pMat);
+#endif
OutputDev::setDefaultCTM(pMat);
@@ -737,8 +741,12 @@ void PDFOutDev::updateCTM(GfxState* state,
{
assert(state);
+#if POPPLER_CHECK_VERSION(26, 2, 0)
+ const std::array<double, 6> pMat = state->getCTM();
+#else
const double* const pMat = state->getCTM();
assert(pMat);
+#endif
printf( "updateCtm %f %f %f %f %f %f\n",
normalize(pMat[0]),
@@ -1044,7 +1052,11 @@ void PDFOutDev::drawChar(GfxState *state, double x, do
double csdx = 0.0;
double csdy = 0.0;
+#if POPPLER_CHECK_VERSION(26, 2, 0)
+ if (!state->getFont() || GfxFont::WritingMode::Horizontal == state->getFont()->getWMode())
+#else
if (!state->getFont() || !state->getFont()->getWMode())
+#endif
{
csdx = state->getCharSpace();
if (*u == ' ')
@@ -1067,7 +1079,11 @@ void PDFOutDev::drawChar(GfxState *state, double x, do
const double aPositionX(x-originX);
const double aPositionY(y-originY);
+#if POPPLER_CHECK_VERSION(26, 2, 0)
+ const std::array<double, 6> pTextMat=state->getTextMat();
+#else
const double* pTextMat=state->getTextMat();
+#endif
printf( "drawChar %f %f %f %f %f %f %f %f %f ",
normalize(aPositionX),
normalize(aPositionY),
@@ -1098,7 +1114,9 @@ void PDFOutDev::drawChar(GfxState *state, double x, do
@@ -1114,7 +1114,9 @@ void PDFOutDev::drawChar(GfxState *state, double x, do
printf( "\n" );
}
@@ -72,15 +14,3 @@ Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
void PDFOutDev::drawString(GfxState*, const GooString* /*s*/)
#else
void PDFOutDev::drawString(GfxState*, GooString* /*s*/)
@@ -1348,7 +1366,11 @@ poppler_bool PDFOutDev::tilingPatternFill(GfxState *st
const int nDPI = 72; // GfxState seems to have 72.0 as magic for some reason
auto pSplashGfxState = new GfxState(nDPI, nDPI, &aBox, 0, false);
+#if POPPLER_CHECK_VERSION(26, 2, 0)
+ auto pSplashOut = new SplashOutputDev(splashModeRGB8, 1, nullptr);
+#else
auto pSplashOut = new SplashOutputDev(splashModeRGB8, 1, false, nullptr);
+#endif
pSplashOut->setEnableFreeType(false);
pSplashOut->startDoc(m_pDoc);
pSplashOut->startPage(0 /* pageNum */, pSplashGfxState, nullptr /* xref */);
editors/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
+2 -59
View File
@@ -1,66 +1,9 @@
Fix build with poppler-26.02.0 and 26.04.0.
First one from upstream commit 3c29b709cd2b5b18776b3c15638b66bd8a7dcb07.
Fix build with 26.04.0.
Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -84,13 +84,21 @@ namespace pdfi
isUnderline(rSrc.isUnderline),
size(rSrc.size)
{
+#if POPPLER_CHECK_VERSION(26, 2, 0)
+ familyName.append(rSrc.getFamilyName());
+#else
familyName.append(&rSrc.getFamilyName());
+#endif
}
FontAttributes& operator=( const FontAttributes& rSrc )
{
familyName.clear();
+#if POPPLER_CHECK_VERSION(26, 2, 0)
+ familyName.append(rSrc.getFamilyName());
+#else
familyName.append(&rSrc.getFamilyName());
+#endif
isEmbedded = rSrc.isEmbedded;
maFontWeight= rSrc.maFontWeight;
@@ -103,12 +111,21 @@ namespace pdfi
bool operator==(const FontAttributes& rFont) const
{
+#if POPPLER_CHECK_VERSION(26, 2, 0)
+ return getFamilyName().compare(rFont.getFamilyName())==0 &&
+ isEmbedded == rFont.isEmbedded &&
+ maFontWeight == rFont.maFontWeight &&
+ isItalic == rFont.isItalic &&
+ isUnderline == rFont.isUnderline &&
+ size == rFont.size;
+#else
return getFamilyName().cmp(&rFont.getFamilyName())==0 &&
isEmbedded == rFont.isEmbedded &&
maFontWeight == rFont.maFontWeight &&
isItalic == rFont.isItalic &&
isUnderline == rFont.isUnderline &&
size == rFont.size;
+#endif
}
GooString familyName;
@@ -171,7 +188,9 @@ namespace pdfi
//----- initialization and control
// Set default transform matrix.
-#if POPPLER_CHECK_VERSION(0, 71, 0)
+#if POPPLER_CHECK_VERSION(26, 2, 0)
+void setDefaultCTM(const std::array<double, 6> &pMat) override;
+#elif POPPLER_CHECK_VERSION(0, 71, 0)
virtual void setDefaultCTM(const double *ctm) override;
#else
virtual void setDefaultCTM(double *ctm) override;
@@ -241,7 +260,9 @@ namespace pdfi
@@ -260,7 +260,9 @@ void setDefaultCTM(const std::array<double, 6> &pMat)
double originX, double originY,
CharCode code, int nBytes, Unicode *u, int uLen) override;
#endif