summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--office/LibreOffice/LibreOffice.SlackBuild5
-rw-r--r--office/LibreOffice/LibreOffice.info10
-rw-r--r--office/LibreOffice/bison_yyn-yyrule_rename.diff18
-rw-r--r--office/LibreOffice/libreoffice-7.4.0.3-poppler_22_09_fixes-1.patch29
-rw-r--r--office/LibreOffice/skia-freetype-2.11.diff51
5 files changed, 6 insertions, 107 deletions
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild
index 753229ba9c..86fc2a8d06 100644
--- a/office/LibreOffice/LibreOffice.SlackBuild
+++ b/office/LibreOffice/LibreOffice.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=LibreOffice
SRCNAM=libreoffice
-VERSION=${VERSION:-7.4.1.2}
+VERSION=${VERSION:-7.4.2.3}
SHORT_VERSION=${VERSION%.*.*}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -292,9 +292,6 @@ if [ "$HAVE_SRCS_TARBALL" = "0" ]; then
fi
patch -p0 < $CWD/no-check-if-root.diff
-#patch -p0 < $CWD/skia-freetype-2.11.diff
-#patch -p0 < $CWD/bison_yyn-yyrule_rename.diff
-patch -p1 < $CWD/libreoffice-7.4.0.3-poppler_22_09_fixes-1.patch
# GCC10 requirements (Tx alienBOB)
sed -i external/libebook/ExternalProject_libebook.mk \
diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info
index 6a413c27b1..7f03d2b6ff 100644
--- a/office/LibreOffice/LibreOffice.info
+++ b/office/LibreOffice/LibreOffice.info
@@ -1,10 +1,10 @@
PRGNAM="LibreOffice"
-VERSION="7.4.1.2"
+VERSION="7.4.2.3"
HOMEPAGE="https://www.libreoffice.org"
-DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/7.4.1/libreoffice-7.4.1.2.tar.xz \
- https://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-7.4.1.2-srcs.tar.xz"
-MD5SUM="2fb28cbd5a436e05fccf3b73ca77e6ed \
- bb2e0ad08305f80d4c8df4123ea07149"
+DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/7.4.2/libreoffice-7.4.2.3.tar.xz \
+ https://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-7.4.2.3-srcs.tar.xz"
+MD5SUM="aeb1fba3a91cf2edd580f7acf3ac66c6 \
+ 4b020d96f8d28b0b16bf4ddcc853ae82"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="zulu-openjdk11 apache-ant perl-Archive-Zip"
diff --git a/office/LibreOffice/bison_yyn-yyrule_rename.diff b/office/LibreOffice/bison_yyn-yyrule_rename.diff
deleted file mode 100644
index 9802135098..0000000000
--- a/office/LibreOffice/bison_yyn-yyrule_rename.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- connectivity/source/parse/sqlbison.y.orig 2021-09-18 13:35:17.897000000 +1000
-+++ connectivity/source/parse/sqlbison.y 2021-09-18 13:32:58.864000000 +1000
-@@ -74,9 +74,15 @@
-
- // yyi is the internal number of the rule that is currently being reduced
- // This can be mapped to external rule number via the yyrmap.
-+#if defined YYBISON && YYBISON >= 30800
-+#define SQL_NEW_RULE newNode("", SQLNodeType::Rule, yyr1[yyrule])
-+#define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule, yyr1[yyrule])
-+#define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule, yyr1[yyrule])
-+#else
- #define SQL_NEW_RULE newNode("", SQLNodeType::Rule, yyr1[yyn])
- #define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule, yyr1[yyn])
- #define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule, yyr1[yyn])
-+#endif
-
-
- extern connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;
diff --git a/office/LibreOffice/libreoffice-7.4.0.3-poppler_22_09_fixes-1.patch b/office/LibreOffice/libreoffice-7.4.0.3-poppler_22_09_fixes-1.patch
deleted file mode 100644
index 69e707d871..0000000000
--- a/office/LibreOffice/libreoffice-7.4.0.3-poppler_22_09_fixes-1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Submitted By: Douglas R. Reno <renodr at linuxfromscratch dot org>
-Date: 2022-09-03
-Initial Package Version: 7.4.0.3
-Origin: Gentoo (commit 3fe3e0dc873e97eb1bb5ccb2846fffee35182caa in gentoo.git)
-Upstream Status: Submitted
-Description: Adapts libreoffice-7.4.0.3 to changes in Poppler's API,
- similar to Inkscape's poppler-22.09 patch.
-
-diff -Naurp libreoffice-7.4.0.3.orig/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx libreoffice-7.4.0.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
---- libreoffice-7.4.0.3.orig/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2022-08-10 09:14:32.000000000 -0500
-+++ libreoffice-7.4.0.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2022-09-03 10:39:04.244841138 -0500
-@@ -678,8 +678,16 @@ void PDFOutDev::updateLineDash(GfxState
- return;
- assert(state);
-
-- double* dashArray; int arrayLen; double startOffset;
-+ int arrayLen; double startOffset;
-+#if POPPLER_CHECK_VERSION(22, 9, 0)
-+ const double* dashArray;
-+ const std::vector<double> &dash = state->getLineDash(&startOffset);
-+ dashArray = dash.data();
-+ arrayLen = dash.size();
-+#else
-+ double* dashArray;
- state->getLineDash(&dashArray, &arrayLen, &startOffset);
-+#endif
-
- printf( "updateLineDash" );
- if( arrayLen && dashArray )
diff --git a/office/LibreOffice/skia-freetype-2.11.diff b/office/LibreOffice/skia-freetype-2.11.diff
deleted file mode 100644
index 73d16e6ead..0000000000
--- a/office/LibreOffice/skia-freetype-2.11.diff
+++ /dev/null
@@ -1,51 +0,0 @@
---- external/skia/UnpackedTarball_skia.mk.orig 2021-08-23 22:03:48.538000000 +1000
-+++ external/skia/UnpackedTarball_skia.mk 2021-08-23 22:04:58.137000000 +1000
-@@ -39,6 +39,7 @@
- fast-png-write.patch.1 \
- skia_sk_cpu_sse_level_0_by_default.patch.1 \
- fix-warnings.patch.1 \
-+ skia_freetype-2.11.patch.0 \
-
- $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
-
---- /dev/null 2021-08-23 17:37:05.741000000 +1000
-+++ external/skia/skia_freetype-2.11.patch.0 2021-08-23 22:01:05.176000000 +1000
-@@ -0,0 +1,38 @@
-+--- src/ports/SkFontHost_FreeType_common.cpp.orig 2021-03-02 00:53:09.178606791 +1000
-++++ src/ports/SkFontHost_FreeType_common.cpp 2021-08-23 21:58:57.678000000 +1000
-+@@ -665,8 +665,13 @@
-+ canvas->drawPaint(paint);
-+ break;
-+ }
-++#ifdef FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
-++ case FT_COLR_PAINTFORMAT_TRANSFORM: {
-++ SkMatrix transform = ToSkMatrix(colrv1_paint.u.transform.affine);
-++#else
-+ case FT_COLR_PAINTFORMAT_TRANSFORMED: {
-+ SkMatrix transform = ToSkMatrix(colrv1_paint.u.transformed.affine);
-++#endif
-+
-+ canvas->concat(transform);
-+ break;
-+@@ -760,12 +765,21 @@
-+ traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID,
-+ FT_COLOR_NO_ROOT_TRANSFORM);
-+ break;
-++#ifdef FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
-++ case FT_COLR_PAINTFORMAT_TRANSFORM:
-++ canvas->saveLayer(nullptr, nullptr);
-++ // Traverse / draw operation will apply transform.
-++ colrv1_draw_paint(canvas, palette, face, paint);
-++ traverse_result =
-++ colrv1_traverse_paint(canvas, palette, face, paint.u.transform.paint);
-++#else
-+ case FT_COLR_PAINTFORMAT_TRANSFORMED:
-+ canvas->saveLayer(nullptr, nullptr);
-+ // Traverse / draw operation will apply transform.
-+ colrv1_draw_paint(canvas, palette, face, paint);
-+ traverse_result =
-+ colrv1_traverse_paint(canvas, palette, face, paint.u.transformed.paint);
-++#endif
-+ canvas->restore();
-+ break;
-+ case FT_COLR_PAINTFORMAT_ROTATE:
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-22 17:37:50 +0000