Accepting request 105770 from X11:windowmanagers

update to 0.95.2, wow, latest stable from 2005 :) (forwarded request 105760 from computersalat)

OBS-URL: https://build.opensuse.org/request/show/105770
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/WindowMaker?expand=0&rev=25

Window-Maker-5a2507602c48.tar.bz2

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

WindowMaker-0.92.0-printf.diff

@@ -1,31 +0,0 @@
---- src/misc.c
-+++ src/misc.c
-@@ -696,7 +696,7 @@
-     olen = len+1;
-     out = malloc(olen);
-     if (!out) {
--        wwarning(_("out of memory during expansion of \"%s\""));
-+        wwarning(_("out of memory during expansion of \"%s\""), cmdline);
-         return NULL;
-     }
-     *out = 0;
-@@ -785,7 +785,8 @@
-                     olen += slen;
-                     nout = realloc(out,olen);
-                     if (!nout) {
--                        wwarning(_("out of memory during expansion of \"%a\""));
-+                        wwarning(_("out of memory during expansion of \"%a\""),
-+					user_input);
-                         goto error;
-                     }
-                     out = nout;
-@@ -835,7 +836,8 @@
-                 olen += slen;
-                 nout = realloc(out,olen);
-                 if (!nout) {
--                    wwarning(_("out of memory during expansion of \"%s\""));
-+                    wwarning(_("out of memory during expansion of \"%s\""),
-+				    selection);
-                     goto error;
-                 }
-                 out = nout;

WindowMaker-0.95.2.tar.bz2

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

WindowMaker-MAX_WORKSPACENAME_WIDTH.patch

@@ -1,11 +0,0 @@
---- src/wconfig.h.in
-+++ src/wconfig.h.in
-@@ -453,7 +453,7 @@
- 
- #define HRESIZE_THRESHOLD	3
- 
--#define MAX_WORKSPACENAME_WIDTH	32
-+#define MAX_WORKSPACENAME_WIDTH	64
- #define MAX_WINDOWLIST_WIDTH	160     /* max width of window title in
-                                          * window list */
- 

WindowMaker-asm.patch

