| 1 |
patrick 09/09/01 10:14:04 |
| 2 |
|
| 3 |
Added: squeak-dprintf.patch squeak-inisqueak.patch |
| 4 |
squeak-vm-sugar-3.10.3-sugar-squeak-dprintf.patch |
| 5 |
Log: |
| 6 |
Bump to 3.10.5. Patches by manny15. Closes #275748 and adds ~amd64 keyword. |
| 7 |
(Portage version: 2.2_rc40/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-lang/squeak/files/squeak-dprintf.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/squeak/files/squeak-dprintf.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/squeak/files/squeak-dprintf.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: squeak-dprintf.patch |
| 16 |
=================================================================== |
| 17 |
--- ./platforms/unix/plugins/MIDIPlugin/sqUnixMIDIALSA.inc.orig Wed Jun 24 17:39:12 2009 -0400 |
| 18 |
+++ ./platforms/unix/plugins/MIDIPlugin/sqUnixMIDIALSA.inc Wed Jun 24 18:01:19 2009 -0400 |
| 19 |
@@ -116,6 +116,12 @@ |
| 20 |
|
| 21 |
#include <als./asoundlib.h> |
| 22 |
|
| 23 |
+#if (DEBUG) |
| 24 |
+# define dprintf(...) printf(__VA_ARGS__) |
| 25 |
+#else |
| 26 |
+# define dprintf(...) |
| 27 |
+#endif |
| 28 |
+ |
| 29 |
static snd_seq_t *seq = 0; |
| 30 |
static int queue = 0; |
| 31 |
static int in_port = -1; |
| 32 |
--- ./platforms/unix/vm-display-fbdev/sqUnixFBDev.c.orig Wed Jun 24 17:39:12 2009 -0400 |
| 33 |
+++ ./platforms/unix/vm-display-fbdev/sqUnixFBDev.c Wed Jun 24 18:01:19 2009 -0400 |
| 34 |
@@ -49,7 +49,13 @@ |
| 35 |
# undef ioMSecs |
| 36 |
#endif |
| 37 |
|
| 38 |
-#include <stdio.h> |
| 39 |
+// we need stdio.h to override glibc's dprintf function |
| 40 |
+// since new glibc has this function with different interface |
| 41 |
+#include <features.h> |
| 42 |
+#ifdef __USE_XOPEN2K8 |
| 43 |
+# include <stdio.h> |
| 44 |
+#endif |
| 45 |
+ |
| 46 |
#include <time.h> |
| 47 |
#include <sys/time.h> |
| 48 |
#include <sys/types.h> |
| 49 |
@@ -68,15 +74,11 @@ |
| 50 |
#endif |
| 51 |
|
| 52 |
|
| 53 |
-static void dprintf(const char *fmt, ...) |
| 54 |
-{ |
| 55 |
#if (DEBUG) |
| 56 |
- va_list ap; |
| 57 |
- va_start(ap, fmt); |
| 58 |
- vprintf(fmt, ap); |
| 59 |
- va_end(ap); |
| 60 |
+# define dprintf(...) printf(__VA_ARGS__) |
| 61 |
+#else |
| 62 |
+# define dprintf(...) |
| 63 |
#endif |
| 64 |
-} |
| 65 |
|
| 66 |
static void fatalError(const char *who) |
| 67 |
{ |
| 68 |
--- ./platforms/unix/vm-sound-NAS/sqUnixSoundNAS.c.orig Wed Jun 24 17:39:12 2009 -0400 |
| 69 |
+++ ./platforms/unix/vm-sound-NAS/sqUnixSoundNAS.c Wed Jun 24 18:01:19 2009 -0400 |
| 70 |
@@ -33,13 +33,12 @@ |
| 71 |
#include <audio/audiolib.h> |
| 72 |
#include <assert.h> |
| 73 |
|
| 74 |
-#ifdef DEBUG |
| 75 |
-# define dprintf printf |
| 76 |
+#if (DEBUG) |
| 77 |
+# define dprintf(...) printf(__VA_ARGS__) |
| 78 |
#else |
| 79 |
- static void dprintf(char *fmt, ...) {} |
| 80 |
+# define dprintf(...) |
| 81 |
#endif |
| 82 |
|
| 83 |
- |
| 84 |
#ifdef WORDS_BIGENDIAN |
| 85 |
# define AU_FORMAT AuFormatLinearSigned16MSB |
| 86 |
#else |
| 87 |
|
| 88 |
|
| 89 |
|
| 90 |
1.1 dev-lang/squeak/files/squeak-inisqueak.patch |
| 91 |
|
| 92 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/squeak/files/squeak-inisqueak.patch?rev=1.1&view=markup |
| 93 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/squeak/files/squeak-inisqueak.patch?rev=1.1&content-type=text/plain |
| 94 |
|
| 95 |
Index: squeak-inisqueak.patch |
| 96 |
=================================================================== |
| 97 |
--- Squeak-3.10-5/platforms/unix/config/inisqueak.in 2006-10-18 13:14:20.000000000 -0400 |
| 98 |
+++ Squeak-3.10-5-new/platforms/unix/config/inisqueak.in 2009-07-03 22:09:34.000000000 -0400 |
| 99 |
@@ -30,7 +30,7 @@ |
| 100 |
# |
| 101 |
# Last edited: 2006-10-18 10:14:20 by piumarta on emilia.local |
| 102 |
|
| 103 |
-MAJOR=@SQ_MAJOR@ |
| 104 |
+MAJOR=@SQ_MAJOR@9 |
| 105 |
VERSION=@SQ_VERSION@ |
| 106 |
|
| 107 |
prefix=@prefix@ |
| 108 |
|
| 109 |
|
| 110 |
|
| 111 |
1.1 dev-lang/squeak/files/squeak-vm-sugar-3.10.3-sugar-squeak-dprintf.patch |
| 112 |
|
| 113 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/squeak/files/squeak-vm-sugar-3.10.3-sugar-squeak-dprintf.patch?rev=1.1&view=markup |
| 114 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/squeak/files/squeak-vm-sugar-3.10.3-sugar-squeak-dprintf.patch?rev=1.1&content-type=text/plain |
| 115 |
|
| 116 |
Index: squeak-vm-sugar-3.10.3-sugar-squeak-dprintf.patch |
| 117 |
=================================================================== |
| 118 |
--- ./platforms/unix/vm/debug.h.orig 2003-08-07 07:39:34.000000000 +0000 |
| 119 |
+++ ./platforms/unix/vm/debug.h 2009-05-09 21:38:27.000000000 +0000 |
| 120 |
@@ -7,6 +7,13 @@ |
| 121 |
#endif |
| 122 |
|
| 123 |
|
| 124 |
+// we need stdio.h to override glibc's dprintf function |
| 125 |
+// since new glibc has this function with different interface |
| 126 |
+#include <features.h> |
| 127 |
+#ifdef __USE_XOPEN2K8 |
| 128 |
+# include <stdio.h> |
| 129 |
+#endif |
| 130 |
+ |
| 131 |
#if (DEBUG) |
| 132 |
/* the thing to use here is a variadic macro, but Apple's gcc barfs on |
| 133 |
** them when running in precomp mode. did they _really_ have to break |
| 134 |
--- olpc/platforms/unix/plugins/MIDIPlugin/sqUnixMIDIALSA.inc.orig 2007-03-11 23:56:36.000000000 +0000 |
| 135 |
+++ olpc/platforms/unix/plugins/MIDIPlugin/sqUnixMIDIALSA.inc 2009-05-09 22:07:29.000000000 +0000 |
| 136 |
@@ -116,6 +116,12 @@ |
| 137 |
|
| 138 |
#include <alsa/asoundlib.h> |
| 139 |
|
| 140 |
+#if (DEBUG) |
| 141 |
+# define dprintf(...) printf(__VA_ARGS__) |
| 142 |
+#else |
| 143 |
+# define dprintf(...) |
| 144 |
+#endif |
| 145 |
+ |
| 146 |
static snd_seq_t *seq = 0; |
| 147 |
static int queue = 0; |
| 148 |
static int in_port = -1; |
Archives