summaryrefslogtreecommitdiff
path: root/x11-wm/fvwm3/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm/fvwm3/files')
-rw-r--r--x11-wm/fvwm3/files/fvwm3-1.0.8-implicit-function-decl-configure.patch18
-rw-r--r--x11-wm/fvwm3/files/fvwm3-1.1.0-fix-go-detection-v2.patch (renamed from x11-wm/fvwm3/files/fvwm3-1.1.0-fix-go-detection.patch)2
2 files changed, 1 insertions, 19 deletions
diff --git a/x11-wm/fvwm3/files/fvwm3-1.0.8-implicit-function-decl-configure.patch b/x11-wm/fvwm3/files/fvwm3-1.0.8-implicit-function-decl-configure.patch
deleted file mode 100644
index 374afddcd6e4..000000000000
--- a/x11-wm/fvwm3/files/fvwm3-1.0.8-implicit-function-decl-configure.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://github.com/fvwmorg/fvwm3/pull/914
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Tue, 17 Oct 2023 16:01:33 +1000
-Subject: [PATCH] Fix implicit function declaration in configure
-
-Missing unistd.h include for `close` and `unlink`
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -996,6 +996,7 @@ AC_DEFUN([AM_SAFETY_CHECK_MKSTEMP],[
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
- int main(void)
- {
- char template[128];
---
-2.42.0
diff --git a/x11-wm/fvwm3/files/fvwm3-1.1.0-fix-go-detection.patch b/x11-wm/fvwm3/files/fvwm3-1.1.0-fix-go-detection-v2.patch
index 6c38f51ce932..5c17193728cc 100644
--- a/x11-wm/fvwm3/files/fvwm3-1.1.0-fix-go-detection.patch
+++ b/x11-wm/fvwm3/files/fvwm3-1.1.0-fix-go-detection-v2.patch
@@ -35,7 +35,7 @@ Reported-by: Denny Rivetti <denny.rivetti.me@gmail.com>
+ GOVERSIONOPTION=version
+ go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version go//' | sed -e 's/ .*$//')
+ AX_COMPARE_VERSION([$go_version], [ge], ["1.14.0"],
-+ [with_golang="yes ($go_version)"; GO=],
++ [with_golang="yes"; GO=],
+ [with_golang="no";
+ AC_MSG_ERROR([Go version ($go_version) is lower than the minimum required version ($REQUIRED_GO_VERSION)])])
fi