From ec240538844fc8ebf2fe6f51daae71aa8222359d09a66bbd473e31c8571ac690 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 2 Oct 2007 22:53:10 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fvwm2?expand=0&rev=13 --- fvwm-2.5.21-string_compar.patch | 171 ------------------ fvwm-2.5.21.tar.bz2 | 3 - ...gs.patch => fvwm-2.5.23-gcc-warnings.patch | 8 +- ....5.21-ia64.patch => fvwm-2.5.23-ia64.patch | 0 ....21-sv_SE.patch => fvwm-2.5.23-sv_SE.patch | 0 ...ng.patch => fvwm-2.5.23-utf_encoding.patch | 5 +- fvwm-2.5.23.tar.bz2 | 3 + fvwm2.changes | 81 +++++++++ fvwm2.spec | 120 ++++++++++-- 9 files changed, 197 insertions(+), 194 deletions(-) delete mode 100644 fvwm-2.5.21-string_compar.patch delete mode 100644 fvwm-2.5.21.tar.bz2 rename fvwm-2.5.21-gcc-warnings.patch => fvwm-2.5.23-gcc-warnings.patch (59%) rename fvwm-2.5.21-ia64.patch => fvwm-2.5.23-ia64.patch (100%) rename fvwm-2.5.21-sv_SE.patch => fvwm-2.5.23-sv_SE.patch (100%) rename fvwm-2.5.21-utf_encoding.patch => fvwm-2.5.23-utf_encoding.patch (89%) create mode 100644 fvwm-2.5.23.tar.bz2 diff --git a/fvwm-2.5.21-string_compar.patch b/fvwm-2.5.21-string_compar.patch deleted file mode 100644 index c5bb04e..0000000 --- a/fvwm-2.5.21-string_compar.patch +++ /dev/null @@ -1,171 +0,0 @@ ---- fvwm/builtins.c -+++ fvwm/builtins.c -@@ -2884,7 +2884,7 @@ - int ret; - unsigned long argument, data1 = 0, data2 = 0; - -- if (action == NULL || action == "\0") -+ if (action == NULL || action[0] == '\0') - { - return; - } ---- libs/Flocale.c -+++ libs/Flocale.c -@@ -1066,21 +1066,22 @@ - FftFontType *fftf = NULL; - FlocaleFont *flf = NULL; - char *fn, *hints = NULL; -+ char *fallback_font = FLOCALE_FFT_FALLBACK_FONT; - - hints = GetQuotedString(fontname, &fn, "/", NULL, NULL, NULL); - if (fn == NULL) - { -- fn = FLOCALE_FFT_FALLBACK_FONT; -+ fn = fallback_font; - } - else if (*fn == '\0') - { - free(fn); -- fn = FLOCALE_FFT_FALLBACK_FONT; -+ fn = fallback_font; - } - fftf = FftGetFont(dpy, fn, module); - if (fftf == NULL) - { -- if (fn != NULL && fn != FLOCALE_FFT_FALLBACK_FONT) -+ if (fn != NULL && fn != fallback_font) - { - free(fn); - } -@@ -1095,7 +1096,7 @@ - &flf->fftf, &flf->height, &flf->ascent, &flf->descent); - FftGetFontWidths(flf, &flf->max_char_width); - free(fftf); -- if (fn != NULL && fn != FLOCALE_FFT_FALLBACK_FONT) -+ if (fn != NULL && fn != fallback_font) - { - free(fn); - } -@@ -1115,16 +1116,17 @@ - char *ds; - XFontSetExtents *fset_extents; - char *fn, *hints = NULL, *fn_fixed = NULL; -+ char *fallback_font = FLOCALE_MB_FALLBACK_FONT; - - hints = GetQuotedString(fontname, &fn, "/", NULL, NULL, NULL); - if (*fn == '\0') - { - free(fn); -- fn = fn_fixed = FLOCALE_MB_FALLBACK_FONT; -+ fn = fn_fixed = fallback_font; - } - else if (!(fn_fixed = FlocaleFixNameForFontSet(dpy, fn, module))) - { -- if (fn != NULL && fn != FLOCALE_MB_FALLBACK_FONT) -+ if (fn != NULL && fn != fallback_font) - { - free(fn); - } -@@ -1136,7 +1138,7 @@ - { - free(fn_fixed); - } -- if (fn != NULL && fn != FLOCALE_MB_FALLBACK_FONT) -+ if (fn != NULL && fn != fallback_font) - { - free(fn); - } -@@ -1185,7 +1187,7 @@ - { - free(fn_fixed); - } -- if (fn != NULL && fn != FLOCALE_MB_FALLBACK_FONT) -+ if (fn != NULL && fn != fallback_font) - { - free(fn); - } -@@ -1201,6 +1203,7 @@ - FlocaleFont *flf; - char *str,*fn,*tmp; - char *hints = NULL; -+ char *fallback_font = FLOCALE_FALLBACK_FONT; - - hints = GetQuotedString(fontname, &tmp, "/", NULL, NULL, NULL); - str = GetQuotedString(tmp, &fn, ",", NULL, NULL, NULL); -@@ -1209,10 +1212,10 @@ - if (*fn == '\0') - { - free(fn); -- fn = FLOCALE_FALLBACK_FONT; -+ fn = fallback_font; - } - font = XLoadQueryFont(dpy, fn); -- if (fn != NULL && fn != FLOCALE_FALLBACK_FONT) -+ if (fn != NULL && fn != fallback_font) - { - free(fn); - fn = NULL; -@@ -1224,7 +1227,7 @@ - } - if (font == NULL) - { -- if (fn != NULL && fn != FLOCALE_FALLBACK_FONT) -+ if (fn != NULL && fn != fallback_font) - { - free(fn); - } -@@ -1248,7 +1251,7 @@ - flf->max_char_width = font->max_bounds.width; - if (flf->font->max_byte1 > 0) - flf->flags.is_mb = True; -- if (fn != NULL && fn != FLOCALE_FALLBACK_FONT) -+ if (fn != NULL && fn != fallback_font) - { - free(fn); - } -@@ -1382,6 +1385,8 @@ - int shadow_offset = 0; - int shadow_dir = MULTI_DIR_SE; - int i; -+ char *mb_fallback_font = FLOCALE_MB_FALLBACK_FONT; -+ char *fallback_font = FLOCALE_FALLBACK_FONT; - - /* removing quoting for modules */ - if (fontname && (t = strchr("\"'`", *fontname))) -@@ -1395,7 +1400,7 @@ - if (fontname == NULL || *fontname == 0) - { - ask_default = True; -- fontname = FLOCALE_MB_FALLBACK_FONT; -+ fontname = mb_fallback_font; - } - - while (flf) -@@ -1454,14 +1459,14 @@ - } - else - { -- fn = FLOCALE_MB_FALLBACK_FONT; -+ fn = mb_fallback_font; - } - while (!flf && (fn && *fn)) - { - flf = FlocaleGetFontOrFontSet( - dpy, fn, encoding, fontname, module); -- if (fn != NULL && fn != FLOCALE_MB_FALLBACK_FONT && -- fn != FLOCALE_FALLBACK_FONT) -+ if (fn != NULL && fn != mb_fallback_font && -+ fn != fallback_font) - { - free(fn); - fn = NULL; -@@ -1471,8 +1476,7 @@ - str = GetQuotedString(str, &fn, ";", NULL, NULL, NULL); - } - } -- if (fn != NULL && fn != FLOCALE_MB_FALLBACK_FONT && -- fn != FLOCALE_FALLBACK_FONT) -+ if (fn != NULL && fn != mb_fallback_font && fn != fallback_font) - { - free(fn); - } diff --git a/fvwm-2.5.21.tar.bz2 b/fvwm-2.5.21.tar.bz2 deleted file mode 100644 index 2b7f1b4..0000000 --- a/fvwm-2.5.21.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5549a3ad693f9ab523653738e493e95418626a6d2fd52465ce200ae4116b8800 -size 2062532 diff --git a/fvwm-2.5.21-gcc-warnings.patch b/fvwm-2.5.23-gcc-warnings.patch similarity index 59% rename from fvwm-2.5.21-gcc-warnings.patch rename to fvwm-2.5.23-gcc-warnings.patch index f67abf4..2395746 100644 --- a/fvwm-2.5.21-gcc-warnings.patch +++ b/fvwm-2.5.23-gcc-warnings.patch @@ -1,11 +1,11 @@ --- libs/Flocale.c +++ libs/Flocale.c -@@ -419,7 +419,7 @@ - int **l_to_v) +@@ -427,7 +427,7 @@ { char *str1, *str2, *str3; -- int len1 = len, len2; -+ int len1 = len, len2 = 0; + int len1; +- int len2; ++ int len2 = 0; int i; Bool do_iconv = True; const char *bidi_charset; diff --git a/fvwm-2.5.21-ia64.patch b/fvwm-2.5.23-ia64.patch similarity index 100% rename from fvwm-2.5.21-ia64.patch rename to fvwm-2.5.23-ia64.patch diff --git a/fvwm-2.5.21-sv_SE.patch b/fvwm-2.5.23-sv_SE.patch similarity index 100% rename from fvwm-2.5.21-sv_SE.patch rename to fvwm-2.5.23-sv_SE.patch diff --git a/fvwm-2.5.21-utf_encoding.patch b/fvwm-2.5.23-utf_encoding.patch similarity index 89% rename from fvwm-2.5.21-utf_encoding.patch rename to fvwm-2.5.23-utf_encoding.patch index ac6a38a..2b033e3 100644 --- a/fvwm-2.5.21-utf_encoding.patch +++ b/fvwm-2.5.23-utf_encoding.patch @@ -1,11 +1,12 @@ --- libs/FlocaleCharset.c +++ libs/FlocaleCharset.c -@@ -522,7 +522,7 @@ +@@ -521,7 +521,7 @@ } - if (FLCXOMCharsetList_num > 0 && FLCXOMCharsetList[0]) + { - FLCXOMCharset = FLCXOMCharsetList[0]; + FLCXOMCharset = FLCXOMCharsetList[FLCXOMCharsetList_num - 1]; + } #endif } diff --git a/fvwm-2.5.23.tar.bz2 b/fvwm-2.5.23.tar.bz2 new file mode 100644 index 0000000..cd00aa5 --- /dev/null +++ b/fvwm-2.5.23.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db2cbb97df9191faf4cedb49e0845bb69782e2291e090331d58aa5268b1f3f3e +size 2513623 diff --git a/fvwm2.changes b/fvwm2.changes index ce3de1e..21c3171 100644 --- a/fvwm2.changes +++ b/fvwm2.changes @@ -1,3 +1,84 @@ +------------------------------------------------------------------- +Tue Sep 25 16:23:14 CEST 2007 - lmichnovic@suse.cz + +- excluding useless file README.vms +- file list with %lang (macro find_lang is hard to use for fvwm) +- added gnome-libs-devel (/usr/bin/gnome-config) and librsvg into + BuildReq to enable more features + +------------------------------------------------------------------- +Tue Sep 25 14:16:47 CEST 2007 - lmichnovic@suse.cz + +- update to version 2.5.23 + - obsoletes *string_compar.patch + - fixes segfault on dual core processors [#304236] +- New Features in 2.5.23 cumulative with 2.5.22: + - New Style command options: + StartShaded + UnderMousePlacementHonorsStartsOnPage + UnderMousePlacementIgnoresStartsOnPage + !MinOverlapPlacementPenalties + !MinOverlapPercentPlacementPenalties + MinWindowSize + - SVG (scalable vector graphics) image loading support. + - New extended variables + $[w.iconfile.svgopts] + $[w.miniiconfile.svgopts]. + - Added suffix 'w' to the arguments of the Move command and + similar. It is now possible to add multiple shifts to a + window position, e.g. "50-50w 50-50w" for the center of the + screen. + - Removed UnderMousePlacement and CenterPlacement. Use + "PositionPlacement Center" and "PositionPlacement UnderMouse" + instead. + - Documentation in HTML format. + - Replaced "UseListSkip" with "UseSkipList" & "OnlyListSkip" with + "OnlySkipList" in WindowList command. (Old options deprecated.) + - New subject ImageCache for PrintInfo command. + - The new commad EchoFuncDefinition prints a function's + definition to the console for debugging purposes. + - The CursorStyle command can now load PNG and SVG images as + mouse cursors. New x and y arguments to specify the + hot spot. Also, it is now possible to load non-monochrome + cursors and cursors with partial transparency. +- New module features: + - FvwmScript: New instructions: ChangeWindowTitle and + ChangeWindowTitleFromArg. +- Bug Fixes: + - Windows with aspect ratio no longer maximize past the screen + edges. + - Fixed CenterPlacement with Xinerama screens. + - Fixed CascadePlacement with title direction west and east + - Windows no longer unstick when going to fullscreen mode. + - Fixed crash when raising/lowering a destroyed window. + - Fixed expansion of $[n-] and $[*], broken in 2.5.20. + - Fixes for resizing shaded windows and windows with a gravity + other than northwest. + - Fixed CursorStyle POSITION, broken since 2.3.24. + - The hi, sh and fgsh colors in colorsets are no longer replaced + by computed values if not explicit set on the same line as the + bg, or for fgsh fg, changes. (bug #3359) + - FvwmButtons now redraws stretched button backgrounds correctly + on partial expose. + - Windows with circular transient for hints may no longer crash + fvwm with StackTransientParent style. + - FvwmPager now displays windows that are StickyAcrossPages + correctly. + - Fixed a possible crash with modules closing down. + - Fixed broken demo script fvwm_make_browse_menu.sh. + - The conditon following a comma separator without whitespace + padding was previously ignored if the presiding condition was + multi-worded. + - Various FvwmButtons drawing problems. + - Window movement or resizing triggered by an EWMH message now + honours the FixedSize and FixedPosition window styles. + - Properly generate leave_window and enter_window events for + the root window in FvwmEvent. + - Fixed crash in UTF8 code. + - Fixed parsing of the PropertyChange command. + - Fixed windowlist crash when combining CurrentAtEnd with + IconifiedAtEnd and all windows are iconified. + ------------------------------------------------------------------- Fri Aug 10 16:40:43 CEST 2007 - dmueller@suse.de diff --git a/fvwm2.spec b/fvwm2.spec index eb50d36..cbe4902 100644 --- a/fvwm2.spec +++ b/fvwm2.spec @@ -1,5 +1,5 @@ # -# spec file for package fvwm2 (Version 2.5.21) +# spec file for package fvwm2 (Version 2.5.23) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,17 +11,17 @@ # norootforbuild Name: fvwm2 -BuildRequires: freetype2-devel fribidi-devel gcc-c++ gtk-devel gtkdoc imlib-config imlib-devel libpng-devel libstroke-devel pkgconfig readline-devel update-desktop-files +BuildRequires: freetype2-devel fribidi-devel gcc-c++ gnome-libs-devel gtk-devel gtkdoc imlib-config imlib-devel libpng-devel librsvg-devel libstroke-devel pkgconfig readline-devel update-desktop-files License: GPL v2 or later Group: System/GUI/Other -Provides: fvwmicns windowmanager xpmroot +Provides: fvwm fvwmicns windowmanager xpmroot Obsoletes: fvwm xpmroot -Autoreqprov: on -Version: 2.5.21 -Release: 51 +AutoReqProv: on +Version: 2.5.23 +Release: 1 Summary: Improved Version of FVWM Window Manager -URL: http://www.fvwm.org -Source0: fvwm-2.5.21.tar.bz2 +Url: http://www.fvwm.org +Source0: fvwm-2.5.23.tar.bz2 Source1: fvwm_icons.tar.bz2 Source3: %name.desktop Source4: system.fvwm2rc @@ -34,7 +34,6 @@ Patch1: fvwm-%{version}-gcc-warnings.patch Patch2: fvwm-%{version}-ia64.patch Patch3: fvwm-%{version}-sv_SE.patch Patch4: fvwm-%{version}-utf_encoding.patch -Patch5: fvwm-%{version}-string_compar.patch %description FVWM is a virtual desktop window manager for the X Window System. @@ -83,13 +82,12 @@ Authors: %define _xorg7mandir /usr/X11R6/man %endif %prep -%setup -q -n fvwm-2.5.21 +%setup -q -n fvwm-2.5.23 %patch0 %patch1 %patch2 %patch3 %patch4 -%patch5 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 @@ -109,7 +107,8 @@ LDFLAGS="-L/usr/%_lib" \ --libexecdir=%{_xorg7prefix}/lib/X11/fvwm2 \ --mandir=%{_xorg7mandir} \ --x-includes=%{_xorg7prefix}/include \ - --x-libraries=%{_xorg7prefix}/%_lib + --x-libraries=%{_xorg7prefix}/%_lib \ + --with-imagepath=%{_prefix}/%{_xorg7libshare}/X11/fvwm2/pixmaps:%{_prefix}/%{_xorg7libshare}/X11/fvwm2/bitmaps:/usr/share/wallpapers make %{?jobs:-j%jobs} %install @@ -151,6 +150,8 @@ install -m 644 icons/* $RPM_BUILD_ROOT%{_prefix}/%{_xorg7libshare}/X11/fvwm2/pix # install kdm/gdm entry install -m 0755 -d $RPM_BUILD_ROOT/usr/share/xsessions/ install -m 0644 %SOURCE3 $RPM_BUILD_ROOT/usr/share/xsessions/ +# removing the useless README.vms file +rm -f $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/fvwm2/README.vms %suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/xsessions/%name.desktop %clean @@ -165,7 +166,24 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/%{_xorg7libs32}/X11/fvwm2/* %exclude %{_prefix}/%{_xorg7libs32}/X11/fvwm2/FvwmGtk* %{_prefix}/%{_xorg7libshare}/X11/fvwm2/pixmaps/* -%{_xorg7prefix}/share/locale/*/*/* +#%{_xorg7prefix}/share/locale/*/*/* +# the find_lang macro is not very usable for fwvm, +# listing the files manually +%lang(ar) %{_xorg7prefix}/share/locale/ar/LC_MESSAGES/fvwm.mo +%lang(de) %{_xorg7prefix}/share/locale/de/LC_MESSAGES/fvwm.mo +%lang(fr) %{_xorg7prefix}/share/locale/fr/LC_MESSAGES/fvwm.mo +%lang(sv) %{_xorg7prefix}/share/locale/sv/LC_MESSAGES/fvwm.mo +%lang(zh) %{_xorg7prefix}/share/locale/zh_CN/LC_MESSAGES/fvwm.mo +%lang(ar) %{_xorg7prefix}/share/locale/ar/LC_MESSAGES/FvwmScript.mo +%lang(ar) %{_xorg7prefix}/share/locale/ar/LC_MESSAGES/FvwmTaskBar.mo +%lang(de) %{_xorg7prefix}/share/locale/de/LC_MESSAGES/FvwmScript.mo +%lang(de) %{_xorg7prefix}/share/locale/de/LC_MESSAGES/FvwmTaskBar.mo +%lang(fr) %{_xorg7prefix}/share/locale/fr/LC_MESSAGES/FvwmScript.mo +%lang(fr) %{_xorg7prefix}/share/locale/fr/LC_MESSAGES/FvwmTaskBar.mo +%lang(sv) %{_xorg7prefix}/share/locale/sv/LC_MESSAGES/FvwmScript.mo +%lang(sv) %{_xorg7prefix}/share/locale/sv/LC_MESSAGES/FvwmTaskBar.mo +%lang(zh) %{_xorg7prefix}/share/locale/zh_CN/LC_MESSAGES/FvwmScript.mo +%lang(zh) %{_xorg7prefix}/share/locale/zh_CN/LC_MESSAGES/FvwmTaskBar.mo %{_prefix}/%{_xorg7libshare}/X11/fvwm2/utils/quantize_pixmaps %dir %{_xorg7prefix}/lib/X11/fvwm2 %{_xorg7prefix}/share/fvwm @@ -188,8 +206,82 @@ rm -rf $RPM_BUILD_ROOT %files gtk %defattr(-,root,root) %{_prefix}/%{_xorg7libs32}/X11/fvwm2/FvwmGtk* - %changelog +* Tue Sep 25 2007 - lmichnovic@suse.cz +- excluding useless file README.vms +- file list with %%lang (macro find_lang is hard to use for fvwm) +- added gnome-libs-devel (/usr/bin/gnome-config) and librsvg into + BuildReq to enable more features +* Tue Sep 25 2007 - lmichnovic@suse.cz +- update to version 2.5.23 + - obsoletes *string_compar.patch + - fixes segfault on dual core processors [#304236] +- New Features in 2.5.23 cumulative with 2.5.22: + - New Style command options: + StartShaded + UnderMousePlacementHonorsStartsOnPage + UnderMousePlacementIgnoresStartsOnPage + !MinOverlapPlacementPenalties + !MinOverlapPercentPlacementPenalties + MinWindowSize + - SVG (scalable vector graphics) image loading support. + - New extended variables + $[w.iconfile.svgopts] + $[w.miniiconfile.svgopts]. + - Added suffix 'w' to the arguments of the Move command and + similar. It is now possible to add multiple shifts to a + window position, e.g. "50-50w 50-50w" for the center of the + screen. + - Removed UnderMousePlacement and CenterPlacement. Use + "PositionPlacement Center" and "PositionPlacement UnderMouse" + instead. + - Documentation in HTML format. + - Replaced "UseListSkip" with "UseSkipList" & "OnlyListSkip" with + "OnlySkipList" in WindowList command. (Old options deprecated.) + - New subject ImageCache for PrintInfo command. + - The new commad EchoFuncDefinition prints a function's + definition to the console for debugging purposes. + - The CursorStyle command can now load PNG and SVG images as + mouse cursors. New x and y arguments to specify the + hot spot. Also, it is now possible to load non-monochrome + cursors and cursors with partial transparency. +- New module features: + - FvwmScript: New instructions: ChangeWindowTitle and + ChangeWindowTitleFromArg. +- Bug Fixes: + - Windows with aspect ratio no longer maximize past the screen + edges. + - Fixed CenterPlacement with Xinerama screens. + - Fixed CascadePlacement with title direction west and east + - Windows no longer unstick when going to fullscreen mode. + - Fixed crash when raising/lowering a destroyed window. + - Fixed expansion of $[n-] and $[*], broken in 2.5.20. + - Fixes for resizing shaded windows and windows with a gravity + other than northwest. + - Fixed CursorStyle POSITION, broken since 2.3.24. + - The hi, sh and fgsh colors in colorsets are no longer replaced + by computed values if not explicit set on the same line as the + bg, or for fgsh fg, changes. (bug #3359) + - FvwmButtons now redraws stretched button backgrounds correctly + on partial expose. + - Windows with circular transient for hints may no longer crash + fvwm with StackTransientParent style. + - FvwmPager now displays windows that are StickyAcrossPages + correctly. + - Fixed a possible crash with modules closing down. + - Fixed broken demo script fvwm_make_browse_menu.sh. + - The conditon following a comma separator without whitespace + padding was previously ignored if the presiding condition was + multi-worded. + - Various FvwmButtons drawing problems. + - Window movement or resizing triggered by an EWMH message now + honours the FixedSize and FixedPosition window styles. + - Properly generate leave_window and enter_window events for + the root window in FvwmEvent. + - Fixed crash in UTF8 code. + - Fixed parsing of the PropertyChange command. + - Fixed windowlist crash when combining CurrentAtEnd with + IconifiedAtEnd and all windows are iconified. * Fri Aug 10 2007 - dmueller@suse.de - package size reduction (#217472) * Thu Jul 19 2007 - lmichnovic@suse.cz