@@ -1,141 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -197,7 +197,7 @@
- 
-     AC_CACHE_CHECK(whether gcc supports x86 inline asm,
-                    ac_cv_c_inline_asm,
--                   [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n"::
-+                   [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n\t pushal\n\t popal"::
-                           "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),
-                           "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x));}],
-                    ac_cv_c_inline_asm=yes,
---- wrlib/x86_specific.c
-+++ wrlib/x86_specific.c
-@@ -98,15 +98,23 @@
-                            int height,
-                            int line_offset)
- {
--    long long rrggbbaa;
--    long long pixel;
-+    union {
-+	long long rrggbbaa;
-+	struct {short int rr, gg, bb, aa;} words;
-+    } rrggbbaa;
-+    
-+    union {
-+	long long pixel;
-+	struct {short int rr, gg, bb, aa;} words;
-+    } pixel;
-+
-     short *tmp_err;
-     short *tmp_nerr;
-     int x;
- 
-     asm volatile
-         (
--         "pushal                        \n\t"
-+         "pushl %%ebx                        \n\t"
- 
-          // pack dr, dg and db into mm6
-          "movl  %7, %%eax               \n\t"
-@@ -290,7 +298,7 @@
- 
- ".Enda:                                 \n\t" // THE END
-          "emms                          \n\t"
--         "popal                         \n\t"
-+         "popl %%ebx                         \n\t"
-          :
-          :
-          "m" (image),                      // %0
-@@ -309,17 +317,18 @@
-          "m" (width),                      // %13
-          "m" (height),                     // %14
-          "m" (line_offset),                // %15
--         "m" (rrggbbaa),                   // %16 (access to rr)
--         "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
--         "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
--         "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
--         "m" (pixel),                      // %20 (access to pixel.r)
--         "m" ((*((short*)(&pixel)+1))),    // %21 (access to pixel.g)
--         "m" ((*((short*)(&pixel)+2))),    // %22 (access to pixel.b)
--         "m" ((*((short*)(&pixel)+3))),    // %23 (access to pixel.a)
-+         "m" (rrggbbaa.rrggbbaa),          // %16 (access to rr)
-+         "m" (rrggbbaa.words.gg),          // %17 (access to gg)
-+         "m" (rrggbbaa.words.bb),          // %18 (access to bb)
-+         "m" (rrggbbaa.words.aa),          // %19 (access to aa)
-+         "m" (pixel.pixel),                // %20 (access to pixel.r)
-+         "m" (pixel.words.gg),             // %21 (access to pixel.g)
-+         "m" (pixel.words.bb),             // %22 (access to pixel.b)
-+         "m" (pixel.words.aa),             // %23 (access to pixel.a)
-          "m" (tmp_err),                    // %24
-          "m" (tmp_nerr),                   // %25
-          "m" (x)                           // %26
-+	 : "eax", "ecx", "edx", "esi", "edi"
-         );
- }
- 
-@@ -342,8 +351,15 @@
-                            int height,
-                            int line_offset)
- {
--    long long rrggbbaa;
--    long long pixel;
-+    union {
-+	long long rrggbbaa;
-+	struct {short int rr, gg, bb, aa;} words;
-+    } rrggbbaa;
-+    
-+    union {
-+	long long pixel;
-+	struct {short int rr, gg, bb, aa;} words;
-+    } pixel;
- 
-     short *tmp_err;
-     short *tmp_nerr;
-@@ -354,7 +370,7 @@
- 
-     asm volatile
-         (
--         "pushal                        \n\t"
-+         "pushl %%ebx                        \n\t"
- 
-          "movl %13, %%eax               \n\t" // eax = width
-          "movl %%eax, %%ebx             \n\t"
-@@ -424,7 +440,7 @@
- 
- ".Endc:                                 \n\t" // THE END
-          "emms                          \n\t"
--         "popal                         \n\t"
-+         "popl %%ebx                         \n\t"
-          :
-          :
-          "m" (image),                      // %0
-@@ -443,19 +459,20 @@
-          "m" (width),                      // %13
-          "m" (height),                     // %14
-          "m" (line_offset),                // %15
--         "m" (rrggbbaa),                   // %16 (access to rr)
--         "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
--         "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
--         "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
--         "m" (pixel),                      // %20 (access to pixel.r)
--         "m" ((*((short*)(&pixel)+1))),    // %21 (access to pixel.g)
--         "m" ((*((short*)(&pixel)+2))),    // %22 (access to pixel.b)
--         "m" ((*((short*)(&pixel)+3))),    // %23 (access to pixel.a)
-+         "m" (rrggbbaa.rrggbbaa),          // %16 (access to rr)
-+         "m" (rrggbbaa.words.gg),          // %17 (access to gg)
-+         "m" (rrggbbaa.words.bb),          // %18 (access to bb)
-+         "m" (rrggbbaa.words.aa),          // %19 (access to aa)
-+         "m" (pixel.pixel),                // %20 (access to pixel.r)
-+         "m" (pixel.words.gg),             // %21 (access to pixel.g)
-+         "m" (pixel.words.bb),             // %22 (access to pixel.b)
-+         "m" (pixel.words.aa),             // %23 (access to pixel.a)
-          "m" (tmp_err),                    // %24
-          "m" (tmp_nerr),                   // %25
-          "m" (x),                          // %26
-          "m" (w1),                         // %27
-          "m" (w2)                          // %28
-+	  : "eax", "ecx", "edx", "esi", "edi"
-         );
- }
- 

WindowMaker-composite.patch

@@ -1,20 +0,0 @@
---- src/main.c
-+++ src/main.c
-@@ -747,6 +747,17 @@
-         exit(1);
-     }
- 
-+    if (wVisualID < 0)
-+        /*
-+         *   If unspecified, use default visual instead of waiting
-+         * for wrlib/context.c:bestContext() that may end up choosing
-+         * the "fake" 24 bits added by the Composite extension.
-+         *   This is required to avoid all sort of corruptions when
-+         * composite is enabled, and at a depth other than 24.
-+         */
-+        wVisualID = (int)DefaultVisual(dpy, DefaultScreen(dpy))->visualid;
-+
-+
-     /* check if the user specified a complete display name (with screen).
-      * If so, only manage the specified screen */
-     if (DisplayName)

WindowMaker-config.patch

@@ -1,4 +1,6 @@
---- WindowMaker/Defaults/WindowMaker.in
+Index: WindowMaker/Defaults/WindowMaker.in
+===================================================================
+--- WindowMaker/Defaults/WindowMaker.in.orig
 +++ WindowMaker/Defaults/WindowMaker.in
 @@ -1,5 +1,6 @@
  {
@@ -34,7 +36,9 @@
    MouseMiddleButtonAction = OpenWindowListMenu;
    MouseRightButtonAction = OpenApplicationsMenu;
    MouseWheelAction = None;
---- dockit
+Index: dockit
+===================================================================
+--- /dev/null
 +++ dockit
 @@ -0,0 +1,247 @@
 +#!/bin/sh
@@ -284,35 +288,36 @@
 +   close $m1
 +}
 +
