Attachment #223538 for bug #254456

Lines 3-9 Link Here

(-)squeak/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= squeak	4	PORTNAME= squeak
5	PORTVERSION= 4.10.2	5	PORTVERSION= 4.10.2
6	PORTREVISION= 8	6	PORTREVISION= 9
7	CATEGORIES= lang	7	CATEGORIES= lang
8	MASTER_SITES= http://www.squeakvm.org/unix/release/:vmsrc \	8	MASTER_SITES= http://www.squeakvm.org/unix/release/:vmsrc \
9	http://ftp.squeak.org/${IMAGE_VERSION}/:src \	9	http://ftp.squeak.org/${IMAGE_VERSION}/:src \

Lines 1-5 Link Here

(-)squeak/files/patch-unix_plugins_CameraPlugin_sqCamera-linux.c (-3 / +3 lines)
1	--- unix/plugins/CameraPlugin/sqCamera-linux.c.orig 2012-07-31 06:59:01.000000000 +0900	1	--- unix/plugins/CameraPlugin/sqCamera-linux.c.orig 2012-07-30 21:59:01 UTC
2	+++ unix/plugins/CameraPlugin/sqCamera-linux.c 2012-09-24 14:44:26.000000000 +0900	2	+++ unix/plugins/CameraPlugin/sqCamera-linux.c
3	@@ -45,8 +45,9 @@	3	@@ -45,8 +45,9 @@
4	#include <sys/ioctl.h>	4	#include <sys/ioctl.h>
5	#include <dlfcn.h>	5	#include <dlfcn.h>
Lines 12-18 Link Here
12	#include <linux/videodev2.h>	12	#include <linux/videodev2.h>
13		13
14		14
15	@@ -176,12 +177,19 @@	15	@@ -176,12 +177,19 @@ libCon(void)
16	int devNum;	16	int devNum;
17	camPtr cam;	17	camPtr cam;
18		18

Lines 1-6 Link Here

