Accepting request 1322950 from Publishing

OBS-URL: https://build.opensuse.org/request/show/1322950
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/typst?expand=0&rev=26

_service

@@ -1,13 +1,10 @@
 <services>
   <service name="download_files" mode="manual" />
   <service name="cargo_vendor" mode="manual">
-     <param name="srctar">typst-0.12.0.tar.gz</param>
+     <param name="srctar">typst-0.14.2.tar.gz</param>
      <param name="compression">xz</param>
-     <param name="update">true</param>
-     <!-- needs a fixed cargo-vendor-filtered package
-          unfiltered tarball isnt actually much bigger
+     <param name="update">false</param>
      <param name="filter">true</param>
-     -->
   </service>
 </services>
 

hayagriva-bump-strum-version.patch

@@ -0,0 +1,113 @@
+# hayagriva uses two versions of strum currently. 0.26 and 0.27,
+# but 0.26 is 'hidden' behind the feature-flag "cli", which
+# typst doesn't use and thus doesn't get vendored.
+# This patch bumps the cli-version of strum to 0.27 as well,
+# so that we don't need another strum-version vendored.
+
+Index: typst-0.14.0/Cargo.toml
+===================================================================
+--- typst-0.14.0.orig/Cargo.toml
++++ typst-0.14.0/Cargo.toml
+@@ -167,3 +167,6 @@ manual_range_contains = "allow"
+ mutable_key_type = "allow"
+ uninlined_format_args = "warn"
+ wildcard_in_or_patterns = "allow"
++
++[patch.crates-io]
++hayagriva = { path="vendor/hayagriva-0.9.1" }
+Index: typst-0.14.0/vendor/hayagriva-0.9.1/Cargo.toml
+===================================================================
+--- typst-0.14.0.orig/vendor/hayagriva-0.9.1/Cargo.toml
++++ typst-0.14.0/vendor/hayagriva-0.9.1/Cargo.toml
+@@ -102,7 +102,7 @@ features = ["derive"]
+ version = "0.9.25"
+ 
+ [dependencies.strum]
+-version = "0.26"
++version = "0.27"
+ features = ["derive"]
+ optional = true
+ 
+Index: typst-0.14.0/vendor/hayagriva-0.9.1/Cargo.lock
+===================================================================
+--- typst-0.14.0.orig/vendor/hayagriva-0.9.1/Cargo.lock
++++ typst-0.14.0/vendor/hayagriva-0.9.1/Cargo.lock
+@@ -69,7 +69,7 @@ checksum = "53d0c374feba1b9a59042a7c1cf0
+ dependencies = [
+  "paste",
+  "roman-numerals-rs",
+- "strum 0.27.2",
++ "strum",
+  "unic-langid",
+  "unicode-normalization",
+  "unscanny",
+@@ -216,7 +216,7 @@ dependencies = [
+  "serde",
+  "serde_json",
+  "serde_yaml",
+- "strum 0.26.3",
++ "strum",
+  "thiserror",
+  "unic-langid",
+  "unicode-segmentation",
+@@ -470,12 +470,6 @@ source = "registry+https://github.com/ru
+ checksum = "c85cd47a33a4510b1424fe796498e174c6a9cf94e606460ef022a19f3e4ff85e"
+ 
+ [[package]]
+-name = "rustversion"
+-version = "1.0.22"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+-
+-[[package]]
+ name = "ryu"
+ version = "1.0.20"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -557,33 +551,11 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e
+ 
+ [[package]]
+ name = "strum"
+-version = "0.26.3"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
+-dependencies = [
+- "strum_macros 0.26.4",
+-]
+-
+-[[package]]
+-name = "strum"
+ version = "0.27.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
+ dependencies = [
+- "strum_macros 0.27.2",
+-]
+-
+-[[package]]
+-name = "strum_macros"
+-version = "0.26.4"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+-dependencies = [
+- "heck",
+- "proc-macro2",
+- "quote",
+- "rustversion",
+- "syn",
++ "strum_macros",
+ ]
+ 
+ [[package]]
+Index: typst-0.14.0/Cargo.lock
+===================================================================
+--- typst-0.14.0.orig/Cargo.lock
++++ typst-0.14.0/Cargo.lock
+@@ -935,8 +935,6 @@ checksum = "bf151400ff0baff5465007dd2f3e
+ [[package]]
+ name = "hayagriva"
+ version = "0.9.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1cb69425736f184173b3ca6e27fcba440a61492a790c786b1c6af7e06a03e575"
+ dependencies = [
+  "biblatex",
+  "ciborium",

typst-0.12.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5e92463965c0cf6aa003a3bacd1c68591ef2dc0db59dcdccb8f7b084836a1266
-size 3421789

typst-0.14.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:70a56445020ca05efc571c7b07a1a9f52eb93842d420518693c077ae74e54142
+size 4124613

typst.changes

@@ -1,3 +1,52 @@
+-------------------------------------------------------------------
+Mon Dec 15 11:42:53 UTC 2025 - Martin Sirringhaus <martin.sirringhaus@suse.com>
+
+- Update to 0.14.2
+  https://typst.app/docs/changelog/0.14.2/
+  https://github.com/typst/typst/releases/tag/v0.14.2
+- Remove upstreamed pr7562-fix-missing-hint-in-testsuite.patch
+
+-------------------------------------------------------------------
+Thu Dec 11 14:25:47 UTC 2025 - Martin Sirringhaus <martin.sirringhaus@suse.com>
+
+- Update to 0.14.1
+  https://typst.app/docs/changelog/0.14.1/
+  https://github.com/typst/typst/releases/tag/v0.14.1
+- Add upstream pr7562-fix-missing-hint-in-testsuite.patch to fix testsuite
+
+-------------------------------------------------------------------
+Mon Oct 27 08:27:34 UTC 2025 - Martin Sirringhaus <martin.sirringhaus@suse.com>
+
+- Update to 0.14.0
+  https://typst.app/blog/2025/typst-0.14/
+  https://typst.app/docs/changelog/0.14.0/ 
+  https://github.com/typst/typst/releases/tag/v0.14.0
+- Add hayagriva-bump-strum-version.patch to fix build of hayagriva
+
+-------------------------------------------------------------------
+Tue Aug 19 06:16:08 UTC 2025 - Martin Sirringhaus <martin.sirringhaus@suse.com>
+
+- Adjust build to updated cargo-packaging macros
+
+-------------------------------------------------------------------
+Thu May  8 13:24:52 UTC 2025 - Martin Sirringhaus <martin.sirringhaus@suse.com>
+
+- Update dependencies to fix bsc#1242630
+
+-------------------------------------------------------------------
+Fri Mar  7 12:55:21 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update 0.13.1
+  https://github.com/typst/typst/releases/tag/v0.13.1
+
+-------------------------------------------------------------------
+Wed Feb 19 16:56:34 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update 0.13.0
+  https://typst.app/blog/2025/typst-0.13/
+  https://typst.app/docs/changelog/0.13.0/
+  https://github.com/typst/typst/releases/tag/v0.13.0
+
 -------------------------------------------------------------------
 Mon Nov 11 02:50:42 UTC 2024 - Joshua Smith <smolsheep@opensuse.org>
 
@@ -7,7 +56,7 @@ Mon Nov 11 02:50:42 UTC 2024 - Joshua Smith <smolsheep@opensuse.org>
 -------------------------------------------------------------------
 Fri Oct 18 23:05:17 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
 
-- Update to 0.12.0 
+- Update to 0.12.0
   https://typst.app/blog/2024/typst-0.12/
   https://typst.app/docs/changelog/0.12.0/
 - hayagriva directory is now versioned:

typst.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package typst
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,17 +23,18 @@
 %define force_gcc_version 13
 %endif
 
-%global hayagriva_version 0.8.0
+%global hayagriva_version 0.9.1
 %global hayagriva_vendor_dir vendor/hayagriva-%{hayagriva_version}
 
 Name:           typst
-Version:        0.12.0
+Version:        0.14.2
 Release:        0
 Summary:        A new markup-based typesetting system that is powerful and easy to learn
 License:        Apache-2.0
 URL:            https://github.com/typst/typst
 Source0:        https://github.com/typst/typst/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        vendor.tar.xz
+Patch0:         hayagriva-bump-strum-version.patch
 BuildRequires:  cargo-packaging
 BuildRequires:  clang-devel
 BuildRequires:  gcc%{?force_gcc_version}-c++
@@ -104,27 +105,36 @@ RUSTFLAGS=%{rustflags} %{cargo_build} --workspace
 # otherwise it would complain about not being a member of the
 # top-level typst-workspace
 echo "[workspace]" >> %{hayagriva_vendor_dir}/Cargo.toml
+
 # hayagriva is older, so typst might use newer dot-dependencies.
 # We tell hayagriva to use the newer ones, if available.
 cargo update --offline --manifest-path=%{hayagriva_vendor_dir}/Cargo.toml
 # We may have updated hayagriva's Cargo.lock-file.
 # So we have to tell typst, not to worry about hash-mismatches.
 # (Matters in the check-section below)
-echo "[patch.crates-io.hayagriva]" >> Cargo.toml
-echo "path = \"%{hayagriva_vendor_dir}\"" >> Cargo.toml
+# Currently part of Patch0. Uncomment, if patch is removed
+# echo "[patch.crates-io.hayagriva]" >> Cargo.toml
+# echo "path = \"%{hayagriva_vendor_dir}\"" >> Cargo.toml
+
 RUSTFLAGS=%{rustflags} %{cargo_build} --manifest-path=%{hayagriva_vendor_dir}/Cargo.toml --features cli
 
+# We need to run update again, because cargo_test-macro now contains --locked as well,
+# which makes the check-section fail.
+# See https://bugzilla.opensuse.org/show_bug.cgi?id=1246346
+%{__cargo} update --offline --workspace
+
 %check
 %if 0%{?force_gcc_version}
 export CC="gcc-%{?force_gcc_version}"
 export CXX="g++-%{?force_gcc_version}"
 %endif
-%{cargo_test} --workspace
+# Also build in release-mode so we don't fully rebuild the package
+%{cargo_test} --workspace --release
 
 %install
 install -d -m 0755 %{buildroot}%{_bindir}
 install -m 0755 target/release/typst %{buildroot}%{_bindir}/%{name}
-install -m 0755 %{hayagriva_vendor_dir}/target/release/hayagriva %{buildroot}%{_bindir}/hayagriva
+install -m 0755 target/release/hayagriva %{buildroot}%{_bindir}/hayagriva
 
 # Shell completions
 install -Dm644 -T %{_builddir}/%{name}-%{version}/artifacts/%{name}.bash %{buildroot}%{_datadir}/bash-completion/completions/%{name}

vendor.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b20576566b5b4b09976c01e7e14ddd306e217ba69e235f81274dabab587fd08
-size 64345276
+oid sha256:75d4216c39cfb2168047ccf6f334fae2003cc6115554b9dbcbcfd62e35f951c6
+size 57647552