---- util/wmaker.inst.in
+Index: util/wmaker.inst.in
+===================================================================
+--- util/wmaker.inst.in.orig
 +++ util/wmaker.inst.in
-@@ -312,42 +312,43 @@
+@@ -281,41 +281,41 @@ fi
  }
  
  wmaker_found=0
 -for xinit in .xinitrc .Xclients .xsession; do
 -     test ! -f "$HOME/$xinit" && continue
--     res="`grep wmaker $HOME/$xinit`"
+-	 res="$(grep wmaker "$HOME/$xinit")"
 -     if test "x$res" != x; then
 -     	wmaker_found=1
 -	break
 -     fi
 -done
--if test $wmaker_found = 1; then
+-if test "$wmaker_found" = 1; then
 -	echo "Found Window Maker to already be your default window manager."
 -	show_end_message
 -	exit 0
 -fi
 +#for xinit in .xinitrc .Xclients .xsession; do
 +#     test ! -f "$HOME/$xinit" && continue
-+#     res="`grep wmaker $HOME/$xinit`"
++#	 res="$(grep wmaker "$HOME/$xinit")"
 +#     if test "x$res" != x; then
 +#     	wmaker_found=1
 +#	break
 +#     fi
 +#done
-+
++#if test "$wmaker_found" = 1; then
-+#if test $wmaker_found = 1; then
 +#	echo "Found Window Maker to already be your default window manager."
 +#	show_end_message
 +#	exit 0
@@ -335,8 +340,8 @@
 -	file=.xinitrc
 -fi
 -
--if [ -f $USERDIR/$file ]; then
+-if [ -f "$USERDIR/$file" ]; then
--	mv $USERDIR/$file $USERDIR/$file.old.$DATE
+-	mv "$USERDIR/$file" "$USERDIR/$file.old.$DATE"
 -fi
 +#echo
 +#echo "Now the .xinitrc, .Xclients or .xsession script must be updated so that"
@@ -352,12 +357,11 @@
 +#	file=.xinitrc
 +#fi
 +
-+#if [ -f $USERDIR/$file ]; then
++#if [ -f "$USERDIR/$file" ]; then
-+#	mv $USERDIR/$file $USERDIR/$file.old.$DATE
++#	mv "$USERDIR/$file" "$USERDIR/$file.old.$DATE"
 +#fi
  
--make_script $USERDIR/$file
+-make_script "$USERDIR/$file"
-+# make_script $USERDIR/$file
++#make_script "$USERDIR/$file"
  
  show_end_message
- 

WindowMaker-crash.patch

@@ -1,11 +0,0 @@
---- src/misc.c
-+++ src/misc.c
-@@ -1105,7 +1105,7 @@
- 
-     len = (msg ? strlen(msg) : 0) + (workspace >=0 ? 4 : 0) + 1 ;
-     buffer = wmalloc(len+5);
--    snprintf(buf, len, "%4i", len);
-+    snprintf(buf, sizeof(buf), "%4i", len);
-     memcpy(buffer, buf, 4);
-     buffer[4] = type;
-     i = 5;

WindowMaker-de_translation.patch

@@ -1,11 +0,0 @@
---- po/de.po
-+++ po/de.po
-@@ -76,7 +76,7 @@
- #: ../src/appicon.c:487 ../src/dock.c:1176 ../src/rootmenu.c:248
- #: ../src/rootmenu.c:264 ../src/winmenu.c:508
- msgid "Kill"
--msgstr "Töten"
-+msgstr "Beenden"
- 
- #: ../src/appicon.c:508 ../src/dock.c:3511
- msgid "Unhide"

WindowMaker-dir-specification.patch

@@ -1,11 +0,0 @@
---- WINGs/wtext.c
-+++ WINGs/wtext.c
-@@ -656,7 +656,7 @@
-     TextBlock *tb;
-     WMFont *font;
-     char *text;
--    int len, y, c, s, done=False, prev_y=-23, dir /* 1 = down */;
-+    int len, y, c, s, done=False, prev_y=-23, dir=1 /* 1 = down */;
-     WMScreen *scr = tPtr->view->screen;
-     Display *dpy = tPtr->view->screen->display;
-     Window win = tPtr->view->window;

