diff --git a/fvwm-2.5.26-libpng.patch b/fvwm-2.5.26-libpng.patch deleted file mode 100644 index 0659c11..0000000 --- a/fvwm-2.5.26-libpng.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- libs/Fpng.h -+++ libs/Fpng.h -@@ -429,7 +429,7 @@ - #define FPNG_FILLER_AFTER PNG_FILLER_AFTER - #define FPNG_INFO_tRNS PNG_INFO_tRNS - --#define Fpng_check_sig(a,b) png_check_sig(a,b) -+#define Fpng_sig_cmp(a,b,c) png_sig_cmp(a,b,c) - #define Fpng_create_read_struct(a,b,c,d) png_create_read_struct(a,b,c,d) - #define Fpng_create_info_struct(a) png_create_info_struct(a) - #define Fpng_destroy_read_struct(a,b,c) png_destroy_read_struct(a,b,c) -@@ -444,7 +444,7 @@ - #define Fpng_set_packing(a) png_set_packing(a) - #define Fpng_set_gray_to_rgb(a) png_set_gray_to_rgb(a) - #define Fpng_get_bit_depth(a,b) png_get_bit_depth(a,b) --#define Fpng_set_gray_1_2_4_to_8(a) png_set_gray_1_2_4_to_8(a) -+#define Fpng_set_expand_gray_1_2_4_to_8(a) png_set_expand_gray_1_2_4_to_8(a) - #define Fpng_get_valid(a,b,c) png_get_valid(a,b,c) - #define Fpng_read_end(a,b) png_read_end(a,b) - #define Fpng_set_interlace_handling(a) png_set_interlace_handling(a) -@@ -462,7 +462,7 @@ - #define FPNG_FILLER_AFTER 5 - #define FPNG_INFO_tRNS 7 - --#define Fpng_check_sig(a,b) 0 -+#define Fpng_sig_cmp(a,b,c) 0 - #define Fpng_create_read_struct(a,b,c,d) NULL - #define Fpng_create_info_struct(a) NULL - #define Fpng_destroy_read_struct(a,b,c) -@@ -477,7 +477,7 @@ - #define Fpng_set_packing(a) - #define Fpng_set_gray_to_rgb(a) - #define Fpng_get_bit_depth(a,b) 0 --#define Fpng_set_gray_1_2_4_to_8(a) -+#define Fpng_set_expand_gray_1_2_4_to_8(a) - #define Fpng_get_valid(a,b,c) 0 - #define Fpng_read_end(a,b) - #define Fpng_set_interlace_handling(a) 0 ---- libs/PictureImageLoader.c -+++ libs/PictureImageLoader.c -@@ -417,7 +417,7 @@ - return False; - } - fread(buf, 1, FPNG_BYTES_TO_CHECK, f); -- if (!Fpng_check_sig(buf, FPNG_BYTES_TO_CHECK)) -+ if (Fpng_sig_cmp(buf, 0, FPNG_BYTES_TO_CHECK)) - { - fclose(f); - return False; -@@ -503,7 +503,7 @@ - Fpng_set_gray_to_rgb(Fpng_ptr); - if (Fpng_get_bit_depth(Fpng_ptr, Finfo_ptr) < 8) - { -- Fpng_set_gray_1_2_4_to_8(Fpng_ptr); -+ Fpng_set_expand_gray_1_2_4_to_8(Fpng_ptr); - } - } - for (i = 0; i < h; i++) diff --git a/fvwm-2.5.26.tar.bz2 b/fvwm-2.5.26.tar.bz2 deleted file mode 100644 index 7694fba..0000000 --- a/fvwm-2.5.26.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84aca15165f600c5c09095c94b3ad1f0bfe16ba25cf2097f76312a0fba89251d -size 2509177 diff --git a/fvwm-2.6.3.tar.bz2 b/fvwm-2.6.3.tar.bz2 new file mode 100644 index 0000000..d263b94 --- /dev/null +++ b/fvwm-2.6.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8299b8f8d712f95305e51d8e416e3788e35805adcc0bb2e5bcb6cc33db126152 +size 2605294 diff --git a/fvwm2.changes b/fvwm2.changes index a78720a..f7d990a 100644 --- a/fvwm2.changes +++ b/fvwm2.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Tue Jan 3 09:21:43 UTC 2012 - vcizek@suse.com + +- update to 2.6.3 + dropped libpng patch + New features over 2.5.26: + * Support libpng 1.4 and 1.5.0's slightly newer APIs + * New extended variable $[w.visiblename] + * Style matching now honours the window's visible name + * New style InitialMapCommand allows to execute any command when + a window is mapped first. + * New option to PrintInfo, "bindings" which prints out all of the + Key, PointerKey, Mouse and Stroke bindings which fvwm knows about. + * New differentiated options for SnapAttraction when snapping + against screen edges: + * New option to the BugOpts command + * New BugOpts option QtDragnDropWorkaround to work around an oddity + in handling drag-n-drop events to Qt applications. + * New MenuStyle "UniqueHotkeyActivatesImmediate" and its negation + "!UniqueHotkeyActivatesImmediate" to retain the menu until the + user presses one of the menu keybindings to enact that change in + the case where there's only one item defined in the menu at the + specified hotkey. + * New Style commands + * New Resize argument to direction + * Couple of changes to the Move command: + * The EWMH working area is now honoured by default. + * To move a window ignoring the working area, the option "ewmhiwa" + can be used, similar to how the Maximize command works. + * New expansion placeholder $[pointer.screen] to return the screen + number the pointer is on. + ------------------------------------------------------------------- Fri Dec 2 07:36:42 UTC 2011 - coolo@suse.com diff --git a/fvwm2.spec b/fvwm2.spec index 227bac1..766cb0b 100644 --- a/fvwm2.spec +++ b/fvwm2.spec @@ -1,7 +1,7 @@ # # spec file for package fvwm2 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: fvwm2 BuildRequires: automake BuildRequires: freetype2-devel @@ -26,13 +27,13 @@ BuildRequires: pkgconfig BuildRequires: readline-devel BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel -License: GPL-2.0+ -Group: System/GUI/Other Provides: fvwm fvwmicns windowmanager xpmroot Obsoletes: fvwm xpmroot -Version: 2.5.26 +Version: 2.6.3 Release: 0 Summary: Improved Version of FVWM Window Manager +License: GPL-2.0+ +Group: System/GUI/Other Url: http://www.fvwm.org Source0: fvwm-%{version}.tar.bz2 Source1: fvwm_icons.tar.bz2 @@ -43,12 +44,11 @@ Source6: openSuSE.xpm BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: xdg-menu, desktop-data, mktemp, xli Patch0: fvwm-configure.patch -Patch1: fvwm-%{version}-gcc-warnings.patch -Patch2: fvwm-%{version}-ia64.patch -Patch3: fvwm-%{version}-sv_SE.patch -Patch5: fvwm-%{version}-charset_in_title.patch -Patch6: fvwm-2.5.26-libpng.patch -Patch7: fvwm-%{version}-no-copy-dt-needed-entries.patch +Patch1: fvwm-2.5.26-gcc-warnings.patch +Patch2: fvwm-2.5.26-ia64.patch +Patch3: fvwm-2.5.26-sv_SE.patch +Patch5: fvwm-2.5.26-charset_in_title.patch +Patch7: fvwm-2.5.26-no-copy-dt-needed-entries.patch %description FVWM is a virtual desktop window manager for the X Window System. @@ -71,7 +71,6 @@ compatible with the Motif MWM. %patch2 %patch3 %patch5 -%patch6 %patch7 -p1 find . -name *sv_SE* |xargs rename sv_SE sv mkdir icons