r623 - in trunk: cdrtools gnome-terminal

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue Aug 31 13:01:01 PDT 2004


Author: jim
Date: 2004-08-31 14:00:59 -0600 (Tue, 31 Aug 2004)
New Revision: 623

Added:
   trunk/cdrtools/cdrtools-2.00.3-kernel_2.6-1.patch
   trunk/gnome-terminal/gnome-terminal-2.6.1-gcc34-1.patch
Log:
Updated by BLFS request

Added: trunk/cdrtools/cdrtools-2.00.3-kernel_2.6-1.patch
===================================================================
--- trunk/cdrtools/cdrtools-2.00.3-kernel_2.6-1.patch	2004-08-31 19:57:54 UTC (rev 622)
+++ trunk/cdrtools/cdrtools-2.00.3-kernel_2.6-1.patch	2004-08-31 20:00:59 UTC (rev 623)
@@ -0,0 +1,50 @@
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2004-05-06
+Initial Package Version: 2.01
+Origin: Jim Gifford and http://kerneltrap.org/node/view/879
+Upstream Status: Sent
+Description: Fixes CDRTools Compile with the 2.6 Kernel
+ 
+ 
+diff -Naur cdrtools-2.01.orig/DEFAULTS/Defaults.gnu cdrtools-2.01/DEFAULTS/Defaults.gnu
+--- cdrtools-2.01.orig/DEFAULTS/Defaults.gnu	2003-02-16 00:01:47.000000000 +0000
++++ cdrtools-2.01/DEFAULTS/Defaults.gnu	2004-05-07 00:52:58.111410726 +0000
+@@ -18,7 +18,7 @@
+ ###########################################################################
+ CWARNOPTS=
+ 
+-DEFINCDIRS=	$(SRCROOT)/include /usr/src/linux/include
++DEFINCDIRS=	$(SRCROOT)/include
+ LDPATH=		-L/opt/schily/lib
+ RUNPATH=	-R $(INS_BASE)/lib -R /opt/schily/lib -R $(OLIBSDIR)
+ 
+diff -Naur cdrtools-2.01.orig/DEFAULTS/Defaults.linux cdrtools-2.01/DEFAULTS/Defaults.linux
+--- cdrtools-2.01.orig/DEFAULTS/Defaults.linux	2003-02-16 00:01:48.000000000 +0000
++++ cdrtools-2.01/DEFAULTS/Defaults.linux	2004-05-07 00:53:05.850026970 +0000
+@@ -18,7 +18,7 @@
+ ###########################################################################
+ CWARNOPTS=
+ 
+-DEFINCDIRS=	$(SRCROOT)/include /usr/src/linux/include
++DEFINCDIRS=	$(SRCROOT)/include
+ LDPATH=		-L/opt/schily/lib
+ RUNPATH=	-R $(INS_BASE)/lib -R /opt/schily/lib -R $(OLIBSDIR)
+ 
+diff -Naur cdrtools-2.01.orig/libscg/scsi-linux-sg.c cdrtools-2.01/libscg/scsi-linux-sg.c
+--- cdrtools-2.01.orig/libscg/scsi-linux-sg.c	2004-04-18 10:26:44.000000000 +0000
++++ cdrtools-2.01/libscg/scsi-linux-sg.c	2004-05-07 00:52:47.953227014 +0000
+@@ -65,6 +65,14 @@
+ 
+ #if LINUX_VERSION_CODE >= 0x01031a /* <linux/scsi.h> introduced in 1.3.26 */
+ #if LINUX_VERSION_CODE >= 0x020000 /* <scsi/scsi.h> introduced somewhere. */
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
++	#define __KERNEL__
++	#include <asm/types.h>
++	#include <asm/byteorder.h>
++	#undef __KERNEL__
++#endif
++
+ /* Need to fine tune the ifdef so we get the transition point right. */
+ #include <scsi/scsi.h>
+ #else

Added: trunk/gnome-terminal/gnome-terminal-2.6.1-gcc34-1.patch
===================================================================
--- trunk/gnome-terminal/gnome-terminal-2.6.1-gcc34-1.patch	2004-08-31 19:57:54 UTC (rev 622)
+++ trunk/gnome-terminal/gnome-terminal-2.6.1-gcc34-1.patch	2004-08-31 20:00:59 UTC (rev 623)
@@ -0,0 +1,24 @@
+Submitted By: Jeremy Utley (jeremy at linuxfromscratch.org)
+Date: 2004-05-20
+Initial Package Version: 2.6.0
+Upstream Status: Not Submitted
+Origin: Self Created
+Description: Fixes syntax issues with GCC 3.4
+
+diff -ur gnome-terminal-2.6.0/src/eggcellrendererkeys.h 
+gnome-terminal-2.6.0.jbit/src/eggcellrendererkeys.h
+--- gnome-terminal-2.6.0/src/eggcellrendererkeys.h	2002-08-22 21:14:25.000000000 -0700
++++ gnome-terminal-2.6.0.jbit/src/eggcellrendererkeys.h	2004-04-13 13:15:43.881284633 -0700
+@@ -70,10 +70,10 @@
+ 
+ void             egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys     *keys,
+ 							 guint                    keyval,
+-							 EggVirtualModifierType   mask);
++							 GdkModifierType          mask);
+ void             egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys     *keys,
+ 							 guint                   *keyval,
+-							 EggVirtualModifierType  *mask);
++							 GdkModifierType         *mask);
+ void             egg_cell_renderer_keys_set_accel_mode  (EggCellRendererKeys     *keys,
+ 							 EggCellRendererKeysMode  accel_mode);
+ 




More information about the patches mailing list