From 42008752bcd9d80d3ca84015b9e8f81d7957579d Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Aug 04 2019 20:37:59 +0000 Subject: Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Robert-André Mauchin --- diff --git a/0001-Target-Go-1.13-Beta-1.patch b/0001-Target-Go-1.13-Beta-1.patch new file mode 100644 index 0000000..06ac4cf --- /dev/null +++ b/0001-Target-Go-1.13-Beta-1.patch @@ -0,0 +1,58 @@ +From cec6ca7e097618d77cf48d3ff838e96305dc0d31 Mon Sep 17 00:00:00 2001 +From: Dmitri Shuralyov +Date: Wed, 24 Jul 2019 17:05:58 -0700 +Subject: [PATCH] target Go 1.13 Beta 1, update version to GopherJS 1.13-wip + +Reference: https://groups.google.com/d/msg/golang-announce/fmU5r5NfHZs/xU3Ym5KJCAAJ. + +Updates #929 +--- + circle.yml | 2 +- + compiler/compiler.go | 2 +- + compiler/version_check.go | 8 ++++---- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/circle.yml b/circle.yml +index a0944f47..6df7246d 100644 +--- a/circle.yml ++++ b/circle.yml +@@ -11,7 +11,7 @@ jobs: + - checkout + - run: git clone https://github.com/creationix/nvm $HOME/.nvm && cd $HOME/.nvm && git checkout v0.33.9 && echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV && echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV + - run: nvm install 10.0.0 && nvm alias default 10.0.0 +- - run: cd /usr/local && sudo rm -rf go && curl https://storage.googleapis.com/golang/go1.12.linux-amd64.tar.gz | sudo tar -xz ++ - run: cd /usr/local && sudo rm -rf go && curl https://storage.googleapis.com/golang/go1.13beta1.linux-amd64.tar.gz | sudo tar -xz + - run: echo 'export PATH="$PATH:/usr/local/go/bin:$HOME/go/bin"' >> $BASH_ENV + - run: go get -t -d -v ./... + - run: go install -v +diff --git a/compiler/compiler.go b/compiler/compiler.go +index 36ec91a8..6e3d5e2f 100644 +--- a/compiler/compiler.go ++++ b/compiler/compiler.go +@@ -17,7 +17,7 @@ import ( + + var sizes32 = &types.StdSizes{WordSize: 4, MaxAlign: 8} + var reservedKeywords = make(map[string]bool) +-var _ = ___GOPHERJS_REQUIRES_GO_VERSION_1_12___ // Compile error on other Go versions, because they're not supported. ++var _ = ___GOPHERJS_REQUIRES_GO_VERSION_1_13___ // Compile error on other Go versions, because they're not supported. + + func init() { + for _, keyword := range []string{"abstract", "arguments", "boolean", "break", "byte", "case", "catch", "char", "class", "const", "continue", "debugger", "default", "delete", "do", "double", "else", "enum", "eval", "export", "extends", "false", "final", "finally", "float", "for", "function", "goto", "if", "implements", "import", "in", "instanceof", "int", "interface", "let", "long", "native", "new", "null", "package", "private", "protected", "public", "return", "short", "static", "super", "switch", "synchronized", "this", "throw", "throws", "transient", "true", "try", "typeof", "undefined", "var", "void", "volatile", "while", "with", "yield"} { +diff --git a/compiler/version_check.go b/compiler/version_check.go +index 48bb27ae..0863d781 100644 +--- a/compiler/version_check.go ++++ b/compiler/version_check.go +@@ -1,9 +1,9 @@ +-// +build go1.12 +-// +build !go1.13 ++// +build go1.13 ++// +build !go1.14 + + package compiler + +-const ___GOPHERJS_REQUIRES_GO_VERSION_1_12___ = true ++const ___GOPHERJS_REQUIRES_GO_VERSION_1_13___ = true + + // Version is the GopherJS compiler version string. +-const Version = "1.12-2" ++const Version = "1.13-wip" diff --git a/golang-github-gopherjs.spec b/golang-github-gopherjs.spec index c5493cd..ba6fff1 100644 --- a/golang-github-gopherjs.spec +++ b/golang-github-gopherjs.spec @@ -24,6 +24,8 @@ Summary: Compiler from Go to JavaScript for running Go code in a browser License: BSD URL: %{gourl} Source0: %{gosource} +# Target Go 1.13 Beta 1 +Patch0: https://github.com/gopherjs/gopherjs/commit/cec6ca7e097618d77cf48d3ff838e96305dc0d31.patch#/0001-Target-Go-1.13-Beta-1.patch BuildRequires: golang(github.com/fsnotify/fsnotify) BuildRequires: golang(github.com/kisielk/gotool) @@ -45,6 +47,7 @@ BuildRequires: golang(golang.org/x/tools/go/types/typeutil) %prep %goprep +%patch0 -p1 # Remove extra dependencies rm tests/misc_test.go build/build_test.go