libreoffice: version bump to 26.2.2.2

2026-04-19 01:04:11 +03:00
parent 6b48b2286c
commit 49bf921da0
2 changed files with 365 additions and 783 deletions
@@ -0,0 +1,107 @@
+From 1e7ca8cd15173fe901f5cb045ba0754503c1d26e Mon Sep 17 00:00:00 2001
+From: Xisco Fauli <xiscofauli@libreoffice.org>
+Date: Thu, 02 Apr 2026 11:32:02 +0200
+Subject: [PATCH] poppler: upgrade to 26.04
+
+Downloaded from https://poppler.freedesktop.org/poppler-26.04.0.tar.xz
+
+Change-Id: I1e43d4a63da2f380b613718a897c3973ec9e16ce
+---
+
+diff --git a/download.lst b/download.lst
+index a54f25b..e73d5df 100644
+--- a/download.lst
+++ b/download.lst
+@@ -599,8 +599,8 @@
+ # three static lines
+ # so that git cherry-pick
+ # will not run into conflicts
+-POPPLER_SHA256SUM := 8b3c5e2a9f2ab4c3ec5029f28af1b433c6b71f0d1e7b3997aa561cf1c0ca4ebe
+-POPPLER_TARBALL := poppler-26.03.0.tar.xz
+POPPLER_SHA256SUM := b0955163114af96bc0106f68cb24daf973a629462453d8b82775f81b0d4e0693
+POPPLER_TARBALL := poppler-26.04.0.tar.xz
+ POPPLER_DATA_SHA256SUM := c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74
+ POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
+ # three static lines
+diff --git a/external/poppler/poppler-config.patch.1 b/external/poppler/poppler-config.patch.1
+index 53685b1..3a1f2c1 100644
+--- a/external/poppler/poppler-config.patch.1
+++ b/external/poppler/poppler-config.patch.1
+@@ -120,7 +120,7 @@
+ +#define PACKAGE_NAME "poppler"
+ +
+ +/* Define to the full name and version of this package. */
+-+#define PACKAGE_STRING "poppler 26.02.0"
++#define PACKAGE_STRING "poppler 26.04.0"
+ +
+ +/* Define to the one symbol short name of this package. */
+ +#define PACKAGE_TARNAME "poppler"
+@@ -129,7 +129,7 @@
+ +#define PACKAGE_URL ""
+ +
+ +/* Define to the version of this package. */
+-+#define PACKAGE_VERSION "26.02.0"
++#define PACKAGE_VERSION "26.04.0"
+ +
+ +/* Poppler data dir */
+ +#define POPPLER_DATADIR "/usr/local/share/poppler"
+@@ -144,7 +144,7 @@
+ +#define USE_FLOAT 0
+ +
+ +/* Version number of package */
+-+#define VERSION "26.02.0"
++#define VERSION "26.04.0"
+ +
+ +#if defined(__APPLE__)
+ +#elif defined (_WIN32)
+@@ -222,7 +222,7 @@
+ +#define POPPLER_CONFIG_H
+ +
+ +/* Defines the poppler version. */
+-+#define POPPLER_VERSION "26.02.0"
++#define POPPLER_VERSION "26.04.0"
+ +
+ +/* Use single precision arithmetic in the Splash backend */
+ +#define USE_FLOAT 0
+@@ -310,9 +310,9 @@
+ +
+ +#include "poppler-global.h"
+ +
+-+#define POPPLER_VERSION "26.02.0"
++#define POPPLER_VERSION "26.04.0"
+ +#define POPPLER_VERSION_MAJOR 26
+-+#define POPPLER_VERSION_MINOR 02
++#define POPPLER_VERSION_MINOR 04
+ +#define POPPLER_VERSION_MICRO 0
+ +
+ +namespace poppler
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index f1487453..18c8559 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -1114,7 +1114,9 @@
+     printf( "\n" );
+ }
+ 
+-#if POPPLER_CHECK_VERSION(0, 64, 0)
+#if POPPLER_CHECK_VERSION(26, 4, 0)
+void PDFOutDev::drawString(GfxState*, const std::string& /*s*/)
+#elif POPPLER_CHECK_VERSION(0, 64, 0)
+ void PDFOutDev::drawString(GfxState*, const GooString* /*s*/)
+ #else
+ void PDFOutDev::drawString(GfxState*, GooString* /*s*/)
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+index da587b1..0c8b771 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -261,7 +261,9 @@
+                               double originX, double originY,
+                               CharCode code, int nBytes, Unicode *u, int uLen) override;
+ #endif
+-#if POPPLER_CHECK_VERSION(0, 64, 0)
+#if POPPLER_CHECK_VERSION(26, 4, 0)
+        virtual void drawString(GfxState *state, const std::string &s) override;
+#elif POPPLER_CHECK_VERSION(0, 64, 0)
+         virtual void drawString(GfxState *state, const GooString *s) override;
+ #else
+         virtual void drawString(GfxState *state, GooString *s) override;