callisto-debian/fvwm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update for fvwm 2.7.0.

Browse Source 
* Removed patches that were applied upstream.
This commit is contained in:
somiaj 2022-10-20 23:23:28 -06:00
parent 8ee4ea427a
commit d412aaa840
15 changed files with 19 additions and 535 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
fvwm (1:2.7.0-1) unstable; urgency=low
* New upstream bugfix release.
* Remove debian/patches applied upstream.
-- Jaimos Skriletz <jaimosskriletz@gmail.com> Thu, 20 Oct 2022 11:00:00 -0600
fvwm (1:2.6.9-1) unstable; urgency=low
* New upstream bugfix release.

36
debian/patches/FvwmIconMan-fix-size-hints-warnings-2.patch vendored
View File

@ -1,36 +0,0 @@
Description: Fix FvwmIconMan still triggering size hint warnings.
* The original patch by Dominik Vogt didn't always work due to a
timing issue. This modifies the original patch by waiting
until FvwmIconMan has finished resizing to set the hints to
keep from triggering the warning.
* Patch only stops FvwmIconMan from triggering the warnings
and other applications my still trigger the warnings. Upstream
rejected patch in hopes of a better fix on the warning system
in the future.
Debian-Bug: https://bugs.debian.org/849355
Author: Jaimos Skriletz <jaimosskriletz@gmail.com>
Forwarded: not-needed
Date: Tue, 28 Feb 2017 19:42:54 -0700
---
modules/FvwmIconMan/xmanager.c | 10 ++++++++++
1 file changed, 10 insertions(+)
--- a/modules/FvwmIconMan/xmanager.c
+++ b/modules/FvwmIconMan/xmanager.c
@@ -438,6 +438,16 @@ static void resize_window(WinManager *ma
}
MyXUngrabServer(theDisplay);
}
+
+ // Wait until the window has resised to fix the HINTS.
+ // counter is used to break an infinte loop.
+ XWindowAttributes attribs;
+ int counter = 20000;
+ while ( counter && (attribs.width != man->geometry.width ||
+ attribs.height != man->geometry.height)) {
+ XGetWindowAttributes(theDisplay, man->theWindow, &attribs);
+ counter--;
+ }
fix_manager_size(man, man->geometry.width, man->geometry.height);
}

24
debian/patches/default-config-fvwm2.patch vendored
View File

@ -76,8 +76,8 @@ Last-Update: 2022-10-08
.IP "\fB\-\-regen\-cmd\fR \fICMD\fR "
This option sets the fvwm command \fICMD\fR that is run when the menu item
-\'Regenerate' is selected. The default is "PipeRead `fvwm-menu-desktop`".
+\'Regenerate' is selected. The default is "PipeRead `fvwm2-menu-desktop`".
-\&'Regenerate' is selected. The default is "PipeRead `fvwm-menu-desktop`".
+\&'Regenerate' is selected. The default is "PipeRead `fvwm2-menu-desktop`".
.IP "\fB\-\-term\-cmd\fR \fICMD\fR "
This option sets the terminal emulator command \fICMD\fR that is used to
@ -100,7 +100,7 @@ Last-Update: 2022-10-08
use this option to specify a different folder.
@@ -207,15 +207,15 @@ Sets the default directory icon if no ot
\'gnome-fs-directory'.
\&'gnome-fs-directory'.
.SH USAGE
-\fBfvwm-menu-desktop\fR outputs XDG .menu files in the syntax of fvwm
@ -322,18 +322,18 @@ Last-Update: 2022-10-08
--dynamic used with dynamic menus.
--- a/default-config/config
+++ b/default-config/config
@@ -56,8 +56,8 @@ InfoStoreAdd terminal x-terminal-emulato
DestroyFunc StartFunction
AddToFunc StartFunction
+ I Test (Init, f $[FVWM_USERDIR]/.BGdefault) \
@@ -64,8 +64,8 @@ AddToFunc StartFunction
DestroyFunc InitBackground
AddToFunc InitBackground
+ I Test (f $[FVWM_USERDIR]/.BGdefault) \
- Exec exec fvwm-root $[FVWM_USERDIR]/.BGdefault
-+ I TestRc (NoMatch) Exec exec fvwm-root \
+ Exec exec fvwm2-root $[FVWM_USERDIR]/.BGdefault
++ I TestRc (NoMatch) Exec exec fvwm2-root \
$[FVWM_DATADIR]/default-config/images/background/bg1.png
+ I Test (Init) Module FvwmBanner
+ I Module FvwmButtons RightPanel
@@ -98,12 +98,12 @@ AddToFunc ViewManPage
# Mouse Bindings Functions
@@ -103,12 +103,12 @@ AddToFunc ViewManPage
DestroyFunc SetBG
AddToFunc SetBG
+ I Test (f $[FVWM_USERDIR]/images/background/$0) \
@ -348,7 +348,7 @@ Last-Update: 2022-10-08
+ I Exec exec ln -fs $[FVWM_DATADIR]/default-config/images/background/$0 \
$[FVWM_USERDIR]/.BGdefault
@@ -296,7 +296,7 @@ AddToMenu MenuFvwmRoot "Fvwm" Title
@@ -301,7 +301,7 @@ AddToMenu MenuFvwmRoot "Fvwm" Title
+ "&Quit%icons/quit.png%" Module FvwmScript FvwmScript-ConfirmQuit
# Generate XDGMenu
@ -357,7 +357,7 @@ Last-Update: 2022-10-08
# Programs Menu
#
@@ -404,30 +404,30 @@ AddToMenu MenuSendToPage
@@ -409,30 +409,30 @@ AddToMenu MenuSendToPage
# Fvwm Man Pages (Help) Menu
DestroyMenu MenuFvwmManPages
AddToMenu MenuFvwmManPages "Help" Title

46
debian/patches/default-config-updates.patch vendored
View File

@ -1,46 +0,0 @@
Description: default-config improvements.
Fix a bug when starting fvwm that resets the chosen background image.
.
Add $FVWM_USERDIR/local.config as a local override to the default-config,
to allow local modifications to the config.
Author: Jaimos Skriletz <jaimosskriletz@gmail.com>
Forwarded: not-needed.
Last-Update: 2022-10-09
--- a/default-config/config
+++ b/default-config/config
@@ -55,14 +55,19 @@ InfoStoreAdd terminal x-terminal-emulato
# actions that are run after a restart.
DestroyFunc StartFunction
AddToFunc StartFunction
-+ I Test (Init, f $[FVWM_USERDIR]/.BGdefault) \
- Exec exec fvwm2-root $[FVWM_USERDIR]/.BGdefault
-+ I TestRc (NoMatch) Exec exec fvwm2-root \
- $[FVWM_DATADIR]/default-config/images/background/bg1.png
++ I Test (Init) InitBackground
+ I Test (Init) Module FvwmBanner
+ I Module FvwmButtons RightPanel
+ I Module FvwmEvent EventNewDesk
+# Function to set background when fvwm starts
+DestroyFunc InitBackground
+AddToFunc InitBackground
++ I Test (f $[FVWM_USERDIR]/.BGdefault) \
+ Exec exec fvwm2-root $[FVWM_USERDIR]/.BGdefault
++ I TestRc (NoMatch) Exec exec fvwm2-root \
+ $[FVWM_DATADIR]/default-config/images/background/bg1.png
+
# Mouse Bindings Functions
DestroyFunc RaiseMoveX
AddToFunc RaiseMoveX
@@ -654,3 +659,11 @@ DestroyModuleConfig EventNewDesk:*
# This sets the default colorsets.
*FvwmFormDefault: Colorset 10
*FvwmFormDefault: ItemColorset 13
+
+# Local configuration file. For use with the default-config.
+#
+# If $FVWMUSER_DIR/local.config ($HOME/.fvwm/local.config by default)
+# exists, then read it. This allows changes to default-config settings
+# without needing a full copy of the default-config. This will also allow
+# default-config changes to get used after upgrades (if applicable).
+Test (f $[FVWM_USERDIR]/local.config) Read $[FVWM_USERDIR]/local.config

21
debian/patches/enable-more-mouse-buttons.patch vendored
View File

@ -1,21 +0,0 @@
Description: Enable usage of more mouse buttons
The number of "extended" mouse buttons by default is 9, which isn't enough in
this day and age. This patch increases the number of usable mouse buttons.
Author: Klaus Ethgen <Klaus@ethgen.de>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775570
Forwarded: not-needed
Reviewed-by: Vincent W. Chen <vinmun@gmail.com>
Last-Update: 2015-01-19
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/libs/defaults.h
+++ b/libs/defaults.h
@@ -25,7 +25,7 @@
/* The "extended" buttons do not provide the full functionality because X has
* no bit mask value for them. Things like dragging windows don't work with
* them. */
-#define NUMBER_OF_EXTENDED_MOUSE_BUTTONS 9
+#define NUMBER_OF_EXTENDED_MOUSE_BUTTONS 15
#if NUMBER_OF_EXTENDED_MOUSE_BUTTONS > 31
#error No more than 31 mouse buttons can be supported on 32 bit platforms
#endif

74
debian/patches/fix-acute-accent.patch vendored
View File

@ -1,74 +0,0 @@
Description: Fix acute accents in manual pages.
Groff treats \' as an acute accent, and not an escaped quote.
Author: Jaimos Skriletz <jaimosskriletz@gmail.com>
Forwarded: https://github.com/fvwmorg/fvwm/commit/527ea3014f29eaeec4d13e0ac795852f8511b8e8
Last-Update: 2022-10-08
--- a/bin/fvwm-menu-desktop.1.in
+++ b/bin/fvwm-menu-desktop.1.in
@@ -123,7 +123,7 @@ are included in the top level menu. \fIN
.IP "\fB\-\-regen\-cmd\fR \fICMD\fR "
This option sets the fvwm command \fICMD\fR that is run when the menu item
-\'Regenerate' is selected. The default is "PipeRead `fvwm2-menu-desktop`".
+\&'Regenerate' is selected. The default is "PipeRead `fvwm2-menu-desktop`".
.IP "\fB\-\-term\-cmd\fR \fICMD\fR "
This option sets the terminal emulator command \fICMD\fR that is used to
@@ -200,11 +200,11 @@ use this option to specify a different f
.IP "\fB\-\-app\-icon\fR \fINAME\fR"
Sets the default application icon if no others are found. Default is
-\'gnome-applications'.
+\&'gnome-applications'.
.IP "\fB\-\-dir\-icon\fR \fINAME\fR"
Sets the default directory icon if no others are found. Default is
-\'gnome-fs-directory'.
+\&'gnome-fs-directory'.
.SH USAGE
\fBfvwm2-menu-desktop\fR outputs XDG .menu files in the syntax of fvwm
--- a/modules/FvwmButtons/FvwmButtons.1.in
+++ b/modules/FvwmButtons/FvwmButtons.1.in
@@ -711,7 +711,7 @@ like this:
.sp
.fi
Any single character can be quoted with a preceding
-backslash '\\'.
+backslash '\(rs'.
.RE
.\" End relative indent
.SH CREATING PANELS
--- a/modules/FvwmCommand/FvwmCommand.1.in
+++ b/modules/FvwmCommand/FvwmCommand.1.in
@@ -106,7 +106,7 @@ FvwmCommand -i 0 foobar
will return,
.EX
[fvwm][executeModule]: <<ERROR>> No such module
-\'foobar\' in ModulePath '/usr/lib/X11/fvwm'
+&'foobar' in ModulePath '/usr/lib/X11/fvwm'
.EE
Note that Fvwm doesn't return any error messages in
@@ -238,8 +238,8 @@ The below will iconify new windows when
.EX
Fvwm -mi3 | perl -ne '
$|=1;
-print "windowid $1 iconify\\n" if /^(0x\\S+) add/;
-\' > ~/\.FvwmCommandC
+print "windowid $1 iconify\\n" if /^(0x\\S+) add/;'
+\&' > ~/\.FvwmCommandC
.EE
.IP "\fI-r\fR"
Waits for a reply before it exits.
--- a/modules/FvwmConsole/FvwmConsoleC.pl.1.in
+++ b/modules/FvwmConsole/FvwmConsoleC.pl.1.in
@@ -165,7 +165,7 @@ string. Example:
Typing 'bigx<return>' in FvwmConsole will launch xterm. '^' denotes
the beginning of line in
.B regular expression.
-\'pl\' in the middle
+\&'pl' in the middle
of the command will not be replaced. Although the format looks different,
it takes Perl regular expression.
It just uses single or double quote as the delimiter.

49
debian/patches/fix-fvwm-iconman.patch vendored
View File

@ -1,49 +0,0 @@
Description: Bugfix for FvwmIconMan
Author: Jaimos Skriletz <jaimosskriletz@gmail.com>
Forwarded: https://github.com/fvwmorg/fvwm/commit/b2d9422fcdcedf93078d36cb3d76a1860f7da771
Last-Update: 2020-09-09
--- a/default-config/config
+++ b/default-config/config
@@ -621,8 +621,7 @@ DestroyModuleConfig FvwmIconMan:*
*FvwmIconMan: UseWinList true
*FvwmIconMan: ButtonGeometry 120x20
*FvwmIconMan: ManagerGeometry 1x1
-*FvwmIconMan: Background #003c3c
-*FvwmIconMan: Foreground #ffffff
+*FvwmIconMan: Colorset 10
*FvwmIconMan: FocusColorset 11
*FvwmIconMan: IconColorset 14
*FvwmIconMan: FocusAndSelectColorset 12
--- a/modules/FvwmIconMan/xmanager.c
+++ b/modules/FvwmIconMan/xmanager.c
@@ -1115,7 +1115,9 @@ static void clear_empty_region(WinManage
rects[0].x, rects[0].y, rects[0].width, rects[0].height,
rects[1].x, rects[1].y, rects[1].width, rects[1].height);
- if (CSET_IS_TRANSPARENT_PR_PURE(man->colorsets[DEFAULT]))
+ int cset = man->colorsets[DEFAULT];
+
+ if (CSET_IS_TRANSPARENT_PR_PURE(cset))
{
for(n=0; n < num_rects; n++)
{
@@ -1127,6 +1129,19 @@ static void clear_empty_region(WinManage
}
}
}
+ else if (cset >= 0)
+ {
+ for(n=0; n < num_rects; n++)
+ {
+ if (rects[n].width > 0 && rects[n].height > 0)
+ {
+ SetRectangleBackground(theDisplay, man->theWindow,
+ rects[n].x, rects[n].y, rects[n].width,
+ rects[n].height, &Colorset[cset], Pdepth,
+ man->backContext[DEFAULT]);
+ }
+ }
+ }
else
{
XFillRectangles(theDisplay, man->theWindow,

14
debian/patches/manpage-ClickTime.patch vendored
View File

@ -1,14 +0,0 @@
Description: Add double click time info to ClickTime in manpage.
Author: Jaimos Skriletz <jaimosskriletz@gmail.com>
Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567387
Forwarded: http://www.mail-archive.com/fvwm-workers@fvwm.org/msg04561.html
Last-Updated: 2016-12-10
--- a/doc/commands/ClickTime.xml
+++ b/doc/commands/ClickTime.xml
@@ -26,4 +26,6 @@ is 150 milliseconds. Omitting the delay
<emphasis remap='B'>ClickTime</emphasis>
to the default.</para>
+<para><emphasis remap='B'>ClickTime</emphasis> also specifies the delay
+between two clicks to be interpreted as a double-click.</para>
</section>

16
debian/patches/menu-directory.patch vendored
View File

@ -1,16 +0,0 @@
Description: Change escape function.
Use escape_file_name instead of escape_fvwm_name since $name is a filename.
Author: Unknown
Forwarded: not-needed
Last-Updated: 2016-12-10
--- a/bin/fvwm-menu-directory.in
+++ b/bin/fvwm-menu-directory.in
@@ -200,7 +200,7 @@ my $sort_sub =
@files = reverse @files if $order < 0;
# dump all menu items and start adding new items
-my $menu_name = &escape_fvwm_name($name);
+my $menu_name = &escape_file_name($name);
my $menu_name2 = &escape_menu_name($name);
print qq(DestroyMenu recreate "$menu_name"\nAddToMenu "$menu_name2"\n);

15
debian/patches/move-locale-dir.patch vendored
View File

@ -1,15 +0,0 @@
Description: Move locale dir to /usr/share/fvwm/locale to avoid conflicts with fvwm3.
Author: Jaimos Skriletz <jaimosskriletz@gmail.com>
Forwarded: not-needed
Last-Updated: 2021-05-31
--- a/configure.ac
+++ b/configure.ac
@@ -1274,7 +1274,7 @@ AC_SUBST(FVWMTASKBAR_DOMAIN)
AC_SUBST(FVWMSCRIPT_DOMAIN)
AC_SUBST(ALL_DOMAINS)
-LOCALEDIR='${datadir}'"/locale"
+LOCALEDIR="$FVWM_DATADIR/locale"
with_gettext="yes"
problem_gettext=""

79
debian/patches/pkgconfig.patch vendored
View File

@ -1,79 +0,0 @@
Description: Replaces fvwm's AM_CHECK_PKG_CONFIG with PKG_PROG_PKG_CONFIG.
Use upstream PKG_PROG_PKG_CONFIG instead of fvwm's AM_CHECK_PKG_CONFIG
macro for pkg-config. This should improve cross building.
.
Upstream was not interested in the patch.
Author: Helmut Grohne <helmutg@debian.org>
Debian-Bug: http://bugs.debian.org/900074
Reviewd-By: Jaimos Skriletz <jaimosskriletz@gmail.com>
Forwarded: not-needed
Last-Updated: 2018-06-12
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -542,37 +542,6 @@
])
#-----------------------------------------------------------------------------
-# pkg-config
-
-dnl
-dnl
-AC_DEFUN([AM_CHECK_PKG_CONFIG],
-[dnl
-dnl Get the cflags and libraries from the freetype-config script
-dnl
-AC_ARG_WITH(pkgconfig-prefix,
-AS_HELP_STRING([--with-pkgconfig-prefix=PFX],[prefix where pkg-config is installed]),
- pkgconfig_config_prefix="$withval", pkgconfig_config_prefix="")
-AC_ARG_WITH(pkgconfig-exec-prefix,
-AS_HELP_STRING([--with-pkgconfig-exec-prefix=PFX],[exec prefix where pkg-config is installed]),
- pkgconfig_config_exec_prefix="$withval",pkgconfig_config_exec_prefix="")
-
-if test x$pkgconfig_config_exec_prefix != x ; then
- pkgconfig_config_args="$pkgconfig_config_args --exec-prefix=$pkgconfig_config_exec_prefix"
- if test x${PKG_CONFIG+set} != xset ; then
- PKG_CONFIG=$pkgconfig_config_exec_prefix/bin/pkg-config
- fi
-fi
-if test x$pkgconfig_config_prefix != x ; then
- pkgconfig_config_args="$pkgconfig_config_args --prefix=$pkgconfig_config_prefix"
- if test x${PKG_CONFIG+set} != xset ; then
- PKG_CONFIG=$pkgconfig_config_prefix/bin/pkg-config
- fi
-fi
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-])
-
-#-----------------------------------------------------------------------------
# Configure paths for fontconfig
# Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
# modified by olicha for fontconfig
--- fvwm-2.6.7-49-gd84d4d4b.orig/configure.ac
+++ fvwm-2.6.7-49-gd84d4d4b/configure.ac
@@ -281,7 +281,7 @@
# unfortunately, we need pkg-config for the detection of certain libs:
# - version of fontconfig without fontconfig-config
# - version of fribidi without fribidi-config
-AM_CHECK_PKG_CONFIG
+PKG_PROG_PKG_CONFIG
# Building man pages & HTML documentation (from XML source).
@@ -879,7 +879,7 @@
)
if test ! x"$with_rsvg" = xno; then
with_rsvg=no
- if test ! x"$PKG_CONFIG" = xno ; then
+ if test ! x"$PKG_CONFIG" = x ; then
AC_MSG_CHECKING(for librsvg - version >= $rsvg_min_version)
if $PKG_CONFIG --exists librsvg-2.0 ; then
if $PKG_CONFIG --exists "librsvg-2.0 >= $rsvg_min_version" ; then
@@ -1163,7 +1163,7 @@
AS_HELP_STRING([--with-fribidi-bindir=DIR],
[directory of fribidi-config if not in PATH]),
FRIBIDI_BINDIR="$withval", FRIBIDI_BINDIR=".")
- if test ! x"$PKG_CONFIG" = xno && $PKG_CONFIG --exists "fribidi >= $fribidi_min_version"; then
+ if test ! x"$PKG_CONFIG" = x && $PKG_CONFIG --exists "fribidi >= $fribidi_min_version"; then
FRIBIDI_CONFIG="$PKG_CONFIG fribidi"
else
AC_PATH_PROG(FRIBIDI_CONFIG, fribidi-config,, [$FRIBIDI_BINDIR:$PATH])

76
debian/patches/remove-FvwmCommand-helper-scripts.patch vendored
View File

@ -1,76 +0,0 @@
Description: Remove broken FvwmCommand.{pm,sh} scripts from build.
The FvwmCommand.pm and FvwmCommand.sh wrapper scripts are broken
and don't generate correctly. Remove them from the build.
Remove wrapper info from manual page.
Author: Jaimos Skriletz <jaimosskriletz@gmail.com>
Forwarded: https://github.com/fvwmorg/fvwm/pull/97/commits/9be57d08a7eff85c1b5c83ef9639a625ab85b646
Last-Update: 2022-10-09
--- a/modules/FvwmCommand/Makefile.am
+++ b/modules/FvwmCommand/Makefile.am
@@ -6,29 +6,14 @@ SUBDIRS = scripts
bin_PROGRAMS = FvwmCommand
moduledir = @FVWM_MODULEDIR@
-module_DATA = FvwmCommand.sh FvwmCommand.pm
FvwmCommand_SOURCES = FvwmCommand.c FvwmCommand.h fifos.c
-FvwmCommand.sh: findcmd.pl $(top_srcdir)/fvwm/functable.c
- if test -n "$(PERL)" -a -x "$(PERL)"; then \
- $(PERL) $(srcdir)/findcmd.pl $(bindir) -sh \
- < $(top_srcdir)/fvwm/functable.c > $@; \
- else echo '# Did not find perl during fvwm install' > $@; fi
-
-FvwmCommand.pm: findcmd.pl $(top_srcdir)/fvwm/functable.c
- if test -n "$(PERL)" -a -x "$(PERL)"; then \
- $(PERL) $(srcdir)/findcmd.pl $(bindir) \
- < $(top_srcdir)/fvwm/functable.c > $@; \
- else echo '# Did not find perl during fvwm install' > $@; fi
-
-CLEANFILES = FvwmCommand.sh FvwmCommand.pm
-
FvwmCommand_DEPENDENCIES = $(top_builddir)/libs/libfvwm.a
man_MANS = FvwmCommand.1
-EXTRA_DIST = $(man_MANS) findcmd.pl
+EXTRA_DIST = $(man_MANS)
LDADD = -L$(top_builddir)/libs -lfvwm
--- a/modules/FvwmCommand/FvwmCommand.1.in
+++ b/modules/FvwmCommand/FvwmCommand.1.in
@@ -281,33 +281,6 @@ FvwmCommand exits if no information or e
time period unless option -m is used.
The default is 500 ms. This option overrides this default value.
-.SH WRAPPER
-.sp
-.sp
-FvwmCommand.sh has bourne shell function definitions
-to keep the syntax similar to fvwm configuration file.
-This file is to be sourced:
-.EX
-\&. FvwmCommand.sh
-.br
-DesktopSize 5x5
-.EE
-.br
-FvwmCommand.pm is for perl in order
-to keep the syntax similar to fvwm configuration file.
-Commas can be used to separate fvwm commands' arguments.
-.EX
-use FvwmCommand;
-if( $ARGV[0] eq 'home' ) {
- Desk 0,0; GotoPage '1 1';
-}elsif( $ARGV[0] eq 'jump' ) {
- Desk "0 2"; GotoPage 0, 1;
-}
-.EE
-Although arguments in FvwmCommand are not case sensitive as fvwm,
-the functions defined in FvwmCommand.sh and FvwmCommand.pl are case sensitive.
-
-
.SH ERRORS
If the following error message show up, it is most likely that FvwmCommandS
is not running.

17
debian/patches/reproducible-build.patch vendored
View File

@ -1,17 +0,0 @@
Description: Reproducible Builds
Allow fvwm to be built reproducibly.
Author: Chris Lamb <lamby@debian.org>
Debian-Bug: https://bugs.debian.org/831646
Forwarded: not-needed
Last-Update: 2016-07-18
--- a/bin/fvwm-bug.in
+++ b/bin/fvwm-bug.in
@@ -85,7 +85,7 @@ trap 'rm -f $TEMP $TEMP.x' 0
# Who is mail to?
if test x"$address" = x; then
- LOCAL=@LOCAL_BUGADDR@
+ LOCAL=
WORKERS=fvwm-workers@fvwm.org
if test "$LOCAL"; then

12
debian/patches/series vendored
View File

@ -1,15 +1,3 @@
fix-fvwm-iconman.patch
pkgconfig.patch
FvwmIconMan-fix-size-hints-warnings-2.patch
manpage-ClickTime.patch
fix-TabCom.patch
reproducible-build.patch
menu-directory.patch
fix-hardcoded-xterm.patch
enable-more-mouse-buttons.patch
move-locale-dir.patch
default-config-fvwm2.patch
spelling-error-fixes.patch
fix-acute-accent.patch
default-config-updates.patch
remove-FvwmCommand-helper-scripts.patch

