pool/fvwm2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 640029 from home:scarabeus_iv:branches:X11:windowmanagers

Browse Source 
- Add patch to work with multibuttons mice. Upstream is not
  interested in the patch as other than xorg servers still might
  not support this:
  * enable-more-mouse-buttons.patch

- Remove not really needed patches:
  * fvwm-2.5.26-gcc-warnings.patch
  * fvwm-2.5.26-ia64.patch
  * fvwm-rsvg.patch
  * fvwm-2.5.26-no-copy-dt-needed-entries.patch
  * fvwm-2.5.26-charset_in_title.patch

- Version update to 2.6.8:
  * Various DESTDIR fixes (especially around the default-config Makefile)
  * fvwm-perllib pod2man fixes.
  * FvwmIconMan no longer triggers a warning about bad size hints in the fvwm core.
  * VMware windows do not disapper when switching between fullscreen and normal state.
  * Fix (de)installation with the configure options
    --program-prefix, --program-suffix and
    --program-transform-name.
  * Remove further references to obsolete modules from man page(s).
  * fvwm-menu-desktop(1) now requires python3 as an explicit dependency.
  * Add a 'fullscreen' option to the 'Maximize' command.
- Remove local fvwm-menu-desktop-config.fpl as upstream has newer
  version
- Refresh patch fvwm-2.5.26-sv_SE.patch
- Rename properly the openSUSE.xpm u->U
- Require python3-base as per above change to use it in
  the menu-desktop

OBS-URL: https://build.opensuse.org/request/show/640029
OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/fvwm2?expand=0&rev=43
This commit is contained in:
Michael Vetter 2018-10-05 10:45:39 +00:00 committed by Git OBS Bridge
parent 37a0df5ab4
commit a68edc093c
14 changed files with 107 additions and 568 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
enable-more-mouse-buttons.patch Normal file
View File

@ -0,0 +1,21 @@
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/
--- libs/defaults.h.orig
+++ 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

22
fvwm-2.5.26-charset_in_title.patch
View File

@ -1,22 +0,0 @@
---
libs/Flocale.c | 2 ++
1 file changed, 2 insertions(+)
--- libs/Flocale.c
+++ libs/Flocale.c 2016-08-02 13:49:28.893927858 +0000
@@ -2318,6 +2318,7 @@ void FlocaleGetNameProperty(
{
return;
}
+#if 0
if (text_prop.encoding == XA_STRING)
{
/* STRING encoding, use this as it is */
@@ -2326,6 +2327,7 @@ void FlocaleGetNameProperty(
return;
}
/* not STRING encoding, try to convert XA_COMPOUND_TEXT */
+#endif
if (XmbTextPropertyToTextList(dpy, &text_prop, &list, &num) >= Success
&& num > 0 && *list)
{

11
fvwm-2.5.26-gcc-warnings.patch
View File

@ -1,11 +0,0 @@
--- libs/Flocale.c
+++ libs/Flocale.c
@@ -427,7 +427,7 @@
{
char *str1, *str2, *str3;
int len1;
- int len2;
+ int len2 = 0;
int i;
Bool do_iconv = True;
const char *bidi_charset;

41
fvwm-2.5.26-ia64.patch
View File

@ -1,41 +0,0 @@
---
fvwm/stack.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- fvwm/stack.c
+++ fvwm/stack.c 2017-02-07 10:55:25.816637544 +0000
@@ -114,7 +114,7 @@ static void dump_stack_ring(void)
t1 = t1->stack_next)
{
fprintf(stderr," l=%d fw=%p f=0x%08x '%s'\n", t1->layer,
- t1, (int)FW_W_FRAME(t1), t1->name.name);
+ t1, FW_W_FRAME(t1), t1->name.name);
}
return;
@@ -203,14 +203,14 @@ void verify_stack_ring_consistency(void)
fprintf(
stderr,"vsrc: window already died:"
" fw=%p w=0x%08x '%s'\n",
- t1, (int)FW_W_FRAME(t1), t1->name.name);
+ t1, FW_W_FRAME(t1), t1->name.name);
}
else if (i >= last_index)
{
fprintf(
stderr, "vsrc: window is at wrong position"
" in stack ring: fw=%p f=0x%08x '%s'\n",
- t1, (int)FW_W_FRAME(t1),
+ t1, FW_W_FRAME(t1),
t1->name.name);
dump_stack_ring();
fprintf(stderr,"dumping X stacking order:\n");
@@ -226,7 +226,7 @@ void verify_stack_ring_consistency(void)
{
fprintf(
stderr, " f=0x%08x\n",
- (int)children[i]);
+ children[i]);
break;
}
}

109
fvwm-2.5.26-no-copy-dt-needed-entries.patch
View File

