diff options
| author | David Strawn | 2019-04-13 10:55:34 -0600 |
|---|---|---|
| committer | David Strawn | 2019-04-13 10:55:34 -0600 |
| commit | 7ef31f32aa179d3e8ab37fa47786ba1308d7b6c4 (patch) | |
| tree | 69bca02dcf632057a733dfb7ae90ad7ec8a3c4de | |
| parent | 33f9ac416eb6769a84cd0462b4473a93ac901aa9 (diff) | |
| download | aur-7ef31f32aa179d3e8ab37fa47786ba1308d7b6c4.tar.gz | |
Add Patch To Fix SBT Version Error
See: https://github.com/scalameta/metals/issues/662
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 34 | ||||
| -rw-r--r-- | version-fix.patch | 16 |
3 files changed, 50 insertions, 9 deletions
@@ -1,7 +1,7 @@ pkgbase = metals pkgdesc = Language Server For Scala pkgver = 0.5.0 - pkgrel = 2 + pkgrel = 3 url = https://scalameta.org/metals/ arch = any license = Apache @@ -19,42 +19,49 @@ pkgbase = metals source = metals-vim.sh source = metals-vscode.sh source = metals-sublime.sh + source = version-fix.patch md5sums = 1893a9e8e8a26431904cced138d8e26d md5sums = d680f9edd2d896048f077cfb8b023ac5 md5sums = a883291ea3ae425c2c51b8310c7e4d1b md5sums = dcb3e81e16b90333647d3bc052ce1ece md5sums = b1d64c236e20f91fbbaa06a32dbb72e7 md5sums = 2d7e382b962b705bcd5862f7182574fe + md5sums = 1228820359ad5d636e56db35349350f4 sha1sums = 8370cb58637a47d0640f4f619c95207374cb5eb7 sha1sums = dafd89307afc8f75fa6c15903f84e400bf4d69a4 sha1sums = 9e0f0f83edd2dacc1053f66297e4f2c16618c48e sha1sums = 214de4e3e38cffce813ba4eafcaf5ca641d95d50 sha1sums = f3fd084eee605caa54fdeb3787dab7c359c75e32 sha1sums = 42ee89665251bf99935c91283750fe431f7713c4 + sha1sums = feaf909569c00776b67e8d5315332ae3dc02a8b2 sha224sums = 24546483700bda5d64cd135bc3d7d53a34b33376ec8a4502c5335385 sha224sums = 1638081b5bcca4919152528b1b6a340518fc326ed973e7832c80b41c sha224sums = 4df1908182071dc2359d0ced412c7ab11ee81cd1d2f1039436776e92 sha224sums = c78851f0f0f1839563ae32e9b9bfa1221165e93050036a52017a5fd9 sha224sums = 909f6b8caecfcb587c982e55f4ded982a8cb7493e79b621bb6dc9b34 sha224sums = d4ae4cba4aaa5d2ad1baf45d7a4aa4dce894569ca5fba5e9d63f2a95 + sha224sums = 702ee997e46be69bca262c1be3867203ccb4454df859b8b9ca323d74 sha256sums = 57f61352e382cef8c53a674307fcc8aab1d2b44719831830a9d899dbf14f197c sha256sums = 1277ef9c0cefdb769cfb4e6182a8aa55542cae9604b8f8f3dc98c909d8160572 sha256sums = f8f895cb11d0b9af2b5320acf5862fb878f3ba94324bca35278b8aa31b32020c sha256sums = 351f317247124f1ba05680520ca6cacb9c8ed9259d50505aa5127018bcad620d sha256sums = a60cfc3f0fc6fde8309ee7cd9c4a2bdf58668314cee8bdbc7938809e3de4e6c4 sha256sums = 1f587cc96100d560a43da35127ed1b5d2e36d14211f20e7931029abcab64d430 + sha256sums = 510bab61855505e4e301f98c2b44259964803ced3799fb9fb3d5bc180ba765f9 sha384sums = 871a1da43a17de6a7251c0c7c1ae19bf6aa85f293249674ffa535803a75bfcc14714cf19fc6ea0956bdb00f94332517d sha384sums = 090dce5f166dd210e22ded19eb0150cb35c390d07f2b93bb824cf4fadf4c188788246c264a59aab2f908258f81c0389d sha384sums = ae8b87a65ee897708134374f976d6b704d48f1f525e036de12cc793ab6960d2bcc176a57be886b0204ddba7c94b93214 sha384sums = 5c7aa52760f882910dca99f046c1b4384d36e72b40709a513345087ade967a0668a1b003e23320c57200fefb65772016 sha384sums = 71326bea2d7905bce5a1a4a495108af53b06cc162c86da46a62e85666ce7a78b25e7258219dc953da08743d050e86a60 sha384sums = 1235abb496221584c8b11b987460c7683ab160210b86d7a5acf117ad9c3315733795bc10af73844f731c20f1c25c64c7 + sha384sums = 24ae61e7e62d5b2944093cc1273b9be3a813db436ffe44769e5dbe0dc37f085492950389e0324285bd149c4d818f79ca sha512sums = 21d6bd645ad35b749374b76015e7019375e2723b4e4e1b25dc0a983591f475c5466f1b6840a90b8dcd582e870a25f7d8296c04da8ec6e780512f0a5b53c6dd5c sha512sums = 6cad8b806c5111604381d8ce760db9da8afd46312b8916678af65ace65e531b402e481e457bb7265bc3a3699f08b612b7b231755934af9bd7ee221b902e0dcd7 sha512sums = 95232be1232d3189a82cc0fe6af1d00fffd8334908e6d166143c69c0eda8e3a24674ce06d85e36213bc6a7044ae2f6a76d94a0715852aaf78b205a08112b403a sha512sums = 1f1b034051fb65170bfd3f33cb8eb8a2f75018c1d32ef3a404e876427c3c94dd3beeb17d050a3898e803ad1f789b1b6f8258c0e81b4688b4fc17eb8d8f977522 sha512sums = 70a0cc5eb6b9a3b64a056524a1187626628e248f9fe419b00aaa1d665af482aa18c6e1c84570b1d1d196f0b143f2ccf91f26bc0c332e8f46120ce1cd5d68b676 sha512sums = 485f0360f0a25de9e397e44a987fdb2c5872de62568215f225572d0d0607dcab1ceb15d350b917c27c822caf89bdb24abf1433240ceca25867e0a6696d41f240 + sha512sums = b4a4eb0bde4045de411b639e16cf41b95e3e50d8950c3a48008d42b60751541e4957c463f4f817320f15488c702d52fb977d3fe63d8832d55f259907f7e0afcf pkgname = metals @@ -6,7 +6,7 @@ # Maintainer: David Strawn <isomarcte a__t gmail d__o__t c__o__m> pkgname='metals' pkgver='0.5.0' -pkgrel=2 +pkgrel=3 epoch= pkgdesc='Language Server For Scala' url='https://scalameta.org/metals/' @@ -24,48 +24,64 @@ backup=() options=() install= changelog= -source=("https://github.com/scalameta/${pkgname}/archive/v${pkgver}.tar.gz" 'metals-client.sh' 'metals-emacs.sh' 'metals-vim.sh' 'metals-vscode.sh' 'metals-sublime.sh') +source=("https://github.com/scalameta/${pkgname}/archive/v${pkgver}.tar.gz" 'metals-client.sh' 'metals-emacs.sh' 'metals-vim.sh' 'metals-vscode.sh' 'metals-sublime.sh' 'version-fix.patch') noextract=() md5sums=('1893a9e8e8a26431904cced138d8e26d' 'd680f9edd2d896048f077cfb8b023ac5' 'a883291ea3ae425c2c51b8310c7e4d1b' 'dcb3e81e16b90333647d3bc052ce1ece' 'b1d64c236e20f91fbbaa06a32dbb72e7' - '2d7e382b962b705bcd5862f7182574fe') + '2d7e382b962b705bcd5862f7182574fe' + '1228820359ad5d636e56db35349350f4') sha1sums=('8370cb58637a47d0640f4f619c95207374cb5eb7' 'dafd89307afc8f75fa6c15903f84e400bf4d69a4' '9e0f0f83edd2dacc1053f66297e4f2c16618c48e' '214de4e3e38cffce813ba4eafcaf5ca641d95d50' 'f3fd084eee605caa54fdeb3787dab7c359c75e32' - '42ee89665251bf99935c91283750fe431f7713c4') + '42ee89665251bf99935c91283750fe431f7713c4' + 'feaf909569c00776b67e8d5315332ae3dc02a8b2') sha224sums=('24546483700bda5d64cd135bc3d7d53a34b33376ec8a4502c5335385' '1638081b5bcca4919152528b1b6a340518fc326ed973e7832c80b41c' '4df1908182071dc2359d0ced412c7ab11ee81cd1d2f1039436776e92' 'c78851f0f0f1839563ae32e9b9bfa1221165e93050036a52017a5fd9' '909f6b8caecfcb587c982e55f4ded982a8cb7493e79b621bb6dc9b34' - 'd4ae4cba4aaa5d2ad1baf45d7a4aa4dce894569ca5fba5e9d63f2a95') + 'd4ae4cba4aaa5d2ad1baf45d7a4aa4dce894569ca5fba5e9d63f2a95' + '702ee997e46be69bca262c1be3867203ccb4454df859b8b9ca323d74') sha256sums=('57f61352e382cef8c53a674307fcc8aab1d2b44719831830a9d899dbf14f197c' '1277ef9c0cefdb769cfb4e6182a8aa55542cae9604b8f8f3dc98c909d8160572' 'f8f895cb11d0b9af2b5320acf5862fb878f3ba94324bca35278b8aa31b32020c' '351f317247124f1ba05680520ca6cacb9c8ed9259d50505aa5127018bcad620d' 'a60cfc3f0fc6fde8309ee7cd9c4a2bdf58668314cee8bdbc7938809e3de4e6c4' - '1f587cc96100d560a43da35127ed1b5d2e36d14211f20e7931029abcab64d430') + '1f587cc96100d560a43da35127ed1b5d2e36d14211f20e7931029abcab64d430' + '510bab61855505e4e301f98c2b44259964803ced3799fb9fb3d5bc180ba765f9') sha384sums=('871a1da43a17de6a7251c0c7c1ae19bf6aa85f293249674ffa535803a75bfcc14714cf19fc6ea0956bdb00f94332517d' '090dce5f166dd210e22ded19eb0150cb35c390d07f2b93bb824cf4fadf4c188788246c264a59aab2f908258f81c0389d' 'ae8b87a65ee897708134374f976d6b704d48f1f525e036de12cc793ab6960d2bcc176a57be886b0204ddba7c94b93214' '5c7aa52760f882910dca99f046c1b4384d36e72b40709a513345087ade967a0668a1b003e23320c57200fefb65772016' '71326bea2d7905bce5a1a4a495108af53b06cc162c86da46a62e85666ce7a78b25e7258219dc953da08743d050e86a60' - '1235abb496221584c8b11b987460c7683ab160210b86d7a5acf117ad9c3315733795bc10af73844f731c20f1c25c64c7') + '1235abb496221584c8b11b987460c7683ab160210b86d7a5acf117ad9c3315733795bc10af73844f731c20f1c25c64c7' + '24ae61e7e62d5b2944093cc1273b9be3a813db436ffe44769e5dbe0dc37f085492950389e0324285bd149c4d818f79ca') sha512sums=('21d6bd645ad35b749374b76015e7019375e2723b4e4e1b25dc0a983591f475c5466f1b6840a90b8dcd582e870a25f7d8296c04da8ec6e780512f0a5b53c6dd5c' '6cad8b806c5111604381d8ce760db9da8afd46312b8916678af65ace65e531b402e481e457bb7265bc3a3699f08b612b7b231755934af9bd7ee221b902e0dcd7' '95232be1232d3189a82cc0fe6af1d00fffd8334908e6d166143c69c0eda8e3a24674ce06d85e36213bc6a7044ae2f6a76d94a0715852aaf78b205a08112b403a' '1f1b034051fb65170bfd3f33cb8eb8a2f75018c1d32ef3a404e876427c3c94dd3beeb17d050a3898e803ad1f789b1b6f8258c0e81b4688b4fc17eb8d8f977522' '70a0cc5eb6b9a3b64a056524a1187626628e248f9fe419b00aaa1d665af482aa18c6e1c84570b1d1d196f0b143f2ccf91f26bc0c332e8f46120ce1cd5d68b676' - '485f0360f0a25de9e397e44a987fdb2c5872de62568215f225572d0d0607dcab1ceb15d350b917c27c822caf89bdb24abf1433240ceca25867e0a6696d41f240') + '485f0360f0a25de9e397e44a987fdb2c5872de62568215f225572d0d0607dcab1ceb15d350b917c27c822caf89bdb24abf1433240ceca25867e0a6696d41f240' + 'b4a4eb0bde4045de411b639e16cf41b95e3e50d8950c3a48008d42b60751541e4957c463f4f817320f15488c702d52fb977d3fe63d8832d55f259907f7e0afcf') validpgpkeys=() +prepare() { + cd "$pkgname-$pkgver" + + # The build currently does not set the correct version unless + # built from git with the environment variable CI set. See + # https://github.com/scalameta/metals/issues/662 + patch -p1 -i ../version-fix.patch +} + build() { export COURSIER_CACHE="./.cache/coursier/v1" + export CI="TRUE" # Needed so the build will not think it is a SNAPSHOT local -r _SBT_DIR="./.sbt" local -r _SBT_IVY="./.ivy2" @@ -83,6 +99,7 @@ build() { check() { export COURSIER_CACHE="./.cache/coursier/v1" + export CI="TRUE" # Needed so the build will not think it is a SNAPSHOT local -r _SBT_DIR="./.sbt" local -r _SBT_IVY="./.ivy2" @@ -93,6 +110,7 @@ check() { package() { export COURSIER_CACHE='../.cache/coursier/v1' + export CI="TRUE" # Needed so the build will not think it is a SNAPSHOT ## Constants ## local -r _SBT_DIR='../.sbt' diff --git a/version-fix.patch b/version-fix.patch new file mode 100644 index 000000000000..1652cad06458 --- /dev/null +++ b/version-fix.patch @@ -0,0 +1,16 @@ +diff --git a/build.sbt b/build.sbt +index e73ff967..d3e13746 100644 +--- a/build.sbt ++++ b/build.sbt +@@ -2,10 +2,7 @@ def localSnapshotVersion = "0.5.1-SNAPSHOT" + def isCI = System.getenv("CI") != null + inThisBuild( + List( +- version ~= { dynVer => +- if (isCI) dynVer +- else localSnapshotVersion // only for local publishng +- }, ++ version := "0.5.0", + scalaVersion := V.scala212, + crossScalaVersions := List(V.scala212), + scalacOptions ++= List( |