Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11 In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8759
Modified Files: lesstif.patch Log Message: update lesstif package from unstable Index: lesstif.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11/lesstif.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- lesstif.patch 16 Jul 2008 03:01:53 -0000 1.2 +++ lesstif.patch 5 Sep 2009 05:08:25 -0000 1.3 @@ -10,33 +10,82 @@ mwmddir = $(libdir)/X11/mwm mwmd_DATA = system.mwmrc alt.map README AM_YFLAGS = -d -diff -Nurd -x'*~' lesstif-0.95.0.orig/configure lesstif-0.95.0/configure ---- lesstif-0.95.0.orig/configure 2006-06-10 05:35:28.000000000 -0400 -+++ lesstif-0.95.0/configure 2008-06-08 03:34:39.000000000 -0400 -@@ -2150,7 +2150,7 @@ +--- lesstif-0.95.2/configure.orig 2009-05-27 10:07:59.000000000 -0400 ++++ lesstif-0.95.2/configure 2009-07-08 19:39:47.000000000 -0400 +@@ -2837,7 +2837,7 @@ - echo "$as_me:$LINENO: checking where to store autoconf macro files" >&5 - echo $ECHO_N "checking where to store autoconf macro files... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking where to store autoconf macro files" >&5 + $as_echo_n "checking where to store autoconf macro files... " >&6; } -ACLOCALDIR=`aclocal --print-ac-dir` +aclocald...@prefix@/share/aclocal if test x$ACLOCALDIR != x ; then -diff -Nurd -x'*~' lesstif-0.95.0.orig/ltmain.sh lesstif-0.95.0/ltmain.sh ---- lesstif-0.95.0.orig/ltmain.sh 2005-08-12 09:54:36.000000000 -0400 -+++ lesstif-0.95.0/ltmain.sh 2008-06-08 03:34:39.000000000 -0400 -@@ -5362,10 +5362,10 @@ +@@ -20056,9 +20056,9 @@ + esac - # Directory that this library needs to be installed in: - libdir='$install_libdir'" -- if test "$installed" = no && test "$need_relink" = yes; then -- $echo >> $output "\ --relink_command=\"$relink_command\"" -- fi -+# if test "$installed" = no && test "$need_relink" = yes; then -+# $echo >> $output "\ -+#relink_command=\"$relink_command\"" -+# fi - done - fi + saved_LIBS="$LIBS" +-LIBS="$LIBS $freetype_lib" ++LIBS="$freetype_lib $LIBS" + saved_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" ++CPPFLAGS="$FREETYPE_CFLAGS $CPPFLAGS" + for ac_header in freetype/freetype.h + do +--- lesstif2-0.94.4.orig/include/Motif-2.1/Xm/XmStrDefs.h ++++ lesstif2-0.94.4/include/Motif-2.1/Xm/XmStrDefs.h +@@ -28,6 +28,8 @@ + + #include <X11/StringDefs.h> + ++#include <Xm/Xm.h> ++ + #ifdef __cplusplus + extern "C" { + #endif +--- lesstif2-0.95.0.orig/lib/Xm-2.1/RenderTable.c ++++ lesstif2-0.95.0/lib/Xm-2.1/RenderTable.c +@@ -465,7 +465,7 @@ + DEBUGOUT(_LtDebug(__FILE__, w, "_XmRenderTableFinaliseTag(%s)\n", tag)); + #if 1 + /* Experimental start */ +- if (r->dpy == 0) ++ if (r->dpy == 0 && w) + r->dpy = XtDisplay(w); + /* Experimental end */ + #endif +--- lesstif-0.95.2/lib/Xm-2.1/CutPaste.c.org 2009-08-27 21:44:12.000000000 -0400 ++++ lesstif-0.95.2/lib/Xm-2.1/CutPaste.c 2009-08-27 21:45:25.000000000 -0400 +@@ -1028,9 +1028,11 @@ + /* XChangeProperty expects a buffer of longs when receiving 32 bits + data, MEUHH */ + if (sizeof(long) != 4) ++ { + convert_buf = XtMalloc(len * sizeof(long)); + for (i = 0; i < len; i++) + convert_buf[i] = data[i]; ++ } + break; + + case 16: +--- lesstif-0.95.2/lib/Xm-2.1/XmString.c.org 2009-08-29 16:58:59.000000000 -0400 ++++ lesstif-0.95.2/lib/Xm-2.1/XmString.c 2009-08-29 17:00:48.000000000 -0400 +@@ -5481,7 +5481,7 @@ + XtPointer *value) + { + _XmWarning(NULL, "XmStringGetNextTriple() is not implemented yet!\n"); +- return (XmStringComponentType)NULL; ++ return (XmStringComponentType)(uintptr_t)NULL; + } + + +@@ -5517,7 +5517,7 @@ + str->components[0]->type = XmSTRING_COMPONENT_DIRECTION; + str->components[0]->length = 0; + str->components[0]->data = XtMalloc(sizeof(int)); +- str->components[0]->data[0] = (int)value; ++ str->components[0]->data[0] = (int)(uintptr_t)value; + r = _XmStringCreateExternal(NULL, str); + _XmStringFree(str); + return r; ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs