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

Accepting request 417839 from X11:windowmanagers

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/417839
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fvwm2?expand=0&rev=49
This commit is contained in:
Dominique Leuenberger 2016-08-09 20:15:48 +00:00 committed by Git OBS Bridge
commit 6c0112aba3
12 changed files with 296 additions and 14602 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fvwm-2.5.26-charset_in_title.patch
View File

@ -1,6 +1,10 @@
---
libs/Flocale.c | 2 ++
1 file changed, 2 insertions(+)
--- libs/Flocale.c --- libs/Flocale.c
+++ libs/Flocale.c +++ libs/Flocale.c 2016-08-02 13:49:28.893927858 +0000
@@ -2316,6 +2316,7 @@ @@ -2318,6 +2318,7 @@ void FlocaleGetNameProperty(
{ {
return; return;
} }
@ -8,7 +12,7 @@
if (text_prop.encoding == XA_STRING) if (text_prop.encoding == XA_STRING)
{ {
/* STRING encoding, use this as it is */ /* STRING encoding, use this as it is */
@@ -2324,6 +2325,7 @@ @@ -2326,6 +2327,7 @@ void FlocaleGetNameProperty(
return; return;
} }
/* not STRING encoding, try to convert XA_COMPOUND_TEXT */ /* not STRING encoding, try to convert XA_COMPOUND_TEXT */

12
fvwm-2.5.26-ia64.patch
View File

@ -1,6 +1,10 @@
---
fvwm/stack.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- fvwm/stack.c --- fvwm/stack.c
+++ fvwm/stack.c +++ fvwm/stack.c 2016-08-02 13:46:46.357086943 +0000
@@ -111,7 +111,7 @@ @@ -115,7 +115,7 @@ static void dump_stack_ring(void)
t1 = t1->stack_next) t1 = t1->stack_next)
{ {
fprintf(stderr," l=%d fw=%p f=0x%08x '%s'\n", t1->layer, fprintf(stderr," l=%d fw=%p f=0x%08x '%s'\n", t1->layer,
@ -9,7 +13,7 @@
} }
return; return;
@@ -199,14 +199,14 @@ @@ -204,14 +204,14 @@ void verify_stack_ring_consistency(void)
fprintf( fprintf(
stderr,"vsrc: window already died:" stderr,"vsrc: window already died:"
" fw=%p w=0x%08x '%s'\n", " fw=%p w=0x%08x '%s'\n",
@ -26,7 +30,7 @@
t1->name.name); t1->name.name);
dump_stack_ring(); dump_stack_ring();
fprintf(stderr,"dumping X stacking order:\n"); fprintf(stderr,"dumping X stacking order:\n");
@@ -222,7 +222,7 @@ @@ -227,7 +227,7 @@ void verify_stack_ring_consistency(void)
{ {
fprintf( fprintf(
stderr, " f=0x%08x\n", stderr, " f=0x%08x\n",

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

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

12
fvwm-2.5.26-sv_SE.patch
View File

@ -1,11 +1,15 @@
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- configure.ac --- configure.ac
+++ configure.ac +++ configure.ac 2016-08-02 13:48:41.090857180 +0000
@@ -923,7 +923,7 @@ @@ -1272,7 +1272,7 @@ AC_ARG_ENABLE(perllib,
AC_SUBST(FVWM_PERLLIB) AC_SUBST(FVWM_PERLLIB)
# ******* gettext # ******* gettext
-ALL_LINGUAS="ar de fr sv_SE zh_CN" -ALL_LINGUAS="ar de fr sv_SE zh_CN ru es"
+ALL_LINGUAS="ar de fr sv zh_CN" +ALL_LINGUAS="ar de fr sv zh_CN ru es"
FVWM_DOMAIN="fvwm" FVWM_DOMAIN="fvwm"
FVWMTASKBAR_DOMAIN="FvwmTaskBar" FVWMTASKBAR_DOMAIN="FvwmTaskBar"
FVWMSCRIPT_DOMAIN="FvwmScript" FVWMSCRIPT_DOMAIN="FvwmScript"

12
fvwm-2.6.5-eventcrash.patch
View File

@ -1,12 +0,0 @@
--- fvwm/events.c
+++ fvwm/events.c 2013-07-24 10:29:01.563288010 +0000
@@ -3383,8 +3383,7 @@ void HandlePropertyNotify(const evh_args
* if the icon name is NoName, set the name of the icon to be
* the same as the window
*/
- if (!WAS_ICON_NAME_PROVIDED(fw) || (fw->icon_name.name &&
- (fw->icon_name.name != fw->name.name)))
+ if (!WAS_ICON_NAME_PROVIDED(fw))
{
fw->icon_name = fw->name;
setup_visible_name(fw, True);

3
fvwm-2.6.5.tar.bz2
View File

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

3
fvwm-2.6.6.tar.bz2 Normal file
View File

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

80
fvwm-icon-440d675d14412ec0a123d4c977534ab688229148.patch Normal file
View File

@ -0,0 +1,80 @@
From 65bfccfd9ed0cac95088d612fdcdf3edf4c3b23d Mon Sep 17 00:00:00 2001
From: Thomas Adam <thomas@fvwm.org>
Date: Thu, 4 Aug 2016 11:38:52 +0100
Subject: [PATCH] Expose: don't flush accumulated events
When dealing with Expose events, don't ever flush the accumulated ones; the
handling of the queue here is incorrect, and ultimately gets addressed during
other operations.
This should help fix the problem of ParentRelative icon pixmaps from
corrupting other icons, etc.
---
fvwm/events.c | 13 +------------
fvwm/icons.c | 15 ++++-----------
fvwm/menus.c | 1 -
3 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/fvwm/events.c b/fvwm/events.c
index 3ea69bb..1d5bb64 100644
--- a/fvwm/events.c
+++ b/fvwm/events.c
@@ -2412,18 +2412,7 @@ void HandleExpose(const evh_args_t *ea)
FvwmWindow * const fw = ea->exc->w.fw;
e = *ea->exc->x.etrigger;
-#if 0
- /* This doesn't work well. Sometimes, the expose count is zero although
- * dozens of expose events are pending. This happens all the time
- * during a shading animation. Simply flush expose events
- * unconditionally. */
- if (e.xexpose.count != 0)
- {
- flush_accumulate_expose(e.xexpose.window, &e);
- }
-#else
- flush_accumulate_expose(e.xexpose.window, &e);
-#endif
+
if (fw == NULL)
{
return;
diff --git a/fvwm/icons.c b/fvwm/icons.c
index a58a019..d23f08d 100644
--- a/fvwm/icons.c
+++ b/fvwm/icons.c
@@ -1366,18 +1366,11 @@ void DrawIconWindow(
if (draw_title && FW_W_ICON_TITLE(fw) != None)
{
- if (pev && pev->xexpose.window != FW_W_ICON_TITLE(fw))
+ if (pev && pev->xexpose.window == FW_W_ICON_TITLE(fw))
{
- XEvent e;
- if (FCheckTypedWindowEvent(
- dpy, FW_W_ICON_TITLE(fw), Expose, &e))
- {
- flush_accumulate_expose(
- FW_W_ICON_TITLE(fw), &e);
- DrawIconTitleWindow(
- fw, &e, BackColor, Shadow, Relief, cs,
- title_cs);
- }
+ DrawIconTitleWindow(
+ fw, pev, BackColor, Shadow, Relief, cs,
+ title_cs);
}
else
{
diff --git a/fvwm/menus.c b/fvwm/menus.c
index 885eada..2c49195 100644
--- a/fvwm/menus.c
+++ b/fvwm/menus.c
@@ -6239,7 +6239,6 @@ Bool menu_expose(XEvent *event, FvwmWindow *fw)
dpy, event->xany.window, MenuContext, (caddr_t *)&mr) !=
XCNOENT))
{
- flush_accumulate_expose(event->xany.window, event);
paint_menu(mr, event, fw);
return True;

42
fvwm-rsvg.patch
View File

@ -1,30 +1,46 @@
--- configure ---
+++ configure 2013-07-18 11:31:57.449439339 +0000 configure | 1 -
@@ -9461,7 +9461,6 @@ else configure.ac | 1 -
/* end confdefs.h. */ libs/Fsvg.h | 11 -----------
3 files changed, 13 deletions(-)
#include <librsvg/rsvg.h>
- #include <librsvg/rsvg-cairo.h>
int main() {
RsvgHandle *rsvg;
g_type_init();
--- configure.ac --- configure.ac
+++ configure.ac 2013-07-18 11:32:12.985439431 +0000 +++ configure.ac 2016-08-02 15:14:24.251904702 +0000
@@ -941,7 +941,6 @@ if test x"$with_rsvg" = xyes ; then @@ -941,7 +941,6 @@ if test x"$with_rsvg" = xyes ; then
LIBS="$LIBS $rsvg_LIBS" LIBS="$LIBS $rsvg_LIBS"
AC_TRY_RUN([ AC_TRY_RUN([
#include <librsvg/rsvg.h>
- #include <librsvg/rsvg-cairo.h>
int main() {
RsvgHandle *rsvg;
g_type_init();
--- configure
+++ configure 2016-08-02 15:14:24.255904627 +0000
@@ -9746,7 +9746,6 @@ else
/* end confdefs.h. */
#include <librsvg/rsvg.h> #include <librsvg/rsvg.h>
- #include <librsvg/rsvg-cairo.h> - #include <librsvg/rsvg-cairo.h>
int main() { int main() {
RsvgHandle *rsvg; RsvgHandle *rsvg;
g_type_init(); g_type_init();
--- libs/Fsvg.h --- libs/Fsvg.h
+++ libs/Fsvg.h 2013-07-18 11:31:31.785438953 +0000 +++ libs/Fsvg.h 2016-08-02 15:15:16.350925785 +0000
@@ -15,7 +15,6 @@ @@ -15,17 +15,6 @@
#if USE_SVG #if USE_SVG
# include <librsvg/rsvg.h> # include <librsvg/rsvg.h>
-/* TA: (2013-05-07): If the version is >= 2.36.2 then we no longer include
- * the rsvg-cairo header. It is now only necessary with RSvg to include
- * <rsvg.h> and nothing else.
- */
-# if defined (LIBRSVG_CHECK_VERSION)
-# if LIBRSVG_CHECK_VERSION (2, 36, 1)
-# include <librsvg/rsvg-cairo.h> -# include <librsvg/rsvg-cairo.h>
-# endif
-# else
-# include <librsvg/rsvg-cairo.h>
-# endif
typedef RsvgDimensionData FRsvgDimensionData; typedef RsvgDimensionData FRsvgDimensionData;
typedef RsvgHandle FRsvgHandle; typedef RsvgHandle FRsvgHandle;
typedef cairo_surface_t Fcairo_surface_t;

14476
fvwm-snapshot.patch
View File

File diff suppressed because it is too large Load Diff

75
fvwm2.changes
View File

@ -1,3 +1,78 @@
-------------------------------------------------------------------
Tue Aug 2 14:18:11 UTC 2016 - werner@suse.de
- 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.
- Fix fvwm-menu-desktop keyError bug. Use "others" if no desktop
environment found.
- FvwmIconMan had problems displaying the hilight colour on some
systems (64 bit issue?).
- Globally active windows cannot take the focus if the style
forbids programs to take focus themselves (style
!FPFocusByProgram).
- Windows no longer jump from one position to the other which
could happen in some cases with SnapAttraction. Windows now
snap to the closest window (or screen edge).
- Removing bindings had several strange side effects that are
fixed now (removing too many bindings; old bindings showing up
again after another is removed; possibly other effects).
- Windows sometimes did not get expose events (i.e. did not
redraw properly) if they were uncovered by moving a window
above them. This has been fixed.
- FvwmConsole now causes much less network traffic.
- Suppress bogus events sent to the modules when a window is
resized with the mouse.
- Properly handle the has_ref_window_moved flag for ResizeMove and
ResizeMoveMaximize.
- Removed some unnecessary redraws in FvwmPager.
- The option "NoDeskLimitY" option of the GotoPage command did
not work.
- Negative coordinates in the "rectangle" option to the Menu
commend did not work correctly. This has been fixed.
- Removes a slight graphics problem whith the ResizeMaximize
command being invoked from a window button menu.
- When an attempt to reparent a client window (i.e. decorate
it) fails, fvwm no longer throws away all events but only the
events for that window.
- The ChangeButton command of FvwmButtons used to strip
whitespace from the beginning and end of button titles and
image paths. This is no longer done.
- Remove patches now upstream
fvwm-2.6.5-eventcrash.patch
fvwm-rsvg.patch
fvwm-snapshot.patch
- Add upstream patch
fvwm-icon-440d675d14412ec0a123d4c977534ab688229148.patch
Expose: don't flush accumulated events
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 3 14:03:06 UTC 2016 - mvetter@suse.com Thu Mar 3 14:03:06 UTC 2016 - mvetter@suse.com

31
fvwm2.spec
View File

@ -17,7 +17,7 @@
Name: fvwm2 Name: fvwm2
Version: 2.6.5 Version: 2.6.6
Release: 0 Release: 0
Summary: Improved Version of FVWM Window Manager Summary: Improved Version of FVWM Window Manager
License: GPL-2.0+ License: GPL-2.0+
@ -38,11 +38,9 @@ Patch5: fvwm-2.5.26-charset_in_title.patch
Patch7: fvwm-2.5.26-no-copy-dt-needed-entries.patch Patch7: fvwm-2.5.26-no-copy-dt-needed-entries.patch
#PATCH-FIX-OPENSUSE Avoid including internal rsvg-cairo.h #PATCH-FIX-OPENSUSE Avoid including internal rsvg-cairo.h
Patch8: fvwm-rsvg.patch Patch8: fvwm-rsvg.patch
#PATCH-FIX-UPSTREAM Avoid crash due freeing inot set icon names
Patch9: fvwm-2.6.5-eventcrash.patch
Patch10: fvwm-no-date-time.patch Patch10: fvwm-no-date-time.patch
#PATCH-FIX-OPENSUSE Update to snapshot 2012/10/11 #PATCH-FIX-UPSTREAM issue #11 -- pgn/xpm icons with transparent background do not work with 2.6.6
Patch42: fvwm-snapshot.patch Patch11: fvwm-icon-440d675d14412ec0a123d4c977534ab688229148.patch
BuildRequires: automake BuildRequires: automake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libpng-devel BuildRequires: libpng-devel
@ -95,18 +93,17 @@ compatible with the Motif MWM.
%prep %prep
%setup -q -n fvwm-%{version} %setup -q -n fvwm-%{version}
%patch42 %patch0 -b .p0
%patch0 %patch1 -b .p1
%patch1 %patch2 -b .p2
%patch2 %patch3 -b .p3
%patch3 %patch5 -b .p5
%patch5 %patch7 -p1 -b .p7
%patch7 -p1
%if 0%{?suse_version} > 1220 %if 0%{?suse_version} > 1220
%patch8 %patch8 -b .p8
%endif %endif
%patch9 %patch10 -b .p10
%patch10 %patch11 -b .p11 -p1
find . -name *sv_SE* |xargs rename sv_SE sv find . -name *sv_SE* |xargs rename 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
@ -120,7 +117,7 @@ cp %{SOURCE7} bin/
autoreconf -fi autoreconf -fi
CFLAGS="%{optflags} -fno-strict-aliasing" \ CFLAGS="%{optflags} -fno-strict-aliasing" \
LDFLAGS="-L/usr/%{_lib}" \ LDFLAGS="-L/usr/%{_lib}" \
./configure \ %configure \
--prefix=%{_xorg7prefix} \ --prefix=%{_xorg7prefix} \
--bindir=%{_prefix}/%{_xorg7bin} \ --bindir=%{_prefix}/%{_xorg7bin} \
--sysconfdir=%{_sysconfdir}/X11/fvwm2 \ --sysconfdir=%{_sysconfdir}/X11/fvwm2 \
@ -128,7 +125,7 @@ LDFLAGS="-L/usr/%{_lib}" \
--mandir=%{_xorg7mandir} \ --mandir=%{_xorg7mandir} \
--x-includes=%{_xorg7prefix}/include \ --x-includes=%{_xorg7prefix}/include \
--x-libraries=%{_xorg7prefix}/%{_lib} \ --x-libraries=%{_xorg7prefix}/%{_lib} \
--with-imagepath=%{_prefix}/%{_xorg7libshare}/X11/fvwm2/pixmaps:%{_prefix}/%{_xorg7libshare}/X11/fvwm2/bitmaps:%{_datadir}/wallpapers \ --with-imagepath=%{_prefix}/%{_xorg7libshare}/X11/fvwm2/pixmaps:%{_prefix}/%{_xorg7libshare}/X11/fvwm2/bitmaps:%{_datadir}/pixmaps:%{_datadir}/wallpapers \
--disable-gtk --disable-gtk
make %{?_smp_mflags} make %{?_smp_mflags}