Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Conner Clere (0084ccc54b81155054c141db65daff1fba74571a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Conner Clere <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Conner Clere (0084ccc54b81155054c141db65daff1fba74571a)
  • Date: Wed, 8 May 2024 13:27:51 +0000

GIT changes to master grimoire by Conner Clere <xenanthropy AT sourcemage.org>:

ChangeLog | 1
windowmanagers/fvwm3/BUILD | 5
windowmanagers/fvwm3/CONFLICTS | 1
windowmanagers/fvwm3/DEPENDS | 59
++++++++++
windowmanagers/fvwm3/DETAILS | 16 ++
windowmanagers/fvwm3/HISTORY | 4
windowmanagers/fvwm3/PRE_BUILD | 5
windowmanagers/fvwm3/patches/fvwm3-1.1.0-fix-go-detection-v2.patch | 54
+++++++++
8 files changed, 145 insertions(+)

New commits:
commit 0084ccc54b81155054c141db65daff1fba74571a
Author: Conner Clere <xenanthropy AT sourcemage.org>
Commit: Conner Clere <xenanthropy AT sourcemage.org>

windowmanagers/fvwm3: new spell, window manager

diff --git a/ChangeLog b/ChangeLog
index 5270245..fc87d27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2024-05-08 Conner Clere <xenanthropy AT sourcemage.org>
* utils/dex: new spell, desktopentry file generator
+ * windowmanagers/fvwm3: new spell, fvwm3 window manager

2024-05-06 Pavel Vinogradov <public AT sourcemage.org>
* wm-addons/hypridle: new spell. Hyprland's idle daemon
diff --git a/windowmanagers/fvwm3/BUILD b/windowmanagers/fvwm3/BUILD
new file mode 100755
index 0000000..7260dd0
--- /dev/null
+++ b/windowmanagers/fvwm3/BUILD
@@ -0,0 +1,5 @@
+if is_depends_enabled $SPELL go; then
+ GOROOT="${INSTALL_ROOT}/opt/go/" GOPROXY="proxy.golang.org,direct"
default_build
+else
+ default_build
+fi
diff --git a/windowmanagers/fvwm3/CONFLICTS b/windowmanagers/fvwm3/CONFLICTS
new file mode 100755
index 0000000..48c8ffd
--- /dev/null
+++ b/windowmanagers/fvwm3/CONFLICTS
@@ -0,0 +1 @@
+conflicts fvwm
diff --git a/windowmanagers/fvwm3/DEPENDS b/windowmanagers/fvwm3/DEPENDS
new file mode 100755
index 0000000..00afbaf
--- /dev/null
+++ b/windowmanagers/fvwm3/DEPENDS
@@ -0,0 +1,59 @@
+depends PKG-CONFIG &&
+depends python3 &&
+depends perl '--enable-perllib' &&
+depends glib2 &&
+depends libevent &&
+depends fontconfig &&
+depends libpng '--enable-png' &&
+depends libice &&
+depends libsm &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxcursor &&
+depends libxdmcp &&
+depends libxext &&
+depends libxfixes &&
+depends libxft &&
+depends libxpm &&
+depends libxrandr &&
+depends libxrender &&
+depends xorgproto &&
+
+
+optional_depends fribidi \
+ '--enable-bidi' \
+ '--disable-bidi' \
+ 'Enable fribidi support?' &&
+
+optional_depends go \
+ '--enable-golang' \
+ '--disable-golang' \
+ 'Enable go support?' &&
+
+optional_depends librsvg2 \
+ '--enable-rsvg' \
+ '--disable-rsvg' \
+ 'Enable svg support?' &&
+
+if is_depends_enabled $SPELL librsvg2; then
+ depends cairo
+fi &&
+
+optional_depends readline \
+ '--with-readline-library --without-termcap-library' \
+ '--without-readline-library' \
+ 'Enable readline support?' &&
+
+if is_depends_enabled $SPELL readline; then
+ depends ncurses
+fi &&
+
+optional_depends libxslt \
+ '--enable-mandoc --enable-htmldoc' \
+ '--disable-mandoc --disable-htmldoc' \
+ 'Build documentation?' &&
+
+if is_depends_enabled $SPELL libxslt; then
+ depends asciidoctor
+fi
diff --git a/windowmanagers/fvwm3/DETAILS b/windowmanagers/fvwm3/DETAILS
new file mode 100755
index 0000000..538d361
--- /dev/null
+++ b/windowmanagers/fvwm3/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=fvwm3
+ VERSION=1.1.0
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+
SOURCE_URL[0]=https://github.com/fvwmorg/${SPELL}/archive/${VERSION}.tar.gz
+
SOURCE_HASH=sha512:32a8bd12a75eebb6ca8831d1b6b7296f082aca61d3993e3559d5a971777cd09c3f430cb6cf96710d7838ee90d4910c8b8c548e81bb459ce83f8010760d8178b0
+ LICENSE[0]=GPL
+ WEB_SITE=https://www.fvwm.org/
+ ENTERED=20240508
+ KEYWORDS="wm fvwm x11 xorg windowmanager"
+ SHORT="powerful multiple virtual desktop window manager for X11"
+cat << EOF
+Fvwm3 is a multiple large virtual desktop window manager.
+It is intended to be extremely customizable and extendible
+while consuming a relatively small amount of resources.
+EOF
diff --git a/windowmanagers/fvwm3/HISTORY b/windowmanagers/fvwm3/HISTORY
new file mode 100644
index 0000000..9cf80d5
--- /dev/null
+++ b/windowmanagers/fvwm3/HISTORY
@@ -0,0 +1,4 @@
+2024-05-08 Conner Clere <xenanthropy AT sourcemage.org>
+ * BUILD, CONFLICTS, DEPENDS, PRE_BUILD, DETAILS: version 1.1.0, new
spell
+ * patches/fvwm3-1.1.0-fix-go-detection-v2.patch: added
+
diff --git a/windowmanagers/fvwm3/PRE_BUILD b/windowmanagers/fvwm3/PRE_BUILD
new file mode 100755
index 0000000..e721f9f
--- /dev/null
+++ b/windowmanagers/fvwm3/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+patch -p1 <
"${SPELL_DIRECTORY}/patches/fvwm3-1.1.0-fix-go-detection-v2.patch" &&
+
+autoreconf -fi
diff --git
a/windowmanagers/fvwm3/patches/fvwm3-1.1.0-fix-go-detection-v2.patch
b/windowmanagers/fvwm3/patches/fvwm3-1.1.0-fix-go-detection-v2.patch
new file mode 100644
index 0000000..05ce7fb
--- /dev/null
+++ b/windowmanagers/fvwm3/patches/fvwm3-1.1.0-fix-go-detection-v2.patch
@@ -0,0 +1,54 @@
+From 9be90a96c537b4a743774b0be9ffc8ca5c6498da Mon Sep 17 00:00:00 2001
+From: Matt Jolly <kangie AT gentoo.org>
+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 <denny.rivetti.me AT gmail.com>
+
+### Source Mage ###
+Signed-off-by: Conner Clere <xenanthropy AT sourcemage.org>
+###################
+--- 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
++"


  • [[SM-Commit] ] GIT changes to master grimoire by Conner Clere (0084ccc54b81155054c141db65daff1fba74571a), Conner Clere, 05/08/2024

Archive powered by MHonArc 2.6.24.

Top of Page