OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-Jun-2005 17:04:10
Branch: HEAD Handle: 2005061516040801
Modified files:
openpkg-src/bochs bochs.patch bochs.spec
Log:
temporarily downgrade from Boch 2.2 to 2.1.1 in preparation of OpenPKG
2.4 branching
Summary:
Revision Changes Path
1.7 +13 -1 openpkg-src/bochs/bochs.patch
1.39 +2 -2 openpkg-src/bochs/bochs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 bochs.patch
--- openpkg-src/bochs/bochs.patch 13 Jun 2005 17:40:19 -0000 1.6
+++ openpkg-src/bochs/bochs.patch 15 Jun 2005 15:04:08 -0000 1.7
@@ -4,11 +4,23 @@
#include <sys/socket.h>
#include <sys/uio.h>
#include <sys/wait.h>
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||
defined(__APPLE__) // Should be fixed for other *BSD
+-#if defined(__FreeBSD__) || defined(__APPLE__) // Should be fixed for
other *BSD
+#if !defined(__LINUX__) // Should be more carefully written
#include <net/if.h>
#else
#include <asm/types.h>
+Index: reg_ld_str.c
+--- fpu/reg_ld_str.c.orig 2004-06-03 14:34:47.000000000 +0200
++++ fpu/reg_ld_str.c 2004-06-03 14:34:53.000000000 +0200
+@@ -315,7 +315,7 @@
+
+
+ /* Get a short from user memory */
+-int BX_CPP_AttrRegparmN(1)
++int BX_CPP_AttrRegparmN(2)
+ FPU_load_int16(bx_address _s, FPU_REG *loaded_data)
+ {
+ s16 s, negative;
Index: Makefile.in
--- Makefile.in.orig 2004-06-09 15:52:12.955255102 +0200
+++ Makefile.in 2004-06-09 15:52:37.847987737 +0200
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.spec
============================================================================
$ cvs diff -u -r1.38 -r1.39 bochs.spec
--- openpkg-src/bochs/bochs.spec 13 Jun 2005 17:40:19 -0000 1.38
+++ openpkg-src/bochs/bochs.spec 15 Jun 2005 15:04:09 -0000 1.39
@@ -32,8 +32,8 @@
Class: BASE
Group: Misc
License: LGPL
-Version: 2.2
-Release: 20050613
+Version: 2.1.1
+Release: 20050615
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/bochs/bochs-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
