Hello community, here is the log from the commit of package fvwm2 for openSUSE:Factory checked in at 2016-08-09 22:15:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fvwm2 (Old) and /work/SRC/openSUSE:Factory/.fvwm2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fvwm2" Changes: -------- --- /work/SRC/openSUSE:Factory/fvwm2/fvwm2.changes 2016-03-08 10:18:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fvwm2.new/fvwm2.changes 2016-08-09 22:15:53.000000000 +0200 @@ -1,0 +2,75 @@ +Tue Aug 2 14:18:11 UTC 2016 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- fvwm-2.6.5-eventcrash.patch fvwm-2.6.5.tar.bz2 fvwm-snapshot.patch New: ---- fvwm-2.6.6.tar.bz2 fvwm-icon-440d675d14412ec0a123d4c977534ab688229148.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fvwm2.spec ++++++ --- /var/tmp/diff_new_pack.jOrjIw/_old 2016-08-09 22:15:55.000000000 +0200 +++ /var/tmp/diff_new_pack.jOrjIw/_new 2016-08-09 22:15:55.000000000 +0200 @@ -17,7 +17,7 @@ Name: fvwm2 -Version: 2.6.5 +Version: 2.6.6 Release: 0 Summary: Improved Version of FVWM Window Manager License: GPL-2.0+ @@ -38,11 +38,9 @@ Patch7: fvwm-2.5.26-no-copy-dt-needed-entries.patch #PATCH-FIX-OPENSUSE Avoid including internal rsvg-cairo.h 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 -#PATCH-FIX-OPENSUSE Update to snapshot 2012/10/11 -Patch42: fvwm-snapshot.patch +#PATCH-FIX-UPSTREAM issue #11 -- pgn/xpm icons with transparent background do not work with 2.6.6 +Patch11: fvwm-icon-440d675d14412ec0a123d4c977534ab688229148.patch BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: libpng-devel @@ -95,18 +93,17 @@ %prep %setup -q -n fvwm-%{version} -%patch42 -%patch0 -%patch1 -%patch2 -%patch3 -%patch5 -%patch7 -p1 +%patch0 -b .p0 +%patch1 -b .p1 +%patch2 -b .p2 +%patch3 -b .p3 +%patch5 -b .p5 +%patch7 -p1 -b .p7 %if 0%{?suse_version} > 1220 -%patch8 +%patch8 -b .p8 %endif -%patch9 -%patch10 +%patch10 -b .p10 +%patch11 -b .p11 -p1 find . -name *sv_SE* |xargs rename sv_SE sv mkdir icons tar -C icons -j -x -v -f $RPM_SOURCE_DIR/fvwm_icons.tar.bz2 @@ -120,7 +117,7 @@ autoreconf -fi CFLAGS="%{optflags} -fno-strict-aliasing" \ LDFLAGS="-L/usr/%{_lib}" \ -./configure \ +%configure \ --prefix=%{_xorg7prefix} \ --bindir=%{_prefix}/%{_xorg7bin} \ --sysconfdir=%{_sysconfdir}/X11/fvwm2 \ @@ -128,7 +125,7 @@ --mandir=%{_xorg7mandir} \ --x-includes=%{_xorg7prefix}/include \ --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 make %{?_smp_mflags} ++++++ fvwm-2.5.26-charset_in_title.patch ++++++ --- /var/tmp/diff_new_pack.jOrjIw/_old 2016-08-09 22:15:55.000000000 +0200 +++ /var/tmp/diff_new_pack.jOrjIw/_new 2016-08-09 22:15:55.000000000 +0200 @@ -1,6 +1,10 @@ +--- + libs/Flocale.c | 2 ++ + 1 file changed, 2 insertions(+) + --- libs/Flocale.c -+++ libs/Flocale.c -@@ -2316,6 +2316,7 @@ ++++ libs/Flocale.c 2016-08-02 13:49:28.893927858 +0000 +@@ -2318,6 +2318,7 @@ void FlocaleGetNameProperty( { return; } @@ -8,7 +12,7 @@ if (text_prop.encoding == XA_STRING) { /* STRING encoding, use this as it is */ -@@ -2324,6 +2325,7 @@ +@@ -2326,6 +2327,7 @@ void FlocaleGetNameProperty( return; } /* not STRING encoding, try to convert XA_COMPOUND_TEXT */ ++++++ fvwm-2.5.26-ia64.patch ++++++ --- /var/tmp/diff_new_pack.jOrjIw/_old 2016-08-09 22:15:55.000000000 +0200 +++ /var/tmp/diff_new_pack.jOrjIw/_new 2016-08-09 22:15:55.000000000 +0200 @@ -1,6 +1,10 @@ +--- + fvwm/stack.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + --- fvwm/stack.c -+++ fvwm/stack.c -@@ -111,7 +111,7 @@ ++++ fvwm/stack.c 2016-08-02 13:46:46.357086943 +0000 +@@ -115,7 +115,7 @@ static void dump_stack_ring(void) t1 = t1->stack_next) { fprintf(stderr," l=%d fw=%p f=0x%08x '%s'\n", t1->layer, @@ -9,7 +13,7 @@ } return; -@@ -199,14 +199,14 @@ +@@ -204,14 +204,14 @@ void verify_stack_ring_consistency(void) fprintf( stderr,"vsrc: window already died:" " fw=%p w=0x%08x '%s'\n", @@ -26,7 +30,7 @@ t1->name.name); dump_stack_ring(); fprintf(stderr,"dumping X stacking order:\n"); -@@ -222,7 +222,7 @@ +@@ -227,7 +227,7 @@ void verify_stack_ring_consistency(void) { fprintf( stderr, " f=0x%08x\n", ++++++ fvwm-2.5.26-no-copy-dt-needed-entries.patch ++++++ --- /var/tmp/diff_new_pack.jOrjIw/_old 2016-08-09 22:15:55.000000000 +0200 +++ /var/tmp/diff_new_pack.jOrjIw/_new 2016-08-09 22:15:55.000000000 +0200 @@ -1,146 +1,148 @@ Index: fvwm-2.5.26/fvwm/Makefile.am =================================================================== ---- fvwm-2.5.26.orig/fvwm/Makefile.am -+++ fvwm-2.5.26/fvwm/Makefile.am -@@ -35,7 +35,7 @@ LDADD = \ +--- + 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 - INCLUDES = \ + AM_CPPFLAGS = \ -I$(top_srcdir) $(stroke_CFLAGS) $(Xft_CFLAGS) \ -Index: fvwm-2.5.26/modules/FvwmButtons/Makefile.am -=================================================================== ---- fvwm-2.5.26.orig/modules/FvwmButtons/Makefile.am -+++ fvwm-2.5.26/modules/FvwmButtons/Makefile.am -@@ -22,7 +22,7 @@ FvwmButtons_DEPENDENCIES = $(top_builddi +--- 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 - 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) -Index: fvwm-2.5.26/modules/FvwmForm/Makefile.am -=================================================================== ---- fvwm-2.5.26.orig/modules/FvwmForm/Makefile.am -+++ fvwm-2.5.26/modules/FvwmForm/Makefile.am -@@ -45,7 +45,8 @@ config_DATA = \ +--- 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 ++ -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) -Index: fvwm-2.5.26/modules/FvwmIconBox/Makefile.am -=================================================================== ---- fvwm-2.5.26.orig/modules/FvwmIconBox/Makefile.am -+++ fvwm-2.5.26/modules/FvwmIconBox/Makefile.am -@@ -19,7 +19,7 @@ FvwmIconBox_DEPENDENCIES = $(top_builddi +--- 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 - 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) -Index: fvwm-2.5.26/modules/FvwmIconMan/Makefile.am -=================================================================== ---- fvwm-2.5.26.orig/modules/FvwmIconMan/Makefile.am -+++ 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 @@ -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 ++ $(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) -Index: fvwm-2.5.26/modules/FvwmIdent/Makefile.am -=================================================================== ---- fvwm-2.5.26.orig/modules/FvwmIdent/Makefile.am -+++ 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 @@ -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 ++ $(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) -Index: fvwm-2.5.26/modules/FvwmPager/Makefile.am -=================================================================== ---- fvwm-2.5.26.orig/modules/FvwmPager/Makefile.am -+++ fvwm-2.5.26/modules/FvwmPager/Makefile.am -@@ -19,7 +19,7 @@ FvwmPager_DEPENDENCIES = $(top_builddir) +--- 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 - 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) -Index: fvwm-2.5.26/modules/FvwmProxy/Makefile.am -=================================================================== ---- fvwm-2.5.26.orig/modules/FvwmProxy/Makefile.am -+++ fvwm-2.5.26/modules/FvwmProxy/Makefile.am -@@ -19,7 +19,7 @@ FvwmProxy_DEPENDENCIES = $(top_builddir) +--- 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 - 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) -Index: fvwm-2.5.26/modules/FvwmScript/Makefile.am -=================================================================== ---- fvwm-2.5.26.orig/modules/FvwmScript/Makefile.am -+++ fvwm-2.5.26/modules/FvwmScript/Makefile.am -@@ -19,7 +19,7 @@ EXTRA_DIST = $(man_MANS) scanner.l scrip +--- 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 - 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) -Index: fvwm-2.5.26/modules/FvwmTaskBar/Makefile.am -=================================================================== ---- fvwm-2.5.26.orig/modules/FvwmTaskBar/Makefile.am -+++ fvwm-2.5.26/modules/FvwmTaskBar/Makefile.am -@@ -20,7 +20,7 @@ config_DATA = \ +--- 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 - 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) \ -Index: fvwm-2.5.26/modules/FvwmWinList/Makefile.am -=================================================================== ---- fvwm-2.5.26.orig/modules/FvwmWinList/Makefile.am -+++ fvwm-2.5.26/modules/FvwmWinList/Makefile.am -@@ -20,7 +20,7 @@ FvwmWinList_DEPENDENCIES = $(top_builddi +--- 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 - 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) ++++++ fvwm-2.5.26-sv_SE.patch ++++++ --- /var/tmp/diff_new_pack.jOrjIw/_old 2016-08-09 22:15:55.000000000 +0200 +++ /var/tmp/diff_new_pack.jOrjIw/_new 2016-08-09 22:15:55.000000000 +0200 @@ -1,11 +1,15 @@ +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + --- configure.ac -+++ configure.ac -@@ -923,7 +923,7 @@ ++++ configure.ac 2016-08-02 13:48:41.090857180 +0000 +@@ -1272,7 +1272,7 @@ AC_ARG_ENABLE(perllib, AC_SUBST(FVWM_PERLLIB) # ******* gettext --ALL_LINGUAS="ar de fr sv_SE zh_CN" -+ALL_LINGUAS="ar de fr sv zh_CN" +-ALL_LINGUAS="ar de fr sv_SE zh_CN ru es" ++ALL_LINGUAS="ar de fr sv zh_CN ru es" FVWM_DOMAIN="fvwm" FVWMTASKBAR_DOMAIN="FvwmTaskBar" FVWMSCRIPT_DOMAIN="FvwmScript" ++++++ fvwm-2.6.5.tar.bz2 -> fvwm-2.6.6.tar.bz2 ++++++ ++++ 75371 lines of diff (skipped) ++++++ fvwm-icon-440d675d14412ec0a123d4c977534ab688229148.patch ++++++ >From 65bfccfd9ed0cac95088d612fdcdf3edf4c3b23d Mon Sep 17 00:00:00 2001 From: Thomas Adam <[email protected]> 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; ++++++ fvwm-rsvg.patch ++++++ --- /var/tmp/diff_new_pack.jOrjIw/_old 2016-08-09 22:15:57.000000000 +0200 +++ /var/tmp/diff_new_pack.jOrjIw/_new 2016-08-09 22:15:57.000000000 +0200 @@ -1,30 +1,46 @@ ---- configure -+++ configure 2013-07-18 11:31:57.449439339 +0000 -@@ -9461,7 +9461,6 @@ else - /* end confdefs.h. */ - +--- + configure | 1 - + configure.ac | 1 - + libs/Fsvg.h | 11 ----------- + 3 files changed, 13 deletions(-) + +--- configure.ac ++++ configure.ac 2016-08-02 15:14:24.251904702 +0000 +@@ -941,7 +941,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.ac -+++ configure.ac 2013-07-18 11:32:12.985439431 +0000 -@@ -941,7 +941,6 @@ if test x"$with_rsvg" = xyes ; then - LIBS="$LIBS $rsvg_LIBS" - AC_TRY_RUN([ +--- 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-cairo.h> int main() { RsvgHandle *rsvg; g_type_init(); --- libs/Fsvg.h -+++ libs/Fsvg.h 2013-07-18 11:31:31.785438953 +0000 -@@ -15,7 +15,6 @@ ++++ libs/Fsvg.h 2016-08-02 15:15:16.350925785 +0000 +@@ -15,17 +15,6 @@ #if USE_SVG # include <librsvg/rsvg.h> --# include <librsvg/rsvg-cairo.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> +-# endif +-# else +-# include <librsvg/rsvg-cairo.h> +-# endif typedef RsvgDimensionData FRsvgDimensionData; typedef RsvgHandle FRsvgHandle; + typedef cairo_surface_t Fcairo_surface_t;
