dist-git conversion

#2781)

.gitignore

@@ -1,7 +1,2 @@
-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
+wmx-6pl1.tar.gz
+wmx-defaults.tar.gz

background.xpm

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

sources

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

wmx-6pl1-64b.patch

@@ -0,0 +1,31 @@
+--- wmx-6pl1/Client.C.64b	2006-02-16 11:07:31.909626084 -0600
++++ wmx-6pl1/Client.C	2006-02-16 11:08:02.499956573 -0600
+@@ -663,7 +663,7 @@
+ }
+ 
+ 
+-int Client::getAtomProperty(Atom a, Atom type)
++size_t Client::getAtomProperty(Atom a, Atom type)
+ {
+     char **p, *x;
+     if (getProperty_aux(display(), m_window, a, type, 1L,
+@@ -673,7 +673,7 @@
+ 
+     x = *p;
+     XFree((void *)p);
+-    return (int)x;
++    return (size_t)x;
+ }
+ 
+ 
+--- wmx-6pl1/Client.h.64b	2006-02-16 11:07:37.465322869 -0600
++++ wmx-6pl1/Client.h	2006-02-16 11:08:19.883007902 -0600
+@@ -184,7 +184,7 @@
+     WindowManager *const m_windowManager;
+ 
+     char *getProperty(Atom);
+-    int getAtomProperty(Atom, Atom);
++    size_t getAtomProperty(Atom, Atom);
+     int getIntegerProperty(Atom);
+ 
+     // accessors 

wmx-6pl1-cfg.patch

@@ -1,20 +1,19 @@
-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?
+diff -NarU5 wmx-6pl1.orig/Config.h wmx-6pl1/Config.h
+--- wmx-6pl1.orig/Config.h	2006-06-04 13:57:06.000000000 -0400
++++ wmx-6pl1/Config.h	2006-06-04 13:59:12.000000000 -0400
+@@ -75,11 +75,10 @@
  #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 "x-terminal-emulator"
-+#define CONFIG_NEW_WINDOW_COMMAND "/usr/bin/xterm"
+ #define CONFIG_NEW_WINDOW_COMMAND "xterm"
+-//#define CONFIG_NEW_WINDOW_COMMAND "/home/ccannam/.wmx/terminal"
  #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())
-@@ -92,11 +92,11 @@
+@@ -90,11 +89,11 @@
   
  // Directory under $HOME in which to look for commands for the
  // middle-button menu
@@ -27,7 +26,7 @@ diff -NarU5 wmx-8.orig/Config.h wmx-8/Config.h
  #define CONFIG_ADD_SCREEN_TO_COMMAND_MENU False
   
  // Focus possibilities.
-@@ -125,11 +125,11 @@
+@@ -121,11 +120,11 @@
  
  // Number of pixels off the screen you have to push a window
  // before the manager notices the window is off-screen (the higher
@@ -36,11 +35,11 @@ diff -NarU5 wmx-8.orig/Config.h wmx-8/Config.h
 -#define CONFIG_BUMP_DISTANCE      16
 +#define CONFIG_BUMP_DISTANCE      32
  
- // 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 @@
+ // 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 @@
  
  // 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
@@ -53,7 +52,7 @@ diff -NarU5 wmx-8.orig/Config.h wmx-8/Config.h
  // modifier is pressed; they're keysyms as defined in <X11/keysym.h>
  // and <X11/keysymdef.h>
  
-@@ -335,11 +335,11 @@
+@@ -304,11 +303,11 @@
  #define CONFIG_MENU_BORDERS       "black"
  
  // Pixel width for the bit of frame to the left of the window and the
@@ -66,7 +65,7 @@ diff -NarU5 wmx-8.orig/Config.h wmx-8/Config.h
  // ========================
  // Section IV. Flashy stuff
  // ========================
-@@ -348,11 +348,11 @@
+@@ -317,11 +316,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-6pl1-cfgbug.patch

@@ -0,0 +1,32 @@
+diff -NarU5 wmx-6pl1.orig/Config.C wmx-6pl1/Config.C
+--- wmx-6pl1.orig/Config.C	2006-06-04 14:23:33.000000000 -0400
++++ wmx-6pl1/Config.C	2006-06-04 14:25:03.000000000 -0400
+@@ -149,13 +149,25 @@
+ 	    if (OPTION("off")) m_impl->rightBt = 0;
+ 	    else if (OPTION("circulate")) m_impl->rightBt = 1;
+ 	    else if (OPTION("lower")) m_impl->rightBt = 2;
+ 	    else if (OPTION("toggleheight")) m_impl->rightBt = 4;
+ 	
+-	if (OPTION("tabfg:")) strncpy(m_impl->tabfg, s, COLOR_LEN);
+-	if (OPTION("tabbg:")) strncpy(m_impl->tabbg, s, COLOR_LEN);
+-	if (OPTION("framebg:")) strncpy(m_impl->framebg, s, COLOR_LEN);
++	if (OPTION("tabfg:")) {
++	    strncpy(m_impl->tabfg, s, COLOR_LEN);
++	    m_impl->tabfg[COLOR_LEN-1] = '\0';	// prevent unterminated string
++	    s += strlen(m_impl->tabfg);		// avoid error message below
++	}
++	if (OPTION("tabbg:")) {
++	    strncpy(m_impl->tabbg, s, COLOR_LEN);
++	    m_impl->tabbg[COLOR_LEN-1] = '\0';
++	    s += strlen(m_impl->tabbg);
++	}
++	if (OPTION("framebg:")) {
++	    strncpy(m_impl->framebg, s, COLOR_LEN);
++	    m_impl->framebg[COLOR_LEN-1] = '\0';
++	    s += strlen(m_impl->framebg);
++	}
+ 
+ 	if (*s != '\0') {
+ 	    fprintf(stderr, "\nwmx: Dynamic configuration error: "
+ 		    "`%s' @ position %d", s, string - s);
+ 	}

wmx.spec

@@ -1,20 +1,21 @@
 Name: wmx
-Version: 8
-Release: 28%{?dist}
+Version: 6pl1
+Release: 14%{?dist}
 Summary: A really simple window manager for X
-# Automatically converted from old format: BSD - review is highly recommended.
-License: LicenseRef-Callaway-BSD
+License: BSD
+Group: User Interface/X
 URL: http://www.all-day-breakfast.com/wmx/
 Source0: http://www.all-day-breakfast.com/wmx/%{name}-%{version}.tar.gz
-Source1: wmx-defaults-3.tar.gz
+Source1: wmx-defaults.tar.gz
 Source2: background.xpm
 Source3: wmx.desktop
 Source4: Xclients.wmx.sh
-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
+Patch0: wmx-6pl1-cvs20060602.patch
+Patch1: wmx-6pl1-64b.patch
+Patch2: wmx-6pl1-cfgbug.patch
+Patch3: 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
 
 %description
 A really simple window manager for X, based on wm2, with a minimal set of
@@ -22,181 +23,44 @@ configurable options.
 
 %prep
 %setup -q
-%setup -q -a 1
-%{__install} -p -m 0644 %{SOURCE2} .
-%patch -P0 -p1
+%setup -a 1
+%{__install} -p %{SOURCE2} .
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
-%configure --x-libraries=%{_libdir} --x-includes=%{_includedir}/X11 LIBS=-lfontconfig
+%configure --x-libraries=%{_libdir} --x-includes=%{_includedir}/X11
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
 %{__install} -D -m 0755 wmx %{buildroot}%{_bindir}/wmx
 %{__install} -d -m 0755 %{buildroot}%{_datadir}/%{name}
-%{__install} -m 0755 wmx-defaults-3/* %{buildroot}%{_datadir}/%{name}
+%{__install} -m 0755 wmx-defaults/* %{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
-%doc README* UPDATES TODO.netwm rsharman-patch/
+%defattr(-,root,root)
+%doc README* UPDATES ANNOYING-BUGS
 %{_bindir}/*
-%{_datadir}/%{name}
-%{_datadir}/xsessions/*
+%{_datadir}/*
 %{_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
-
-* Sat Nov 17 2007 Gabriel Somlo <somlo@cmu.edu> 6pl1-16
-- rebuild
-
-* Tue Nov 13 2007 Gabriel Somlo <somlo@cmu.edu> 6pl1-15
-- patch containing latest cvs fixes
-- added xnodecor.c from ftp://ftp.42.org/pub/wmx/contrib/xnodecor.c
-- updated default menu entries
-
 * Fri Sep 08 2006 Gabriel Somlo <somlo@cmu.edu> 6pl1-14
 - rebuilt for FC6MassRebuild
 
-* Thu Jun 08 2006 Gabriel Somlo <somlo@cmu.edu> 6pl1-13
+* Wed Jun 08 2006 Gabriel Somlo <somlo@cmu.edu> 6pl1-13
 - rebuild
 
-* Thu Jun 08 2006 Gabriel Somlo <somlo@cmu.edu> 6pl1-12
+* Wed 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
@@ -236,8 +100,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
@@ -251,5 +115,5 @@ configurable options.
 * Tue Aug 09 2005 Gabriel Somlo <somlo@cmu.edu> 6pl1-0
 - rebuilt for Fedora Core 4
 
-* Sun May 23 2004 Gabriel Somlo <somlo@acns.colostate.edu>
+* Wed May 23 2004 Gabriel Somlo <somlo@acns.colostate.edu>
 - initial spec and packages.