Accepting request 1177200 from Publishing:TeXLive
- 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 - Update vendored dependencies. - Apply the following patches for icu 75 support * 0001-build-set-standard-to-c-17.patch * 0002-fix-update-symbols-tags_from_lang-hb_ot_tag_from_lan.patch - Update _service file and replace obsoleted "disabled" option OBS-URL: https://build.opensuse.org/request/show/1177200 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tectonic?expand=0&rev=12
This commit is contained in:
Ana Guerrero
Git OBS Bridge
commit
556483247d
26
0001-build-set-c-standard-to-c-17.patch
Normal file
26
0001-build-set-c-standard-to-c-17.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From 55252b6d5e3ac14b8c990a0d56ec2c827bca37e6 Mon Sep 17 00:00:00 2001
|
||||
From: Soc Virnyl Estela <contact@uncomfyhalomacro.pl>
|
||||
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>
|
||||
---
|
||||
crates/xetex_layout/build.rs | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/crates/xetex_layout/build.rs b/crates/xetex_layout/build.rs
|
||||
index bdd0d03f..558fd29e 100644
|
||||
--- a/crates/xetex_layout/build.rs
|
||||
+++ b/crates/xetex_layout/build.rs
|
||||
@@ -86,7 +86,7 @@ fn main() {
|
||||
let mut cppcfg = cc::Build::new();
|
||||
|
||||
let cppflags = [
|
||||
- "-std=c++14",
|
||||
+ "-std=c++17",
|
||||
"-Wall",
|
||||
"-Wdate-time",
|
||||
"-Wendif-labels",
|
||||
--
|
||||
2.45.1
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
From 7b62ef557d524e49d4f44e3a136af7f59d9d392c Mon Sep 17 00:00:00 2001
|
||||
From: Soc Virnyl Estela <contact@uncomfyhalomacro.pl>
|
||||
Date: Tue, 28 May 2024 12:04:26 +0800
|
||||
Subject: [PATCH 2/2] fix: update symbols tags_from_lang ->
|
||||
hb_ot_tag_from_language
|
||||
|
||||
Signed-off-by: Soc Virnyl Estela <contact@uncomfyhalomacro.pl>
|
||||
---
|
||||
crates/xetex_layout/layout/xetex-XeTeXLayoutInterface.cpp | 6 +++---
|
||||
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 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;
|
||||
}
|
||||
|
||||
-#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);
|
||||
- gr_feature_val *featureValues = gr_face_featureval_for_lang (grFace, tag_from_lang(engine->language));
|
||||
+ gr_feature_val *featureValues = gr_face_featureval_for_lang (grFace, hb_ot_tag_from_language(engine->language));
|
||||
|
||||
rval = gr_fref_feature_value(feature, featureValues);
|
||||
}
|
||||
@@ -1023,7 +1023,7 @@ initGraphiteBreaking(XeTeXLayoutEngine engine, const uint16_t* txtPtr, int txtLe
|
||||
grPrevSlot = NULL;
|
||||
}
|
||||
|
||||
- gr_feature_val *grFeatureValues = gr_face_featureval_for_lang (grFace, tag_from_lang(engine->language));
|
||||
+ gr_feature_val *grFeatureValues = gr_face_featureval_for_lang (grFace, hb_ot_tag_from_language(engine->language));
|
||||
|
||||
int nFeatures = engine->nFeatures;
|
||||
hb_feature_t *features = engine->features;
|
||||
--
|
||||
2.45.1
|
||||
|
||||
6
_service
6
_service
@ -1,9 +1,9 @@
|
||||
<services>
|
||||
<service name="cargo_vendor" mode="disabled">
|
||||
<param name="srctar">tectonic-0.15.0.tar.gz</param>
|
||||
<service name="cargo_vendor" mode="manual">
|
||||
<param name="srctar">tectonic-*.tar.gz</param>
|
||||
<param name="compression">zst</param>
|
||||
<param name="update">true</param>
|
||||
</service>
|
||||
<service name="cargo_audit" mode="disabled" />
|
||||
<service name="cargo_audit" mode="manual" />
|
||||
</services>
|
||||
|
||||
|
||||
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
- Update vendored dependencies.
|
||||
- Apply the following patches for icu 75 support
|
||||
* 0001-build-set-standard-to-c-17.patch
|
||||
* 0002-fix-update-symbols-tags_from_lang-hb_ot_tag_from_lan.patch
|
||||
- Update _service file and replace obsoleted "disabled" option
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 24 09:41:30 UTC 2024 - Gordon Leung <pirateclip@protonmail.com>
|
||||
|
||||
|
||||
@ -25,6 +25,8 @@ 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-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
|
||||
BuildRequires: cargo-packaging
|
||||
@ -32,6 +34,7 @@ BuildRequires: pkg-config
|
||||
BuildRequires: pkgconfig(fontconfig)
|
||||
BuildRequires: pkgconfig(freetype2)
|
||||
BuildRequires: pkgconfig(harfbuzz)
|
||||
# https://github.com/tectonic-typesetting/tectonic/issues/1190
|
||||
BuildRequires: pkgconfig(icu-uc)
|
||||
BuildRequires: pkgconfig(libpng)
|
||||
BuildRequires: pkgconfig(openssl)
|
||||
@ -43,7 +46,7 @@ Tectonic is a complete self-contained TeX/LaTeX engine powered by
|
||||
XeTeX and TeXLive.
|
||||
|
||||
%prep
|
||||
%autosetup -a1 -n %{name}-%{name}-%{version}
|
||||
%autosetup -p1 -a1 -n %{name}-%{name}-%{version}
|
||||
|
||||
%build
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:484d99089e46d5909d0d658d59d3b9ef2c80afb0c959c45448bf51c7dec09d47
|
||||
size 49949400
|
||||
oid sha256:172975b4df18e48180af5fa61564bbb1aa573bb97d287830788a61d3f2312891
|
||||
size 48055789
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user