rpms/wmx/devel wmx-6pl1-64b.patch,NONE,1.1 wmx.spec,1.2,1.3
Ignacio Vazquez-Abrams (ivazquez)
fedora-extras-commits at redhat.com
Fri Feb 17 01:09:02 UTC 2006
Author: ivazquez
Update of /cvs/extras/rpms/wmx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1681/devel
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/devel/wmx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wmx.spec 16 Feb 2006 04:47:16 -0000 1.2
+++ wmx.spec 17 Feb 2006 01:09:01 -0000 1.3
@@ -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-proto-devel libX11-devel libXpm-devel libXext-devel
@@ -25,8 +26,10 @@
%{__install} -p %{SOURCE2} .
%patch0 -p1
%patch1 -p1
+%patch2 -p1 -b .64b
%build
+export LDFLAGS=-L/usr/X11R6/%{_lib}
%configure
%{__make} %{?_smp_mflags}
@@ -50,6 +53,9 @@
%{_sysconfdir}/X11/xinit/Xclients.d/*
%changelog
+* Thu Feb 16 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
+- Fixed 64-bit build
+
* Wed Feb 15 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
- Modified for modular X
More information about the fedora-extras-commits
mailing list