(-)squeak/files/patch-unix_plugins_ScratchPlugin_unixSeriaPort2Ops.c (-3 / +3 lines)
1	--- unix/plugins/ScratchPlugin/unixSeriaPort2Ops.c.org 2012-09-24 15:26:44.000000000 +0900	1	--- unix/plugins/ScratchPlugin/unixSeriaPort2Ops.c.orig 2012-07-30 21:58:07 UTC
2	+++ unix/plugins/ScratchPlugin/unixSeriaPort2Ops.c 2012-09-24 15:26:54.000000000 +0900	2	+++ unix/plugins/ScratchPlugin/unixSeriaPort2Ops.c
3	@@ -337,7 +337,7 @@	3	@@ -337,7 +337,7 @@ error:
4	}	4	}
5		5
6	int isSerialPortDev(char *s) {	6	int isSerialPortDev(char *s) {




--- unix/plugins/SerialPlugin/sqUnixSerial.c.orig	2011-03-14 05:01:56 UTC
+++ unix/plugins/SerialPlugin/sqUnixSerial.c
@@ -21,7 +21,7 @@
 #define PORT_NAME_SIZE 64
 

 
 /* stopBits	0=1.5, 1=1, 2=2 */
 /* I don't know how to get 1.5 stop bits. Oh well. So you get 2 instead */
@@ -94,10 +94,8 @@ static drDecode dataRateDecode[] = {
 #endif
 #if defined(B500000)		/* missing on GNU/Linux prior to 2.2 */
   { 500000, B500000 },
-  { 576000, B576000 },
   { 921600, B921600 },
   { 1000000, B1000000 },
-  { 1152000, B1152000 },
   { 1500000, B1500000 },
   { 2000000, B2000000 },
 #endif

Lines 1-6 Link Here

(-)squeak/files/patch-unix_plugins_UUIDPlugin_config.cmake (-3 / +4 lines)
1	--- unix/plugins/UUIDPlugin/config.cmake.orig 2012-09-13 21:09:00.000000000 +0200	1	--- unix/plugins/UUIDPlugin/config.cmake.orig 2012-09-13 19:09:00 UTC
2	+++ unix/plugins/UUIDPlugin/config.cmake 2013-10-27 14:10:07.948211424 +0100	2	+++ unix/plugins/UUIDPlugin/config.cmake
3	@@ -4,8 +4,8 @@	3	@@ -4,8 +4,8 @@ CONFIG_DEFINE (HAVE_UUID_H)
4	PLUGIN_FIND_INCLUDE (SYS_UUID sys/uuid.h)	4	PLUGIN_FIND_INCLUDE (SYS_UUID sys/uuid.h)
5	CONFIG_DEFINE (HAVE_SYS_UUID_H)	5	CONFIG_DEFINE (HAVE_SYS_UUID_H)
6		6
Lines 10-12 Link Here
10	+#---CONFIG_DEFINE (HAVE_UUID_UUID_H)	10	+#---CONFIG_DEFINE (HAVE_UUID_UUID_H)
11		11
12	PLUGIN_FIND_LIBRARY (UUID uuid)	12	PLUGIN_FIND_LIBRARY (UUID uuid)
		13

Lines 1-4 Link Here

(-)squeak/files/patch-unix_vm-sound-pulse_sqUnixSoundPulseAudio.c (-1 / +1 lines)
1	--- unix/vm-sound-pulse/sqUnixSoundPulseAudio.c.orig 2012-08-08 10:34:42 +0800	1	--- unix/vm-sound-pulse/sqUnixSoundPulseAudio.c.orig 2012-08-08 02:34:42 UTC
2	+++ unix/vm-sound-pulse/sqUnixSoundPulseAudio.c	2	+++ unix/vm-sound-pulse/sqUnixSoundPulseAudio.c
3	@@ -995,10 +995,10 @@ DBGMSG("<sound_StartRecording()");	3	@@ -995,10 +995,10 @@ DBGMSG("<sound_StartRecording()");
4	static sqInt sound_StopRecording(void) {	4	static sqInt sound_StopRecording(void) {

Lines 1-6 Link Here

(-)squeak/files/patch-unix_vm_build.cmake (-3 / +3 lines)
1	--- unix/vm/build.cmake.orig 2013-06-09 22:54:13.000000000 +0200	1	--- unix/vm/build.cmake.orig 2012-09-17 01:03:14 UTC
2	+++ unix/vm/build.cmake 2013-06-09 22:55:18.000000000 +0200	2	+++ unix/vm/build.cmake
3	@@ -90,4 +90,4 @@	3	@@ -90,4 +90,4 @@ ADD_CUSTOM_TARGET (squeak.1
4	COMMAND sh ${bld}/config ${unix}/doc/squeak.1 ${bld}/squeak.1	4	COMMAND sh ${bld}/config ${unix}/doc/squeak.1 ${bld}/squeak.1
5	)	5	)
6	ADD_DEPENDENCIES (squeakvm${scriptsuffix} squeak.1)	6	ADD_DEPENDENCIES (squeakvm${scriptsuffix} squeak.1)

Lines 1-6 Link Here

(-)squeak/files/patch-unix_vm_sqUnixMain.c (-2 / +2 lines)
1	--- unix/vm/sqUnixMain.c.bak 2013-12-05 13:49:51 -0800	1	--- unix/vm/sqUnixMain.c.orig 2012-09-17 01:03:14 UTC
2	+++ unix/vm/sqUnixMain.c	2	+++ unix/vm/sqUnixMain.c
3	@@ -1334,8 +1334,8 @@	3	@@ -1334,8 +1334,8 @@ void imgInit(void)
4	\|\| defined(POWERPC) \|\| defined(__POWERPC) \|\| defined (__POWERPC__) )	4	\|\| defined(POWERPC) \|\| defined(__POWERPC) \|\| defined (__POWERPC__) )
5	void mtfsfi(unsigned long long fpscr)	5	void mtfsfi(unsigned long long fpscr)
6	{	6	{

Return to bug 254456

Lines 1-5 Link Here

(-)squeak/files/patch-unix_plugins_SerialPlugin_sqUnixSerial.c (-2 / +13 lines)
1	--- unix/plugins/SerialPlugin/sqUnixSerial.c.org 2012-09-24 15:29:28.000000000 +0900	1	--- unix/plugins/SerialPlugin/sqUnixSerial.c.orig 2011-03-14 05:01:56 UTC
2	+++ unix/plugins/SerialPlugin/sqUnixSerial.c 2012-09-24 15:29:38.000000000 +0900	2	+++ unix/plugins/SerialPlugin/sqUnixSerial.c
3	@@ -21,7 +21,7 @@	3	@@ -21,7 +21,7 @@
4	#define PORT_NAME_SIZE 64	4	#define PORT_NAME_SIZE 64
5		5
Lines 9-11 Link Here
9		9
10	/* stopBits 0=1.5, 1=1, 2=2 */	10	/* stopBits 0=1.5, 1=1, 2=2 */
11	/* I don't know how to get 1.5 stop bits. Oh well. So you get 2 instead */	11	/* I don't know how to get 1.5 stop bits. Oh well. So you get 2 instead */
		12	@@ -94,10 +94,8 @@ static drDecode dataRateDecode[] = {
		13	#endif
		14	#if defined(B500000) /* missing on GNU/Linux prior to 2.2 */
		15	{ 500000, B500000 },
		16	- { 576000, B576000 },
		17	{ 921600, B921600 },
		18	{ 1000000, B1000000 },
		19	- { 1152000, B1152000 },
		20	{ 1500000, B1500000 },
		21	{ 2000000, B2000000 },
		22	#endif