[packages/fvwm2] Up to 2.6.6
arekm
arekm at pld-linux.org
Fri May 22 20:06:31 CEST 2026
commit 1c223ba991ec55d0bed1a4e5cd8760fbbf9dc3b4
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri May 22 20:06:02 2026 +0200
Up to 2.6.6
FvwmPager.patch | 7 +++--
fvwm2-fno-common.patch | 33 +++++++++++++++++++++++
fvwm2-format-string.patch | 68 -----------------------------------------------
fvwm2-locale_names.patch | 12 ++++-----
fvwm2-paths.patch | 26 ++++++++----------
fvwm2-xft2-link.patch | 6 ++---
fvwm2.spec | 16 +++++++----
7 files changed, 67 insertions(+), 101 deletions(-)
---
diff --git a/fvwm2.spec b/fvwm2.spec
index 359abbb..a294bba 100644
--- a/fvwm2.spec
+++ b/fvwm2.spec
@@ -9,6 +9,9 @@
%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
+%define specflags -std=gnu89
+
Summary: An improved version of the FVWM X-based window manager
Summary(de.UTF-8): F(?) Virtual Window Manager
Summary(es.UTF-8): Administrador de ventanas semejante al mwm
@@ -19,12 +22,12 @@ 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.5
-Release: 5
+Version: 2.6.6
+Release: 1
License: GPL
Group: X11/Window Managers
-Source0: ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-%{version}.tar.bz2
-# Source0-md5: 090ba4e0c517e8b94f71317951530f69
+Source0: https://github.com/fvwmorg/fvwm/releases/download/version-2_6_6/fvwm-%{version}.tar.gz
+# Source0-md5: 76e8731bf02ba0b73cfbbf7628f2230f
Source1: ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm_icons-20070101.tar.bz2
# Source1-md5: 2ab5ee60a96830af23a43855e33afc7d
Source2: %{name}-system.%{name}rc.tar.gz
@@ -39,7 +42,7 @@ Patch2: %{name}-locale_names.patch
Patch3: %{name}-varia.patch
Patch5: %{name}-xft2-link.patch
Patch7: %{name}-aclocal.patch
-Patch8: %{name}-format-string.patch
+Patch8: %{name}-fno-common.patch
URL: http://www.fvwm.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -149,6 +152,9 @@ fvwm-perllib, FvwmPerl i zależne moduły.
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
diff --git a/FvwmPager.patch b/FvwmPager.patch
index c4563db..fb72701 100644
--- a/FvwmPager.patch
+++ b/FvwmPager.patch
@@ -1,7 +1,6 @@
-diff -urN fvwm-2.5.12.vanilla/modules/FvwmPager/x_pager.c fvwm-2.5.12/modules/FvwmPager/x_pager.c
---- fvwm-2.5.12.vanilla/modules/FvwmPager/x_pager.c 2004-09-27 12:32:20.000000000 +0200
-+++ fvwm-2.5.12/modules/FvwmPager/x_pager.c 2005-02-21 21:47:10.254445160 +0100
-@@ -1078,6 +1078,29 @@
+--- 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)
else if((Event->xbutton.button == 1)||
(Event->xbutton.button == 2))
{
diff --git a/fvwm2-fno-common.patch b/fvwm2-fno-common.patch
new file mode 100644
index 0000000..09bdc53
--- /dev/null
+++ b/fvwm2-fno-common.patch
@@ -0,0 +1,33 @@
+--- 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-format-string.patch b/fvwm2-format-string.patch
deleted file mode 100644
index 15c49b6..0000000
--- a/fvwm2-format-string.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- fvwm-2.6.5/libs/FRenderInit.c~ 2013-05-05 08:55:11.555668251 +0200
-+++ fvwm-2.6.5/libs/FRenderInit.c 2013-05-05 08:54:36.265666672 +0200
-@@ -129,7 +129,7 @@
- code <= FRenderErrorBase +
- (sizeof(error_names) / sizeof(char *)) -1)
- {
-- sprintf(msg, error_names[code - FRenderErrorBase]);
-+ sprintf(msg, "%s", error_names[code - FRenderErrorBase]);
- return 1;
- }
- }
---- fvwm-2.6.5/modules/FvwmIconMan/functions.c~ 2007-01-27 12:33:16.000000000 +0100
-+++ fvwm-2.6.5/modules/FvwmIconMan/functions.c 2013-05-05 11:22:41.200960493 +0200
-@@ -535,7 +535,7 @@
- else
- {
- sprintf(buf, "%s\n", s);
-- ConsoleMessage(buf);
-+ ConsoleMessage("%s", buf);
- }
-
- return 0;
---- fvwm-2.6.5/fvwm/virtual.c~ 2011-08-16 09:05:53.000000000 +0200
-+++ fvwm-2.6.5/fvwm/virtual.c 2013-05-05 11:18:18.824282087 +0200
-@@ -2020,9 +2020,9 @@
- "The command EdgeResistance with three arguments is"
- " obsolete. Please use the following commands"
- " instead:");
-- fvwm_msg(OLD, "", cmd);
-- fvwm_msg(OLD, "", stylecmd);
-- fvwm_msg(OLD, "", stylecmd2);
-+ fvwm_msg(OLD, "", "%s", cmd);
-+ fvwm_msg(OLD, "", "%s", stylecmd);
-+ fvwm_msg(OLD, "", "%s", stylecmd2);
- execute_function(
- cond_rc, exc, cmd,
- FUNC_DONT_REPEAT | FUNC_DONT_EXPAND_COMMAND);
---- fvwm-2.6.5/fvwm/builtins.c~ 2012-01-18 11:22:45.000000000 +0100
-+++ fvwm-2.6.5/fvwm/builtins.c 2013-05-05 11:15:10.200940313 +0200
-@@ -2682,7 +2682,7 @@
- action[len-1]='\0';
- }
- }
-- fvwm_msg(ECHO,"Echo",action);
-+ fvwm_msg(ECHO,"Echo","%s",action);
-
- return;
- }
---- fvwm-2.6.5/fvwm/move_resize.c~ 2011-09-30 11:00:53.000000000 +0200
-+++ fvwm-2.6.5/fvwm/move_resize.c 2013-05-05 11:12:05.544265384 +0200
-@@ -3038,7 +3038,7 @@
- OLD, "CMD_SnapAttraction",
- "The command SnapAttraction is obsolete. Please use the"
- " following command instead:");
-- fvwm_msg(OLD, "", cmd);
-+ fvwm_msg(OLD, "","%s", cmd);
- execute_function(
- cond_rc, exc, cmd,
- FUNC_DONT_REPEAT | FUNC_DONT_EXPAND_COMMAND);
-@@ -3060,7 +3060,7 @@
- OLD, "CMD_SnapGrid",
- "The command SnapGrid is obsolete. Please use the following"
- " command instead:");
-- fvwm_msg(OLD, "", cmd);
-+ fvwm_msg(OLD, "","%s", cmd);
- execute_function(
- cond_rc, exc, cmd,
- FUNC_DONT_REPEAT | FUNC_DONT_EXPAND_COMMAND);
diff --git a/fvwm2-locale_names.patch b/fvwm2-locale_names.patch
index 63fe0ce..f198017 100644
--- a/fvwm2-locale_names.patch
+++ b/fvwm2-locale_names.patch
@@ -1,11 +1,11 @@
---- fvwm-2.5.16.orig/configure.ac 2006-04-14 03:13:34.000000000 +0200
-+++ fvwm-2.5.16/configure.ac 2006-04-14 03:14:04.000000000 +0200
-@@ -922,7 +922,7 @@ AC_ARG_ENABLE(perllib,
+--- 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"
-+ALL_LINGUAS="ar de fr sv zh"
+-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 cfa1dfb..789b4a4 100644
--- a/fvwm2-paths.patch
+++ b/fvwm2-paths.patch
@@ -1,26 +1,22 @@
-diff -urp fvwm-2.5.16.orig/configure.ac fvwm-2.5.16/configure.ac
---- fvwm-2.5.16.orig/configure.ac 2006-01-20 10:17:13.000000000 +0100
-+++ fvwm-2.5.16/configure.ac 2006-04-14 03:10:34.000000000 +0200
-@@ -73,7 +73,7 @@ AM_INIT_AUTOMAKE(fvwm, ${version})
- AM_CONFIG_HEADER(config.h)
-
+--- 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)
+
# installation paths
-FVWM_MODULESUBDIR=/${PACKAGE}/${VERSION}
+FVWM_MODULESUBDIR=/${PACKAGE}
FVWM_DATASUBDIR=/${PACKAGE}
-
- AC_ARG_ENABLE(package-subdirs,
-@@ -111,8 +111,8 @@ AC_ARG_ENABLE(package-subdirs,
+ FVWM_DOCSUBDIR=/doc/${PACKAGE}
+
+@@ -115,8 +115,8 @@ AC_ARG_ENABLE(package-subdirs,
fi], [])
-
-
+
+
-FVWM_MODULEDIR='${libexecdir}'"$FVWM_MODULESUBDIR"
-FVWM_DATADIR='${datadir}'"$FVWM_DATASUBDIR"
+FVWM_MODULEDIR='${libdir}'"$FVWM_MODULESUBDIR"
+FVWM_DATADIR='${pkgdatadir}'
FVWM_DOCDIR='${datadir}'"$FVWM_DOCSUBDIR"
FVWM_PERLLIBDIR='${datadir}'"$FVWM_DATASUBDIR/perllib"
- FVWM_CONFDIR='${sysconfdir}'dnl used _only_ to search for system.fvwm2rc
-Only in fvwm-2.5.16: fvwm2.menu.m4
-Only in fvwm-2.5.16: icons
-Only in fvwm-2.5.16: system.fvwm2rc
+ FVWM_CONFDIR='${sysconfdir}'dnl used _only_ to search for system.fvwm2rc
diff --git a/fvwm2-xft2-link.patch b/fvwm2-xft2-link.patch
index 55e4c74..0eeec5a 100644
--- a/fvwm2-xft2-link.patch
+++ b/fvwm2-xft2-link.patch
@@ -1,6 +1,6 @@
---- fvwm-2.5.28/configure.ac~ 2011-07-28 01:41:11.691879311 +0200
-+++ fvwm-2.5.28/configure.ac 2011-07-28 01:49:18.593313721 +0200
-@@ -715,7 +715,7 @@
+--- 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
AC_DEFINE(HAVE_XFT2)
AC_DEFINE(HAVE_XFT)
AC_DEFINE(HAVE_XFT_UTF8)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fvwm2.git/commitdiff/1c223ba991ec55d0bed1a4e5cd8760fbbf9dc3b4
More information about the pld-cvs-commit
mailing list