rpms/lesstif/devel lesstif-0.95.0-64bitcleanups.patch, NONE, 1.1 lesstif-0.95.0-CAN-2005-0605.patch, NONE, 1.1 lesstif-0.95.0-c++fix.patch, NONE, 1.1 lesstif.spec, 1.1, 1.2
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Wed Aug 30 21:02:52 UTC 2006
Author: pertusus
Update of /cvs/extras/rpms/lesstif/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12057
Modified Files:
lesstif.spec
Added Files:
lesstif-0.95.0-64bitcleanups.patch
lesstif-0.95.0-CAN-2005-0605.patch lesstif-0.95.0-c++fix.patch
Log Message:
* Wed Aug 30 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.95.0-8
- better fix for xpdf/ddd (thanks Hans de Goede)
- 64 bit cleanups (thanks Hans de Goede)
- resolve rpmlint error from rpm-braindead behavior on handling symlinks
with debuginfo
- fix CAN-2005-0605
- nuke host.def, imake owns that
lesstif-0.95.0-64bitcleanups.patch:
--- NEW FILE lesstif-0.95.0-64bitcleanups.patch ---
--- lesstif-0.95.0/include/Motif-2.1/XmI/XpmI.h.BAD 2006-08-30 10:57:12.000000000 -0500
+++ lesstif-0.95.0/include/Motif-2.1/XmI/XpmI.h 2006-08-30 10:58:07.000000000 -0500
@@ -217,8 +217,8 @@
FUNC(xpmHashSlot, xpmHashAtom *, (xpmHashTable *table, char *s));
FUNC(xpmHashIntern, int, (xpmHashTable *table, char *tag, void *data));
-#define HashAtomData(i) ((void *)i)
-#define HashColorIndex(slot) ((unsigned int)((*slot)->data))
+#define HashAtomData(i) ((void *)((unsigned long)i))
+#define HashColorIndex(slot) ((unsigned long)((*slot)->data))
#define USE_HASHTABLE (cpp > 2 && ncolors > 4)
/* I/O utility */
lesstif-0.95.0-CAN-2005-0605.patch:
--- NEW FILE lesstif-0.95.0-CAN-2005-0605.patch ---
--- lesstif-0.95.0/lib/Xm-2.1/Xpmscan.c.BAD 2006-08-29 14:34:31.000000000 -0500
+++ lesstif-0.95.0/lib/Xm-2.1/Xpmscan.c 2006-08-29 14:36:05.000000000 -0500
@@ -672,8 +672,8 @@
char *dst;
unsigned int *iptr;
char *data;
- unsigned int x, y, i;
- int bits, depth, ibu, ibpp, offset;
+ unsigned int x, y;
+ int bits, depth, ibu, ibpp, offset, i;
unsigned long lbt;
Pixel pixel, px;
@@ -684,6 +684,9 @@
ibpp = image->bits_per_pixel;
offset = image->xoffset;
+ if (image->bitmap_unit < 0)
+ return (XpmNoMemory);
+
if ((image->bits_per_pixel | image->depth) == 1) {
ibu = image->bitmap_unit;
for (y = 0; y < height; y++)
--- lesstif-0.95.0/lib/Xm-2.1/Xpmcreate.c.BAD 2006-08-29 14:36:13.000000000 -0500
+++ lesstif-0.95.0/lib/Xm-2.1/Xpmcreate.c 2006-08-29 14:36:36.000000000 -0500
@@ -1265,10 +1265,10 @@
register char *src;
register char *dst;
register unsigned int *iptr;
- register unsigned int x, y, i;
+ register unsigned int x, y;
register char *data;
Pixel pixel, px;
- int nbytes, depth, ibu, ibpp;
+ int nbytes, depth, ibu, ibpp, i;
data = image->data;
iptr = pixelindex;
lesstif-0.95.0-c++fix.patch:
--- NEW FILE lesstif-0.95.0-c++fix.patch ---
--- lesstif-0.95.0/include/Motif-2.1/Xm/VendorSP.h.BAD 2006-08-30 11:00:30.000000000 -0500
+++ lesstif-0.95.0/include/Motif-2.1/Xm/VendorSP.h 2006-08-30 11:00:47.000000000 -0500
@@ -28,12 +28,13 @@
#include <Xm/XmP.h>
#include <Xm/VendorS.h>
-#include <X11/ShellP.h>
#ifdef __cplusplus
extern "C" {
#endif
+#include <X11/ShellP.h>
+
XMLIBEXPORT extern Cardinal _XmFilterResources(XtResource *resources,
Cardinal numResources,
WidgetClass filterClass,
Index: lesstif.spec
===================================================================
RCS file: /cvs/extras/rpms/lesstif/devel/lesstif.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lesstif.spec 30 Aug 2006 18:11:55 -0000 1.1
+++ lesstif.spec 30 Aug 2006 21:02:51 -0000 1.2
@@ -1,7 +1,7 @@
Summary: OSF/Motif(R) library clone
Name: lesstif
Version: 0.95.0
-Release: 7%{?dist}
+Release: 8%{?dist}
License: LGPL
Group: System Environment/Libraries
#Source: ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/lesstif-%{version}.tar.bz2
@@ -12,6 +12,9 @@
Patch0: lesstif-Makefile.in.diff
# have motif-config honor libdir
Patch1: lesstif-motif-config-use_libdir.diff
+Patch2: lesstif-0.95.0-CAN-2005-0605.patch
+Patch3: lesstif-0.95.0-64bitcleanups.patch
+Patch4: lesstif-0.95.0-c++fix.patch
Url: http://www.lesstif.org/
@@ -97,6 +100,9 @@
chmod a-x COPYING* doc/www.lesstif.org/BUG-HUNTING.html
%patch0 -p1
%patch1 -p1 -b .multilib
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
# those substitutions are not usefull, since the symbols are defined
# in the Makefile, but it is clearer like that
@@ -125,6 +131,12 @@
make install DESTDIR=$RPM_BUILD_ROOT \
appdir='%{_datadir}/X11/app-defaults' configdir='%{_datadir}/X11/config'
+# Handle debuginfo dangling-relative-symlink
+# rpm doesn't handle symlinks properly when generating debuginfo
+rm -rf clients/Motif-2.1/xmbind/xmbind.c
+cp -a clients/Motif-1.2/xmbind/xmbind.c \
+ clients/Motif-2.1/xmbind/xmbind.c
+
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -rf $RPM_BUILD_ROOT%{_prefix}/LessTif
@@ -154,6 +166,9 @@
# remove the empty directory
rmdir clean_docs/lessdox/functions
+# remove host.def, it lives in the imake package
+rm -rf $RPM_BUILD_ROOT%{_datadir}/X11/config/host.def
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -203,6 +218,14 @@
%{_datadir}/X11/config/*
%changelog
+* Wed Aug 30 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.95.0-8
+- better fix for xpdf/ddd (thanks Hans de Goede)
+- 64 bit cleanups (thanks Hans de Goede)
+- resolve rpmlint error from rpm-braindead behavior on handling symlinks
+ with debuginfo
+- fix CAN-2005-0605
+- nuke host.def, imake owns that
+
* Wed Aug 30 2006 Patrice Dumas <pertusus at free.fr> 0.95.0-7
- add a patch such that motif-config honors libdir
More information about the fedora-extras-commits
mailing list