[packages/fvwm2] Up to 2.7.0

arekm arekm at pld-linux.org
Sun Aug 9 13:22:56 CEST 2026 

commit ea7c5da96a741b3208ccf933c03a45d68cbb0b02
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Aug 9 13:22:38 2026 +0200

    Up to 2.7.0

 FvwmPager.patch          |  6 ++---
 fvwm2-aclocal.patch      | 16 ++++++------
 fvwm2-fno-common.patch   | 33 -------------------------
 fvwm2-locale_names.patch | 11 ---------
 fvwm2-paths.patch        | 35 +++++++++++++++++----------
 fvwm2-xft2-link.patch    |  6 ++---
 fvwm2.desktop            | 16 ------------
 fvwm2.spec               | 63 ++++++++++--------------------------------------
 8 files changed, 49 insertions(+), 137 deletions(-)
---
diff --git a/fvwm2.spec b/fvwm2.spec
index a294bba..6efd850 100644
--- a/fvwm2.spec
+++ b/fvwm2.spec
@@ -5,8 +5,6 @@
 %bcond_without	stroke		# without mouse strokes (gestures) support
 %bcond_without	xft		# without Xft (1 or 2) support
 %bcond_with	fribidi		# with bidirectional text support
-%bcond_with	gnome		# with gnome-libs and wm-properties
-%bcond_with	gtk		# with gtk 1.x support
 %bcond_with	rplay		# with internal sound support (through rplay)
 #
 # configure tests use K&R-style declarations that modern gcc rejects as errors
@@ -22,34 +20,30 @@ Summary(pt_BR.UTF-8):	Gerenciador de janelas semelhante ao mwm
 Summary(ru.UTF-8):	Виртуальный оконный менеджер F(?)
 Summary(tr.UTF-8):	Yaygın bir pencere denetleyicisi
 Name:		fvwm2
-Version:	2.6.6
+Version:	2.7.0
 Release:	1
 License:	GPL
 Group:		X11/Window Managers
-Source0:	https://github.com/fvwmorg/fvwm/releases/download/version-2_6_6/fvwm-%{version}.tar.gz
-# Source0-md5:	76e8731bf02ba0b73cfbbf7628f2230f
+Source0:	https://github.com/fvwmorg/fvwm/releases/download/%{version}/fvwm-%{version}.tar.gz
+# Source0-md5:	03941921576fcda6aafde76a01b5825c
 Source1:	ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm_icons-20070101.tar.bz2
 # Source1-md5:	2ab5ee60a96830af23a43855e33afc7d
 Source2:	%{name}-system.%{name}rc.tar.gz
 # Source2-md5:	22c1f6c5ab4bd84376daa37debd3e889
 Source3:	%{name}.RunWM
 Source4:	%{name}-xsession.desktop
-Source5:	%{name}.desktop
 Source6:	mozilla.xpm
 Patch0:		%{name}-paths.patch
 Patch1:		FvwmPager.patch
-Patch2:		%{name}-locale_names.patch
 Patch3:		%{name}-varia.patch
 Patch5:		%{name}-xft2-link.patch
 Patch7:		%{name}-aclocal.patch
-Patch8:		%{name}-fno-common.patch
 URL:		http://www.fvwm.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 %{?with_fribidi:BuildRequires:	fribidi-devel}
-%{?with_gnome:BuildRequires:	gnome-libs-devel}
-BuildRequires:	gtk+-devel
 BuildRequires:	libpng-devel >= 1.4
+BuildRequires:	libxslt-progs
 %{?with_stroke:BuildRequires:	libstroke-devel}
 BuildRequires:	pkgconfig
 BuildRequires:	readline-devel >= 4.2
@@ -59,7 +53,6 @@ BuildRequires:	rpm-perlprov
 BuildRequires:	xorg-lib-libXpm-devel
 BuildRequires:	xorg-lib-libXt-devel
 BuildRequires:	librsvg-devel
-BuildRequires:	imlib-devel
 Requires(post):	vfmg >= 0.9.95
 Requires:	fvwm2-icons = %{version}-%{release}
 Requires:	m4
