From bbc79d41081a3576551fdf7498cf5279e97be9c3 Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Mon, 1 Jun 2026 15:03:06 +0200 Subject: [PATCH] graphite: upgrade to 1.3.15 Downloaded from https://github.com/silnrsi/graphite/releases/download/1.3.15/graphite2-minimal-1.3.15.tgz Change-Id: I4781db96e723a552dbb9b64a1be6284850bb2979 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/205875 Tested-by: Jenkins Reviewed-by: Xisco Fauli --- download.lst | 4 ++-- external/graphite/UnpackedTarball_graphite.mk | 3 +-- external/graphite/enumarith.patch | 22 ------------------- 3 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 external/graphite/enumarith.patch diff --git a/download.lst b/download.lst index 2677bd53f8f1..2683985a11d7 100644 --- a/download.lst +++ b/download.lst @@ -317,8 +317,8 @@ GPGME_TARBALL := gpgme-1.24.3.tar.bz2 # three static lines # so that git cherry-pick # will not run into conflicts -GRAPHITE_SHA256SUM := b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc -GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz +GRAPHITE_SHA256SUM := 10cfc69a6f859ce875b9708d170b8222eba76cdb89b6dbb4ee1e375bc7242409 +GRAPHITE_TARBALL := graphite2-minimal-1.3.15.tgz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/graphite/UnpackedTarball_graphite.mk b/external/graphite/UnpackedTarball_graphite.mk index 640368833144..29ce937d6322 100644 --- a/external/graphite/UnpackedTarball_graphite.mk +++ b/external/graphite/UnpackedTarball_graphite.mk @@ -15,12 +15,11 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,graphite,0)) $(eval $(call gb_UnpackedTarball_add_patches,graphite, \ external/graphite/ubsan.patch \ - external/graphite/enumarith.patch \ )) # cannot use post_action since $(file ..) would be run when the recipe is parsed, i.e. would always # happen before the tarball is unpacked $(gb_UnpackedTarball_workdir)/graphite/graphite2-uninstalled.pc: $(call gb_UnpackedTarball_get_target,graphite) - $(file >$@,$(call gb_pkgconfig_file,graphite2,1.3.14,$(GRAPHITE_CFLAGS),$(GRAPHITE_LIBS))) + $(file >$@,$(call gb_pkgconfig_file,graphite2,1.3.15,$(GRAPHITE_CFLAGS),$(GRAPHITE_LIBS))) # vim: set noet sw=4 ts=4: diff --git a/external/graphite/enumarith.patch b/external/graphite/enumarith.patch deleted file mode 100644 index f5b83097f2b6..000000000000 --- a/external/graphite/enumarith.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src/Pass.cpp -+++ src/Pass.cpp -@@ -194,7 +194,7 @@ - m_cPConstraint = vm::Machine::Code(true, pcCode, pcCode + pass_constraint_len, - precontext[0], be::peek(sort_keys), *m_silf, face, PASS_TYPE_UNKNOWN); - if (e.test(!m_cPConstraint, E_OUTOFMEM) -- || e.test(m_cPConstraint.status() != Code::loaded, m_cPConstraint.status() + E_CODEFAILURE)) -+ || e.test(m_cPConstraint.status() != Code::loaded, +m_cPConstraint.status() + E_CODEFAILURE)) - return face.error(e); - face.error_context(face.error_context() - 1); - } -@@ -266,8 +266,8 @@ - r->constraint = new (m_codes+n*2-1) vm::Machine::Code(true, rc_begin, rc_end, r->preContext, r->sort, *m_silf, face, pt, &prog_pool_free); - - if (e.test(!r->action || !r->constraint, E_OUTOFMEM) -- || e.test(r->action->status() != Code::loaded, r->action->status() + E_CODEFAILURE) -- || e.test(r->constraint->status() != Code::loaded, r->constraint->status() + E_CODEFAILURE) -+ || e.test(r->action->status() != Code::loaded, +r->action->status() + E_CODEFAILURE) -+ || e.test(r->constraint->status() != Code::loaded, +r->constraint->status() + E_CODEFAILURE) - || e.test(!r->constraint->immutable(), E_MUTABLECCODE)) - return face.error(e); - }