@ -1,109 +0,0 @@
Index: fvwm-2.5.26/fvwm/Makefile.am
===================================================================
---
fvwm-2.6.6/fvwm/Makefile.am | 3 ++-
fvwm-2.6.6/modules/FvwmButtons/Makefile.am | 3 ++-
fvwm-2.6.6/modules/FvwmForm/Makefile.am | 3 ++-
fvwm-2.6.6/modules/FvwmIconMan/Makefile.am | 3 ++-
fvwm-2.6.6/modules/FvwmIdent/Makefile.am | 3 ++-
fvwm-2.6.6/modules/FvwmPager/Makefile.am | 3 ++-
fvwm-2.6.6/modules/FvwmProxy/Makefile.am | 3 ++-
fvwm-2.6.6/modules/FvwmScript/Makefile.am | 3 ++-
8 files changed, 16 insertions(+), 8 deletions(-)
--- fvwm-2.6.6/fvwm/Makefile.am
+++ fvwm-2.6.6/fvwm/Makefile.am 2016-08-02 14:07:39.789474831 +0000
@@ -36,7 +36,8 @@ LDADD = \
-L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \
$(stroke_LIBS) $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 \
$(X_EXTRA_LIBS) -lm $(iconv_LIBS) $(Xrender_LIBS) $(Xcursor_LIBS) \
- $(Bidi_LIBS) $(png_LIBS) $(rsvg_LIBS) $(intl_LIBS)
+ $(Bidi_LIBS) $(png_LIBS) $(rsvg_LIBS) $(intl_LIBS) -lfontconfig
+ $(Bidi_LIBS) $(png_LIBS) $(rsvg_LIBS) $(intl_LIBS) -lfontconfig
AM_CPPFLAGS = \
-I$(top_srcdir) $(stroke_CFLAGS) $(Xft_CFLAGS) \
--- fvwm-2.6.6/modules/FvwmButtons/Makefile.am
+++ fvwm-2.6.6/modules/FvwmButtons/Makefile.am 2016-08-02 14:07:39.789474831 +0000
@@ -22,7 +22,8 @@ FvwmButtons_DEPENDENCIES = $(top_builddi
LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \
$(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 -lm $(X_EXTRA_LIBS) \
$(iconv_LIBS) $(Xrender_LIBS) $(Xcursor_LIBS) $(Bidi_LIBS) \
- $(png_LIBS) $(rsvg_LIBS)
+ $(png_LIBS) $(rsvg_LIBS) -lfontconfig
+ $(png_LIBS) $(rsvg_LIBS) -lfontconfig
AM_CPPFLAGS = -I$(top_srcdir) $(xpm_CFLAGS) $(Xft_CFLAGS) $(X_CFLAGS) \
$(iconv_CFLAGS) $(Xrender_CFLAGS) $(fribidi_CFLAGS) $(png_CFLAGS)
--- fvwm-2.6.6/modules/FvwmForm/Makefile.am
+++ fvwm-2.6.6/modules/FvwmForm/Makefile.am 2016-08-02 14:07:39.785474903 +0000
@@ -53,7 +53,8 @@ config_DATA = \
## so we might as well link against libXpm, if present.
LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) \
$(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 $(X_EXTRA_LIBS) \
- -lm $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS)
+ -lm $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS) -lfontconfig
+ -lm $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS) -lfontconfig
AM_CPPFLAGS = -I$(top_srcdir) $(Xft_CFLAGS) $(X_CFLAGS) $(iconv_CFLAGS) \
$(Bidi_CFLAGS) $(Xrender_CFLAGS)
--- fvwm-2.6.6/modules/FvwmIconMan/Makefile.am
+++ fvwm-2.6.6/modules/FvwmIconMan/Makefile.am 2016-08-02 14:07:39.789474831 +0000
@@ -21,7 +21,8 @@ FvwmIconMan_DEPENDENCIES = $(top_builddi
## so we might as well link against libXpm, if present.
LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) \
$(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 $(X_EXTRA_LIBS) \
- $(iconv_LIBS) $(Xrender_LIBS) $(rsvg_LIBS) -lm $(Bidi_LIBS)
+ $(iconv_LIBS) $(Xrender_LIBS) $(rsvg_LIBS) -lm $(Bidi_LIBS) -lfontconfig
+ $(iconv_LIBS) $(Xrender_LIBS) $(rsvg_LIBS) -lm $(Bidi_LIBS) -lfontconfig
AM_CPPFLAGS = -I$(top_srcdir) $(Xft_CFLAGS) $(X_CFLAGS) \
$(iconv_CFLAGS) $(Xrender_CFLAGS) $(Bidi_CFLAGS)
--- fvwm-2.6.6/modules/FvwmIdent/Makefile.am
+++ fvwm-2.6.6/modules/FvwmIdent/Makefile.am 2016-08-02 14:07:39.789474831 +0000
@@ -18,7 +18,8 @@ FvwmIdent_DEPENDENCIES = $(top_builddir)
## so we might as well link against libXpm, if present.
LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \
$(png_LIBS) $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 -lm \
- $(X_EXTRA_LIBS) $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS)
+ $(X_EXTRA_LIBS) $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS) -lfontconfig
+ $(X_EXTRA_LIBS) $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS) -lfontconfig
AM_CPPFLAGS = -I$(top_srcdir) $(Xft_CFLAGS) $(xpm_CFLAGS) $(png_CFLAGS) \
$(X_CFLAGS) $(Xrender_CFLAGS) $(iconv_CFLAGS) $(Bidi_CFLAGS)
--- fvwm-2.6.6/modules/FvwmPager/Makefile.am
+++ fvwm-2.6.6/modules/FvwmPager/Makefile.am 2016-08-02 14:07:39.789474831 +0000
@@ -19,7 +19,8 @@ FvwmPager_DEPENDENCIES = $(top_builddir)
LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \
$(png_LIBS) $(rsvg_LIBS) $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 \
$(X_EXTRA_LIBS) -lm $(Xrender_LIBS) $(Xcursor_LIBS) $(iconv_LIBS) \
- $(Bidi_LIBS)
+ $(Bidi_LIBS) -lfontconfig
+ $(Bidi_LIBS) -lfontconfig
AM_CPPFLAGS = -I$(top_srcdir) $(xpm_CFLAGS) $(png_CFLAGS) $(Xft_CFLAGS) \
$(X_CFLAGS) $(Xrender_CFLAGS) $(iconv_CFLAGS) $(Bidi_CFLAGS)
--- fvwm-2.6.6/modules/FvwmProxy/Makefile.am
+++ fvwm-2.6.6/modules/FvwmProxy/Makefile.am 2016-08-02 14:07:39.785474903 +0000
@@ -19,7 +19,8 @@ FvwmProxy_DEPENDENCIES = $(top_builddir)
LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \
$(png_LIBS) $(rsvg_LIBS) $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 \
$(X_EXTRA_LIBS) -lm $(Xrender_LIBS) $(Xcursor_LIBS) $(iconv_LIBS) \
- $(Bidi_LIBS)
+ $(Bidi_LIBS) -lfontconfig
+ $(Bidi_LIBS) -lfontconfig
AM_CPPFLAGS = -I$(top_srcdir) $(xpm_CFLAGS) $(png_CFLAGS) $(Xft_CFLAGS) \
$(X_CFLAGS) $(Xrender_CFLAGS) $(iconv_CFLAGS) $(Bidi_CFLAGS)
--- fvwm-2.6.6/modules/FvwmScript/Makefile.am
+++ fvwm-2.6.6/modules/FvwmScript/Makefile.am 2016-08-02 14:07:39.789474831 +0000
@@ -19,7 +19,8 @@ EXTRA_DIST = $(man_MANS) scanner.l scrip
LDADD = Widgets/libWidgets.a -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) \
$(X_LIBS) $(xpm_LIBS) $(Xinerama_LIBS) $(X_PRE_LIBS) -lXext -lX11 \
$(X_EXTRA_LIBS) -lm $(Xrender_LIBS) $(Xcursor_LIBS) $(iconv_LIBS) \
- $(Bidi_LIBS) $(png_LIBS) $(rsvg_LIBS) $(intl_LIBS)
+ $(Bidi_LIBS) $(png_LIBS) $(rsvg_LIBS) $(intl_LIBS) -lfontconfig
+ $(Bidi_LIBS) $(png_LIBS) $(rsvg_LIBS) $(intl_LIBS) -lfontconfig
AM_CPPFLAGS = -I$(top_srcdir) $(xpm_CFLAGS) $(Xft_CFLAGS) $(X_CFLAGS) \
$(Xrender_CFLAGS) $(iconv_CFLAGS) $(Bidi_CFLAGS) $(png_CFLAGS)

