commit: b2a5ac92d5da2abaa93cc8470390a292d4041fda
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 2 22:54:24 2024 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Tue Apr 2 23:07:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2a5ac92
x11-wm/fvwm3: add 1.1.0-r1
This updated patch does actually fix golang detection.
Drop FVWM_BUGADDR - it's long dead.
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
.../files/fvwm3-1.1.0-fix-go-detection-v2.patch | 50 ++++++++++++++++++++++
.../{fvwm3-9999.ebuild => fvwm3-1.1.0-r1.ebuild} | 8 ++--
x11-wm/fvwm3/fvwm3-9999.ebuild | 3 --
3 files changed, 54 insertions(+), 7 deletions(-)
diff --git a/x11-wm/fvwm3/files/fvwm3-1.1.0-fix-go-detection-v2.patch
b/x11-wm/fvwm3/files/fvwm3-1.1.0-fix-go-detection-v2.patch
new file mode 100644
index 000000000000..5c17193728cc
--- /dev/null
+++ b/x11-wm/fvwm3/files/fvwm3-1.1.0-fix-go-detection-v2.patch
@@ -0,0 +1,50 @@
+From 9be90a96c537b4a743774b0be9ffc8ca5c6498da Mon Sep 17 00:00:00 2001
+From: Matt Jolly <[email protected]>
+Date: Tue, 2 Apr 2024 20:47:38 +1000
+Subject: [PATCH] Use AX_COMPARE_VERSION macro for golang version checks
+
+The previous approach fragile, required manual updates,
+and results in unexpected outcomes when the user has updated
+golang.
+
+Reported-by: Denny Rivetti <[email protected]>
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,23 +80,13 @@ AC_ARG_ENABLE(golang,
+
+ if test ! x"$with_golang" = xno; then
+ AC_CHECK_PROGS(GO, go)
+- if test -n "$GO" ; then
+- GOVERSIONOPTION=version
+- go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version go//' | \
+- sed -e 's/ .*$//')
+- AC_MSG_CHECKING([whether go version is >= 1.14.x ($go_version)])
+- case "$go_version" in
+- 1.14*|1.15*|1.16*|1.17*|1.18*|1.19*|1.20*|1.21*|1.22*|1.23*)
+- AC_MSG_RESULT([yes - version is: $go_version])
+- with_golang="yes"
+- GO=
+- ;;
+- *)
+- AC_MSG_RESULT([no - version is: $go_version])
+- with_golang="no"
+- problem_golang=": version of go ($go_version) <= 1.14.x"
+- ;;
+- esac
++ if test -n "$GO"; then
++ 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=],
++ [with_golang="no";
++ AC_MSG_ERROR([Go
version ($go_version) is lower than the minimum required version
($REQUIRED_GO_VERSION)])])
+ fi
+ fi
+ AM_CONDITIONAL([FVWM_BUILD_GOLANG], [test x"$with_golang" = xyes])
+@@ -1514,4 +1504,4 @@ Fvwm3 Configuration:
+ Build man pages? $with_mandoc$problem_mandoc
+ Build html man pages? $with_htmldoc$problem_htmldoc
+
+-"
+\ No newline at end of file
++"
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-1.1.0-r1.ebuild
similarity index 97%
copy from x11-wm/fvwm3/fvwm3-9999.ebuild
copy to x11-wm/fvwm3/fvwm3-1.1.0-r1.ebuild
index d076b13c7a75..9fe8d41f042d 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-1.1.0-r1.ebuild
@@ -19,7 +19,6 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/fvwmorg/fvwm3.git";
EGIT_BRANCH="main"
- FVWM3_DOCS_PREBUILT=0
else
SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz";
if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then
@@ -105,6 +104,10 @@ RDEPEND="${PYTHON_DEPS}
DEPEND="${COMMON_DEPEND}
x11-base/xorg-proto"
+PATCHES=(
+ "${FILESDIR}"/fvwm3-1.1.0-fix-go-detection-v2.patch
+)
+
src_prepare() {
default
use go && ( sed -e 's/GOFLAGS=-ldflags="-s -w"/GOFLAGS=/' \
@@ -114,9 +117,6 @@ src_prepare() {
}
src_configure() {
- # Non-upstream email where bugs should be sent; used in fvwm-bug.
- export FVWM_BUGADDR="[email protected]"
-
# Recommended by upstream for release. Doesn't really matter for live
ebuilds.
append-flags -fno-strict-aliasing
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index d076b13c7a75..9a9eba17220d 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -114,9 +114,6 @@ src_prepare() {
}
src_configure() {
- # Non-upstream email where bugs should be sent; used in fvwm-bug.
- export FVWM_BUGADDR="[email protected]"
-
# Recommended by upstream for release. Doesn't really matter for live
ebuilds.
append-flags -fno-strict-aliasing
