136796c6ef
- Update to 2.6.6 * fvwm features: - Support for Russian from Ivan Gayevskiy. - EnvMatch supports infostore variables. - The option "forget" to the Maximize command allows to unmaximize a window without changing its size and position. - Windows shaded to a corner (NW, NE, SW, SE) are reduced to a small square. - New option "!raise" to the WarpToWindow command. - The new extended variables $[wa.x], $[wa.y], $[wa.width], $[wa.height] can be used to get the geometry of the EWMH working area, and $[dwa.x], $[dwa.y], $[dwa.width], $[dwa.height] can be used to get the geometry of the EWMH dynamic working area. - The Resize commands accept "wa" or "da" as a suffix of the width or height value. If present, the value is a percentage of the width or height of the EWMH working area or the EWMH dynamic working area. - Fvwm is much more resilient against applications that flood the window manager with repeated events. * New module features: - FvwmForm supports separator lines. - New FvwmIconMan options: IconAndSelectButton IconAndSelectColorset * Bug fixes: - Provide a wrapper for the deprecation of XKeycodeToKeysym and use XkbKeycodeToKeysym() where appropriate. - fvwm-menu-desktop is re-written and provides better support of the XDG menu specification. OBS-URL: https://build.opensuse.org/request/show/417830 OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/fvwm2?expand=0&rev=33
149 lines
7.9 KiB
Diff
149 lines
7.9 KiB
Diff
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/FvwmIconBox/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 ++-
|
|
fvwm-2.6.6/modules/FvwmTaskBar/Makefile.am | 3 ++-
|
|
fvwm-2.6.6/modules/FvwmWinList/Makefile.am | 3 ++-
|
|
11 files changed, 22 insertions(+), 11 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/FvwmIconBox/Makefile.am
|
|
+++ fvwm-2.6.6/modules/FvwmIconBox/Makefile.am 2016-08-02 14:07:39.785474903 +0000
|
|
@@ -19,7 +19,8 @@ FvwmIconBox_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) $(Xft_CFLAGS) $(xpm_CFLAGS) $(X_CFLAGS) \
|
|
$(iconv_CFLAGS) $(Xrender_CFLAGS) $(Bidi_CFLAGS) $(png_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)
|
|
--- fvwm-2.6.6/modules/FvwmTaskBar/Makefile.am
|
|
+++ fvwm-2.6.6/modules/FvwmTaskBar/Makefile.am 2016-08-02 14:07:39.789474831 +0000
|
|
@@ -20,7 +20,8 @@ config_DATA = \
|
|
LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm -lm $(xpm_LIBS) $(png_LIBS) \
|
|
$(rsvg_LIBS) $(Xft_LIBS) $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 \
|
|
$(X_EXTRA_LIBS) $(Xrender_LIBS) $(Xcursor_LIBS) $(iconv_LIBS) \
|
|
- $(Bidi_LIBS) $(intl_LIBS)
|
|
+ $(Bidi_LIBS) $(intl_LIBS) -lfontconfig
|
|
+ $(Bidi_LIBS) $(intl_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/FvwmWinList/Makefile.am
|
|
+++ fvwm-2.6.6/modules/FvwmWinList/Makefile.am 2016-08-02 14:07:39.785474903 +0000
|
|
@@ -20,7 +20,8 @@ FvwmWinList_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 -lm $(X_EXTRA_LIBS) \
|
|
- $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS)
|
|
+ $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS) -lfontconfig
|
|
+ $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS) -lfontconfig
|
|
|
|
AM_CPPFLAGS = -I$(top_srcdir) $(Xft_CFLAGS) $(X_CFLAGS) $(Xrender_CFLAGS) \
|
|
$(iconv_CFLAGS) $(Bidi_CFLAGS)
|