12
fvwm-2.5.26-sv_SE.patch
View File

@ -2,14 +2,16 @@
configure.ac | 2 +- configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
--- configure.ac Index: configure.ac
+++ configure.ac 2017-02-07 10:59:12.000308716 +0000 ===================================================================
@@ -1253,7 +1253,7 @@ AC_ARG_ENABLE(perllib, --- configure.ac.orig
+++ configure.ac
@@ -1263,7 +1263,7 @@ AC_ARG_ENABLE(perllib,
AC_SUBST(FVWM_PERLLIB) AC_SUBST(FVWM_PERLLIB)
# ******* gettext # ******* gettext
-ALL_LINGUAS="ar de fr sv_SE zh_CN ru es" -ALL_LINGUAS="ar da de fr sv_SE zh_CN ru es"
+ALL_LINGUAS="ar de fr sv zh_CN ru es" +ALL_LINGUAS="ar da de fr sv zh_CN ru es"
FVWM_DOMAIN="fvwm" FVWM_DOMAIN="fvwm"
FVWMSCRIPT_DOMAIN="FvwmScript" FVWMSCRIPT_DOMAIN="FvwmScript"
ALL_DOMAINS="$FVWM_DOMAIN $FVWMTASKBAR_DOMAIN $FVWMSCRIPT_DOMAIN" ALL_DOMAINS="$FVWM_DOMAIN $FVWMTASKBAR_DOMAIN $FVWMSCRIPT_DOMAIN"

3
fvwm-2.6.7.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:267747bc9705189af57cdee3a1072477bd13c99c27753385d2c29175a0b0b077
size 3268982

3
fvwm-2.6.8.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fb36c9235d157411efb7383d09d7d4d25a90fe02d0b2b4f752ca4acc7e9bf341
size 3915662

286
fvwm-menu-desktop-config.fpl
View File

@ -1,286 +0,0 @@
# Uage: Module FvwmPerl -l fvwm-menu-desktop-config.fpl
# This script generates an FvwmForm similar to the FvwmForm-Desktop by
# Dan Espen but inserts the found xdg menus dynamically into the Form
# before processed.
# Author: Thomas Funk <t.funk@web.de>
# Version: 1.3
package MenuConfig;
use File::Basename;
use strict;
use warnings;
#open(MSG ,">>/tmp/log.txt") || die "Error $!";
my $modname = 'FvwmForm-Desktop-Config';
my $all = `fvwm-menu-desktop --get-menus all`;
my $selected = `fvwm-menu-desktop --get-menus desktop`;
my @all_filelist = split(/ /,$all);
my @selected_filelist = split(/ /,$selected);
my %all_menus = ();
my %selected__menus = ();
my $max_length = 0;
foreach my $path (@selected_filelist) {
my ($filename, $directories, $suffix) = fileparse($path, qr/\.[^.]*/);
push (@{$selected__menus{$directories}}, $filename);
}
my $i = 1;
foreach my $path (@all_filelist) {
my $name = "MEN" . $i;
# qr matched against the end of the $filename.
# The matching portion is removed and becomes the $suffix.
my ($filename, $directories, $suffix) = fileparse($path, qr/\.[^.]*/);
push (@{$all_menus{$directories}{$i}}, ($filename, $name, "off"));
next if !defined $selected__menus{$directories};
foreach my $hit (@{$selected__menus{$directories}}) {
if ($filename eq $hit) {
pop (@{$all_menus{$directories}{$i}});
push (@{$all_menus{$directories}{$i}}, "on");
}
}
$max_length = length($filename) if ($max_length < length($filename));
$i++;
}
my $fvwmform_commands = "
DestroyModuleConfig ${modname}: *
*${modname}: Title \"\$[gt.Fvwm Menu Desktop Config]\"
*${modname}: WarpPointer
*${modname}: Line center
*${modname}: Text \"\$[gt.Fvwm Menu Desktop Config]\"
*${modname}: Line
*${modname}: Separator
*${modname}: Line center
*${modname}: Text \"\$[gt.Multiple Menu]\"
*${modname}: Line
";
if (scalar keys %all_menus != 0) {
foreach my $key (sort( keys %all_menus)) {
$fvwmform_commands .= "
*${modname}: Line left
*${modname}: Text \"\$[gt.Menus in]\"
*${modname}: Text \" $key\"
*${modname}: Line left
*${modname}: Selection meth multiple
";
my $m_count = 0;
foreach my $count (sort(keys %{$all_menus{$key}})) {
my @menu = @{$all_menus{$key}{$count}};
my $newstring = $menu[0] . ' ' x eval($max_length-length($menu[0]));
$fvwmform_commands .= "*${modname}: Choice $menu[1] $menu[1] $menu[2] \"$newstring\"
";
$m_count++;
if ($m_count == 3) {
$fvwmform_commands .= "
*${modname}: Line left
*${modname}: Selection meth multiple
";
$m_count = 0;
}
}
$fvwmform_commands .= "
*${modname}: Line left
*${modname}: Text \" \"
";
}
}
else {
$fvwmform_commands .= "
*${modname}: Line center
*${modname}: Text \"\$[gt.No menus found! Check why from within a terminal with]\"
*${modname}: Line center
*${modname}: Text \"'fvwm-menu-desktop -v'\"
*${modname}: Line left
*${modname}: Text \" \"
";
}
$fvwmform_commands .= "
*${modname}: Line
*${modname}: Separator
*${modname}: Line center
*${modname}: Text \"\$[gt.General Options]\"
*${modname}: Line
*${modname}: Line Left
*${modname}: Text \"\$[gt.Use Icons in Menus? ]\"
*${modname}: Selection SelItype single
*${modname}: Choice IconsOn IconsOn on \"\$[gt.Yes]\"
*${modname}: Choice IconsOff IconsOff off \"\$[gt.No]\"
*${modname}: Line left
*${modname}: Text \"\$[gt.Icon size: ]\"
*${modname}: Input Size 2 \"\"
*${modname}: Text \"\$[gt. (in pixels. Default is 24)]\"
*${modname}: Line left
*${modname}: Text \"\$[gt.Converted Icon directory: ]\"
*${modname}: Input IconDir 25 \"~/.fvwm/icons\"
*${modname}: Text \"\$[gt. (Directory for converted icons)]\"
*${modname}: Line Left
*${modname}: Text \"\$[gt.Use Titles in Menus? ]\"
*${modname}: Selection SelItype single
*${modname}: Choice TitlesOn TitlesOn on \"\$[gt.Yes]\"
*${modname}: Choice TitlesOff TitlesOff off \"\$[gt.No]\"
*${modname}: Line Left
*${modname}: Text \"\$[gt.Insert Menu(s) in a Menu? ]\"
*${modname}: Selection SelItype single
*${modname}: Choice InsertOn InsertOn off \"\$[gt.Yes]\"
*${modname}: Choice InsertOff InsertOff on \"\$[gt.No]\"
*${modname}: Text \"\$[gt.Top title name: ]\"
*${modname}: Input InMenu 20 \"\"
*${modname}: Line left
*${modname}: Text \"\$[gt.Used Icon theme: ]\"
*${modname}: Input Theme 20 \"\"
*${modname}: Text \"\$[gt. (Theme name for icon selection)]\"
*${modname}: Line left
*${modname}: Line
*${modname}: Line
*${modname}: Separator
*${modname}: Line center
*${modname}: Text \"\$[gt.Single Menu]\"
*${modname}: Line
*${modname}: Line Left
*${modname}: Text \"\$[gt.If you want a single menu only deselect all menus above and fill out]\"
*${modname}: Line Left
*${modname}: Text \"\$[gt.the fields below. But remember, if the menu doesn't exist, nothing happens.]\"
*${modname}: Line
*${modname}: Line left
*${modname}: Text \"\$[gt.Menu Top Title:]\"
*${modname}: Input Title 20 \"\"
*${modname}: Text \"\$[gt. (Eg. FvwmTestMenu)]\"
*${modname}: Line left
*${modname}: Text \"\$[gt.Install-Prefix:]\"
*${modname}: Input Installprefix 20 \"\"
*${modname}: Text \"\$[gt. (Eg. /etc/xdg/menus/)]\"
*${modname}: Line left
*${modname}: Text \"\$[gt.Desktop: ]\"
*${modname}: Input Desktop 20 \"\"
*${modname}: Text \"\$[gt. (Eg. gnome, kde, xfce, lxde)]\"
*${modname}: Line left
*${modname}: Text \"\$[gt.Menutype: ]\"
*${modname}: Input Menutype 20 \"\"
*${modname}: Text \"\$[gt. (Eg. applications, settings)]\"
*${modname}: Line left
*${modname}: Text \"\$[gt.Output path: ]\"
*${modname}: Input Path 25 \"\$FVWM_USERDIR/.menu\"
*${modname}: Text \"\$[gt. (Full path to store output)]\"
*${modname}: Line left
*${modname}: Line
*${modname}: Line
*${modname}: Separator
*${modname}: Line center
*${modname}: Text \"\$[gt.Actions]\"
*${modname}: Line left
*${modname}: Line
*${modname}: Line center
*${modname}: Selection SelItype single
*${modname}: Choice MultiOn MultiOn on \"\$[gt.Multiple]\"
*${modname}: Choice MultiOff MultiOff off \"\$[gt.Single]\"
*${modname}: Line
*${modname}: Separator
*${modname}: Line expand
*${modname}: Button continue \"\$[gt.Generate Menu(s)]\"
*${modname}: Command PipeRead 'fvwm-menu-desktop \\
\$(IconsOn\?--enable-mini-icons )\\
\$(Size\?-s \$(Size) )\\
\$(TitlesOn\?--with-titles )\\
\$(InsertOn\?--insert-in-menu \$(InMenu) )\\
\$(IconDir\?--mini-icon-dir \$(IconDir) )\\
\$(Title\?--title \$(Title) )\\
\$(Installprefix\?--install-prefix \$(Installprefix) )\\
\$(Desktop\?--desktop \$(Desktop) )\\
\$(Menutype\?--menutype \$(Menutype) )\\
\$(Theme\?--theme \$(Theme) )\\
\$(MultiOn\?--set-menus \"\\
";
foreach my $key (keys %all_menus) {
foreach my $file (keys %{$all_menus{$key}}) {
my @menu = @{$all_menus{$key}{$file}};
$fvwmform_commands .= "\$($menu[1]\?$key$menu[0].menu )\\\n";
}
}
$fvwmform_commands .= "\") \$(Path\? > \$(Path)) 2> ~/.xsession-errors && echo \"Read \$(Path\? \$(Path))\"'
*${modname}: Button continue \"\$[gt.Save Settings]\"
# Before saving the data, remove any previously saved data:
*${modname}: Command DestroyModuleConfig ${modname}Default: *
*${modname}: Command !( /bin/echo \\
\"# This file last created by ${modname} on: `/bin/date`.\"; /bin/echo \\
";
foreach my $key (keys %all_menus) {
foreach my $count (keys %{$all_menus{$key}}) {
my @menu = @{$all_menus{$key}{$count}};
$fvwmform_commands .= " '*${modname}Default: $menu[1] \$($menu[1]\?on) ' ; /bin/echo \\
";
}
}
$fvwmform_commands .= ") > \$FVWM_USERDIR/.${modname}
*${modname}: Command !( /bin/echo \\
'*${modname}Default: IconsOn \$(IconsOn\?on) ' ; /bin/echo \\
'*${modname}Default: IconsOff \$(IconsOff\?on) ' ; /bin/echo \\
'*${modname}Default: Size \$(Size) ' ; /bin/echo \\
'*${modname}Default: TitlesOn \$(TitlesOn\?on) ' ; /bin/echo \\
'*${modname}Default: TitlesOff \$(TitlesOff\?on) ' ; /bin/echo \\
'*${modname}Default: InsertOn \$(InsertOn\?on) ' ; /bin/echo \\
'*${modname}Default: InsertOff \$(InsertOff\?on) ' ; /bin/echo \\
'*${modname}Default: InMenu \$(InMenu) ' ; /bin/echo \\
'*${modname}Default: Theme \$(Theme) ' \\
) >> \$FVWM_USERDIR/.${modname}
*${modname}: Command !( /bin/echo \\
'*${modname}Default: Title \$(Title) ' ; /bin/echo \\
'*${modname}Default: Installprefix \$(Installprefix) ' ; /bin/echo \\
'*${modname}Default: Desktop \$(Desktop) ' ; /bin/echo \\
'*${modname}Default: Menutype \$(Menutype) ' ; /bin/echo \\
'*${modname}Default: Path \$(Path) ' ; /bin/echo \\
'*${modname}Default: IconDir \$(IconDir) ' ; /bin/echo \\
'*${modname}Default: MultiOn \$(MultiOn\?on) ' ; /bin/echo \\
'*${modname}Default: MultiOff \$(MultiOff\?on) ' \\
) >> \$FVWM_USERDIR/.${modname}
*${modname}: Button restart \"\$[gt.Reset]\"
*${modname}: Command Nop
*${modname}: Button continue \"\$[gt.Help]\"
*${modname}: Command Exec exec xterm -g 100x50 -n \"Help fvwm-menu-desktop\" -T \"Help fvwm-menu-desktop\" -e \"man fvwm-menu-desktop\" &
*${modname}: Button quit \"\$[gt.Quit]\"
*${modname}: Command Nop
# Tell ${modname} to read vars from .${modname}Default file:
*${modname}: UseData .${modname} *${modname}Default
";
# We are just asked to open a window, give fvwm a chance to do it
::unlock();
$fvwmform_commands =~ s/^\s+//; # trim leading whitespace
::command(qq[
$fvwmform_commands
FvwmForm ${modname}
]);
#print MSG "$fvwmform_commands\n\n";
#close(MSG);
# Local Variables:
# mode: perl
# End:

25
fvwm-rsvg.patch
View File

@ -1,25 +0,0 @@
---
configure | 1 -
configure.ac | 1 -
2 files changed, 2 deletions(-)
--- configure.ac
+++ configure.ac 2017-02-07 11:06:58.555365173 +0000
@@ -922,7 +922,6 @@ if test x"$with_rsvg" = xyes ; then
LIBS="$LIBS $rsvg_LIBS"
AC_TRY_RUN([
#include <librsvg/rsvg.h>
- #include <librsvg/rsvg-cairo.h>
int main() {
RsvgHandle *rsvg;
g_type_init();
--- configure
+++ configure 2017-02-07 11:06:58.559365097 +0000
@@ -9939,7 +9939,6 @@ else
/* end confdefs.h. */
#include <librsvg/rsvg.h>
- #include <librsvg/rsvg-cairo.h>
int main() {
RsvgHandle *rsvg;
g_type_init();

45
fvwm2.changes
View File

@ -1,3 +1,48 @@
-------------------------------------------------------------------
Fri Oct 5 06:49:37 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com>
- Add patch to work with multibuttons mice. Upstream is not
interested in the patch as other than xorg servers still might
not support this:
* enable-more-mouse-buttons.patch
-------------------------------------------------------------------
Fri Oct 5 06:05:12 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com>
- Remove not really needed patches:
* fvwm-2.5.26-gcc-warnings.patch
* fvwm-2.5.26-ia64.patch
* fvwm-rsvg.patch
* fvwm-2.5.26-no-copy-dt-needed-entries.patch
* fvwm-2.5.26-charset_in_title.patch
-------------------------------------------------------------------
Thu Oct 4 20:08:30 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com>
- Version update to 2.6.8:
* Various DESTDIR fixes (especially around the default-config Makefile)
* fvwm-perllib pod2man fixes.
* FvwmIconMan no longer triggers a warning about bad size hints in the fvwm core.
* VMware windows do not disapper when switching between fullscreen and normal state.
* Fix (de)installation with the configure options
--program-prefix, --program-suffix and
--program-transform-name.
* Remove further references to obsolete modules from man page(s).
* fvwm-menu-desktop(1) now requires python3 as an explicit dependency.
* Add a 'fullscreen' option to the 'Maximize' command.
- Remove local fvwm-menu-desktop-config.fpl as upstream has newer
version
- Refresh patch fvwm-2.5.26-sv_SE.patch
- Rename properly the openSUSE.xpm u->U
- Require python3-base as per above change to use it in
the menu-desktop
-------------------------------------------------------------------
Thu Oct 4 20:05:07 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com>
- Reduce usage of self defined macros and rely on system ones
- Switch Source to point to upstream provided archive
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 18 13:24:18 UTC 2018 - mvetter@suse.com Fri May 18 13:24:18 UTC 2018 - mvetter@suse.com

91
fvwm2.spec
View File

@ -12,39 +12,33 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
Name: fvwm2 Name: fvwm2
Version: 2.6.7 Version: 2.6.8
Release: 0 Release: 0
Summary: The F Virtual Window Manager Summary: The F Virtual Window Manager
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: System/GUI/Other Group: System/GUI/Other
Url: http://www.fvwm.org URL: http://www.fvwm.org
Source0: fvwm-%{version}.tar.bz2 Source0: https://github.com/fvwmorg/fvwm/releases/download/%{version}/fvwm-%{version}.tar.gz
Source1: fvwm_icons.tar.bz2 Source1: fvwm_icons.tar.bz2
Source3: %{name}.desktop Source3: %{name}.desktop
Source4: system.fvwm2rc Source4: system.fvwm2rc
Source6: openSuSE.xpm Source6: openSUSE.xpm
#SOURCE-FIX-OPENSUSE for snapshot 2012/10/11
Source7: fvwm-menu-desktop-config.fpl
Patch0: fvwm-configure.patch Patch0: fvwm-configure.patch
Patch1: fvwm-2.5.26-gcc-warnings.patch Patch1: fvwm-2.5.26-sv_SE.patch
Patch2: fvwm-2.5.26-ia64.patch Patch2: fvwm-no-date-time.patch
Patch3: fvwm-2.5.26-sv_SE.patch Patch3: enable-more-mouse-buttons.patch
Patch5: fvwm-2.5.26-charset_in_title.patch
Patch7: fvwm-2.5.26-no-copy-dt-needed-entries.patch
#PATCH-FIX-OPENSUSE Avoid including internal rsvg-cairo.h
Patch8: fvwm-rsvg.patch
Patch10: fvwm-no-date-time.patch
BuildRequires: automake BuildRequires: automake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: libstroke-devel BuildRequires: libstroke-devel
BuildRequires: libxslt-tools BuildRequires: libxslt-tools
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python3-base
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(cairo)
@ -84,59 +78,31 @@ FVWM is intended to have a small memory footprint but a rich feature
set, to be extremely customizable and extendible, and to be very set, to be extremely customizable and extendible, and to be very
compatible with the Motif Window Manager (mwm). compatible with the Motif Window Manager (mwm).
%define _xorg7libs %{_lib}
%define _xorg7bin bin
%define _xorg7libs32 lib
%define _xorg7libshare share
%define _xorg7prefix %{_prefix}
%define _xorg7mandir %{_mandir}
%prep %prep
%setup -q -n fvwm-%{version} %setup -q -n fvwm-%{version}
%patch0 -b .p0 %autopatch -p0
%patch1 -b .p1
%patch2 -b .p2
%patch3 -b .p3
%patch5 -b .p5
%patch7 -p1 -b .p7
%patch8 -b .p8
%patch10 -b .p10
find . -name *sv_SE* -exec rename --verbose sv_SE sv '{}' \+ find . -name *sv_SE* -exec rename --verbose sv_SE sv '{}' \+
mkdir icons mkdir icons
tar -C icons -j -x -v -f $RPM_SOURCE_DIR/fvwm_icons.tar.bz2 tar -C icons -j -x -v -f $RPM_SOURCE_DIR/fvwm_icons.tar.bz2
cp %{SOURCE6} icons cp %{SOURCE6} icons
cp %{SOURCE7} bin/
#
# build
%build %build
autoreconf -fi autoreconf -fvi
CFLAGS="%{optflags} -fno-strict-aliasing" \
LDFLAGS="-L/usr/%{_lib}" \
%configure \ %configure \
--prefix=%{_xorg7prefix} \
--bindir=%{_prefix}/%{_xorg7bin} \
--sysconfdir=%{_sysconfdir}/X11/fvwm2 \ --sysconfdir=%{_sysconfdir}/X11/fvwm2 \
--libexecdir=%{_xorg7prefix}/lib/X11/fvwm2 \ --libexecdir=%{_prefix}/lib/X11/fvwm2 \
--mandir=%{_xorg7mandir} \ --with-imagepath=%{_datadir}/X11/fvwm2/pixmaps:%{_datadir}/X11/fvwm2/bitmaps:%{_datadir}/pixmaps:%{_datadir}/wallpapers
--x-includes=%{_xorg7prefix}/include \
--x-libraries=%{_xorg7prefix}/%{_lib} \
--with-imagepath=%{_prefix}/%{_xorg7libshare}/X11/fvwm2/pixmaps:%{_prefix}/%{_xorg7libshare}/X11/fvwm2/bitmaps:%{_datadir}/pixmaps:%{_datadir}/wallpapers \
--disable-gtk
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
%make_install %make_install
#make prefix=$RPM_BUILD_ROOT%{_xorg7prefix} \
# sysconfdir=$RPM_BUILD_ROOT/etc/X11/fvwm2 \
# install
#
# default config # default config
install -d -m 755 %{buildroot}%{_sysconfdir}/X11/fvwm2 install -d -m 755 %{buildroot}%{_sysconfdir}/X11/fvwm2
install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/X11/fvwm2/system.fvwm2rc install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/X11/fvwm2/system.fvwm2rc
#
# documentation for modules # documentation for modules
rm -vf sample.fvwmrc/Makefile* sample.fvwmrc/system.fvwm2rc-sample-95 rm -vf sample.fvwmrc/Makefile* sample.fvwmrc/system.fvwm2rc-sample-95
rm -vf docs/Makefile* rm -vf docs/Makefile*
install -d -m 755 docu-module install -d -m 755 docu-module
for i in $(find -name "README*" -not -name "*,v" -and -not -name "*.orig") for i in $(find -name "README*" -not -name "*,v" -and -not -name "*.orig")
@ -148,7 +114,7 @@ do
install -m 644 $i docu-module/README.$(basename "$TMPDIR") install -m 644 $i docu-module/README.$(basename "$TMPDIR")
fi fi
done done
#
# forbidden links # forbidden links
pushd %{buildroot}/ pushd %{buildroot}/
find . -type l -printf '%%P %%l\n' | while read dst src find . -type l -printf '%%P %%l\n' | while read dst src
@ -164,11 +130,11 @@ pushd %{buildroot}/
esac esac
done done
popd popd
#
# icons # icons
install -d -m 755 %{buildroot}%{_prefix}/%{_xorg7libshare}/X11/fvwm2/pixmaps install -d -m 755 %{buildroot}%{_datadir}/X11/fvwm2/pixmaps
install -m 644 icons/* %{buildroot}%{_prefix}/%{_xorg7libshare}/X11/fvwm2/pixmaps install -m 644 icons/* %{buildroot}%{_datadir}/X11/fvwm2/pixmaps
#
# install kdm/gdm entry # install kdm/gdm entry
install -m 0755 -d %{buildroot}%{_datadir}/xsessions/ install -m 0755 -d %{buildroot}%{_datadir}/xsessions/
install -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/xsessions/ install -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/xsessions/
@ -191,15 +157,14 @@ rm -f %{buildroot}/%{_docdir}/fvwm2/README.vms
%doc NEWS docs docu-module/* %doc NEWS docs docu-module/*
%dir %{_sysconfdir}/X11/fvwm2 %dir %{_sysconfdir}/X11/fvwm2
%config %{_sysconfdir}/X11/fvwm2/system.fvwm2rc %config %{_sysconfdir}/X11/fvwm2/system.fvwm2rc
%{_prefix}/%{_xorg7bin}/* %{_bindir}/*
%{_prefix}/%{_xorg7libs32}/X11/fvwm2/* %{_prefix}/lib/X11/fvwm2/*
%{_prefix}/%{_xorg7libshare}/X11/fvwm2/pixmaps/* %{_datadir}/X11/fvwm2/pixmaps/*
#%{_xorg7prefix}/share/locale/*/*/* %dir %{_prefix}/lib/X11/fvwm2
%dir %{_xorg7prefix}/lib/X11/fvwm2 %{_datadir}/fvwm
%{_xorg7prefix}/share/fvwm %dir %{_datadir}/X11/fvwm2
%dir %{_prefix}/%{_xorg7libshare}/X11/fvwm2 %dir %{_datadir}/X11/fvwm2/pixmaps
%dir %{_prefix}/%{_xorg7libshare}/X11/fvwm2/pixmaps %{_mandir}/man1/*
%{_xorg7mandir}/man1/*
%{_datadir}/xsessions/*desktop %{_datadir}/xsessions/*desktop
%changelog %changelog

2
openSuSE.xpm → openSUSE.xpm
View File

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
static char * openSuSE1_xpm[] = { static char * openSUSE1_xpm[] = {
"51 34 2 1", "51 34 2 1",
" c None", " c None",
". c #084404", ". c #084404",

2
system.fvwm2rc
View File

@ -336,7 +336,7 @@ AddToFunc barshellspopupfunc
*FvwmButtons: (Swallow FvwmXeyes 'Exec xeyes -name "FvwmXeyes" -geometry +0+0 -bg grey67 &') *FvwmButtons: (Swallow FvwmXeyes 'Exec xeyes -name "FvwmXeyes" -geometry +0+0 -bg grey67 &')
*FvwmButtons: (Swallow FvwmXclock 'Exec xclock -name "FvwmXclock" -geometry +0+0 -padding 1 -bg rgb:91/ae/d6 &') *FvwmButtons: (Swallow FvwmXclock 'Exec xclock -name "FvwmXclock" -geometry +0+0 -padding 1 -bg rgb:91/ae/d6 &')
*FvwmButtons:(Title "Fvwm2", Icon fvwm.xpm, Action (Mouse 0) Function barthiswmpopupfunc) *FvwmButtons:(Title "Fvwm2", Icon fvwm.xpm, Action (Mouse 0) Function barthiswmpopupfunc)
*FvwmButtons: (Title "openSUSE", Icon openSuSE.xpm, Action (Mouse 0) Function barsusepopupfunc) *FvwmButtons: (Title "openSUSE", Icon openSUSE.xpm, Action (Mouse 0) Function barsusepopupfunc)
*FvwmButtons: (Title "Graphics", Icon gimp.xpm, Action (Mouse 0) Function bargraphicspopupfunc) *FvwmButtons: (Title "Graphics", Icon gimp.xpm, Action (Mouse 0) Function bargraphicspopupfunc)
*FvwmButtons (Title "Tools", Icon toolbox.xpm, Action (Mouse 0) Function bartoolspopupfunc) *FvwmButtons (Title "Tools", Icon toolbox.xpm, Action (Mouse 0) Function bartoolspopupfunc)
*FvwmButtons (Title "Shells", Icon xterm.xpm, Action (Mouse 0) Function barshellspopupfunc) *FvwmButtons (Title "Shells", Icon xterm.xpm, Action (Mouse 0) Function barshellspopupfunc)