@@ -69,7 +62,6 @@ Conflicts:	filesystem < 3.0-20
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/X11/fvwm2
-%define		_wmpropsdir	/usr/share/gnome/wm-properties
 
 %description
 FVWM2 (the F stands for whatever you want, but the VWM stands for
@@ -143,21 +135,11 @@ fvwm-perllib, FvwmPerl i zależne moduły.
 %setup -n fvwm-%{version} -q -a1 -a2
 %patch -P0 -p1
 %patch -P1 -p1
-%patch -P2 -p1
 %patch -P3 -p1
 %patch -P5 -p1
 %patch -P7 -p1
-%patch -P8 -p1
-
-mv -f po/FvwmScript.sv{_SE,}.po
-mv -f po/FvwmTaskBar.sv{_SE,}.po
-mv -f po/fvwm.sv{_SE,}.po
-mv -f po/FvwmScript.zh{_CN,}.po
-mv -f po/FvwmTaskBar.zh{_CN,}.po
-mv -f po/fvwm.zh{_CN,}.po
 
 %build
-rm -f missing
 %{__aclocal}
 %{__autoconf}
 %{__automake}
@@ -166,12 +148,11 @@ rm -f missing
 	--disable-efence \
 	--%{!?debug:dis}%{?debug:en}able-debug-msgs \
 	--disable-command-log \
+	--enable-mandoc \
 	%{!?with_fribidi:--disable-bidi} \
 	%{!?with_xft:--disable-xft} \
 	--enable-shape \
 	--enable-sm \
-	%{?with_gnome:--with-gnome}%{!?with_gnome:--without-gnome} \
-	%{!?with_gtk:--disable-gtk} \
 	--with-xpm-library \
 	%{!?with_rplay:--without-rplay-library} \
 	--with-stroke-library \
@@ -190,7 +171,7 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -d \
-	$RPM_BUILD_ROOT{%{_sysconfdir},%{_wmpropsdir}} \
+	$RPM_BUILD_ROOT%{_sysconfdir} \
 	$RPM_BUILD_ROOT{%{_datadir}/{locale,xsessions},%{_pixmapsdir}/mini}
 
 install system.fvwm2rc $RPM_BUILD_ROOT%{_sysconfdir}/system.fvwm2rc
@@ -206,7 +187,6 @@ mv $RPM_BUILD_ROOT%{_pixmapsdir}/xv{,-fvwm}.xpm
 
 install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/fvwm2-session
 install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
-%{?with_gnome:install %{SOURCE5} $RPM_BUILD_ROOT%{_wmpropsdir}}
 install %{SOURCE6} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 touch $RPM_BUILD_ROOT%{_sysconfdir}/fvwm2.menu2
@@ -227,7 +207,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README AUTHORS NEWS docs
+%doc NEWS README.md docs
 %dir %{_sysconfdir}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fvwm2.menu.m4
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/system.fvwm2rc
@@ -238,30 +218,20 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/fvwm2
 %attr(755,root,root) %{_bindir}/fvwm2-session
 %dir %{_libdir}/fvwm
-%attr(755,root,root) %{_libdir}/fvwm/Fvwm[!DGPWT]*
-%attr(755,root,root) %{_libdir}/fvwm/FvwmD[!e]*
-%{?with_gtk:%attr(755,root,root) %{_libdir}/fvwm/FvwmGtk}
-%attr(755,root,root) %{_libdir}/fvwm/FvwmP[!e]*
-%attr(755,root,root) %{_libdir}/fvwm/FvwmT[!a]*
-%attr(755,root,root) %{_libdir}/fvwm/FvwmTalk
-%attr(755,root,root) %{_libdir}/fvwm/FvwmTaskBar
-%attr(755,root,root) %{_libdir}/fvwm/FvwmW[!i]*
-%attr(755,root,root) %{_libdir}/fvwm/FvwmWinList
+%attr(755,root,root) %{_libdir}/fvwm/Fvwm[!P]*
+%attr(755,root,root) %{_libdir}/fvwm/FvwmPager
+%attr(755,root,root) %{_libdir}/fvwm/FvwmProxy
 %dir %{_datadir}/fvwm
 %{_datadir}/fvwm/[!p]*
 %{_datadir}/xsessions/%{name}.desktop
 %{_datadir}/locale/ar/LC_MESSAGES/FvwmScript.mo
-%{?with_gnome:%{_wmpropsdir}/fvwm2.desktop}
 %{_mandir}/man1/[!Ff]*.1*
-%{_mandir}/man1/Fvwm[!DGPW]*.1*
-%{_mandir}/man1/FvwmD[!e]*.1*
-%{_mandir}/man1/FvwmP[!e]*.1*
-%{_mandir}/man1/FvwmW[!i]*.1*
-%{_mandir}/man1/FvwmWinList.1*
+%{_mandir}/man1/Fvwm[!P]*.1*
+%{_mandir}/man1/FvwmPager.1*
+%{_mandir}/man1/FvwmProxy.1*
 %{_mandir}/man1/fvwm.1*
 %{_mandir}/man1/fvwm-[!p]*.1*
 %{_mandir}/man1/fvwm2.1*
-%{?with_gtk:%{_mandir}/man1/FvwmGtk.1.*}
 
 %files icons
 %defattr(644,root,root,755)
@@ -272,14 +242,7 @@ rm -rf $RPM_BUILD_ROOT
 %files perl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/fvwm-perllib
-%attr(755,root,root) %{_libdir}/fvwm/FvwmDebug
-%{?with_gtk:%attr(755,root,root) %{_libdir}/fvwm/FvwmGtkDebug}
 %attr(755,root,root) %{_libdir}/fvwm/FvwmPerl
-%attr(755,root,root) %{_libdir}/fvwm/FvwmTabs
-%attr(755,root,root) %{_libdir}/fvwm/FvwmWindowMenu
 %{_datadir}/fvwm/perllib
 %{_mandir}/man1/fvwm-perllib.1*
-%{_mandir}/man1/FvwmDebug.1*
-%{?with_gtk:%{_mandir}/man1/FvwmGtkDebug.1*}
 %{_mandir}/man1/FvwmPerl.1*
-%{_mandir}/man1/FvwmWindowMenu.1*
diff --git a/FvwmPager.patch b/FvwmPager.patch
index fb72701..eb1f6ca 100644
--- a/FvwmPager.patch
+++ b/FvwmPager.patch
@@ -1,6 +1,6 @@
---- fvwm-2.6.6.orig/modules/FvwmPager/x_pager.c	2016-03-19 22:14:16.000000000 +0100
-+++ fvwm-2.6.6/modules/FvwmPager/x_pager.c	2026-05-21 01:38:12.786219023 +0200
-@@ -1144,6 +1144,29 @@ void DispatchEvent(XEvent *Event)
+--- fvwm-2.7.0.orig/modules/FvwmPager/x_pager.c
++++ fvwm-2.7.0/modules/FvwmPager/x_pager.c
+@@ -1143,6 +1143,29 @@
      else if((Event->xbutton.button == 1)||
  	    (Event->xbutton.button == 2))
      {
diff --git a/fvwm2-aclocal.patch b/fvwm2-aclocal.patch
index 46c1eec..896d171 100644
--- a/fvwm2-aclocal.patch
+++ b/fvwm2-aclocal.patch
@@ -1,11 +1,11 @@
---- fvwm-2.6.5/configure.ac~	2013-05-06 18:24:49.677728463 +0200
-+++ fvwm-2.6.5/configure.ac	2013-05-06 22:23:48.570323806 +0200
-@@ -69,7 +69,7 @@
- AC_SUBST(MANPAGE_PREAMBLE)
- 
- AM_INIT_AUTOMAKE(fvwm, ${version})
+--- fvwm-2.7.0.orig/configure.ac
++++ fvwm-2.7.0/configure.ac
+@@ -19,7 +19,7 @@
+ AC_CONFIG_AUX_DIR(etc)
+ AM_INIT_AUTOMAKE([foreign subdir-objects])
+ AM_SILENT_RULES([yes])
 -AM_CONFIG_HEADER(config.h)
 +AC_CONFIG_HEADER(config.h)
  
- # check for programs needed to build html docs
- AC_CHECK_PROG(SED, sed, sed, "")
+ VERSIONINFO=""
+ 
diff --git a/fvwm2-fno-common.patch b/fvwm2-fno-common.patch
deleted file mode 100644
index 09bdc53..0000000
--- a/fvwm2-fno-common.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- fvwm-2.6.6.orig/modules/FvwmScroll/GrabWindow.c
-+++ fvwm-2.6.6/modules/FvwmScroll/GrabWindow.c
-@@ -80,7 +80,7 @@ extern char *BackColor;
- 		     ButtonPressMask | ButtonMotionMask | FocusChangeMask)
-
- Atom wm_del_win;
--Atom _XA_WM_PROTOCOLS;
-+extern Atom _XA_WM_PROTOCOLS;
- Atom _XA_WM_COLORMAP_WINDOWS;
-
- /*
---- fvwm-2.6.6.orig/modules/FvwmWharf/FvwmWharf.c
-+++ fvwm-2.6.6/modules/FvwmWharf/FvwmWharf.c
-@@ -177,7 +177,7 @@ char *imagePath = NULL;
- char *imagePath = NULL;
-
- static Atom _XA_WM_DEL_WIN;
--Atom _XA_WM_PROTOCOLS;
-+extern Atom _XA_WM_PROTOCOLS;
- Atom _XA_WM_NAME;
- #ifdef ENABLE_DND
- Atom DndProtocol;
---- fvwm-2.6.6.orig/modules/FvwmIconBox/FvwmIconBox.c
-+++ fvwm-2.6.6/modules/FvwmIconBox/FvwmIconBox.c
-@@ -188,7 +188,7 @@ char *FvwmDefaultIcon = NULL;
- char *FvwmDefaultIcon = NULL;
-
- static Atom wm_del_win;
--Atom _XA_WM_PROTOCOLS;
-+extern Atom _XA_WM_PROTOCOLS;
- Atom _XA_WM_NAME;
-
- int ready = 0;
diff --git a/fvwm2-locale_names.patch b/fvwm2-locale_names.patch
deleted file mode 100644
index f198017..0000000
--- a/fvwm2-locale_names.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fvwm-2.6.6.orig/configure.ac	2016-03-15 00:00:00.000000000 +0100
-+++ fvwm-2.6.6/configure.ac	2026-05-21 00:00:00.000000000 +0200
-@@ -1272,7 +1272,7 @@ AC_SUBST(FVWM_PERLLIB)
- AC_SUBST(FVWM_PERLLIB)
-
- # ******* gettext
--ALL_LINGUAS="ar de fr sv_SE zh_CN ru es"
-+ALL_LINGUAS="ar de fr sv zh ru es"
- FVWM_DOMAIN="fvwm"
- FVWMTASKBAR_DOMAIN="FvwmTaskBar"
- FVWMSCRIPT_DOMAIN="FvwmScript"
diff --git a/fvwm2-paths.patch b/fvwm2-paths.patch
index 789b4a4..834fb76 100644
--- a/fvwm2-paths.patch
+++ b/fvwm2-paths.patch
@@ -1,18 +1,18 @@
---- fvwm-2.6.6.orig/configure.ac	2016-03-19 22:26:44.000000000 +0100
-+++ fvwm-2.6.6/configure.ac	2026-05-21 01:37:58.144487695 +0200
-@@ -104,7 +104,7 @@ AC_MSG_RESULT([assuming $PERL as perl lo
- AC_SUBST(PERL)
-
+--- fvwm-2.7.0.orig/configure.ac
++++ fvwm-2.7.0/configure.ac
+@@ -100,7 +100,7 @@
  # installation paths
--FVWM_MODULESUBDIR=/${PACKAGE}/${VERSION}
-+FVWM_MODULESUBDIR=/${PACKAGE}
- FVWM_DATASUBDIR=/${PACKAGE}
- FVWM_DOCSUBDIR=/doc/${PACKAGE}
-
-@@ -115,8 +115,8 @@ AC_ARG_ENABLE(package-subdirs,
+ transform=`echo "${program_transform_name}" | "$SED" -e 's/\\$\\$/\\$/'`
+ PPACKAGE=`echo "${PACKAGE}" | "$SED" -e "${transform}"`
+-FVWM_MODULESUBDIR=/${PPACKAGE}/${VERSION}
++FVWM_MODULESUBDIR=/${PPACKAGE}
+ FVWM_DATASUBDIR=/${PPACKAGE}
+ FVWM_DOCSUBDIR=/doc/${PPACKAGE}
+ 
+@@ -111,8 +111,8 @@
    fi], [])
-
-
+ 
+ 
 -FVWM_MODULEDIR='${libexecdir}'"$FVWM_MODULESUBDIR"
 -FVWM_DATADIR='${datadir}'"$FVWM_DATASUBDIR"
 +FVWM_MODULEDIR='${libdir}'"$FVWM_MODULESUBDIR"
@@ -20,3 +20,12 @@
  FVWM_DOCDIR='${datadir}'"$FVWM_DOCSUBDIR"
  FVWM_PERLLIBDIR='${datadir}'"$FVWM_DATASUBDIR/perllib"
  FVWM_CONFDIR='${sysconfdir}'dnl used _only_ to search for system.fvwm2rc
+@@ -1274,7 +1274,7 @@
+ AC_SUBST(FVWMSCRIPT_DOMAIN)
+ AC_SUBST(ALL_DOMAINS)
+ 
+-LOCALEDIR="$FVWM_DATADIR/locale"
++LOCALEDIR='${datadir}'"/locale"
+ with_gettext="yes"
+ problem_gettext=""
+ 
diff --git a/fvwm2-xft2-link.patch b/fvwm2-xft2-link.patch
index 0eeec5a..f9484f4 100644
--- a/fvwm2-xft2-link.patch
+++ b/fvwm2-xft2-link.patch
@@ -1,6 +1,6 @@
---- fvwm-2.6.6.orig/configure.ac	2016-03-19 22:26:44.000000000 +0100
-+++ fvwm-2.6.6/configure.ac	2026-05-21 01:38:12.789552356 +0200
-@@ -727,7 +727,7 @@ if test ! x"$with_xft" = xno; then
+--- fvwm-2.7.0.orig/configure.ac
++++ fvwm-2.7.0/configure.ac
+@@ -725,7 +725,7 @@
        AC_DEFINE(HAVE_XFT2)
        AC_DEFINE(HAVE_XFT)
        AC_DEFINE(HAVE_XFT_UTF8)
diff --git a/fvwm2.desktop b/fvwm2.desktop
deleted file mode 100644
index 7341816..0000000
--- a/fvwm2.desktop
+++ /dev/null
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Name=Fvwm2
-Comment=An improved version of the FVWM X-based window manager
-Comment[de]=F(?) Virtual Window Manager
-Comment[es]=Administrador de ventanas semejante al mwm
-Comment[fr]=F(?) Virtual Window Manager
-Comment[ja]=改良版 FVWM - X 用ウィンドウマネージャ
-Comment[tr]=Yaygın bir pencere denetleyicisi
-Comment[pl]=Ulepszona wersja zarządcy okien FVWM
-Comment[pt_BR]=Gerenciador de janelas semelhante ao mwm
-Comment[ru]=Виртуальный оконный менеджер F(?)
-Exec=fvwm2
-TryExec=fvwm2
-[Window Manager]
-SessionManaged=false
-# vi: encoding=utf-8
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fvwm2.git/commitdiff/ea7c5da96a741b3208ccf933c03a45d68cbb0b02

More information about the pld-cvs-commit mailing list