From b7e7149d700ad60ead835f13fb255a865c2cd996 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Fri, 27 Apr 2018 22:46:41 +0200 Subject: [PATCH] tectonic: cleanup and unbreak Closes #13917. Signed-off-by: Enno Boland --- .../tectonic/patches/cargo_lock_openssl.patch | 95 ------------------- srcpkgs/tectonic/template | 4 - 2 files changed, 99 deletions(-) delete mode 100644 srcpkgs/tectonic/patches/cargo_lock_openssl.patch diff --git a/srcpkgs/tectonic/patches/cargo_lock_openssl.patch b/srcpkgs/tectonic/patches/cargo_lock_openssl.patch deleted file mode 100644 index ef99ff1dbe8..00000000000 --- a/srcpkgs/tectonic/patches/cargo_lock_openssl.patch +++ /dev/null @@ -1,95 +0,0 @@ -set openssl-sys version to 0.9.27 to be compatible with libressl-2.6.4 - ---- Cargo.lock.orig 2018-03-04 21:36:21.407801124 +0100 -+++ Cargo.lock 2018-03-04 21:36:39.476800800 +0100 -@@ -1,31 +1,3 @@ --[root] --name = "tectonic" --version = "0.1.7" --dependencies = [ -- "aho-corasick 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "app_dirs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "clap 2.27.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "flate2 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", -- "fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)", -- "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "hyper-native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", -- "md-5 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "mkstemp-rs 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", -- "sha2 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "termcolor 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "toml 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "zip 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", --] -- - [[package]] - name = "advapi32-sys" - version = "0.2.0" -@@ -479,12 +451,12 @@ - "foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl-sys 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.9.27 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] - name = "openssl-sys" --version = "0.9.20" -+version = "0.9.27" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "cc 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -698,6 +670,34 @@ - ] - - [[package]] -+name = "tectonic" -+version = "0.1.7" -+dependencies = [ -+ "aho-corasick 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "app_dirs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "clap 2.27.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "flate2 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", -+ "fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hyper-native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", -+ "md-5 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mkstemp-rs 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "sha2 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "termcolor 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "toml 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "zip 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] - name = "tempdir" - version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -941,7 +941,7 @@ - "checksum num_cpus 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "514f0d73e64be53ff320680ca671b64fe3fb91da01e1ae2ddc99eb51d453b20d" - "checksum ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c" - "checksum openssl 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)" = "8bf434ff6117485dc16478d77a4f5c84eccc9c3645c4da8323b287ad6a15a638" --"checksum openssl-sys 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)" = "0ad395f1cee51b64a8d07cc8063498dc7554db62d5f3ca87a67f4eed2791d0c8" -+"checksum openssl-sys 0.9.27 (registry+https://github.com/rust-lang/crates.io-index)" = "d6fdc5c4a02e69ce65046f1763a0181107038e02176233acb0b3351d7cc588f9" - "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - "checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903" - "checksum podio 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e5422a1ee1bc57cc47ae717b0137314258138f38fd5f3cea083f43a9725383a0" diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template index 04ae88f63fe..c1b70f7a21b 100644 --- a/srcpkgs/tectonic/template +++ b/srcpkgs/tectonic/template @@ -12,10 +12,6 @@ distfiles="https://github.com/tectonic-typesetting/${pkgname}/archive/v${version checksum=c39acc8a4e2e102245037fd2ea3e77b058d25e29bbab0dcc53a3167c5d3fee2a nocross=yes -case "$XBPS_TARGET_MACHINE" in - x86_64-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/9607/steps/shell_3/logs/stdio" -esac - do_build() { cargo update --package openssl-sys --precise 0.9.28 cargo build --release