diff options
Diffstat (limited to 'net-im/nextcloud-spreed-signaling/files')
3 files changed, 6 insertions, 77 deletions
diff --git a/net-im/nextcloud-spreed-signaling/files/patch-Makefile b/net-im/nextcloud-spreed-signaling/files/patch-Makefile index 447c1ae19353..6a362af9901c 100644 --- a/net-im/nextcloud-spreed-signaling/files/patch-Makefile +++ b/net-im/nextcloud-spreed-signaling/files/patch-Makefile @@ -1,61 +1,10 @@ ---- Makefile.orig 2023-07-05 09:17:27 UTC +--- Makefile.orig 2025-01-22 09:33:28 UTC +++ Makefile -@@ -1,7 +1,7 @@ +@@ -1,6 +1,6 @@ all: build all: build - GO := $(shell which go) --GOPATH := $(shell "$(GO)" env GOPATH) -+GOPATH := $(CURDIR)/vendor +-GO := $(shell which go) ++GO := $(shell which go122) + GOPATH := $(shell "$(GO)" env GOPATH) GODIR := $(shell dirname "$(GO)") GOFMT := "$(GODIR)/gofmt" - GOOS ?= linux -@@ -54,15 +54,13 @@ hook: - [ ! -d "$(CURDIR)/.git/hooks" ] || ln -sf "$(CURDIR)/scripts/pre-commit.hook" "$(CURDIR)/.git/hooks/pre-commit" - - $(GOPATHBIN)/easyjson: -- [ "$(GOPROXY)" = "off" ] || $(GO) get -u -d github.com/mailru/easyjson/... -- $(GO) install github.com/mailru/easyjson/... -+ $(GO) build -o $(CURDIR)/easyjson ./vendor/src/github.com/mailru/easyjson/easyjson/main.go - - $(GOPATHBIN)/protoc-gen-go: -- $(GO) install google.golang.org/protobuf/cmd/protoc-gen-go -+ $(GO) build google.golang.org/protobuf/cmd/protoc-gen-go - - $(GOPATHBIN)/protoc-gen-go-grpc: -- [ "$(GOPROXY)" = "off" ] || $(GO) get -u -d google.golang.org/grpc/cmd/protoc-gen-go-grpc -- $(GO) install google.golang.org/grpc/cmd/protoc-gen-go-grpc -+ $(GO) build google.golang.org/grpc/cmd/protoc-gen-go-grpc - - continentmap.go: - $(CURDIR)/scripts/get_continent_map.py $@ -@@ -102,12 +100,12 @@ coverhtml: vet common - $(GO) tool cover -html=cover.out -o coverage.html - - %_easyjson.go: %.go $(GOPATHBIN)/easyjson | common_proto -- PATH="$(GODIR)":$(PATH) "$(GOPATHBIN)/easyjson" -all $*.go -+ PATH="$(GODIR)":$(PATH) "$(CURDIR)/easyjson" -all $(CURDIR)/vendor/src/github.com/strukturag/nextcloud-spreed-signaling/$*.go - - %.pb.go: %.proto $(GOPATHBIN)/protoc-gen-go $(GOPATHBIN)/protoc-gen-go-grpc -- PATH="$(GODIR)":"$(GOPATHBIN)":$(PATH) protoc --go_out=. --go_opt=paths=source_relative \ -- --go-grpc_out=. --go-grpc_opt=paths=source_relative \ -- $*.proto -+ PATH="$(GODIR)":"$(GOPATHBIN)":"$(CURDIR)":$(PATH) protoc --go_out=. --go_opt=paths=source_relative \ -+ --go-grpc_out=. --go-grpc_opt=paths=source_relative --proto_path="$(CURDIR)" \ -+ "$(CURDIR)/$*.proto" - - common: common_easyjson common_proto - -@@ -162,6 +160,13 @@ tarball: vendor - gzip --force nextcloud-spreed-signaling-$(TARVERSION).tar - - dist: tarball -+install: -+ install -d $(DESTDIR)$(PREFIX)/etc/ncs/ -+ install -m 644 server.conf.in $(DESTDIR)$(PREFIX)/etc/ncs/server.conf.sample -+ install -m 644 proxy.conf.in $(DESTDIR)$(PREFIX)/etc/ncs/proxy.conf.sample -+ install -m 644 gnatsd.conf $(DESTDIR)$(PREFIX)/etc/ncs/gnatsd.conf.sample -+ install -m 755 bin/signaling $(DESTDIR)$(PREFIX)/bin/ncs-signaling -+ install -m 755 bin/proxy $(DESTDIR)$(PREFIX)/bin/ncs-proxy - - .NOTPARALLEL: %_easyjson.go - .PHONY: continentmap.go vendor diff --git a/net-im/nextcloud-spreed-signaling/files/patch-scripts_get-version.sh b/net-im/nextcloud-spreed-signaling/files/patch-scripts_get-version.sh deleted file mode 100644 index 2eec2779da51..000000000000 --- a/net-im/nextcloud-spreed-signaling/files/patch-scripts_get-version.sh +++ /dev/null @@ -1,21 +0,0 @@ ---- scripts/get-version.sh.orig 2023-07-05 09:17:27 UTC -+++ scripts/get-version.sh -@@ -1,7 +1,6 @@ --#!/usr/bin/env bash -+#!/bin/sh - set -e --ROOT="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" -- -+ROOT="$(cd "$( dirname $0 )" && pwd)" - VERSION= - if [ -s "$ROOT/../version.txt" ]; then - VERSION=$(cat "$ROOT/../version.txt" | tr -d '[:space:]') -@@ -15,7 +14,7 @@ if [ -z $VERSION ] && [ -d "$ROOT/../.git" ]; then - fi - - if [ -z $VERSION ]; then -- VERSION=unknown -+ VERSION=%%PORTVERSION%% - fi - - echo $VERSION diff --git a/net-im/nextcloud-spreed-signaling/files/version.txt b/net-im/nextcloud-spreed-signaling/files/version.txt new file mode 100644 index 000000000000..e865da1df4d5 --- /dev/null +++ b/net-im/nextcloud-spreed-signaling/files/version.txt @@ -0,0 +1 @@ +%%DISTVERSION%% |