diff options
author | Andrew Clemons <andrew.clemons@gmail.com> | 2018-10-14 21:36:17 +1300 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2018-10-21 06:46:49 +0700 |
commit | 63669a0293ee2c343c86bdde6de21322853749d9 (patch) | |
tree | 009ed58d8a68b4dc5ad7129d42fce12a1cab85c9 /system/alacritty | |
parent | 12f551c8a7a68ee6157248ab29cd5b9fdf01f825 (diff) |
system/alacritty: Updated for version 0.2.1.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
Diffstat (limited to 'system/alacritty')
-rw-r--r-- | system/alacritty/alacritty.SlackBuild | 62 | ||||
-rw-r--r-- | system/alacritty/alacritty.info | 28 | ||||
-rw-r--r-- | system/alacritty/patch_crate_deps.diff | 55 |
3 files changed, 27 insertions, 118 deletions
diff --git a/system/alacritty/alacritty.SlackBuild b/system/alacritty/alacritty.SlackBuild index 79115f39a4339..43533c95a0622 100644 --- a/system/alacritty/alacritty.SlackBuild +++ b/system/alacritty/alacritty.SlackBuild @@ -23,8 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=alacritty -GITREV=${GITREV:-593d7718d0d3e1e2071021d34178856079ac8bf7} -VERSION=${VERSION:-git$(echo "$GITREV" | sed 's/^\(.\{7\}\).*$/\1/')} +VERSION=${VERSION:-0.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -66,12 +65,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$GITREV -tar xvf $CWD/$PRGNAM-$GITREV.tar.gz -cd $PRGNAM-$GITREV - -# force offline for git crate dependencies -patch -p1 < $CWD/patch_crate_deps.diff +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION # build offline # configuration tells cargo to use the configured directory @@ -100,7 +96,6 @@ mkdir vendor atty=0.2.11 \ base64=0.9.3 \ bitflags=0.7.0 \ - bitflags=0.8.2 \ bitflags=1.0.4 \ block=0.1.6 \ byteorder=1.2.6 \ @@ -132,8 +127,8 @@ mkdir vendor fnv=1.0.6 \ foreign-types-shared=0.1.1 \ foreign-types=0.3.2 \ - freetype-rs=0.13.0 \ - freetype-sys=0.4.0 \ + freetype-rs=0.19.0 \ + freetype-sys=0.7.0 \ fsevent-sys=0.1.6 \ fsevent=0.2.17 \ fuchsia-zircon-sys=0.3.3 \ @@ -211,6 +206,8 @@ mkdir vendor serde_derive=1.0.79 \ serde_json=1.0.28 \ serde_yaml=0.7.5 \ + servo-fontconfig-sys=4.0.7 \ + servo-fontconfig=0.4.0 \ shared_library=0.1.9 \ siphasher=0.2.3 \ slab=0.3.0 \ @@ -259,41 +256,17 @@ mkdir vendor x11-dl=2.18.3 \ xdg=2.1.0 \ xml-rs=0.7.0 \ - yaml-rust=0.4.2 \ - servo-fontconfig=0.4.0 \ - servo-fontconfig-sys=4.0.3 ; do + yaml-rust=0.4.2 ; do dep="$(echo "$dependency" | cut -d= -f1)" ver="$(echo "$dependency" | cut -d= -f2)" - if [ "$dep" = "servo-fontconfig" ] || [ "$dep" = "servo-fontconfig-sys" ] ; then - if [ "$dep" = "servo-fontconfig" ] ; then - srcnam="rust-fontconfig" - sha1="be2b94de833ec69cf767186262a5fb8360fa5b45" - else - srcnam="libfontconfig" - sha1="5c1845e1bffa11cf4d3e6fb27f456bf5c814ce1b" - fi - - crate="$CWD/$srcnam-$sha1.tar.gz" - tar xvf "$crate" - mv "$srcnam-$sha1" "$dep-$ver" - - if [ "$dep" = "servo-fontconfig" ] ; then - ( - cd "$dep-$ver" - sed -i 's/^servo-fontconfig-sys =.*/servo-fontconfig-sys = "4.0.3"/' Cargo.toml - ) - fi - else - crate="$CWD/$dep-$ver.crate" - tar xvf "$crate" - fi + tar xvf $CWD/$dep-$ver.crate touch $dep-$ver/.cargo-ok # generate checksum { - printf "{\\n" + printf "{\n" printf ' "files": {\n' ( @@ -301,19 +274,12 @@ mkdir vendor find . -type f -print0 | xargs -0 sha256sum | sed -n '/\.cargo-checksum\.json/!p' | sed 's/\.\///;s/^\([^ ]*\)[[:space:]][[:space:]]*\(.*\)$/"\2":"\1",/' ) | sed '$ s/,$//' - printf " },\\n" + printf " },\n" printf ' "package": "' - if [ "$dep" = "servo-fontconfig" ] || [ "$dep" = "servo-fontconfig-sys" ] ; then - checksum="$(tar cz $dep-$ver | sha256sum | cut -f1 -d' ')" - sed -i "s/^\(\"checksum $dep [^=]*\)= \".*$/\1= \"$checksum\"/" ../Cargo.lock - - printf "%s\"\\n" "$checksum" - else - sha256sum "$crate" | cut -f1 -d' ' | sed 's/$/"/' - fi + sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/' - printf "}\\n" + printf "}\n" } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json done ) diff --git a/system/alacritty/alacritty.info b/system/alacritty/alacritty.info index 8e68635bd18a3..e4ca1ef54f214 100644 --- a/system/alacritty/alacritty.info +++ b/system/alacritty/alacritty.info @@ -1,7 +1,7 @@ PRGNAM="alacritty" -VERSION="git593d771" +VERSION="0.2.1" HOMEPAGE="https://github.com/jwilm/alacritty" -DOWNLOAD="https://github.com/jwilm/alacritty/archive/593d7718d0d3e1e2071021d34178856079ac8bf7/alacritty-593d7718d0d3e1e2071021d34178856079ac8bf7.tar.gz \ +DOWNLOAD="https://github.com/jwilm/alacritty/archive/v0.2.1/alacritty-0.2.1.tar.gz \ https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.6.8.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/android_glue/android_glue-0.2.3.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \ @@ -10,7 +10,6 @@ DOWNLOAD="https://github.com/jwilm/alacritty/archive/593d7718d0d3e1e2071021d3417 https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.11.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.9.3.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-0.7.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-0.8.2.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.0.4.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/block/block-0.1.6.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.2.6.crate \ @@ -42,8 +41,8 @@ DOWNLOAD="https://github.com/jwilm/alacritty/archive/593d7718d0d3e1e2071021d3417 https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.6.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/foreign-types-shared/foreign-types-shared-0.1.1.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/foreign-types/foreign-types-0.3.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/freetype-rs/freetype-rs-0.13.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/freetype-sys/freetype-sys-0.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/freetype-rs/freetype-rs-0.19.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/freetype-sys/freetype-sys-0.7.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/fsevent-sys/fsevent-sys-0.1.6.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/fsevent/fsevent-0.2.17.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-zircon-sys/fuchsia-zircon-sys-0.3.3.crate \ @@ -121,6 +120,8 @@ DOWNLOAD="https://github.com/jwilm/alacritty/archive/593d7718d0d3e1e2071021d3417 https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.79.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.28.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_yaml/serde_yaml-0.7.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/servo-fontconfig-sys/servo-fontconfig-sys-4.0.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/servo-fontconfig/servo-fontconfig-0.4.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/shared_library/shared_library-0.1.9.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/siphasher/siphasher-0.2.3.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/slab/slab-0.3.0.crate \ @@ -169,10 +170,8 @@ DOWNLOAD="https://github.com/jwilm/alacritty/archive/593d7718d0d3e1e2071021d3417 https://crates-io.s3-us-west-1.amazonaws.com/crates/x11-dl/x11-dl-2.18.3.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/xdg/xdg-2.1.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/xml-rs/xml-rs-0.7.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/yaml-rust/yaml-rust-0.4.2.crate \ - https://github.com/jwilm/rust-fontconfig/archive/be2b94de833ec69cf767186262a5fb8360fa5b45/rust-fontconfig-be2b94de833ec69cf767186262a5fb8360fa5b45.tar.gz \ - https://github.com/jwilm/libfontconfig/archive/5c1845e1bffa11cf4d3e6fb27f456bf5c814ce1b/libfontconfig-5c1845e1bffa11cf4d3e6fb27f456bf5c814ce1b.tar.gz" -MD5SUM="6a9c341101b836837eb4efde3a681f9d \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/yaml-rust/yaml-rust-0.4.2.crate" +MD5SUM="d96eb1da8ce2c54dc997cf3aee6bbf06 \ 851ec573d64fa799d588fbf3733aab2f \ 196a2eb81627baf71f6677a3c669e6ac \ 294a49d3c53865fa7ac5d0ce2f5d5735 \ @@ -181,7 +180,6 @@ MD5SUM="6a9c341101b836837eb4efde3a681f9d \ 5d7155b7fbc0e234c017f418f0dc9d64 \ 496ce53f8d4d95bf19e48bb2f31e4a7e \ 1dd9b755c91f0f7bb401e393a9ed69f2 \ - d7dfd092eb34b9ea76791c60c46346f6 \ e5767560aad375059c975285c07022c0 \ ea2d23ceb9f98853a7dffc6c02884464 \ ef65c8896b47528d0496e46c77419c4b \ @@ -213,8 +211,8 @@ MD5SUM="6a9c341101b836837eb4efde3a681f9d \ b0fd8ad50f5e64c71f0daf8af79ca952 \ 667e86b8b8d96ab4e9605627ce7dcc9a \ 78c898fdaa3968e23904bf8538c4a271 \ - 497a8a40b0ec5daba365884ed8848e82 \ - ea9725c5b4c6d855c05e23549f970bb7 \ + a0a0e08161808758a06e0d7e1e27e532 \ + 2f3a4829521147ee8994c8b770e8aa94 \ f674063e8f2d60813bd3f036efa82118 \ 88fddf6adf1f767dba359fdc6e85cde7 \ 54cfab480b7a5f7302eadf44129d3f4b \ @@ -292,6 +290,8 @@ MD5SUM="6a9c341101b836837eb4efde3a681f9d \ 3b1280b17c2516528070bbeeda7a9bd5 \ b0a46929455f8d095f55338734ede030 \ ffeaa4b98744f389df4946ff2e158ff0 \ + 2aaa993ba5f5cb24369e21647549188a \ + 0a1c33ff15279010692af23566070deb \ e0a0f1fa737110ffd0b04af8d1062edd \ 85e4e64ebc6bd76f1b9ff5be147a918d \ e20d7941c777a14a3620fe2a089c776f \ @@ -340,9 +340,7 @@ MD5SUM="6a9c341101b836837eb4efde3a681f9d \ 65c71ba710824feabcdbc340aa9dbebe \ 6492ecb377ffc18c649cbca93e3b18c3 \ 3330bd5ad46e2b2a7276a954cdc60a62 \ - 12a788ed8a569a3011f52e501ba01225 \ - 3c9934f89d41f1da7f24671807901d57 \ - 89096560654f357de70d1f36c0b47614" + 12a788ed8a569a3011f52e501ba01225" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="xclip" diff --git a/system/alacritty/patch_crate_deps.diff b/system/alacritty/patch_crate_deps.diff deleted file mode 100644 index 7be620300aa8e..0000000000000 --- a/system/alacritty/patch_crate_deps.diff +++ /dev/null @@ -1,55 +0,0 @@ -diff -Naur alacritty-593d7718d0d3e1e2071021d34178856079ac8bf7.bak/Cargo.lock alacritty-593d7718d0d3e1e2071021d34178856079ac8bf7/Cargo.lock ---- alacritty-593d7718d0d3e1e2071021d34178856079ac8bf7.bak/Cargo.lock 2018-09-27 06:42:41.000000000 +1200 -+++ alacritty-593d7718d0d3e1e2071021d34178856079ac8bf7/Cargo.lock 2018-09-27 08:01:19.889994814 +1200 -@@ -353,7 +353,7 @@ - "freetype-rs 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "servo-fontconfig 0.4.0 (git+https://github.com/jwilm/rust-fontconfig?branch=updated-2017-10-8)", -+ "servo-fontconfig 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] -@@ -1048,16 +1048,16 @@ - [[package]] - name = "servo-fontconfig" - version = "0.4.0" --source = "git+https://github.com/jwilm/rust-fontconfig?branch=updated-2017-10-8#be2b94de833ec69cf767186262a5fb8360fa5b45" -+source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", -- "servo-fontconfig-sys 4.0.3 (git+https://github.com/jwilm/libfontconfig?branch=updated-2017-10-8)", -+ "servo-fontconfig-sys 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] - name = "servo-fontconfig-sys" - version = "4.0.3" --source = "git+https://github.com/jwilm/libfontconfig?branch=updated-2017-10-8#5c1845e1bffa11cf4d3e6fb27f456bf5c814ce1b" -+source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "expat-sys 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "freetype-sys 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -1578,8 +1578,8 @@ - "checksum serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)" = "31569d901045afbff7a9479f793177fe9259819aff10ab4f89ef69bbc5f567fe" - "checksum serde_json 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "d30ec34ac923489285d24688c7a9c0898d16edff27fc1f1bd854edeff6ca3b7f" - "checksum serde_yaml 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ef8099d3df28273c99a1728190c7a9f19d444c941044f64adf986bee7ec53051" --"checksum servo-fontconfig 0.4.0 (git+https://github.com/jwilm/rust-fontconfig?branch=updated-2017-10-8)" = "<none>" --"checksum servo-fontconfig-sys 4.0.3 (git+https://github.com/jwilm/libfontconfig?branch=updated-2017-10-8)" = "<none>" -+"checksum servo-fontconfig 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8fdda5bd03e66fab61e02767591f2e55cbc39e1620cb20f2b440339dad112a8f" -+"checksum servo-fontconfig-sys 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8f3221f35108edad6e90016c80c5d8452bf53a5860f160e992eb7c78392c3346" - "checksum shared_library 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11" - "checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" - "checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23" -diff -Naur alacritty-593d7718d0d3e1e2071021d34178856079ac8bf7.bak/font/Cargo.toml alacritty-593d7718d0d3e1e2071021d34178856079ac8bf7/font/Cargo.toml ---- alacritty-593d7718d0d3e1e2071021d34178856079ac8bf7.bak/font/Cargo.toml 2018-09-27 06:42:41.000000000 +1200 -+++ alacritty-593d7718d0d3e1e2071021d34178856079ac8bf7/font/Cargo.toml 2018-09-27 08:01:45.390943211 +1200 -@@ -12,7 +12,7 @@ - log = "0.4" - - [target.'cfg(not(target_os = "macos"))'.dependencies] --servo-fontconfig = { git = "https://github.com/jwilm/rust-fontconfig", branch = "updated-2017-10-8" } -+servo-fontconfig = "0.4.0" - freetype-rs = "0.13" - - [target.'cfg(target_os = "macos")'.dependencies] |