Author: bdubbs
Date: 2005-05-13 10:32:37 -0600 (Fri, 13 May 2005)
New Revision: 951
Added:
trunk/MPlayer/MPlayer-1.0pre7-kernel_2.6-1.patch
trunk/cvs/cvs-1.11.20-zlib-1.patch
trunk/lcms/
trunk/lcms/lcms-1.14-gcc343-1.patch
trunk/lesstif/
trunk/lesstif/lesstif-0.94.4-testsuite_fix-1.patch
trunk/tidy/tidy-050502-prevent_PRE_newlines-1.patch
Log:
Add patches used in BLFS: lcms, MPlayer, cvs, lesstif, and tidy
Added: trunk/MPlayer/MPlayer-1.0pre7-kernel_2.6-1.patch
===================================================================
--- trunk/MPlayer/MPlayer-1.0pre7-kernel_2.6-1.patch 2005-05-13 04:14:43 UTC
(rev 950)
+++ trunk/MPlayer/MPlayer-1.0pre7-kernel_2.6-1.patch 2005-05-13 16:32:37 UTC
(rev 951)
@@ -0,0 +1,23 @@
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2004-04-29
+Initial Package Version: 1.0pre4
+Origin: Jim Gifford
+Upstream Status: Sent
+Description: Fixes Compile Issues with the 2.6 Kernel
+
+$LastChangedBy: randy $
+$Date: 2005-05-01 09:28:53 -0500 (Sun, 01 May 2005) $
+
+diff -Naur MPlayer-1.0pre4.orig/osdep/kerneltwosix.h
MPlayer-1.0pre4/osdep/kerneltwosix.h
+--- MPlayer-1.0pre4.orig/osdep/kerneltwosix.h 2004-01-10 09:48:15.000000000
+0000
++++ MPlayer-1.0pre4/osdep/kerneltwosix.h 2004-04-30 02:10:54.429252761
+0000
+@@ -1,9 +1,3 @@
+ #include <linux/version.h>
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70)
+-#define __KERNEL__
+-#include <linux/thread_info.h>
+-#include <linux/list.h>
+-#undef __KERNEL__
+-#endif
+
+
Added: trunk/cvs/cvs-1.11.20-zlib-1.patch
===================================================================
--- trunk/cvs/cvs-1.11.20-zlib-1.patch 2005-05-13 04:14:43 UTC (rev 950)
+++ trunk/cvs/cvs-1.11.20-zlib-1.patch 2005-05-13 16:32:37 UTC (rev 951)
@@ -0,0 +1,53 @@
+Submitted By: Matthew Burgess <[EMAIL PROTECTED]>
+Date: 2004-11-12
+Initial Package Version: 1.11.2
+Upstream Status: Not submitted
+Origin: BLFS Dev Post
+Description: Links against system zlib instead of the
+ internal zlib.
+
+$LastChangedBy: randy $
+$Date: 2005-05-03 08:59:48 -0500 (Tue, 03 May 2005) $
+
+diff -Naur cvs-1.11.18.orig/src/Makefile.in cvs-1.11.18/src/Makefile.in
+--- cvs-1.11.18.orig/src/Makefile.in 2004-11-11 18:17:20.000000000 +0000
++++ cvs-1.11.18/src/Makefile.in 2004-11-12 19:58:14.962293296 +0000
+@@ -86,7 +86,7 @@
+ version.$(OBJEXT) vers_ts.$(OBJEXT) watch.$(OBJEXT) \
+ wrapper.$(OBJEXT) zlib.$(OBJEXT)
+ cvs_OBJECTS = $(am_cvs_OBJECTS)
+-cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a ../zlib/libz.a
++cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(bin_SCRIPTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -199,7 +199,7 @@
+ # some namespace hackery going on that maybe shouldn't be. Long term fix is
to
+ # try and remove naming ocnflicts and fix Automake to allow particular
includes
+ # to be attached only to particular object files. Short term fix is either
or.
+-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib
$(includeopt)
++INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
+ bin_SCRIPTS = cvsbug
+
+ # The cvs executable
+@@ -278,7 +278,7 @@
+ cvs_LDADD = \
+ ../diff/libdiff.a \
+ ../lib/libcvs.a \
+- ../zlib/libz.a
++ -lz
+
+
+ # extra clean targets
+diff -Naur cvs-1.11.18.orig/src/zlib.c cvs-1.11.18/src/zlib.c
+--- cvs-1.11.18.orig/src/zlib.c 2004-03-19 19:18:57.000000000 +0000
++++ cvs-1.11.18/src/zlib.c 2004-11-12 19:58:55.531125896 +0000
+@@ -22,7 +22,7 @@
+
+ #if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT)
+
+-#include "zlib.h"
++#include <zlib.h>
+
+ /* OS/2 doesn't have EIO. FIXME: this whole notion of turning
+ a different error into EIO strikes me as pretty dubious. */
Added: trunk/lcms/lcms-1.14-gcc343-1.patch
===================================================================
--- trunk/lcms/lcms-1.14-gcc343-1.patch 2005-05-13 04:14:43 UTC (rev 950)
+++ trunk/lcms/lcms-1.14-gcc343-1.patch 2005-05-13 16:32:37 UTC (rev 951)
@@ -0,0 +1,22 @@
+Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date: 2005-04-15
+Initial Package Version: 1.14
+Upstream Status: Submitted to the LCMS mailing list
+Origin: Randy McMurchy
+Description: Adds an identifier declaration so that the SWIG/Python
+ module will compile using GCC-3.4.3
+
+$LastChangedBy: randy $
+$Date: 2005-04-15 17:45:20 -0500 (Fri, 15 Apr 2005) $
+
+diff -Naur lcms-1.14-orig/python/lcms.i lcms-1.14/python/lcms.i
+--- lcms-1.14-orig/python/lcms.i 2004-07-16 16:59:48.000000000 +0000
++++ lcms-1.14/python/lcms.i 2005-04-15 21:48:32.000000000 +0000
+@@ -102,6 +102,7 @@
+ %typemap(in) LPGAMMATABLE[3](LPGAMMATABLE gamma[3]) {
+
+ PyObject* tmp[3];
++ swig_type_info* SWIGTYPE_LPGAMMATABLE;
+
+ if (PyTuple_Check($input)) {
+ if (!PyArg_ParseTuple($input,"OOO",&tmp[0],&tmp[1],&tmp[2])) {
Added: trunk/lesstif/lesstif-0.94.4-testsuite_fix-1.patch
===================================================================
--- trunk/lesstif/lesstif-0.94.4-testsuite_fix-1.patch 2005-05-13 04:14:43 UTC
(rev 950)
+++ trunk/lesstif/lesstif-0.94.4-testsuite_fix-1.patch 2005-05-13 16:32:37 UTC
(rev 951)
@@ -0,0 +1,162 @@
+Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date: 2005-04-16
+Initial Package Version: 0.94.4
+Upstream Status: Not submitted (LFS specific)
+Origin: Randy McMurchy
+Description: Add minor changes to the testsuite so that something
+ meaningful can be made by running the tests
+
+$LastChangedBy: randy $
+$Date: 2005-04-17 16:02:50 -0500 (Sun, 17 Apr 2005) $
+
+diff -Naur lesstif-0.94.4-orig/test/Xm/failed.known
lesstif-0.94.4/test/Xm/failed.known
+--- lesstif-0.94.4-orig/test/Xm/failed.known 1970-01-01 00:00:00.000000000
+0000
++++ lesstif-0.94.4/test/Xm/failed.known 2005-04-16 22:19:30.000000000
+0000
+@@ -0,0 +1,100 @@
++
++bulletinboard/test1 1
++bulletinboard/test2 1
++bulletinboard/test4 1
++cascadebutton/test2 1
++cascadebutton/test7 1
++cascadebuttong/test3 78
++cascadebuttong/test4 1
++cascadebuttong/test7 1
++drawnbutton/test10 1
++drawnbutton/test6 78
++filesb/test1 1
++filesb/test10 1
++filesb/test13 30
++filesb/test2 1
++filesb/test20 1
++filesb/test3 1
++filesb/test4 1
++filesb/test6 1
++filesb/test8 1
++filesb/test9 1
++form/test4 1
++form/test50 1
++form/test53 8
++form/test56 1
++form/test58 1
++form/test6 1
++frame/test10 1
++frame/test8 2
++frame/test9 1
++label/test1 1
++label/test10 1
++label/test3 1
++label/test4 1
++labelg/test2 1
++labelg/test4 78
++list/test16 1
++list/test21 3
++mainw/test12 2
++mainw/test13 1
++mainw/test17 1
++mainw/test9 1
++menushell/test9 1
++messagebox/test12 1
++messagebox/test19 2
++messagebox/test8 1
++misc/test8 1
++panedw/test1 1
++panedw/test6 1
++panedw/test7 3
++panedw/test8 1
++pushbg/test2 1
++pushbg/test5 1
++pushbg/test6 1
++pushbg/test7 1
++pushbg/test9 78
++pushbutton/test13 1
++pushbutton/test2 1
++pushbutton/test6 1
++pushbutton/test7 1
++reptype/test1 2
++resconvert/test2 139
++rowcolumn/test18 1
++rowcolumn/test50 7
++rowcolumn/test51 100
++rowcolumn/test58 1
++rowcolumn/test60 1
++rowcolumn/test62 1
++rowcolumn/test63 2
++rowcolumn/test65 1
++scale/test17 78
++scrolledwindow/test1 1
++scrolledwindow/test13 1
++scrolledwindow/test19 1
++scrolledwindow/test20 1
++scrolledwindow/test21 1
++selectionbox/test11 1
++selectionbox/test13 1
++selectionbox/test9 145
++text/test1 1
++text/test10 1
++text/test13 1
++text/test16 55
++text/test2 1
++text/test22 1
++text/test23 1
++text/test7 1
++text/test8 1
++textf/test15 1
++textf/test17 139
++textf/test2 1
++textf/test3 1
++textf/test7 1
++togglebg/test2 78
++togglebutton/test7 78
++tracking/test1 1
++traversal/test1 1
++traversal/test4 1
++vendor/test5 1
++xmstring/test8 139
+
+diff -Naur lesstif-0.94.4-orig/test/testall.in lesstif-0.94.4/test/testall.in
+--- lesstif-0.94.4-orig/test/testall.in 2001-11-21 12:55:04.000000000
+0000
++++ lesstif-0.94.4/test/testall.in 2005-04-16 22:43:17.000000000 +0000
+@@ -127,7 +127,7 @@
+ if [ $status -ne 0 ]
+ then
+ echo "failed $status"
+- echo "status" >>failed
++ echo "$dir/$file $status" >>../failed
+ FAILED=`expr $FAILED + 1`
+ else
+ echo "okay"
+@@ -156,7 +156,7 @@
+ echo ""
+ diff failed failed.known
+ else
+- echo "No change in the tests"
++ echo "All failed tests were expected"
+ fi
+
+ # Exiting. Return number of broken tests (?!)
+
+diff -Naur lesstif-0.94.4-orig/test/Xm/fonts/test3.c
lesstif-0.94.4/test/Xm/fonts/test3.c
+--- lesstif-0.94.4-orig/test/Xm/fonts/test3.c 2003-08-24 12:55:45.000000000
+0000
++++ lesstif-0.94.4/test/Xm/fonts/test3.c 2005-04-17 02:27:15.000000000
+0000
+@@ -33,7 +33,7 @@
+
+ XtRealizeWidget(toplevel);
+
+- for (i=0; i<100; i++) {
++ for (i=0; i<50; i++) {
+ fontlist = _XmGetDefaultFontList(label, XmBUTTON_FONTLIST);
+ XmFontListFree(fontlist);
+ sleep(1);
+
+diff -Naur lesstif-0.94.4-orig/test/Xm/pushbutton/test18.c
lesstif-0.94.4/test/Xm/pushbutton/test18.c
+--- lesstif-0.94.4-orig/test/Xm/pushbutton/test18.c 2004-10-03
13:26:50.000000000 +0000
++++ lesstif-0.94.4/test/Xm/pushbutton/test18.c 2005-04-17 02:27:58.000000000
+0000
+@@ -72,6 +72,6 @@
+ /* End */
+ fprintf(stderr, "Finishing up\n");
+
+- sleep(300);
++ sleep(10);
+ exit(0);
+ }
Added: trunk/tidy/tidy-050502-prevent_PRE_newlines-1.patch
===================================================================
--- trunk/tidy/tidy-050502-prevent_PRE_newlines-1.patch 2005-05-13 04:14:43 UTC
(rev 950)
+++ trunk/tidy/tidy-050502-prevent_PRE_newlines-1.patch 2005-05-13 16:32:37 UTC
(rev 951)
@@ -0,0 +1,31 @@
+Submitted By: BLFS Book <[email protected]>
+Date: 2005-03-07
+Initial Package Version: 040914
+Upstream Status: Unknown
+Origin: Nico R. submitted to lfs.dev mailing list
+Description: Fixes an issue where an extra line feed is
incorrectly
+ inserted when using the <pre></pre> tags
+
+$LastChangedBy: randy $
+$Date: 2005-05-03 13:56:30 -0500 (Tue, 03 May 2005) $
+
+diff -Naur tidy-20040914T211547+0000.orig/src/pprint.c
tidy-20040914T211547+0000/src/pprint.c
+--- tidy-20040914T211547+0000.orig/src/pprint.c 2004-09-14
21:13:08.000000000 +0000
++++ tidy-20040914T211547+0000/src/pprint.c 2004-09-14 22:08:08.000000000
+0000
+@@ -1976,14 +1976,14 @@
+ PPrintTag( doc, mode, indent, node );
+
+ indent = 0;
+- PFlushLine( doc, indent );
++ if ( !nodeIsPRE(node) ) PFlushLine( doc, indent );
+
+ for ( content = node->content; content; content = content->next )
+ {
+ PPrintTree( doc, (mode | PREFORMATTED | NOWRAP),
+ indent, content );
+ }
+- PCondFlushLine( doc, indent );
++ if ( !nodeIsPRE(node) ) PCondFlushLine( doc, indent );
+ indent = indprev;
+ PPrintEndTag( doc, mode, indent, node );
+
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
