- Replace 0001-build-set-standard-to-c-17.patch to 0001-build-set-c-standard-to-c-17.patch

- Adjust patches for the release branch. tectonic uses a separate branch for releases
  so that's why the patches are failing

OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/tectonic?expand=0&rev=28
This commit is contained in:
Soc Virnyl Estela
2024-05-28 04:19:44 +00:00
committed by Git OBS Bridge
parent 001a89406e
commit 89b53a6b96
4 changed files with 21 additions and 16 deletions

View File

@@ -1,9 +1,7 @@
From f0284b57226ff78a606a0fd893d1b39e21ed6dbf Mon Sep 17 00:00:00 2001
From 55252b6d5e3ac14b8c990a0d56ec2c827bca37e6 Mon Sep 17 00:00:00 2001
From: Soc Virnyl Estela <contact@uncomfyhalomacro.pl>
Date: Tue, 28 May 2024 11:09:21 +0800
Subject: [PATCH 1/2] build: set standard to c++17
new unicode header uses auto
Date: Tue, 28 May 2024 12:02:54 +0800
Subject: [PATCH 1/2] build: set c standard to c++17
Signed-off-by: Soc Virnyl Estela <contact@uncomfyhalomacro.pl>
---

View File

@@ -1,6 +1,6 @@
From 22bbb5955aa6a06bf4ddbe60369882a1fbe9f50d Mon Sep 17 00:00:00 2001
From 7b62ef557d524e49d4f44e3a136af7f59d9d392c Mon Sep 17 00:00:00 2001
From: Soc Virnyl Estela <contact@uncomfyhalomacro.pl>
Date: Tue, 28 May 2024 11:12:39 +0800
Date: Tue, 28 May 2024 12:04:26 +0800
Subject: [PATCH 2/2] fix: update symbols tags_from_lang ->
hb_ot_tag_from_language
@@ -10,19 +10,19 @@ Signed-off-by: Soc Virnyl Estela <contact@uncomfyhalomacro.pl>
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/crates/xetex_layout/layout/xetex-XeTeXLayoutInterface.cpp b/crates/xetex_layout/layout/xetex-XeTeXLayoutInterface.cpp
index e73af347..b63fcead 100644
index 89c1de6a..73aaf7a0 100644
--- a/crates/xetex_layout/layout/xetex-XeTeXLayoutInterface.cpp
+++ b/crates/xetex_layout/layout/xetex-XeTeXLayoutInterface.cpp
@@ -494,7 +494,7 @@ getGraphiteFeatureSettingCode(XeTeXLayoutEngine engine, uint32_t featureID, uint
return rval;
}
-hb_tag_t tag_from_lang(hb_language_t lang) {
+hb_tag_t hb_ot_tag_from_language(hb_language_t lang) {
const char* str = hb_language_to_string(lang);
if (str) {
return hb_tag_from_string(str, strlen(str));
@@ -513,7 +513,7 @@ getGraphiteFeatureDefaultSetting(XeTeXLayoutEngine engine, uint32_t featureID)
-#define tag_from_lang(x) hb_tag_from_string(hb_language_to_string(x), strlen(hb_language_to_string(x)))
+#define hb_ot_tag_from_language(x) hb_tag_from_string(hb_language_to_string(x), strlen(hb_language_to_string(x)))
uint32_t
getGraphiteFeatureDefaultSetting(XeTeXLayoutEngine engine, uint32_t featureID)
@@ -506,7 +506,7 @@ getGraphiteFeatureDefaultSetting(XeTeXLayoutEngine engine, uint32_t featureID)
if (grFace != NULL) {
const gr_feature_ref* feature = gr_face_find_fref(grFace, featureID);
@@ -31,7 +31,7 @@ index e73af347..b63fcead 100644
rval = gr_fref_feature_value(feature, featureValues);
}
@@ -1026,7 +1026,7 @@ initGraphiteBreaking(XeTeXLayoutEngine engine, const uint16_t* txtPtr, int txtLe
@@ -1023,7 +1023,7 @@ initGraphiteBreaking(XeTeXLayoutEngine engine, const uint16_t* txtPtr, int txtLe
grPrevSlot = NULL;
}

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 28 04:18:15 UTC 2024 - Soc Virnyl Estela <uncomfy+openbuildservice@uncomfyhalomacro.pl>
- Replace 0001-build-set-standard-to-c-17.patch to 0001-build-set-c-standard-to-c-17.patch
- Adjust patches for the release branch. tectonic uses a separate branch for releases
so that's why the patches are failing
-------------------------------------------------------------------
Tue May 28 03:18:21 UTC 2024 - Soc Virnyl Estela <uncomfy+openbuildservice@uncomfyhalomacro.pl>

View File

@@ -25,7 +25,7 @@ Group: Productivity/Publishing/TeX/Utilities
URL: https://tectonic-typesetting.github.io
Source0: https://github.com/tectonic-typesetting/tectonic/archive/refs/tags/%{name}@%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: vendor.tar.zst
Patch1: 0001-build-set-standard-to-c-17.patch
Patch1: 0001-build-set-c-standard-to-c-17.patch
Patch2: 0002-fix-update-symbols-tags_from_lang-hb_ot_tag_from_lan.patch
BuildRequires: c++_compiler
BuildRequires: c_compiler