WindowMaker-event.patch

@@ -1,48 +0,0 @@
---- src/event.c
-+++ src/event.c
-@@ -107,27 +107,27 @@
- 
- 
- static void saveTimestamp(XEvent *event);
--static void handleColormapNotify();
--static void handleMapNotify();
--static void handleUnmapNotify();
--static void handleButtonPress();
--static void handleExpose();
--static void handleDestroyNotify();
--static void handleConfigureRequest();
--static void handleMapRequest();
--static void handlePropertyNotify();
--static void handleEnterNotify();
--static void handleLeaveNotify();
--static void handleExtensions();
--static void handleClientMessage();
--static void handleKeyPress();
--static void handleFocusIn();
--static void handleMotionNotify();
--static void handleVisibilityNotify();
-+static void handleColormapNotify(XEvent *event);
-+static void handleMapNotify(XEvent *event);
-+static void handleUnmapNotify(XEvent *event);
-+static void handleButtonPress(XEvent *event);
-+static void handleExpose(XEvent *event);
-+static void handleDestroyNotify(XEvent *event);
-+static void handleConfigureRequest(XEvent *event);
-+static void handleMapRequest(XEvent *event);
-+static void handlePropertyNotify(XEvent *event);
-+static void handleEnterNotify(XEvent *event);
-+static void handleLeaveNotify(XEvent *event);
-+static void handleExtensions(XEvent *event);
-+static void handleClientMessage(XEvent *event);
-+static void handleKeyPress(XEvent *event);
-+static void handleFocusIn(XEvent *event);
-+static void handleMotionNotify(XEvent *event);
-+static void handleVisibilityNotify(XEvent *event);
- 
- 
- #ifdef SHAPE
--static void handleShapeNotify();
-+static void handleShapeNotify(XEvent *event);
- #endif
- 
- /* called from the signal handler */

WindowMaker-fonts.patch

