Attachment 128324 Details for Bug 172200 – file.diff

[patch] file.diff

file.diff (text/plain), 3.55 KB, created by Chris Petrik on 2012-10-01 10:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Petrik

Created: 2012-10-01 10:20:01 UTC

Size: 3.55 KB

patch

obsolete

>Index: fceux/files/patch-file.c
>===================================================================
>--- fceux/files/patch-file.c	(revision 0)
>+++ fceux/files/patch-file.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/file.cpp.bak	2012-09-30 18:58:51.000000000 -0500
>++++ src/file.cpp	2012-09-30 18:59:15.000000000 -0500
>+@@ -310,7 +310,7 @@
>+ 				if(magic==0x088b1f) {
>+ 					 // maybe gzip... 
>+ 
>+-					void* gzfile = gzopen(fileToOpen.c_str(),"rb");
>++					gzFile gzfile = gzopen(fileToOpen.c_str(),"rb");
>+ 					if(gzfile) {
>+ 						delete fp;
>+ 
>Index: fceux/files/patch-SConstruct
>===================================================================
>--- fceux/files/patch-SConstruct	(revision 305061)
>+++ fceux/files/patch-SConstruct	(working copy)
>@@ -1,33 +1,15 @@
>---- SConstruct	2010-03-30 21:41:39.000000000 -0600
>-+++ SConstruct.bak	2010-04-28 20:52:16.000000000 -0500
>-@@ -16,7 +16,7 @@
>-   BoolVariable('GTK_LITE', 'Enable GTK2 for dialogs only', 0)
>- )
>- 
>--env = Environment(options = opts)
>-+env = Environment(ENV = os.environ, options = opts)
>- 
>- # LSB_FIRST must be off for PPC to compile
>- if platform.system == "ppc":
>-@@ -37,6 +37,8 @@
>-   env.Append(CCFLAGS = os.environ['CFLAGS'].split())
>- if os.environ.has_key('LDFLAGS'):
>-   env.Append(LINKFLAGS = os.environ['LDFLAGS'].split())
>-+  env['CPPPATH'] = Split(env['CPPPATH'])
>-+  env['LIBPATH'] = Split(env['LIBPATH'])
>- 
>- print "platform: ", env['PLATFORM']
>- 
>-@@ -53,9 +55,9 @@
>-   env.Append(LIBS = ["rpcrt4", "comctl32", "vfw32", "winmm", "ws2_32", "comdlg32", "ole32", "gdi32", "htmlhelp"])
>+--- SConstruct.bak	2012-09-30 14:49:24.000000000 -0500
>++++ SConstruct	2012-09-30 14:50:46.000000000 -0500
>+@@ -56,9 +56,9 @@
>  else:
>    conf = Configure(env)
>+   assert conf.CheckLibWithHeader('z', 'zlib.h', 'C', 'inflate;', 1), "please install: zlib"
> -  if not conf.CheckLib('SDL'):
> -    print 'Did not find libSDL or SDL.lib, exiting!'
> -    Exit(1)
> +  ###if not conf.CheckLib('SDL'):
> +  ###  print 'Did not find libSDL or SDL.lib, exiting!'
> +  ###  Exit(1)
>-   if env['GTK'] or env['GTK_LITE']:
>+ 
>+   if env['GTK']:
>      # Add compiler and linker flags from pkg-config
>-     env.ParseConfig('pkg-config --cflags --libs gtk+-2.0')
>Index: fceux/Makefile
>===================================================================
>--- fceux/Makefile	(revision 305061)
>+++ fceux/Makefile	(working copy)
>@@ -1,15 +1,10 @@
>-# New ports collection makefile for:	fceu
>-# Date Created:		10 Mov 2002
>-# Whom:			HIYAMA Takeshi <gibbon@cocoa.freemail.ne.jp>
>-#
>+# Created by: HIYAMA Takeshi <gibbon@cocoa.freemail.ne.jp>
> # $FreeBSD$
>-#
> 
> PORTNAME=	fceux
>-PORTVERSION=	2.1.4a
>-PORTREVISION=	3
>+PORTVERSION=	2.1.5
> CATEGORIES=	emulators
>-MASTER_SITES=	SF/fceultra/Source%20Code/2.1.4%20src/
>+MASTER_SITES=	SF/fceultra/Source%20Code/2.1.5%20src/
> DISTNAME=	${PORTNAME}-${PORTVERSION}.src
> 
> MAINTAINER=	davide.italiano@gmail.com
>@@ -33,7 +28,6 @@
> 	${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' \
> 		${WRKSRC}/src/drivers/common/vidblit.cpp
> 	@${MV} ${WRKSRC}/documentation/fceux.6 ${WRKSRC}/
>-
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/fceux ${PREFIX}/bin
> 	${INSTALL_MAN} ${WRKSRC}/fceux.6 ${PREFIX}/man/man6
>Index: fceux/distinfo
>===================================================================
>--- fceux/distinfo	(revision 305061)
>+++ fceux/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (fceux-2.1.4a.src.tar.bz2) = 267aef2cf05c510f66eca8330060c495a3c18ad22c73bda42df73d8d8330df3a
>-SIZE (fceux-2.1.4a.src.tar.bz2) = 5083564
>+SHA256 (fceux-2.1.5.src.tar.bz2) = ee6b1ee6a0347e325032f6655a5caa289e2b0458f7fccddccd5137f1cd63bf9f
>+SIZE (fceux-2.1.5.src.tar.bz2) = 7322199

Actions: View | Diff

Attachments on bug 172200: 128324