68
debian/patches/spelling-error-fixes.patch vendored
View File

@ -1,68 +0,0 @@
Description: Fix spelling errors in binary and manual pages.
Author: Jaimos Skriletz <jaimosskriletz@gmail.com>
Forwarded: https://github.com/fvwmorg/fvwm/commit/02225f83b8e9443a8e7418a9614e90c31708c428
Last-Update: 2021-04-21
--- a/fvwm/bindings.c
+++ b/fvwm/bindings.c
@@ -577,7 +577,7 @@ static int ParseBinding(
{
fvwm_msg(
WARN, "ParseBinding", "Binding specified AnyModifier"
- " and other modifers too. Excess modifiers are"
+ " and other modifiers too. Excess modifiers are"
" ignored.");
modifier = AnyModifier;
}
--- a/fvwm/menubindings.c
+++ b/fvwm/menubindings.c
@@ -456,7 +456,7 @@ int menu_binding(
{
fvwm_msg(
WARN, "menu_binding", "Binding specified AnyModifier"
- " and other modifers too. Excess modifiers are"
+ " and other modifiers too. Excess modifiers are"
" ignored.");
modifier = AnyModifier;
}
--- a/modules/FvwmButtons/FvwmButtons.1.in
+++ b/modules/FvwmButtons/FvwmButtons.1.in
@@ -388,7 +388,7 @@ to center the contents on the button.
This option specifies that this button will not be considered at
all when making the initial calculations of button sizes. Useful
for the odd button that gets just a couple of pixels too large to
-keep in line, and therefor blows up your whole buttonbox. "NoSize"
+keep in line, and therefore blows up your whole buttonbox. "NoSize"
is equivalent to "Size 0 0".
.IP "Padding \fIwidth height\fP"
--- a/modules/FvwmIconMan/readconfig.c
+++ b/modules/FvwmIconMan/readconfig.c
@@ -681,7 +681,7 @@ Binding *ParseMouseEntry(char *tline)
modifiers_string_to_modmask(modifiers, &mods);
if((mods & AnyModifier)&&(mods&(~AnyModifier))) {
- ConsoleMessage("Binding specified AnyModifier and other modifers too. "
+ ConsoleMessage("Binding specified AnyModifier and other modifiers too. "
"Excess modifiers will be ignored.");
}
@@ -736,7 +736,7 @@ static Binding *ParseKeyEntry(char *tlin
modifiers_string_to_modmask(modifiers, &mods);
if((mods & AnyModifier)&&(mods&(~AnyModifier))) {
- ConsoleMessage("Binding specified AnyModifier and other modifers too. Excess modifiers will be ignored.");
+ ConsoleMessage("Binding specified AnyModifier and other modifiers too. Excess modifiers will be ignored.");
}
/*
--- a/doc/commands/WindowList.xml
+++ b/doc/commands/WindowList.xml
@@ -243,7 +243,7 @@ causes fvwm to add a menu title with the
before each group of windows on the same desk.
With
<fvwmopt cmd="WindowList" opt="NoLayer"/>,
-the layer of the window is not diplayed. The options
+the layer of the window is not displayed. The options
<fvwmopt cmd="WindowList" opt="ShowPage"/>,
<fvwmopt cmd="WindowList" opt="ShowPageX"/> and
<fvwmopt cmd="WindowList" opt="ShowPageY"/>