rpms/wmx/FC-4 wmx-6pl1-64b.patch,NONE,1.1 wmx.spec,1.1,1.2

[Ignacio Vazquez-Abrams (ivazquez)]

Author: ivazquez

Update of /cvs/extras/rpms/wmx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1681/FC-4

Modified Files:
	wmx.spec 
Added Files:
	wmx-6pl1-64b.patch 
Log Message:
Fixed 64-bit build

wmx-6pl1-64b.patch:

--- NEW FILE wmx-6pl1-64b.patch ---
--- 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 


Index: wmx.spec
===================================================================
RCS file: /cvs/extras/rpms/wmx/FC-4/wmx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wmx.spec	14 Feb 2006 21:20:05 -0000	1.1
+++ wmx.spec	17 Feb 2006 01:08:54 -0000	1.2
@@ -12,6 +12,7 @@
 Source4: Xclients.wmx.sh
 Patch0: wmx-6pl1-fix.patch
 Patch1: wmx-6pl1-cfg.patch
+Patch1: wmx-6pl1-64b.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: xorg-x11-devel
 
@@ -27,6 +28,7 @@
 %patch1 -p1
 
 %build
+export LDFLAGS=-L/usr/X11R6/%{_lib}
 %configure
 %{__make} %{?_smp_mflags}
 
@@ -50,6 +52,9 @@
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Thu Feb 16 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
+- Fixed 64-bit build
+
 * Sat Dec 31 2005 Gabriel Somlo <somlo at cmu.edu> 6pl1-7
 - added BuildRequires for X