commit: ff198d2aed5a80f2880302b162a4d7cf9d77c6c1 Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Sun Dec 8 12:31:31 2024 +0000 Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> CommitDate: Sun Dec 8 12:31:31 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ff198d2a
dev-tex/tectonic: fix build with rust-1.80 Closes: https://bugs.gentoo.org/920027 Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> dev-tex/tectonic/Manifest | 4 +- .../tectonic-0.15.0-fix-xetex_layout-build.patch | 12 ++++++ .../tectonic/files/tectonic-0.15.0-rust-1.80.patch | 27 ++++++++++++ dev-tex/tectonic/tectonic-0.15.0.ebuild | 48 ++++++++++++---------- 4 files changed, 68 insertions(+), 23 deletions(-) diff --git a/dev-tex/tectonic/Manifest b/dev-tex/tectonic/Manifest index c534bb2d9..1ed075ca7 100644 --- a/dev-tex/tectonic/Manifest +++ b/dev-tex/tectonic/Manifest @@ -390,10 +390,10 @@ DIST thiserror-impl-1.0.40.crate 15138 BLAKE2B 7590428b5a97efde6a823440a9c91e1d1 DIST thiserror-impl-1.0.56.crate 15367 BLAKE2B 6fad787eb1e2c0f25fee7bef160be794fb8000a0aa292ec0d2d66d7a4d1fcb226c3e2e690ff6a61ba2d8704208014eea84044dba27523d4b2c26d2f7d4ba64d5 SHA512 da66f4674cf699083f7142f3a60c1c9334767b4de3690b4c7af460ffda787fab2089f5bca231e92b6e71724d46fe7dbdcaa19073f5d8100838536d10971efbde DIST thread_local-1.1.4.crate 13106 BLAKE2B 64c19368f8cec46f23b3052759c4c4ef0de50748432790e6ea11b12477239b177d54e60b9046fdcb2f495b8e0b37ad82809d03602edab9fc85cf814e3bd94fe2 SHA512 db7ff3eb88a73d9313dd58d72397614c5aae6be1d64ead7f16535cae2857be3b27d189e7955308591ec64a0d67777fd2a62a2b124ca73facb9a2d8e0458bdbb5 DIST time-0.3.22.crate 113792 BLAKE2B 8c9920d38b2d9b2f3204de7fe399f6e25b0a7ae7bb72d155eeba397f5721130fae1e0b3022ce9f1109d08e73b72a9fd09043d69f5cca953e80f3d70c4f49a71d SHA512 55575d043cdda64f7a789c61360974d17d3d380a4f0b243346222709743609503644c352ab2ec5d5336bd2b2a4709d54fe1863209d5625f14f881a1c33df1763 -DIST time-0.3.34.crate 118430 BLAKE2B 6d04a20596c9b0961ca104748d9d360f07b16059719d7410fdf1a7a0d5f2aa02aaebf640999464835964bbded2d3257d79c4b0ca3080fbecf13dd2d0aa6962fc SHA512 3997e1b8d9be2f54184ebc9e1355d4b65f0b7bc9439b2b29e4a4acd86ad3a3aa019261112a24d998d76a7f66b266a86536fa50412279911b14d4d7aa7078c116 +DIST time-0.3.36.crate 119805 BLAKE2B d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf SHA512 83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133 DIST time-core-0.1.1.crate 7197 BLAKE2B 9d0be2ef7111a8b66e5c750b2c372627ae4acfb2c68b0c6ed44b3c23bea1cdca4f65b24d2f2027b4d334667b1620019f4cb8c6d9799c1c2c537e6cfe692ab88a SHA512 a29d6619581d3fed73d6bc66a2c18805b80a3d54197feac5ad987a2c31d003bf4fef88a312d5315d2fa5c7d3e509066a65c1732be2ce280cf937bb4eff012e14 DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52 -DIST time-macros-0.2.17.crate 24443 BLAKE2B 5045af9352961db0c97cae2f6ca3e8d2c4f89a129c7ac2ec1d8d20804292aa9f2901a61f910a564954614b68f39311bd381deeb66fed8bdac423227d077f3d14 SHA512 c81747f0b74e68d3b3f36d378ac5911dece8c6b511e5ac793807f854cc31c812b927d0df941f55ff90d3d67512d0ac6a5f63f2de4322c81b05da42f46b4a661c +DIST time-macros-0.2.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7 SHA512 557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4 DIST time-macros-0.2.9.crate 23684 BLAKE2B 5484a3c5bca52fcff3fcd4e6f060ee24ce293fbdad1abd5819d0426eca29b95de866fe1273e0ed3431d1b94b12c37f23748d4cacb0112a67e9be0f49132d03ba SHA512 2fe094e61ca0ab708d60693367812f1b87fb9b6770dbfa3dad8a2aad7d2a000c24ae3b8960104d6c5b72b4a055c7715fa5d4d601eb7b7ea1764bb730aec86033 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e diff --git a/dev-tex/tectonic/files/tectonic-0.15.0-fix-xetex_layout-build.patch b/dev-tex/tectonic/files/tectonic-0.15.0-fix-xetex_layout-build.patch new file mode 100644 index 000000000..43d461b50 --- /dev/null +++ b/dev-tex/tectonic/files/tectonic-0.15.0-fix-xetex_layout-build.patch @@ -0,0 +1,12 @@ +https://github.com/tectonic-typesetting/tectonic/commit/d260961426b01f7643ba0f35f493bdb671eeaf3f +--- a/crates/xetex_layout/build.rs 2024-12-08 10:19:21.243061431 -0000 ++++ b/crates/xetex_layout/build.rs 2024-12-08 10:44:13.539667493 -0000 +@@ -86,7 +86,7 @@ + let mut cppcfg = cc::Build::new(); + + let cppflags = [ +- "-std=c++14", ++ "-std=c++17", + "-Wall", + "-Wdate-time", + "-Wendif-labels", diff --git a/dev-tex/tectonic/files/tectonic-0.15.0-rust-1.80.patch b/dev-tex/tectonic/files/tectonic-0.15.0-rust-1.80.patch new file mode 100644 index 000000000..be48171fe --- /dev/null +++ b/dev-tex/tectonic/files/tectonic-0.15.0-rust-1.80.patch @@ -0,0 +1,27 @@ +Fix build with rust-1.80. +--- a/Cargo.lock 2024-12-08 10:19:21.230061469 -0000 ++++ b/Cargo.lock 2024-12-08 10:20:33.419850806 -0000 +@@ -2682,9 +2682,9 @@ + + [[package]] + name = "time" +-version = "0.3.34" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index"; +-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", +@@ -2705,9 +2705,9 @@ + + [[package]] + name = "time-macros" +-version = "0.2.17" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index"; +-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ + "num-conv", + "time-core", diff --git a/dev-tex/tectonic/tectonic-0.15.0.ebuild b/dev-tex/tectonic/tectonic-0.15.0.ebuild index dabebf897..13f9c5f89 100644 --- a/dev-tex/tectonic/tectonic-0.15.0.ebuild +++ b/dev-tex/tectonic/tectonic-0.15.0.ebuild @@ -250,9 +250,9 @@ CRATES=" [email protected] [email protected] [email protected] - [email protected] + [email protected] [email protected] - [email protected] + [email protected] [email protected] [email protected] [email protected] @@ -345,20 +345,32 @@ CRATES=" inherit cargo DESCRIPTION="A modernized, complete, embeddable TeX/LaTeX engine." -# Double check the homepage as the cargo_metadata crate -# does not provide this value so instead repository is used HOMEPAGE="https://github.com/tectonic-typesetting/tectonic/"; SRC_URI=" https://github.com/tectonic-typesetting/tectonic/archive/refs/tags/tectonic@${PV}.tar.gz -> ${P}.tar.gz ${CARGO_CRATE_URIS} " +S="${WORKDIR}/${PN}-${P}" -# License set may be more restrictive as OR is not respected -# use cargo-license for a more accurate license picture LICENSE="MIT" +# Dependent crate licenses +LICENSE+=" + Apache-2.0 BSD ISC MIT Unicode-DFS-2016 WTFPL-2 + || ( Artistic-2 CC0-1.0 ) +" SLOT="0" KEYWORDS="~amd64" +DEPEND=" + dev-libs/icu:= + dev-libs/openssl:= + media-gfx/graphite2 + media-libs/fontconfig + media-libs/freetype + media-libs/harfbuzz:= + media-libs/libpng:= + sys-libs/zlib +" RDEPEND="${DEPEND}" BDEPEND="media-libs/harfbuzz" @@ -366,20 +378,14 @@ BDEPEND="media-libs/harfbuzz" # update with proper path to binaries this crate installs, omit leading / QA_FLAGS_IGNORED="usr/bin/${PN}" -src_unpack() { - cargo_src_unpack - mv tectonic-${P}/* ${P}/ -} - -src_compile() { - cargo_gen_config - cargo_src_compile --features external-harfbuzz -} - -src_test() { - cargo_src_test --features external-harfbuzz -} +PATCHES=( + "${FILESDIR}/${P}-fix-xetex_layout-build.patch" + "${FILESDIR}/${P}-rust-1.80.patch" +) -src_install() { - cargo_src_install --features external-harfbuzz +src_configure() { + local myfeatures=( + external-harfbuzz + ) + cargo_src_configure }
