From 1f35d49c24b37e5b2f37ef6d5e680f096f91d3ee7b54453f4a92cc5e0fed483e Mon Sep 17 00:00:00 2001 From: Gordon Leung Date: Tue, 28 May 2024 01:23:22 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/tectonic?expand=0&rev=26 --- tectonic.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tectonic.spec b/tectonic.spec index e0922cf..e3f62be 100644 --- a/tectonic.spec +++ b/tectonic.spec @@ -32,7 +32,8 @@ BuildRequires: pkg-config BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(harfbuzz) -BuildRequires: pkgconfig(icu-uc) +# https://github.com/tectonic-typesetting/tectonic/issues/1190 +BuildRequires: pkgconfig(icu-uc) < 75 BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(zlib) From 001a89406ec0ca337a5f448a4cf741d3bbb8ec4f29a6385ae334ced5c423477b Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Tue, 28 May 2024 03:23:08 +0000 Subject: [PATCH 2/3] - 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/package/show/Publishing:TeXLive/tectonic?expand=0&rev=27 --- 0001-build-set-standard-to-c-17.patch | 28 ++++++++++++ ...ls-tags_from_lang-hb_ot_tag_from_lan.patch | 45 +++++++++++++++++++ _service | 6 +-- tectonic.changes | 9 ++++ tectonic.spec | 6 ++- vendor.tar.zst | 4 +- 6 files changed, 91 insertions(+), 7 deletions(-) create mode 100644 0001-build-set-standard-to-c-17.patch create mode 100644 0002-fix-update-symbols-tags_from_lang-hb_ot_tag_from_lan.patch diff --git a/0001-build-set-standard-to-c-17.patch b/0001-build-set-standard-to-c-17.patch new file mode 100644 index 0000000..06bea72 --- /dev/null +++ b/0001-build-set-standard-to-c-17.patch @@ -0,0 +1,28 @@ +From f0284b57226ff78a606a0fd893d1b39e21ed6dbf Mon Sep 17 00:00:00 2001 +From: Soc Virnyl Estela +Date: Tue, 28 May 2024 11:09:21 +0800 +Subject: [PATCH 1/2] build: set standard to c++17 + +new unicode header uses auto + +Signed-off-by: Soc Virnyl Estela +--- + 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 + diff --git a/0002-fix-update-symbols-tags_from_lang-hb_ot_tag_from_lan.patch b/0002-fix-update-symbols-tags_from_lang-hb_ot_tag_from_lan.patch new file mode 100644 index 0000000..d0f21dc --- /dev/null +++ b/0002-fix-update-symbols-tags_from_lang-hb_ot_tag_from_lan.patch @@ -0,0 +1,45 @@ +From 22bbb5955aa6a06bf4ddbe60369882a1fbe9f50d Mon Sep 17 00:00:00 2001 +From: Soc Virnyl Estela +Date: Tue, 28 May 2024 11:12:39 +0800 +Subject: [PATCH 2/2] fix: update symbols tags_from_lang -> + hb_ot_tag_from_language + +Signed-off-by: Soc Virnyl Estela +--- + 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 e73af347..b63fcead 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) + + 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); + } +@@ -1026,7 +1026,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 + diff --git a/_service b/_service index 5d36a45..e05d6bd 100644 --- a/_service +++ b/_service @@ -1,9 +1,9 @@ - - tectonic-0.15.0.tar.gz + + tectonic-*.tar.gz zst true - + diff --git a/tectonic.changes b/tectonic.changes index 100239e..b2d62dd 100644 --- a/tectonic.changes +++ b/tectonic.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue May 28 03:18:21 UTC 2024 - Soc Virnyl Estela + +- 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 diff --git a/tectonic.spec b/tectonic.spec index e3f62be..eb6f9aa 100644 --- a/tectonic.spec +++ b/tectonic.spec @@ -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-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 @@ -33,7 +35,7 @@ BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(harfbuzz) # https://github.com/tectonic-typesetting/tectonic/issues/1190 -BuildRequires: pkgconfig(icu-uc) < 75 +BuildRequires: pkgconfig(icu-uc) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(zlib) @@ -44,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 diff --git a/vendor.tar.zst b/vendor.tar.zst index bb0068e..7325bd6 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:484d99089e46d5909d0d658d59d3b9ef2c80afb0c959c45448bf51c7dec09d47 -size 49949400 +oid sha256:172975b4df18e48180af5fa61564bbb1aa573bb97d287830788a61d3f2312891 +size 48055789 From 89b53a6b969e4043822448db95d4ee612ae94aa895fe0d6bbd8703cd9a1f7c27 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Tue, 28 May 2024 04:19:44 +0000 Subject: [PATCH 3/3] - 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 --- ...=> 0001-build-set-c-standard-to-c-17.patch | 8 +++----- ...ls-tags_from_lang-hb_ot_tag_from_lan.patch | 20 +++++++++---------- tectonic.changes | 7 +++++++ tectonic.spec | 2 +- 4 files changed, 21 insertions(+), 16 deletions(-) rename 0001-build-set-standard-to-c-17.patch => 0001-build-set-c-standard-to-c-17.patch (77%) diff --git a/0001-build-set-standard-to-c-17.patch b/0001-build-set-c-standard-to-c-17.patch similarity index 77% rename from 0001-build-set-standard-to-c-17.patch rename to 0001-build-set-c-standard-to-c-17.patch index 06bea72..c168164 100644 --- a/0001-build-set-standard-to-c-17.patch +++ b/0001-build-set-c-standard-to-c-17.patch @@ -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 -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 --- diff --git a/0002-fix-update-symbols-tags_from_lang-hb_ot_tag_from_lan.patch b/0002-fix-update-symbols-tags_from_lang-hb_ot_tag_from_lan.patch index d0f21dc..a01755f 100644 --- a/0002-fix-update-symbols-tags_from_lang-hb_ot_tag_from_lan.patch +++ b/0002-fix-update-symbols-tags_from_lang-hb_ot_tag_from_lan.patch @@ -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 -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 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; } diff --git a/tectonic.changes b/tectonic.changes index b2d62dd..b077e0b 100644 --- a/tectonic.changes +++ b/tectonic.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 28 04:18:15 UTC 2024 - Soc Virnyl Estela + +- 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 diff --git a/tectonic.spec b/tectonic.spec index eb6f9aa..aad0510 100644 --- a/tectonic.spec +++ b/tectonic.spec @@ -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