Index | Thread | Search

From:
Omar Polo <op@omarpolo.com>
Subject:
Re: FVWM3 as of a recent current no longer lets mouse scroll across to new windows
To:
Chris Bennett <cpb_ports@bennettconstruction.us>
Cc:
ports@openbsd.org, Michael <michi+openbsd@dataswamp.org>
Date:
Sun, 21 Jan 2024 18:51:15 +0100

Download raw body.

Thread
On 2024/01/21 09:37:46 -0800, Chris Bennett <cpb_ports@bennettconstruction.us> wrote:
> As of 1.0.9, I can't get mouse to cross windows, but I can move window
> items with the mouse.
> Someone in the forum said that the version after 1.0.9 has the fix for
> this I saw in github.

fvwm3 was updated to 1.0.9 on 2023/12/03, so I guess you're using
-STABLE and not -CURRENT.

This diff should apply to the -STABLE port tree and build.  There have
been several bugfixes between 1.0.6a (in -stable versions) and the
current 1.0.9 that it may be worthwile to backport.

However, I can't test it in -stable.

Index: Makefile
===================================================================
RCS file: /home/cvs/ports/x11/fvwm3/Makefile,v
diff -u -p -r1.8 Makefile
--- Makefile	24 Jan 2023 18:05:35 -0000	1.8
+++ Makefile	21 Jan 2024 17:49:32 -0000
@@ -1,6 +1,6 @@
 COMMENT=	multiple virtual desktop window manager
 
-VERSION=	1.0.6a
+VERSION=	1.0.9
 DISTNAME=	fvwm3-${VERSION}
 
 CATEGORIES=     x11
@@ -20,13 +20,14 @@ WANTLIB += readline rsvg-2 event_core ev
 
 MASTER_SITES=	https://github.com/fvwmorg/fvwm3/releases/download/${VERSION}/
 
+BUILD_DEPENDS+=	textproc/asciidoctor
+
 LIB_DEPENDS+=	graphics/png \
 		x11/gnome/librsvg \
 		devel/libevent2
 
 SUBST_VARS=	VERSION
 
-SEPARATE_BUILD=		Yes
 CONFIGURE_STYLE=	gnu
 
 CONFIGURE_ARGS+=	--enable-mandoc \
@@ -39,7 +40,14 @@ CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS} -
 
 DEBUG_PACKAGES =       ${BUILD_PACKAGES}
 
+USE_GMAKE =	yes
+
 post-install:
+	cd ${WRKINST}/${TRUEPREFIX}/man/man1 && for m in Fvwm*.1; \
+		do mv {,fvwm3-}$$m; done
+	cd ${WRKINST}/${TRUEPREFIX}/man/man1/ && \
+		mv fvwm3-FvwmCommand{,3}.1 && \
+		ln -s fvwm3-FvwmCommand3.1 FvwmCommand3.1
 	mv ${WRKINST}/${TRUEPREFIX}/bin/FvwmCommand{,3}
 	mv ${WRKINST}/${TRUEPREFIX}/share/FvwmScript-* \
 		${WRKINST}/${TRUEPREFIX}/share/fvwm3/
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/x11/fvwm3/distinfo,v
diff -u -p -r1.3 distinfo
--- distinfo	22 Jan 2023 12:11:26 -0000	1.3
+++ distinfo	21 Jan 2024 17:47:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (fvwm3-1.0.6a.tar.gz) = RmWmYTPgcLeRkXsHlMxt9rdUZ56+kTBxhCfbZHm7W2g=
-SIZE (fvwm3-1.0.6a.tar.gz) = 4538100
+SHA256 (fvwm3-1.0.9.tar.gz) = xtBBGpe2IdjA7tNbxBZ4BBUUgOhH9kaUrcqOVd0ZBkg=
+SIZE (fvwm3-1.0.9.tar.gz) = 4525552
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/x11/fvwm3/patches/patch-configure,v
diff -u -p -r1.3 patch-configure
--- patches/patch-configure	13 Oct 2022 16:00:45 -0000	1.3
+++ patches/patch-configure	21 Jan 2024 17:47:20 -0000
@@ -1,7 +1,7 @@
 Index: configure
 --- configure.orig
 +++ configure
-@@ -11779,7 +11779,7 @@ then :
+@@ -11784,7 +11784,7 @@ then :
  else $as_nop
  
      with_intl=maybe
Index: patches/patch-default-config_Makefile_in
===================================================================
RCS file: /home/cvs/ports/x11/fvwm3/patches/patch-default-config_Makefile_in,v
diff -u -p -r1.3 patch-default-config_Makefile_in
--- patches/patch-default-config_Makefile_in	13 Oct 2022 16:00:45 -0000	1.3
+++ patches/patch-default-config_Makefile_in	21 Jan 2024 17:47:20 -0000
@@ -1,7 +1,7 @@
 Index: default-config/Makefile.in
 --- default-config/Makefile.in.orig
 +++ default-config/Makefile.in
-@@ -593,9 +593,10 @@ uninstall-am: uninstall-configDATA
+@@ -575,9 +575,10 @@ uninstall-am: uninstall-configDATA
  
  install-data-hook:
  	cp -r $(srcdir)/images $(inst_location)/default-config