Page MenuHomeSolus
Files F10826019

D8239.diff
No OneTemporary
Actions

D8239.diff
View Options

diff --git a/files/0001-Drop-git-pull-on-update-since-we-re-using-a-tarball.patch b/files/0001-Drop-git-pull-on-update-since-we-re-using-a-tarball.patch
deleted file mode 100644
--- a/files/0001-Drop-git-pull-on-update-since-we-re-using-a-tarball.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3cb22838865f77b552ca094085ccb73bd7ae91cc Mon Sep 17 00:00:00 2001
-From: Joshua Strobl <joshua@stroblindustries.com>
-Date: Sat, 11 Aug 2018 13:53:13 +0300
-Subject: [PATCH 1/1] Drop git pull on update since we're using a tarball.
-
----
- Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index e03ee2f..c68d2f7 100644
---- a/Makefile
-+++ b/Makefile
-@@ -33,7 +33,6 @@ install-quick:
- go install -ldflags "-s -w -X main.Version=$(VERSION) -X main.CommitHash=$(HASH) -X 'main.CompileDate=$(DATE)' $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
-
- update:
-- git pull
- git submodule update --init
-
- # Builds the runtime
---
-2.18.0
-
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
new file mode 100644
--- /dev/null
+++ b/files/0001-remove-usages-of-git-as-we-use-a-tarball.patch
@@ -0,0 +1,39 @@
+From 01b61a2f50e92d266b5c833ba9f790fbe190b780 Mon Sep 17 00:00:00 2001
+From: Campbell Jones <git@serebit.com>
+Date: Fri, 3 Jan 2020 19:15:16 -0500
+Subject: [PATCH] remove usages of git as we use a tarball
+
+---
+ Makefile | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 76da995..33c94a3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2,13 +2,12 @@
+
+ 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)
+ 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:
+
+ # Builds the runtime
+ runtime:
+- git submodule update --init
+ go run runtime/syntax/make_headers.go runtime/syntax
+ go build -o tools/bindata ./tools/go-bindata
+ tools/bindata -pkg config -nomemcopy -nometadata -o runtime.go runtime/...
+--
+2.24.1
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,9 @@
name : micro
-version : 1.4.1
-release : 13
+version : 2.0.1
+release : 14
source :
- - https://github.com/zyedidia/micro/releases/download/v1.4.1/micro-1.4.1-src.tar.gz : 0b516826226cf1ddf2fbb274f049cab456a5c162efe3d648f0871564fadcf812
+ - https://github.com/zyedidia/micro/archive/v2.0.1.tar.gz : dabbc94f58f63b2b2c4589cdfc83e265019f3ac02e13654bf91927f4bc6434ec
+ - git|https://github.com/zyedidia/go-bindata.git : 9453701aa0dbd20f88145dbd77c6f50937f17a19
license : MIT
component : editor
summary : Micro is a terminal-based text editor that aims to be easy to use and intuitive
@@ -18,9 +19,10 @@
setup : |
export GOPATH=$workdir
mkdir -p micro-$version/src/github.com/zyedidia/micro
- tar -xf $sources/micro-$version-src.tar.gz -C micro-$version/src/github.com/zyedidia/micro --strip-components=1
+ tar xf $sources/v$version.tar.gz -C micro-$version/src/github.com/zyedidia/micro --strip-components=1
cd micro-$version/src/github.com/zyedidia/micro/
- %patch -p1 < $pkgfiles/0001-Drop-git-pull-on-update-since-we-re-using-a-tarball.patch
+ cp -R $sources/go-bindata.git/. tools/go-bindata
+ %patch -p1 < $pkgfiles/0001-remove-usages-of-git-as-we-use-a-tarball.patch
install : |
export GOPATH=$workdir
cd src/github.com/zyedidia/micro
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,15 +2,15 @@
<Source>
<Name>micro</Name>
<Packager>
- <Name>Joshua Strobl</Name>
- <Email>joshua@stroblindustries.com</Email>
+ <Name>Campbell Jones</Name>
+ <Email>dev@serebit.com</Email>
</Packager>
<License>MIT</License>
<PartOf>editor</PartOf>
<Summary xml:lang="en">Micro is a terminal-based text editor that aims to be easy to use and intuitive</Summary>
<Description xml:lang="en">Micro is a terminal-based text editor that aims to be easy to use and intuitive, while also taking advantage of the full capabilities of modern terminals
</Description>
- <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+ <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
</Source>
<Package>
<Name>micro</Name>
@@ -23,12 +23,12 @@
</Files>
</Package>
<History>
- <Update release="13">
- <Date>2018-08-11</Date>
- <Version>1.4.1</Version>
+ <Update release="14">
+ <Date>2020-02-13</Date>
+ <Version>2.0.1</Version>
<Comment>Packaging update</Comment>
- <Name>Joshua Strobl</Name>
- <Email>joshua@stroblindustries.com</Email>
+ <Name>Campbell Jones</Name>
+ <Email>dev@serebit.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Jun 5 2023, 1:46 AM (9 w, 5 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5801126
Default Alt Text
D8239.diff (5 KB)

Event Timeline

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