ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

graphite: upgrade to 1.3.15

Browse Source 
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 <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli
2026-06-01 20:44:25 +02:00
parent ccbbb20630
commit bbc79d4108
3 changed files with 3 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
download.lst
+2 -2
View File
@@ -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
external/graphite/UnpackedTarball_graphite.mk
Vendored
+1 -2
View File
@@ -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:
external/graphite/enumarith.patch
Vendored
-22
View File
@@ -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<uint16>(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);
}