rpms/dosbox/devel dosbox-x86-64-build.patch, NONE, 1.1 dosbox.spec, 1.8, 1.9

Andreas Bierfert (awjb) fedora-extras-commits at redhat.com
Sun May 22 22:25:03 UTC 2005


Author: awjb

Update of /cvs/extras/rpms/dosbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12790

Modified Files:
	dosbox.spec 
Added Files:
	dosbox-x86-64-build.patch 
Log Message:
- hopefully fix #158446


dosbox-x86-64-build.patch:

--- NEW FILE dosbox-x86-64-build.patch ---
--- src/dos/drive_cache.cpp.orig	2005-05-23 00:12:57.412255755 +0200
+++ src/dos/drive_cache.cpp	2005-05-23 00:15:03.667374882 +0200
@@ -317,7 +317,7 @@
 {
 	char* cpos = strchr(shortName,'~');
 	if (cpos) {
-		Bits compareCount1	= (int)cpos - (int)shortName;
+		Bits compareCount1	= (intptr_t)cpos - (intptr_t)shortName;
 		char* endPos		= strchr(cpos,'.');
 		Bitu numberSize		= endPos ? int(endPos)-int(cpos) : strlen(cpos);
 		


Index: dosbox.spec
===================================================================
RCS file: /cvs/extras/rpms/dosbox/devel/dosbox.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dosbox.spec	6 Apr 2005 22:11:36 -0000	1.8
+++ dosbox.spec	22 May 2005 22:25:01 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           dosbox
 Version:        0.63
-Release:        2
+Release:        3
 
 Summary:        x86/DOS emulator with sound and graphics
 
@@ -10,6 +10,7 @@
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        dosbox.desktop
 Source2:        dosbox.png
+Patch0:         dosbox-x86-64-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  libpng-devel
@@ -31,7 +32,7 @@
 
 %prep
 %setup -q
-
+%patch0
 
 %build
 %configure --enable-shots
@@ -70,6 +71,10 @@
 
 
 %changelog
+* Mon May 23 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.63-3
+- fix x86_64 build (#158446)
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 




More information about the fedora-extras-commits mailing list