Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

.gitignore

@@ -1,2 +1,7 @@
-wmx-6pl1.tar.gz
 wmx-defaults-1.tar.gz
+wmx-7.tar.gz
+/wmx-7.tar.gz
+/wmx-defaults-1.tar.gz
+/wmx-defaults-2.tar.gz
+/wmx-8.tar.gz
+/wmx-defaults-3.tar.gz

background.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *background[] = {
+static const char *background[] = {
 /* width height num_colors chars_per_pixel */
 "    80    80       27            1",
 /* colors */

sources

@@ -1,2 +1,2 @@
-212297d70acef90bbc9dac254de39cb8  wmx-6pl1.tar.gz
-a5f221d36884276cbf331414d4f2a761  wmx-defaults-1.tar.gz
+52a0e31b9a77e227eb6dc732f7941f15  wmx-8.tar.gz
+d5d5e760039fce77133abff54ce97cc1  wmx-defaults-3.tar.gz

wmx-8-cfg.patch

@@ -1,19 +1,20 @@
-diff -NarU5 wmx-6pl1.orig/Config.h wmx-6pl1/Config.h
---- wmx-6pl1.orig/Config.h	2007-12-25 17:08:03.000000000 -0500
-+++ wmx-6pl1/Config.h	2007-12-25 17:10:44.000000000 -0500
-@@ -75,11 +75,10 @@
+diff -NarU5 wmx-8.orig/Config.h wmx-8/Config.h
+--- wmx-8.orig/Config.h	2014-11-16 14:34:19.000000000 -0500
++++ wmx-8/Config.h	2014-11-20 09:41:54.238623357 -0500
+@@ -77,11 +77,11 @@
+ // Spawn a temporary new shell between the wm and each new process?
  #define CONFIG_EXEC_USING_SHELL   False
  
  // What to run to get a new window (from the "New" menu option)
  #define CONFIG_NEW_WINDOW_LABEL "New"
- #define CONFIG_NEW_WINDOW_COMMAND "xterm"
--//#define CONFIG_NEW_WINDOW_COMMAND "/home/ccannam/.wmx/terminal"
+-#define CONFIG_NEW_WINDOW_COMMAND "x-terminal-emulator"
++#define CONFIG_NEW_WINDOW_COMMAND "/usr/bin/xterm"
  #define CONFIG_NEW_WINDOW_COMMAND_OPTIONS 0
  // or, for example,
  //#define CONFIG_NEW_WINDOW_COMMAND_OPTIONS "-ls","-sb","-sl","1024",0
  // alternatively,
  #define CONFIG_DISABLE_NEW_WINDOW_COMMAND (DynamicConfig::config.disableNew())
-@@ -90,11 +89,11 @@
+@@ -92,11 +92,11 @@
   
  // Directory under $HOME in which to look for commands for the
  // middle-button menu
@@ -26,7 +27,7 @@ diff -NarU5 wmx-6pl1.orig/Config.h wmx-6pl1/Config.h
  #define CONFIG_ADD_SCREEN_TO_COMMAND_MENU False
   
  // Focus possibilities.
-@@ -121,11 +120,11 @@
+@@ -125,11 +125,11 @@
  
  // Number of pixels off the screen you have to push a window
  // before the manager notices the window is off-screen (the higher
@@ -35,11 +36,11 @@ diff -NarU5 wmx-6pl1.orig/Config.h wmx-6pl1/Config.h
 -#define CONFIG_BUMP_DISTANCE      16
 +#define CONFIG_BUMP_DISTANCE      32
  
- // If CONFIG_PROD_SHAPE is True, all frame element shapes will be
- // recalculated afresh every time their focus changes.  This will
- // probably slow things down hideously, but has been reported as
- // necessary on some systems (possibly SunOS 4.x with OpenWindows).
-@@ -178,11 +177,11 @@
+ // If CONFIG_BUMP_EVERYWHERE is defined, windows will "bump" against
+ // other window edges as well as the edges of the screen
+ 
+ #define CONFIG_BUMP_EVERYWHERE    True
+@@ -192,11 +192,11 @@
  
  // This is the key for wm controls: e.g. Alt/Left and Alt/Right to
  // flip channels, and Alt/Tab to switch windows.  (On my 105-key
@@ -52,20 +53,7 @@ diff -NarU5 wmx-6pl1.orig/Config.h wmx-6pl1/Config.h
  // modifier is pressed; they're keysyms as defined in <X11/keysym.h>
  // and <X11/keysymdef.h>
  
-@@ -284,11 +283,11 @@
- // standard X cursor font; otherwise it will install its own.  You may
- // wish to set this if your X client and server are on different
- // endian machines, or if you've aliased the cursor font to something
- // else you like better, or if you just prefer the plain X cursors
- 
--#define CONFIG_USE_PLAIN_X_CURSORS	False
-+#define CONFIG_USE_PLAIN_X_CURSORS	True
- 
- // Colours for window decorations.  The BORDERS one is for the
- // one-pixel border around the edge of each piece of decoration, not
- // for the whole decoration
- 
-@@ -304,11 +303,11 @@
+@@ -335,11 +335,11 @@
  #define CONFIG_MENU_BORDERS       "black"
  
  // Pixel width for the bit of frame to the left of the window and the
@@ -78,7 +66,7 @@ diff -NarU5 wmx-6pl1.orig/Config.h wmx-6pl1/Config.h
  // ========================
  // Section IV. Flashy stuff
  // ========================
-@@ -317,11 +316,11 @@
+@@ -348,11 +348,11 @@
  // in ./background.xpm; if USE_PIXMAP_MENUS is also True, the menus
  // will be too.  The latter screws up in palette-based visuals, but
  // should be okay in true-colour.

wmx.spec

@@ -1,20 +1,20 @@
 Name: wmx
-Version: 6pl1
-Release: 17%{?dist}
+Version: 8
+Release: 28%{?dist}
 Summary: A really simple window manager for X
-License: BSD
-Group: User Interface/X
+# Automatically converted from old format: BSD - review is highly recommended.
+License: LicenseRef-Callaway-BSD
 URL: http://www.all-day-breakfast.com/wmx/
 Source0: http://www.all-day-breakfast.com/wmx/%{name}-%{version}.tar.gz
-Source1: wmx-defaults-1.tar.gz
+Source1: wmx-defaults-3.tar.gz
 Source2: background.xpm
 Source3: wmx.desktop
 Source4: Xclients.wmx.sh
-Source5: xnodecor.c
-Patch0: wmx-6pl1-cvs20071113.patch
-Patch1: wmx-6pl1-cfg.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXext-devel libXaw-devel libXt-devel
+Patch0: wmx-8-cfg.patch
+#wmx's 'New' button is hardcoded to start an xterm, better make sure we have it:
+Requires: xterm
+BuildRequires: make
+BuildRequires: gcc-c++ xorg-x11-proto-devel libX11-devel libXpm-devel libXext-devel libXaw-devel libXt-devel libXcomposite-devel freetype-devel libXft-devel
 
 %description
 A really simple window manager for X, based on wm2, with a minimal set of
@@ -22,37 +22,163 @@ configurable options.
 
 %prep
 %setup -q
-%setup -a 1
-%{__install} -p %{SOURCE2} .
-%patch0 -p1
-%patch1 -p1
+%setup -q -a 1
+%{__install} -p -m 0644 %{SOURCE2} .
+%patch -P0 -p1
 
 %build
-%configure --x-libraries=%{_libdir} --x-includes=%{_includedir}/X11
+%configure --x-libraries=%{_libdir} --x-includes=%{_includedir}/X11 LIBS=-lfontconfig
 %{__make} %{?_smp_mflags}
-%{__cc} -o xnodecor %{SOURCE5} -Werror -lX11
 
 %install
 %{__rm} -rf %{buildroot}
 %{__install} -D -m 0755 wmx %{buildroot}%{_bindir}/wmx
-%{__install} -D -m 0755 xnodecor %{buildroot}%{_bindir}/xnodecor
 %{__install} -d -m 0755 %{buildroot}%{_datadir}/%{name}
-%{__install} -m 0755 wmx-defaults-1/* %{buildroot}%{_datadir}/%{name}
+%{__install} -m 0755 wmx-defaults-3/* %{buildroot}%{_datadir}/%{name}
 %{__chmod} 0644 %{buildroot}%{_datadir}/%{name}/startup
 %{__install} -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/xsessions/wmx.desktop
 %{__install} -D -m 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/X11/xinit/Xclients.d/Xclients.wmx.sh
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files
-%defattr(-,root,root)
-%doc README* UPDATES ANNOYING-BUGS
+%doc README* UPDATES TODO.netwm rsharman-patch/
 %{_bindir}/*
-%{_datadir}/*
+%{_datadir}/%{name}
+%{_datadir}/xsessions/*
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 8-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 8-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 8-24
+- convert license to SPDX
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jul 23 2018 Gabriel Somlo <somlo@cmu.edu> 8-10
+- add "BuildRequires: gcc-c++" (#1606700)
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 8-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 8-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 8-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 8-2
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Thu Nov 20 2014 Gabriel Somlo <somlo@cmu.edu> 8-1
+- update to 8
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-14.20120109svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-13.20120109svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-12.20120109svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-11.20120109svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-10.20120109svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Mon Jan 09 2012 Gabriel Somlo <somlo@cmu.edu> 7-9.20120109svn
+- upgrade to latest svn checkout
+- updated defaults
+- dropped xnodecor
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Dec 07 2010 Gabriel Somlo <somlo@cmu.edu> 7-7
+- explicitly link against libfontconfig (BZ 660741)
+
+* Mon Mar 01 2010 Gabriel Somlo <somlo@cmu.edu> 7-6
+- fixed directory ownership (BZ 569408)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Jan 19 2009 Gabriel Somlo <somlo@cmu.edu> 7-3
+- applied patch for use of compositing offscreen storage to speed up rendering
+- added buildreq for libxcomposite-devel
+
+* Tue Jan 13 2009 Gabriel Somlo <somlo@cmu.edu> 7-2
+- re-enabled scroll-wheel-cycles-channels feature
+
+* Sat Jan 10 2009 Gabriel Somlo <somlo@cmu.edu> 7-1
+- update to 7
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 6pl1-18
+- Autorebuild for GCC 4.3
+
 * Tue Dec 25 2007 Gabriel Somlo <somlo@cmu.edu> 6pl1-17
 - changed build config option to use default X cursor fonts
 
@@ -67,10 +193,10 @@ configurable options.
 * Fri Sep 08 2006 Gabriel Somlo <somlo@cmu.edu> 6pl1-14
 - rebuilt for FC6MassRebuild
 
-* Wed Jun 08 2006 Gabriel Somlo <somlo@cmu.edu> 6pl1-13
+* Thu Jun 08 2006 Gabriel Somlo <somlo@cmu.edu> 6pl1-13
 - rebuild
 
-* Wed Jun 08 2006 Gabriel Somlo <somlo@cmu.edu> 6pl1-12
+* Thu Jun 08 2006 Gabriel Somlo <somlo@cmu.edu> 6pl1-12
 - more X11 buildrequires (thanks tibbs@math.uh.edu and Jarod Wilson)
 
 * Wed Jun 07 2006 Gabriel Somlo <somlo@cmu.edu> 6pl1-11
@@ -110,8 +236,8 @@ configurable options.
 * Fri Dec 16 2005 Gabriel Somlo <somlo@cmu.edu> 6pl1-3
 - spec file fixes as per P. Lemenkov and I. Vazquez
 - default menu entries now go in /usr/share/wmx/menu
-- example wmx .xsession file added to %doc
-- gave up on using /usr/X11R6/bin -- using %{_bindir} instead 
+- example wmx .xsession file added to doc
+- gave up on using /usr/X11R6/bin -- using bindir instead
 
 * Wed Dec 14 2005 Gabriel Somlo <somlo@cmu.edu> 6pl1-2
 - increased bump-distance parameter for easier placement at edge of screen
@@ -125,5 +251,5 @@ configurable options.
 * Tue Aug 09 2005 Gabriel Somlo <somlo@cmu.edu> 6pl1-0
 - rebuilt for Fedora Core 4
 
-* Wed May 23 2004 Gabriel Somlo <somlo@acns.colostate.edu>
+* Sun May 23 2004 Gabriel Somlo <somlo@acns.colostate.edu>
 - initial spec and packages.

xnodecor.c

@@ -1,141 +0,0 @@
-/* Copyright 1998 by Vadim Kolontsov			
- * All rights reserved
- *
- * Distribute freely, except: don't remove my name from the source or
- * documentation (don't take credit for my work), mark your changes (don't
- * get me blamed for your possible bugs), don't alter or remove this
- * notice.  May be sold if buildable source is provided to buyer.  No
- * warrantee of any kind, express or implied, is included with this
- * software; use at your own risk, responsibility for damages (if any) to
- * anyone resulting from the use of this software rests entirely with the
- * user.
- *
- * Send bug reports, bug fixes, enhancements, requests, flames, etc., and
- * I'll try to keep a version up to date.  I can be reached as follows:
- *
- * Vadim Kolontsov <sb@123.org>
- *-----------------------------------------------------------------------
- * This program sets attribute "override_redirect" to True for any window
- * you've specified (using window name). Window Managers should ignore
- * such windows; it's useful, for example, if you're using wmx Window Manager,
- * and want to have a clock on every virtual screen and without any
- * borders. Just add the following string to your X-startfile (after
- * starting watch app):
- *
- *   xnodecor -w watch
- *
- * (assuming that your watch application has a window named "watch")
- *  
- * For details see http://sb.123.org/xnodecor.html
- *
- * Tested on FreeBSD 2.2.2, XFree86 3.2, wmx-4
- *
- * Compilation:
- * 
- *    gcc -o xnodecor xnodecor.c -L/usr/X11R6/lib -I/usr/X11R6/include -lX11 */
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
- 
-#define WAIT_DEFAULT	0
-#define WAIT_TIMEOUT	15
-#define VERBOSE_DEFAULT	0
-
-int main(int argc, char *argv[])
-{
-   Display *d;
-   Window w1, w2, *wins;
-   int c;
-   XSetWindowAttributes a;
-   char *name, *program_name, *display_name = NULL;
-   unsigned int i, n, found = 0,
-   	        f_wait = WAIT_DEFAULT, 
-	    	f_verbose = VERBOSE_DEFAULT,
-		delay = WAIT_TIMEOUT;
-
-   if (argv && argv[0] && *argv[0])
-      program_name = (program_name = rindex(argv[0], '/')) ?
-	 (*++program_name ? program_name : "xnodecor") : argv[0];
-
-   while ((c = getopt(argc, argv, "vd:wt:h")) != EOF)
-      switch (c)
-      {
-	 case 'd':
-	    display_name = strdup(optarg);
-	    break;
-
-	 case 'w':
-	    f_wait = f_wait ? 0 : 1;
-	    break;
-	    
-	 case 'v':
-	    f_verbose = f_verbose ? 0 : 1;
-	    break;
-	    
-	 case 't':
-	    delay = atoi(optarg);
-	    break;
-
-	 case 'h':
-	 default:
-	    fprintf(stderr, "Usage: %s [options] window-name\n\n"
-		  	    "   -d display	specify alternative display\n"
-			    "   -w		wait for specified window (default: %swait)\n"
-			    "   -t n		timeout for waiting (default: %d sec)\n"
-			    "   -v		verbose mode (default: %s)\n"
- 			    "   -h		this help\n\n", program_name, 
-			    f_wait ? "" : "no ", delay, 
-			    f_verbose ? "on" : "off");
-	    exit(0);
-      }
-
-   argc -= optind;
-   argv += optind;
-   
-   if (argc != 1)
-   {
-      fprintf(stderr, "%s: Window name not specified\n", program_name);
-      exit(1);
-   }
-
-   d = XOpenDisplay(display_name);
-   if (!d)
-   {
-      fprintf(stderr, "%s: Can't open display\n", program_name);
-      exit(1);
-   }
-
-   do
-   {
-      if (XQueryTree(d, RootWindow(d, 0), &w1, &w2, &wins, &n) == 0)
-      {
-	 fprintf(stderr, "%s: XQueryTree failed\n", program_name);
-	 exit(1);
-      }
-      
-      found = 0;
-      for (i = 0; i < n; i++)
-	 if (XFetchName(d, wins[i], &name))
-	 {
-	    if (f_verbose) printf("%s\n", name);
-	    if (!strcmp(name, argv[0]))
-	    {
-	       if (f_verbose) printf("(found!)\n");
-
-	       a.override_redirect = 1;
-	       XChangeWindowAttributes(d, wins[i], CWOverrideRedirect, &a);
-	       found = 1;
-	    }
-	 }
-
-      if (f_wait)
-	 sleep(1);
-   } while (f_wait && delay-- && !found);
-   
-   XCloseDisplay(d);
-}
-