@@ -1,34 +0,0 @@
---- WindowMaker/Defaults/WMGLOBAL
-+++ WindowMaker/Defaults/WMGLOBAL
-@@ -1,6 +1,6 @@
- {
--  SystemFont = "Trebuchet MS,Luxi Sans";
--  BoldSystemFont = "Trebuchet MS,Luxi Sans:bold";
-+  SystemFont = "Sans";
-+  BoldSystemFont = "Sans:bold";
-   DefaultFontSize = 11;
-   AntialiasedText = Yes;
-   FloppyPath = "/floppy";
---- WindowMaker/Defaults/WindowMaker.in
-+++ WindowMaker/Defaults/WindowMaker.in
-@@ -109,13 +109,13 @@
-   ConstrainWindowSize = NO;
-   ClipRaiseLowerKey = None;
-   TitleJustify = center;
--  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
--  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
--  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
--  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
--  ClipTitleFont = "Verdana:bold:pixelsize=10";
--  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
--  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
-+  WindowTitleFont = "Sans:bold:pixelsize=12";
-+  MenuTitleFont = "Sans:bold:pixelsize=12";
-+  MenuTextFont = "Sans:pixelsize=12";
-+  IconTitleFont = "Sans:pixelsize=9";
-+  ClipTitleFont = "Sans:bold:pixelsize=10";
-+  DisplayFont = "Sans:pixelsize=12";
-+  LargeDisplayFont = "Sans:pixelsize=24";
-   HighlightColor = white;
-   HighlightTextColor = black;
-   ClipTitleColor = black;

WindowMaker-nb-locale.patch

@@ -1,22 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -292,7 +292,7 @@
- 
- dnl List of supported locales
- dnl -------------------------
--supported_locales="be bg bs ca cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW"
-+supported_locales="be bg bs ca cs da de el es et fi fr gl hr hu it ja ko ms nl nb pl pt ro ru sk sv tr zh_CN zh_TW"
- supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pt ru sk zh_CN zh_TW"
- supported_wings_locales="bg ca cs de fr sk"
- 
---- po/Makefile.am
-+++ po/Makefile.am
-@@ -6,7 +6,7 @@
- 
- # Please keep this sorted in alphabetic order!
- EXTRA_DIST = be.po bg.po bs.po ca.po cs.po da.po de.po el.po es.po et.po \
--	fi.po fr.po gl.po hr.po hu.po it.po ja.po ko.po ms.po nl.po no.po \
-+	fi.po fr.po gl.po hr.po hu.po it.po ja.po ko.po ms.po nl.po nb.po \
- 	pl.po pt.po ro.po ru.po sk.po sv.po tr.po zh_CN.po zh_TW.po
- 
- POTFILES  = \

WindowMaker-null.patch

@@ -1,11 +0,0 @@
---- Window-Maker-5a2507602c48/WINGs/wfontpanel.c
-+++ Window-Maker-5a2507602c48/WINGs/wfontpanel.c
-@@ -585,7 +585,7 @@
-     int i;
- 
-     pat = FcPatternCreate();
--    os = FcObjectSetBuild(FC_FAMILY, FC_STYLE, 0);
-+    os = FcObjectSetBuild(FC_FAMILY, FC_STYLE, NULL);
-     fs = FcFontList(0, pat, os);
-     if (!fs) {
-         WMRunAlertPanel(scr, panel->win, _("Error"),

WindowMaker-png_check_sig.patch

@@ -1,11 +0,0 @@
---- wrlib/load.c
-+++ wrlib/load.c
-@@ -348,7 +348,7 @@
- 
- #ifdef USE_PNG
-     /* check for PNG */
--    if (png_check_sig(buffer, 8))
-+    if (!png_sig_cmp(buffer, 0, 8))
-         return IM_PNG;
- #endif
- 

WindowMaker-rpmlintrc

@@ -1,2 +1 @@
-# no left over, but the original menu
+addFilter("macro-in-comment")
-addFilter("E: suse-filelist-forbidden.*/usr/share/doc/packages/WindowMaker/menu.orig")

WindowMaker-warnings.patch

@@ -1,110 +0,0 @@
---- WINGs/Examples/puzzle.c
-+++ WINGs/Examples/puzzle.c
-@@ -12,7 +12,7 @@
- 
- WMWindow *win;
- WMButton *Button[MAX_SIZE];
--char Map[MAX_SIZE];
-+signed char Map[MAX_SIZE];
- int Size = 4;
- int MoveCount;
- 
---- WINGs/WINGs/WUtil.h
-+++ WINGs/WINGs/WUtil.h
-@@ -216,11 +216,11 @@
- /* don't free the returned string */
- char* wstrerror(int errnum);
- 
--void wmessage(const char *msg, ...);
--void wwarning(const char *msg, ...);
--void wfatal(const char *msg, ...);
--void wsyserror(const char *msg, ...);
--void wsyserrorwithcode(int error, const char *msg, ...);
-+void wmessage(const char *msg, ...) __attribute__((__format__(printf,1,2)));
-+void wwarning(const char *msg, ...) __attribute__((__format__(printf,1,2)));
-+void wfatal(const char *msg, ...) __attribute__((__format__(printf,1,2)));
-+void wsyserror(const char *msg, ...) __attribute__((__format__(printf,1,2)));
-+void wsyserrorwithcode(int error, const char *msg, ...) __attribute__((__format__(printf,2,3)));
- 
- char* wfindfile(char *paths, char *file);
- 
---- WINGs/wcolorpanel.c
-+++ WINGs/wcolorpanel.c
-@@ -1239,7 +1239,7 @@
-     }
- 
-     if (!(dPtr = opendir(panel->configurationPath))) {
--        wwarning(_("Color Panel: Could not find file"), "%s", panel->configurationPath);
-+        wwarning(_("Color Panel: Could not find file: %s"), panel->configurationPath);
-         return;
-     }
- 
-@@ -3715,6 +3715,7 @@
-         color.red = 0;
-         color.green = 0;
-         color.blue = 0;
-+        color.alpha = 0;
-         return color;
-     }
- 
-@@ -3724,6 +3725,7 @@
-     color.red   = xcolor->red >> 8;
-     color.green = xcolor->green >> 8;
-     color.blue  = xcolor->blue >> 8;
-+    color.alpha = 0;
- 
-     wfree(xcolor);
- 
---- src/cycling.c
-+++ src/cycling.c
-@@ -22,6 +22,7 @@
- 
- #include "wconfig.h"
- 
-+#include <stdlib.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/keysym.h>
---- src/dock.c
-+++ src/dock.c
-@@ -3780,7 +3780,7 @@
- 
- 
-     if (wPreferences.flags.noupdates)
--        return;
-+        return False;
- 
-     if (XGrabPointer(dpy, icon->core->window, True, ButtonMotionMask
-                      |ButtonReleaseMask|ButtonPressMask, GrabModeAsync,
---- src/texture.c
-+++ src/texture.c
-@@ -421,6 +421,8 @@
-     texture->argc = argc;
-     texture->argv = argv;
- 
-+    memset(&fallbackColor, 0, sizeof(fallbackColor));
-+
-     fallbackColor.red = 0x8000;
-     fallbackColor.green = 0x8000;
-     fallbackColor.blue = 0x8000;
---- src/xdnd.c
-+++ src/xdnd.c
-@@ -185,7 +185,7 @@
-         wfree(scr->xdestring); /* this xdestring is not from Xlib (no XFree) */
-     }
- 
--    /* why doesn't this function return anything ? -Dan */
-+    return True;
- }
- 
- Bool
---- util/wmsetup.c
-+++ util/wmsetup.c
-@@ -21,6 +21,7 @@
- int
- main()
- {
-+return 0;
- }
- #else
- #define PROG_VERSION "wmsetup 0.0 (Window Maker)"

WindowMaker-wmspec.c-findBestIcon.patch

@@ -1,11 +0,0 @@
---- src/wmspec.c
-+++ src/wmspec.c
-@@ -402,7 +402,7 @@
-      * results in better overall aesthetics -Dan */
-     wanted = wPreferences.icon_size * wPreferences.icon_size;
- 
--    for (icon=NULL, distance=LONG_MAX, i=0L; i<items-1; ) {
-+    for (icon=NULL, distance=wanted, i=0L; i<items-1; ) {
-         size = data[i] * data[i+1];
-         if (size==0)
-             break;

WindowMaker.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Feb 17 23:01:00 UTC 2012 - chris@computersalat.de
+
+- update to 0.95.2
+  * no up-to-date ChangeLog available
+    see http://repo.or.cz/w/wmaker-crm.git/shortlog
+- rebase patches
+  * config, menu
+- remove obsolete patches
+- rpmlintrc
+  * add macro-in-comment
+  * remove suse-filelist-forbidden
+- add missing libjpeg-devel
+
 -------------------------------------------------------------------
 Tue Nov 15 13:12:12 UTC 2011 - coolo@suse.com
 

WindowMaker.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package WindowMaker
 #
-# 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
@@ -18,104 +18,111 @@
 
 
 Name:           WindowMaker
-BuildRequires:  fontconfig-devel freetype2-devel gcc-c++ giflib-devel
+Summary:        A Colorful and Flexible Window Manager
-BuildRequires:  libpng-devel libtiff-devel libtool update-desktop-files xorg-x11-devel
 License:        GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain
 Group:          System/GUI/Other
-Url:            http://www.windowmaker.info/
+Version:        0.95.2
-Obsoletes:      wmaker 
+Release:        0
-Provides:       wmaker windowmanager
+Url:            http://windowmaker.org/
-Requires:       xdg-menu
+Source:         http://windowmaker.org/pub/source/release/%{name}-%{version}.tar.bz2
-Summary:        A Colorful and Flexible Window Manager
+Source1:        %{name}-extra-0.1.tar.bz2
-Version:        0.92.0
-Release:        219
-Source:         Window-Maker-5a2507602c48.tar.bz2
-Source1:        WindowMaker-extra-0.1.tar.bz2
 Source2:        SuSE-theme.tar.bz2
 Source4:        README.SuSE
-Source5:        %name.desktop
+Source5:        %{name}.desktop
 Source6:        windowmaker
-Source7:        WindowMaker-rpmlintrc
+Source7:        %{name}-rpmlintrc
-Patch1:         WindowMaker-config.dif
+Patch1:         %{name}-config.patch
-Patch2:         WindowMaker-menu.patch
+Patch2:         %{name}-menu.patch
-Patch22:        WindowMaker-warnings.patch
+#
-Patch24:        WindowMaker-nb-locale.patch
-Patch26:        WindowMaker-null.patch
-Patch27:        WindowMaker-de_translation.patch
-Patch29:        WindowMaker-asm.patch
-Patch31:        WindowMaker-MAX_WORKSPACENAME_WIDTH.patch
-Patch32:        WindowMaker-0.92.0-printf.diff
-Patch34:        WindowMaker-crash.patch
-Patch35:        WindowMaker-fonts.patch
-Patch37:        WindowMaker-event.patch
-Patch38:        WindowMaker-wmspec.c-findBestIcon.patch
-Patch39:        WindowMaker-dir-specification.patch
-Patch40:        WindowMaker-composite.patch
-Patch41:        WindowMaker-png_check_sig.patch
-Patch42:        wm-linking.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
+BuildRequires:  fontconfig-devel
-%package devel
+BuildRequires:  freetype2-devel
-License:        GPL-2.0+
+BuildRequires:  gcc-c++
-Requires:       %{name} = %{version} libtiff-devel libjpeg-devel xorg-x11-devel libpng-devel zlib-devel giflib-devel
+BuildRequires:  giflib-devel
-Summary:        Includes and static libraries for Window Maker
+BuildRequires:  libjpeg-devel
-Group:          Development/Libraries/X11
+BuildRequires:  libpng-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  libtool
+%if 0%{?suse_version} > 1210
+BuildRequires:  libXft-devel
+%endif
+BuildRequires:  update-desktop-files
+BuildRequires:  xorg-x11-devel
+Provides:       wmaker
+Provides:       windowmanager
+Requires:       xdg-menu
 
 %description
-Window Maker is a colorful and flexible window manager and
+Window Maker is an X11 window manager originally designed to provide
-the designated successor of AfterStep. For more details, check
+integration support for the GNUstep Desktop Environment. In every way
-http://www.windowmaker.org.
+possible, it reproduces the elegant look and feel of the NEXTSTEP user
+interface. It is fast, feature rich, easy to configure, and easy to
+use. It is also free software, with contributions being made by
+programmers from around the world.
+
+Window Maker has a stable user interface since many years and comes
+with a powerful GUI configuration editor called WPrefs, which removes
+the need to edit text-based config files by hand. It supports running
+dockapps which make everyday tasks such as monitoring system 
+performance and battery usage, mounting devices or connecting to the
+internet very easy. Please see the features section for more specifics
+on what Window Maker can do, and how it compares with other popular
+window managers.
+
+%package devel
+Summary:        Development files for WindowMaker
+License:        GPL-2.0+
+Group:          Development/Libraries/X11
+Requires:       %{name} = %{version}
+Requires:       giflib-devel
+Requires:       libjpeg-devel
+Requires:       libpng-devel
+Requires:       libtiff-devel
+Requires:       xorg-x11-devel
+Requires:       zlib-devel
 
 %description devel
-Includes and static libraries for Window Maker
+This package contains the header files and libraries necessary for
+developing applications which use WindowMaker.
 
 %prep
-%setup -q -n Window-Maker-5a2507602c48 -a 1
+%setup -q -n %{name}-%{version} -a 1
-mkdir menu.orig
+mkdir menu_orig
-cp WindowMaker/{menu.*,plmenu.*} menu.orig
+cp %{name}/{menu.*,plmenu.*} menu_orig
 %patch1
 %patch2
-%patch22
-%patch24
-%patch26 -p1
-%patch27
-#patch29
-%patch31
-%patch32
-%patch34
-%patch35
-%patch37
-%patch38
-%patch39
-%patch40
-%patch41
-%patch42
 cp %{S:4} .
 cp %{S:6} .
+%if 0%{?suse_version} < 1140
 rename no nb po/no.*
-(cd WindowMaker; rm -f *.orig; ./mkMakefile )
+%endif
+(cd %{name}; rm -f *.orig; ./mkMakefile )
 # ---------------------------------------------------------------------------
 
 %build
-autoreconf --force --install
+#autoreconf --force --install
-export LINGUAS="be bg ca cs da de el es et fi fr gl hr hu it ja ko ms nl nb pl pt ro ru sk sv tr zh_CN zh_TW"
+%if 0%{?suse_version} >= 1140
+export LINGUAS="be bg bs ca cs da de el es et fi fr gl hr hu hy it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW"
+%else
+export LINGUAS="be bg bs ca cs da de el es et fi fr gl hr hu hy it ja ko ms nl nb pl pt ro ru sk sv tr zh_CN zh_TW"
+%endif
 export CFLAGS="$RPM_OPT_FLAGS $(freetype-config --cflags)"
-%configure --disable-static --with-pic\
+%configure \
-            --sysconfdir=/etc/X11 \
+  --disable-static \
-            --enable-sound \
+  --with-pic\
-	    --enable-gnome \
+  --sysconfdir=/etc/X11 \
-	    --enable-kde \
+  --enable-xinerama \
-	    --enable-xinerama \
+  --with-nlsdir=/usr/share/locale \
-            --with-nlsdir=/usr/share/locale \
+  --with-pixmapdir=/usr/share/%{name}/Pixmaps \
-            --with-pixmapdir=/usr/share/WindowMaker/Pixmaps \
+  --with-gnustepdir=/usr/lib/GNUstep
-	    --with-gnustepdir=/usr/lib/GNUstep
 
-(cd WindowMaker/Defaults; make clean; make %{?_smp_mflags})
+(cd %{name}/Defaults; make clean; make %{?_smp_mflags})
 make %{?_smp_mflags}
-(cd WindowMaker-extra-0.1
+(cd %{name}-extra-0.1
-%configure --disable-static --with-pic\
+%configure \
-            --with-pixmapdir=/usr/share/WindowMaker/Pixmaps
+  --disable-static \
+  --with-pic\
+  --with-pixmapdir=/usr/share/%{name}/Pixmaps
 
 make %{?_smp_mflags}
 )
@@ -125,23 +132,24 @@ make %{?_smp_mflags}
 make DESTDIR=$RPM_BUILD_ROOT install
 install -m 755 dockit $RPM_BUILD_ROOT/usr/bin/dockit
 install -m 755 windowmaker $RPM_BUILD_ROOT/usr/bin/windowmaker
-cd WindowMaker-extra-0.1
+cd %{name}-extra-0.1
 make DESTDIR=$RPM_BUILD_ROOT install
-tar -xvjf %SOURCE2 -C $RPM_BUILD_ROOT/usr/share/WindowMaker/Themes/
+tar -xvjf %SOURCE2 -C $RPM_BUILD_ROOT/usr/share/%{name}/Themes/
-find $RPM_BUILD_ROOT/usr/share/WindowMaker/Themes -type f -exec chmod 644 {} \;
+find $RPM_BUILD_ROOT/usr/share/%{name}/Themes -type f -exec chmod 644 {} \;
-find $RPM_BUILD_ROOT/usr/share/WindowMaker/Themes -type d -exec chmod 755 {} \;
+find $RPM_BUILD_ROOT/usr/share/%{name}/Themes -type d -exec chmod 755 {} \;
 #----------------------------------------------------------------------
 # not packaged
-rm -f $RPM_BUILD_ROOT/%{_mandir}/sk/man1/*
+rm -f $RPM_BUILD_ROOT/%{_mandir}/{cs,ru,sk}/man1/*
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 # install kdm/gdm entry
 install -m 0755 -d $RPM_BUILD_ROOT/usr/share/xsessions/
 install -m 0644 %SOURCE5 $RPM_BUILD_ROOT/usr/share/xsessions/
-%suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/xsessions/%name.desktop
+%suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/xsessions/%{name}.desktop
 cd ..
 %find_lang %{name}
 %find_lang WINGs %{name}.lang
 %find_lang WPrefs %{name}.lang
+%find_lang wmgenmenu %{name}.lang
 
 %post -p /sbin/ldconfig
 
@@ -149,25 +157,25 @@ cd ..
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%dir /etc/X11/WindowMaker
+%doc AUTHORS BUGFORM BUGS COPYING COPYING.WTFPL ChangeLog FAQ FAQ.I18N
-%config /etc/X11/WindowMaker/*
+%doc NEWS README* TODO
+%doc menu_orig
+%dir /etc/X11/%{name}
+%config /etc/X11/%{name}/*
 /usr/lib/GNUstep
 /usr/bin/*
 %{_libdir}/*.so.*
 %{_mandir}/man1/*
 /usr/share/WINGs
-/usr/share/WindowMaker
+/usr/share/%{name}
 /usr/share/xsessions/*
-%doc AUTHORS BUGFORM BUGS COPYING COPYING.WTFPL ChangeLog FAQ FAQ.I18N
+#/usr/X11R6/share/%{name}
-%doc MIRRORS NEWS README TODO README.SuSE
-%doc menu.orig
-#/usr/X11R6/share/WindowMaker
 #/usr/X11R6/GNUstep
 
 %files devel
 %defattr(-,root,root)
-%{_libdir}/pkgconfig/*.pc
 %{_includedir}/*
+%{_libdir}/pkgconfig/*.pc
 %{_libdir}/*.so
 
 %changelog

wm-linking.patch

@@ -1,10 +0,0 @@
---- WPrefs.app/Makefile.am.orig
-+++ WPrefs.app/Makefile.am
-@@ -55,5 +55,6 @@ WPrefs_LDADD = \
- 	$(top_builddir)/WINGs/libWUtil.la\
- 	$(top_builddir)/wrlib/libwraster.la \
- 	@XFTLIBS@ \
--	@INTLIBS@
-+	@INTLIBS@ \
-+	-lfontconfig
-