download.lst | 8 +-
external/graphite/StaticLibrary_graphite.mk | 4 -
external/graphite/UnpackedTarball_graphite.mk | 8 --
external/graphite/graphite2.issue1115.patch.1 | 22 ------
external/graphite/graphite2.win64.patch.1 | 60 -----------------
external/graphite/ubsan.patch | 62 ------------------
external/libetonyek/Library_etonyek.mk | 1
external/libetonyek/UnpackedTarball_libetonyek.mk | 1
external/libetonyek/initial-creator.patch.1 | 26 -------
external/libetonyek/libetonyek-bundled-soname.patch.0 | 3
solenv/flatpak-manifest.in | 6 -
11 files changed, 9 insertions(+), 192 deletions(-)
New commits:
commit 09a2e6d218ec5d6ad33d05f254919a619783b7de
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu Dec 13 09:13:39 2018 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sat Nov 6 00:40:46 2021 +0100
graphite: update to 1.3.12
Martin Hosken thinks all patches are redundant now, so drop them.
Change-Id: I062168416a1289b7f4dd42d8ae58b7df56a37712
Reviewed-on: https://gerrit.libreoffice.org/65074
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
(cherry picked from commit 6b84708914f9c026776b28a300ac6d278272881f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124774
Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/download.lst b/download.lst
index 92e64f51f323..f6647d1384b6 100644
--- a/download.lst
+++ b/download.lst
@@ -92,8 +92,8 @@ export GLM_SHA256SUM :=
d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c8106299
export GLM_TARBALL :=
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
export GPGME_SHA256SUM :=
1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
export GPGME_TARBALL := gpgme-1.9.0.tar.bz2
-export GRAPHITE_SHA256SUM :=
aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9
-export GRAPHITE_TARBALL := graphite2-minimal-1.3.10.tgz
+export GRAPHITE_SHA256SUM :=
0ebf80886bfc39e591c59bc975f4bb5dc717da7489eedfdb8acf84435261e7df
+export GRAPHITE_TARBALL := graphite2-minimal-1.3.12.tgz
export HARFBUZZ_SHA256SUM :=
3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd
export HARFBUZZ_TARBALL := harfbuzz-1.8.4.tar.bz2
export HSQLDB_SHA256SUM :=
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
diff --git a/external/graphite/StaticLibrary_graphite.mk
b/external/graphite/StaticLibrary_graphite.mk
index 8c16482ba11b..9eeff041dc28 100644
--- a/external/graphite/StaticLibrary_graphite.mk
+++ b/external/graphite/StaticLibrary_graphite.mk
@@ -44,7 +44,6 @@ $(eval $(call
gb_StaticLibrary_add_generated_exception_objects,graphite,\
UnpackedTarball/graphite/src/gr_segment \
UnpackedTarball/graphite/src/gr_slot \
UnpackedTarball/graphite/src/json \
- UnpackedTarball/graphite/src/CachedFace \
UnpackedTarball/graphite/src/CmapCache \
UnpackedTarball/graphite/src/Code \
UnpackedTarball/graphite/src/Collider \
@@ -60,9 +59,6 @@ $(eval $(call
gb_StaticLibrary_add_generated_exception_objects,graphite,\
UnpackedTarball/graphite/src/NameTable \
UnpackedTarball/graphite/src/Pass \
UnpackedTarball/graphite/src/Position \
- UnpackedTarball/graphite/src/SegCache \
- UnpackedTarball/graphite/src/SegCacheEntry \
- UnpackedTarball/graphite/src/SegCacheStore \
UnpackedTarball/graphite/src/Segment \
UnpackedTarball/graphite/src/Silf \
UnpackedTarball/graphite/src/Slot \
diff --git a/external/graphite/UnpackedTarball_graphite.mk
b/external/graphite/UnpackedTarball_graphite.mk
index a162d172b795..0abd4b657d91 100644
--- a/external/graphite/UnpackedTarball_graphite.mk
+++ b/external/graphite/UnpackedTarball_graphite.mk
@@ -11,12 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,graphite))
$(eval $(call gb_UnpackedTarball_set_tarball,graphite,$(GRAPHITE_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,graphite,0))
-
-$(eval $(call gb_UnpackedTarball_add_patches,graphite,\
- external/graphite/graphite2.issue1115.patch.1 \
- external/graphite/graphite2.win64.patch.1 \
- external/graphite/ubsan.patch \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/external/graphite/graphite2.issue1115.patch.1
b/external/graphite/graphite2.issue1115.patch.1
deleted file mode 100644
index 454114bb32c9..000000000000
--- a/external/graphite/graphite2.issue1115.patch.1
+++ /dev/null
@@ -1,22 +0,0 @@
---- graphite/src/Code.cpp
-+++ graphite/src/Code.cpp
-@@ -175,8 +175,8 @@ Machine::Code::Code(bool is_constraint,
- bytecode_end,
- pre_context,
- rule_length,
-- silf.numClasses(),
-- face.glyphs().numAttrs(),
-+ static_cast<uint16>(silf.numClasses()),
-+ static_cast<uint16>(face.glyphs().numAttrs()),
- face.numFeatures(),
- {1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,255,
-@@ -184,7 +184,7 @@ Machine::Code::Code(bool is_constraint,
- 1,1,1,1,1,1,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-- 0,0,0,0,0,0,0, silf.numUser()}
-+ 0,0,0,0,0,0,0, static_cast<byte>(silf.numUser())}
- };
-
- decoder dec(lims, *this, pt);
diff --git a/external/graphite/graphite2.win64.patch.1
b/external/graphite/graphite2.win64.patch.1
deleted file mode 100644
index d7cf11e63189..000000000000
--- a/external/graphite/graphite2.win64.patch.1
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -urN graphite2-1.3.4.orig/src/inc/json.h graphite2-1.3.4/src/inc/json.h
---- graphite2-1.3.4.orig/src/inc/json.h 2015-12-22 14:25:46.403566441
+0100
-+++ graphite2-1.3.4/src/inc/json.h 2015-12-22 14:26:13.439722846 +0100
-@@ -85,6 +85,9 @@
- json & operator << (string) throw();
- json & operator << (number) throw();
- json & operator << (integer) throw();
-+#ifdef _WIN64
-+ json & operator << (size_t) throw();
-+#endif
- json & operator << (long unsigned int d) throw();
- json & operator << (boolean) throw();
- json & operator << (_null_t) throw();
-diff -urN graphite2-1.3.4.orig/src/inc/Main.h graphite2-1.3.4/src/inc/Main.h
---- graphite2-1.3.4.orig/src/inc/Main.h 2015-12-22 14:25:46.399566417
+0100
-+++ graphite2-1.3.4/src/inc/Main.h 2015-12-22 14:26:13.439722846 +0100
-@@ -25,6 +25,9 @@
- of the License or (at your option) any later version.
- */
- #pragma once
-+#ifdef _WIN32
-+#pragma warning(disable: 4510 4610)
-+#endif
-
- #include <cstdlib>
- #include "graphite2/Types.h"
-diff -urN graphite2-1.3.4.orig/src/json.cpp graphite2-1.3.4/src/json.cpp
---- graphite2-1.3.4.orig/src/json.cpp 2015-12-22 14:25:46.399566417 +0100
-+++ graphite2-1.3.4/src/json.cpp 2015-12-22 14:26:13.439722846 +0100
-@@ -133,6 +133,9 @@
- }
- json & json::operator << (json::integer d) throw() { context(seq);
fprintf(_stream, "%ld", d); return *this; }
- json & json::operator << (long unsigned d) throw() { context(seq);
fprintf(_stream, "%ld", d); return *this; }
-+#ifdef _WIN64
-+json & json::operator << (size_t d) throw() { context(seq);
fprintf(_stream, "%ld", d); return *this; }
-+#endif
- json & json::operator << (json::boolean b) throw() { context(seq); fputs(b ?
"true" : "false", _stream); return *this; }
- json & json::operator << (json::_null_t) throw() { context(seq);
fputs("null",_stream); return *this; }
-
-diff -urN graphite2-1.3.4.orig/src/Pass.cpp graphite2-1.3.4/src/Pass.cpp
---- graphite2-1.3.4.orig/src/Pass.cpp 2015-12-22 14:25:46.399566417 +0100
-+++ graphite2-1.3.4/src/Pass.cpp 2015-12-22 14:26:13.439722846 +0100
-@@ -568,7 +568,7 @@
- if (r->rule->preContext > fsm.slots.context())
- continue;
- *fsm.dbgout << json::flat << json::object
-- << "id" << r->rule - m_rules
-+ << "id" << static_cast<size_t>(r->rule - m_rules)
- << "failed" << true
- << "input" << json::flat << json::object
- << "start" << objectid(dslot(&fsm.slots.segment,
input_slot(fsm.slots, -r->rule->preContext)))
-@@ -582,7 +582,7 @@
- void Pass::dumpRuleEventOutput(const FiniteStateMachine & fsm, const Rule &
r, Slot * const last_slot) const
- {
- *fsm.dbgout << json::item << json::flat << json::object
-- << "id" << &r - m_rules
-+ << "id" << static_cast<size_t>(&r - m_rules)
- << "failed" << false
- << "input" << json::flat << json::object
- << "start" << objectid(dslot(&fsm.slots.segment,
input_slot(fsm.slots, 0)))
diff --git a/external/graphite/ubsan.patch b/external/graphite/ubsan.patch
deleted file mode 100644
index 86039de4e1c8..000000000000
--- a/external/graphite/ubsan.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- src/TtfUtil.cpp
-+++ src/TtfUtil.cpp
-@@ -1247,7 +1247,7 @@
- void * GlyfLookup(const void * pGlyf, size_t nGlyfOffset, size_t nTableLen)
- {
- const uint8 * pByte = reinterpret_cast<const uint8 *>(pGlyf);
-- if (nGlyfOffset + pByte < pByte || nGlyfOffset + sizeof(Sfnt::Glyph)
>= nTableLen)
-+ if (nGlyfOffset > nTableLen || sizeof(Sfnt::Glyph) >= nTableLen -
nGlyfOffset)
- return NULL;
- return const_cast<uint8 *>(pByte + nGlyfOffset);
- }
---- src/gr_face.cpp
-+++ src/gr_face.cpp
-@@ -87,7 +87,7 @@
-
- Face *res = new Face(appFaceHandle, *ops);
- if (res && load_face(*res, faceOptions))
-- return static_cast<gr_face *>(res);
-+ return reinterpret_cast<gr_face *>(res);
-
- delete res;
- return 0;
-@@ -195,7 +195,7 @@
-
- void gr_face_destroy(gr_face *face)
- {
-- delete face;
-+ delete static_cast<Face *>(face);
- }
-
-
---- src/gr_font.cpp
-+++ src/gr_font.cpp
-@@ -50,7 +50,7 @@
- if (face == 0) return 0;
-
- Font * const res = new Font(ppm, *face, appFontHandle, font_ops);
-- return static_cast<gr_font*>(res);
-+ return reinterpret_cast<gr_font*>(res);
- }
-
- gr_font* gr_make_font_with_advance_fn(float ppm/*pixels per em*/, const void*
appFontHandle/*non-NULL*/, gr_advance_fn getAdvance, const gr_face *
face/*needed for scaling*/)
-@@ -61,7 +61,7 @@
-
- void gr_font_destroy(gr_font *font)
- {
-- delete font;
-+ delete static_cast<Font *>(font);
- }
-
-
---- src/inc/Code.h
-+++ src/inc/Code.h
-@@ -162,7 +162,7 @@
- {
- if (_code && !_own)
- {
-- _code += dist / sizeof(instr);
-+ _code += dist / int(sizeof(instr));
- _data += dist;
- }
- }
commit 914e7f712b718e4e4d3cebd2a1f4cd09fd0dba75
Author: David Tardon <dtar...@redhat.com>
AuthorDate: Sat Dec 29 09:34:05 2018 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sat Nov 6 00:40:33 2021 +0100
upload libetonyek 0.1.9
Reviewed-on: https://gerrit.libreoffice.org/65701
Tested-by: Jenkins
Reviewed-by: David Tardon <dtar...@redhat.com>
(cherry picked from commit c6e73f3e5bfd5b1cca94f985b5299857d0238ae3)
Change-Id: Ib29e1a622e25731731512a695443ac2c530d30c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124773
Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/download.lst b/download.lst
index 712ea9d0ba52..92e64f51f323 100644
--- a/download.lst
+++ b/download.lst
@@ -39,8 +39,8 @@ export EPM_SHA256SUM :=
b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7
export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
export EPUBGEN_SHA256SUM :=
03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad
export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz
-export ETONYEK_SHA256SUM :=
9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d
-export ETONYEK_VERSION_MICRO := 8
+export ETONYEK_SHA256SUM :=
e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a
+export ETONYEK_VERSION_MICRO := 9
export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
export EXPAT_SHA256SUM :=
2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40
export EXPAT_TARBALL := expat-2.4.1.tar.bz2
diff --git a/external/libetonyek/Library_etonyek.mk
b/external/libetonyek/Library_etonyek.mk
index 414b2d02b707..f4d2a0d3bfee 100644
--- a/external/libetonyek/Library_etonyek.mk
+++ b/external/libetonyek/Library_etonyek.mk
@@ -71,6 +71,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,etonyek,\
UnpackedTarball/libetonyek/src/lib/IWORKStyle \
UnpackedTarball/libetonyek/src/lib/IWORKStyleStack \
UnpackedTarball/libetonyek/src/lib/IWORKStylesheet \
+ UnpackedTarball/libetonyek/src/lib/IWORKSubDirStream \
UnpackedTarball/libetonyek/src/lib/IWORKTable \
UnpackedTarball/libetonyek/src/lib/IWORKTableRecorder \
UnpackedTarball/libetonyek/src/lib/IWORKText \
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index d90e44955687..d64d7e45212b 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -20,7 +20,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/ubsan.patch \
external/libetonyek/rpath.patch \
external/libetonyek/warnings.patch \
- external/libetonyek/initial-creator.patch.1 \
))
ifneq ($(OS),MACOSX)
diff --git a/external/libetonyek/initial-creator.patch.1
b/external/libetonyek/initial-creator.patch.1
deleted file mode 100644
index 44b7b19ea1b3..000000000000
--- a/external/libetonyek/initial-creator.patch.1
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1a91c62e829a2eda2f5870aae984125ef48ce672 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caol...@redhat.com>
-Date: Mon, 23 Apr 2018 17:20:16 +0100
-Subject: [PATCH] intial-creator->initial-creator
-
-Change-Id: I6fe5d0732edb97ac7ff6d527f48543cab1bb3f7b
----
- src/lib/IWORKCollector.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/IWORKCollector.cpp b/src/lib/IWORKCollector.cpp
-index 0e0c775..4252a49 100644
---- a/src/lib/IWORKCollector.cpp
-+++ b/src/lib/IWORKCollector.cpp
-@@ -771,7 +771,7 @@ void
IWORKCollector::fillMetadata(librevenge::RVNGPropertyList &props)
- if (!m_metadata.m_title.empty())
- props.insert("dc:subject", m_metadata.m_title.c_str());
- if (!m_metadata.m_author.empty())
-- props.insert("meta:intial-creator", m_metadata.m_author.c_str());
-+ props.insert("meta:initial-creator", m_metadata.m_author.c_str());
- if (!m_metadata.m_keywords.empty())
- props.insert("meta:keyword", m_metadata.m_keywords.c_str());
- if (!m_metadata.m_comment.empty())
---
-2.14.3
-
diff --git a/external/libetonyek/libetonyek-bundled-soname.patch.0
b/external/libetonyek/libetonyek-bundled-soname.patch.0
index 122763d9fc17..5aaf61464edd 100644
--- a/external/libetonyek/libetonyek-bundled-soname.patch.0
+++ b/external/libetonyek/libetonyek-bundled-soname.patch.0
@@ -1,7 +1,6 @@
--- src/lib/Makefile.in.orig 2016-01-12 19:21:24.000000000 +0100
+++ src/lib/Makefile.in 2016-03-02 18:19:52.214551270 +0100
-@@ -538,7 +538,7 @@
-
+@@ -538,6 +538,6 @@
libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LIBADD =
libetonyek_internal.la $(REVENGE_LIBS) $(LANGTAG_LIBS) $(XML_LIBS) $(ZLIB_LIBS)
@LIBETONYEK_WIN32_RESOURCE@
libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_DEPENDENCIES =
libetonyek_internal.la @LIBETONYEK_WIN32_RESOURCE@
-libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS =
$(version_info) -export-dynamic -no-undefined
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 7db6021ece3c..6fccf7b3f5c7 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -261,10 +261,10 @@
"dest-filename": "external/tarballs/libe-book-0.1.3.tar.xz"
},
{
- "url":
"https://dev-www.libreoffice.org/src/libetonyek-0.1.8.tar.xz";,
- "sha256":
"9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d",
+ "url":
"https://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz";,
+ "sha256":
"e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a",
"type": "file",
- "dest-filename":
"external/tarballs/libetonyek-0.1.8.tar.xz"
+ "dest-filename":
"external/tarballs/libetonyek-0.1.9.tar.xz"
},
{
"url":
"https://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz";,
