Page MenuHomeSolus
Files F10889628

D8248.id19769.diff
No OneTemporary
Actions

D8248.id19769.diff
View Options

diff --git a/files/0001-remove-usages-of-git-as-we-use-a-tarball.patch b/files/0001-remove-usages-of-git-as-we-use-a-tarball.patch
--- a/files/0001-remove-usages-of-git-as-we-use-a-tarball.patch
+++ b/files/0001-remove-usages-of-git-as-we-use-a-tarball.patch
@@ -1,32 +1,28 @@
-From 01b61a2f50e92d266b5c833ba9f790fbe190b780 Mon Sep 17 00:00:00 2001
-From: Campbell Jones <git@serebit.com>
-Date: Fri, 3 Jan 2020 19:15:16 -0500
+From 51d2e22401ec3e7b826d2498f41d136a26d00d84 Mon Sep 17 00:00:00 2001
+From: Troy Harvey <harveydev@protonmail.com>
+Date: Sat, 15 Feb 2020 15:16:46 +1100
Subject: [PATCH] remove usages of git as we use a tarball
---
- Makefile | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
+ Makefile | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
-index 76da995..33c94a3 100644
+index 4d53621..a2c6d49 100644
--- a/Makefile
+++ b/Makefile
-@@ -2,13 +2,12 @@
+@@ -1,8 +1,7 @@
+ .PHONY: runtime
- VERSION = $(shell GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \
- go run tools/build-version.go)
+-VERSION = $(shell GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \
+- go run tools/build-version.go)
-HASH = $(shell git rev-parse --short HEAD)
++VERSION = 2.0.1
++HASH = 7c71995
DATE = $(shell GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \
go run tools/build-date.go)
ADDITIONAL_GO_LINKER_FLAGS = $(shell GOOS=$(shell go env GOHOSTOS) \
- GOARCH=$(shell go env GOHOSTARCH))
- GOBIN ?= $(shell go env GOPATH)/bin
--GOVARS = -X github.com/zyedidia/micro/internal/util.Version=$(VERSION) -X github.com/zyedidia/micro/internal/util.CommitHash=$(HASH) -X 'github.com/zyedidia/micro/internal/util.CompileDate=$(DATE)' -X github.com/zyedidia/micro/internal/util.Debug=OFF
-+GOVARS = -X github.com/zyedidia/micro/internal/util.Version=$(VERSION) -X 'github.com/zyedidia/micro/internal/util.CompileDate=$(DATE)' -X github.com/zyedidia/micro/internal/util.Debug=OFF
-
- # Builds micro after checking dependencies but without updating the runtime
- build:
-@@ -37,7 +36,6 @@ install-quick:
+@@ -43,7 +42,6 @@ fetch-tags:
# Builds the runtime
runtime:
@@ -35,5 +31,5 @@
go build -o tools/bindata ./tools/go-bindata
tools/bindata -pkg config -nomemcopy -nometadata -o runtime.go runtime/...
--
-2.24.1
+2.25.0
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : micro
version : 2.0.1
-release : 14
+release : 15
source :
- https://github.com/zyedidia/micro/archive/v2.0.1.tar.gz : dabbc94f58f63b2b2c4589cdfc83e265019f3ac02e13654bf91927f4bc6434ec
- git|https://github.com/zyedidia/go-bindata.git : 9453701aa0dbd20f88145dbd77c6f50937f17a19
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>micro</Name>
<Packager>
- <Name>Campbell Jones</Name>
- <Email>dev@serebit.com</Email>
+ <Name>Troy Harvey</Name>
+ <Email>harveydev@protonmail.com</Email>
</Packager>
<License>MIT</License>
<PartOf>editor</PartOf>
@@ -23,12 +23,12 @@
</Files>
</Package>
<History>
- <Update release="14">
- <Date>2020-02-13</Date>
+ <Update release="15">
+ <Date>2020-02-15</Date>
<Version>2.0.1</Version>
<Comment>Packaging update</Comment>
- <Name>Campbell Jones</Name>
- <Email>dev@serebit.com</Email>
+ <Name>Troy Harvey</Name>
+ <Email>harveydev@protonmail.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Jun 29 2023, 1:25 AM (6 w, 2 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5822008
Default Alt Text
D8248.id19769.diff (3 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.