[CVS] OpenPKG: openpkg-src/bochs/ bochs.patch bochs.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 08-Jun-2009 10:33:19 Branch: HEAD Handle: 2009060809331900 Removed files: openpkg-src/bochs bochs.patch bochs.spec Log: OpenPKG primarily is about server-computing, so remove some of the dedicated GUI applications Summary: RevisionChanges Path 1.13+0 -25 openpkg-src/bochs/bochs.patch 1.59+0 -183openpkg-src/bochs/bochs.spec rm -f openpkg-src/bochs/bochs.patch <<'@@ .' Index: openpkg-src/bochs/bochs.patch [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f openpkg-src/bochs/bochs.spec <<'@@ .' Index: openpkg-src/bochs/bochs.spec [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/bochs/ bochs.patch bochs.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 27-Mar-2009 10:39:12
Branch: HEAD Handle: 2009032709391100
Modified files:
openpkg-src/bochs bochs.patch bochs.spec
Log:
upgrading package: bochs 2.2.6 -> 2.3.7
Summary:
RevisionChanges Path
1.12+7 -43 openpkg-src/bochs/bochs.patch
1.57+2 -6 openpkg-src/bochs/bochs.spec
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.patch
$ cvs diff -u -r1.11 -r1.12 bochs.patch
--- openpkg-src/bochs/bochs.patch 14 Jun 2006 19:33:29 - 1.11
+++ openpkg-src/bochs/bochs.patch 27 Mar 2009 09:39:11 - 1.12
@@ -1,7 +1,7 @@
Index: Makefile.in
Makefile.in.orig 2005-07-06 22:28:23 +0200
-+++ Makefile.in 2005-07-09 22:18:29 +0200
-@@ -101,7 +101,7 @@
+--- Makefile.in.orig 2008-06-01 18:48:13 +0200
Makefile.in 2009-03-27 10:23:04 +0100
+@@ -102,7 +102,7 @@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
XPM_LIB = @XPM_LIB@
@@ -11,27 +11,9 @@
GUI_LINK_OPTS_SVGA = -lvga -lvgagl
GUI_LINK_OPTS_BEOS = -lbe
Index: iodev/eth_vde.cc
iodev/eth_vde.cc.orig2005-12-10 19:37:35 +0100
-+++ iodev/eth_vde.cc 2006-03-10 10:04:14 +0100
-@@ -41,13 +41,17 @@
- #include
- #include
- #include
-+#if defined(__linux__)
- #include
-+#endif
- #include
- #include
- #include
- #include
-+#if defined(__linux__)
- #include
- #include
-+#endif
- #include
- #include
- #include
-@@ -111,6 +115,9 @@
+--- iodev/eth_vde.cc.orig2008-02-15 23:05:42 +0100
iodev/eth_vde.cc 2009-03-27 10:23:04 +0100
+@@ -117,6 +117,9 @@
//if (strncmp (netif, "vde", 3) != 0) {
// BX_PANIC (("eth_vde: interface name (%s) must be vde", netif));
//}
@@ -39,23 +21,5 @@
+#define IFNAMSIZ 1024
+#endif
char intname[IFNAMSIZ];
- if (netif == NULL || strcmp(netif,"") == 0)
+ if (netif == NULL || strcmp(netif,"") == 0)
strcpy(intname,"/tmp/vde.ctl");
-Index: iodev/hdimage.h
iodev/hdimage.h.orig 2005-11-06 12:07:01 +0100
-+++ iodev/hdimage.h 2006-06-14 21:29:22 +0200
-@@ -273,14 +273,8 @@
-
- void panic(const char * message);
- off_t
--#ifndef PARANOID
-- sparse_image_t::
--#endif
-get_physical_offset();
- void
--#ifndef PARANOID
-- sparse_image_t::
--#endif
-set_virtual_page(Bit32u new_virtual_page);
- void read_header();
- ssize_t read_page_fragment(Bit32u read_virtual_page, Bit32u
read_page_offset, size_t read_size, void * buf);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.spec
$ cvs diff -u -r1.56 -r1.57 bochs.spec
--- openpkg-src/bochs/bochs.spec 1 Jan 2008 14:51:26 - 1.56
+++ openpkg-src/bochs/bochs.spec 27 Mar 2009 09:39:11 - 1.57
@@ -31,8 +31,8 @@
Class:EVAL
Group:Emulator
License: LGPL
-Version: 2.2.6
-Release: 20080101
+Version: 2.3.7
+Release: 20090327
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/bochs/bochs-%{version}.tar.gz
@@ -123,10 +123,6 @@
# perform standard installation procedure
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
-# post-adjust manual pages
-rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/bochs-dlx.1.gz
-%{l_gzip} -d $RPM_BUILD_ROOT%{l_prefix}/man/man*/*.gz
-
# provide configuration file
mv $RPM_BUILD_ROOT%{l_prefix}/share/doc/bochs/bochsrc-sample.txt \
$RPM_BUILD_ROOT%{l_prefix}/etc/bochs/bochsrc.sample
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/bochs/ bochs.patch bochs.spec
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: 14-Jun-2006 21:33:31
Branch: HEAD Handle: 2006061420332901
Modified files:
openpkg-src/bochs bochs.patch bochs.spec
Log:
fix building under stricter C++ of GCC 4.1
Summary:
RevisionChanges Path
1.11+18 -0 openpkg-src/bochs/bochs.patch
1.50+1 -1 openpkg-src/bochs/bochs.spec
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.patch
$ cvs diff -u -r1.10 -r1.11 bochs.patch
--- openpkg-src/bochs/bochs.patch 10 Mar 2006 09:07:09 - 1.10
+++ openpkg-src/bochs/bochs.patch 14 Jun 2006 19:33:29 - 1.11
@@ -41,3 +41,21 @@
char intname[IFNAMSIZ];
if (netif == NULL || strcmp(netif,"") == 0)
strcpy(intname,"/tmp/vde.ctl");
+Index: iodev/hdimage.h
+--- iodev/hdimage.h.orig 2005-11-06 12:07:01 +0100
iodev/hdimage.h 2006-06-14 21:29:22 +0200
+@@ -273,14 +273,8 @@
+
+ void panic(const char * message);
+ off_t
+-#ifndef PARANOID
+- sparse_image_t::
+-#endif
+get_physical_offset();
+ void
+-#ifndef PARANOID
+- sparse_image_t::
+-#endif
+set_virtual_page(Bit32u new_virtual_page);
+ void read_header();
+ ssize_t read_page_fragment(Bit32u read_virtual_page, Bit32u
read_page_offset, size_t read_size, void * buf);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.spec
$ cvs diff -u -r1.49 -r1.50 bochs.spec
--- openpkg-src/bochs/bochs.spec 24 May 2006 18:50:47 - 1.49
+++ openpkg-src/bochs/bochs.spec 14 Jun 2006 19:33:30 - 1.50
@@ -33,7 +33,7 @@
Group:Misc
License: LGPL
Version: 2.2.6
-Release: 20060524
+Release: 20060614
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/bochs/bochs-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/bochs/ bochs.patch bochs.spec
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: 10-Mar-2006 10:07:10
Branch: HEAD Handle: 2006031009070900
Modified files:
openpkg-src/bochs bochs.patch bochs.spec
Log:
upgrading package: bochs 2.2.1 -> 2.2.6
Summary:
RevisionChanges Path
1.10+31 -0 openpkg-src/bochs/bochs.patch
1.48+3 -2 openpkg-src/bochs/bochs.spec
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.patch
$ cvs diff -u -r1.9 -r1.10 bochs.patch
--- openpkg-src/bochs/bochs.patch 9 Jul 2005 20:20:45 - 1.9
+++ openpkg-src/bochs/bochs.patch 10 Mar 2006 09:07:09 - 1.10
@@ -10,3 +10,34 @@
GUI_LINK_OPTS_SDL = `sdl-config --cflags --libs`
GUI_LINK_OPTS_SVGA = -lvga -lvgagl
GUI_LINK_OPTS_BEOS = -lbe
+Index: iodev/eth_vde.cc
+--- iodev/eth_vde.cc.orig2005-12-10 19:37:35 +0100
iodev/eth_vde.cc 2006-03-10 10:04:14 +0100
+@@ -41,13 +41,17 @@
+ #include
+ #include
+ #include
++#if defined(__linux__)
+ #include
++#endif
+ #include
+ #include
+ #include
+ #include
++#if defined(__linux__)
+ #include
+ #include
++#endif
+ #include
+ #include
+ #include
+@@ -111,6 +115,9 @@
+ //if (strncmp (netif, "vde", 3) != 0) {
+// BX_PANIC (("eth_vde: interface name (%s) must be vde", netif));
+ //}
++#ifndef IFNAMSIZ
++#define IFNAMSIZ 1024
++#endif
+ char intname[IFNAMSIZ];
+ if (netif == NULL || strcmp(netif,"") == 0)
+ strcpy(intname,"/tmp/vde.ctl");
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.spec
$ cvs diff -u -r1.47 -r1.48 bochs.spec
--- openpkg-src/bochs/bochs.spec 1 Jan 2006 13:12:20 - 1.47
+++ openpkg-src/bochs/bochs.spec 10 Mar 2006 09:07:09 - 1.48
@@ -32,8 +32,8 @@
Class:BASE
Group:Misc
License: LGPL
-Version: 2.2.1
-Release: 20051014
+Version: 2.2.6
+Release: 20060310
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/bochs/bochs-%{version}.tar.gz
@@ -105,6 +105,7 @@
--enable-cpu-level=5 \
--enable-all-optimizations \
--enable-cdrom \
+--disable-vde \
$NIC \
--enable-compressed-hd \
--disable-shared
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/bochs/ bochs.patch bochs.spec
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: 09-Jul-2005 22:20:45
Branch: HEAD Handle: 2005070921204500
Modified files:
openpkg-src/bochs bochs.patch bochs.spec
Log:
upgrading package: bochs 2.2 -> 2.2.1
Summary:
RevisionChanges Path
1.9 +3 -14 openpkg-src/bochs/bochs.patch
1.42+2 -2 openpkg-src/bochs/bochs.spec
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.patch
$ cvs diff -u -r1.8 -r1.9 bochs.patch
--- openpkg-src/bochs/bochs.patch 25 Jun 2005 09:39:03 - 1.8
+++ openpkg-src/bochs/bochs.patch 9 Jul 2005 20:20:45 - 1.9
@@ -1,18 +1,7 @@
iodev/eth_tap.cc.orig2004-01-27 12:00:49.921496528 +0100
-+++ iodev/eth_tap.cc 2004-01-27 12:02:00.181584599 +0100
-@@ -100,7 +100,7 @@
- #include
- #include
- #include
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||
defined(__APPLE__) // Should be fixed for other *BSD
-+#if !defined(__LINUX__) // Should be more carefully written
- #include
- #else
- #include
Index: Makefile.in
Makefile.in.orig 2004-06-09 15:52:12.955255102 +0200
-+++ Makefile.in 2004-06-09 15:52:37.847987737 +0200
-@@ -100,7 +100,7 @@
+--- Makefile.in.orig 2005-07-06 22:28:23 +0200
Makefile.in 2005-07-09 22:18:29 +0200
+@@ -101,7 +101,7 @@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
XPM_LIB = @XPM_LIB@
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.spec
$ cvs diff -u -r1.41 -r1.42 bochs.spec
--- openpkg-src/bochs/bochs.spec 7 Jul 2005 08:15:10 - 1.41
+++ openpkg-src/bochs/bochs.spec 9 Jul 2005 20:20:45 - 1.42
@@ -32,8 +32,8 @@
Class:BASE
Group:Misc
License: LGPL
-Version: 2.2
-Release: 20050707
+Version: 2.2.1
+Release: 20050709
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/bochs/bochs-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/bochs/ bochs.patch bochs.spec
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: 25-Jun-2005 11:39:04
Branch: HEAD Handle: 2005062510390300
Modified files:
openpkg-src/bochs bochs.patch bochs.spec
Log:
upgrading package: bochs 2.1.1 -> 2.2
Summary:
RevisionChanges Path
1.8 +1 -13 openpkg-src/bochs/bochs.patch
1.40+2 -2 openpkg-src/bochs/bochs.spec
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.patch
$ cvs diff -u -r1.7 -r1.8 bochs.patch
--- openpkg-src/bochs/bochs.patch 15 Jun 2005 15:04:08 - 1.7
+++ openpkg-src/bochs/bochs.patch 25 Jun 2005 09:39:03 - 1.8
@@ -4,23 +4,11 @@
#include
#include
#include
--#if defined(__FreeBSD__) || defined(__APPLE__) // Should be fixed for
other *BSD
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||
defined(__APPLE__) // Should be fixed for other *BSD
+#if !defined(__LINUX__) // Should be more carefully written
#include
#else
#include
-Index: reg_ld_str.c
fpu/reg_ld_str.c.orig2004-06-03 14:34:47.0 +0200
-+++ fpu/reg_ld_str.c 2004-06-03 14:34:53.0 +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.39 -r1.40 bochs.spec
--- openpkg-src/bochs/bochs.spec 15 Jun 2005 15:04:09 - 1.39
+++ openpkg-src/bochs/bochs.spec 25 Jun 2005 09:39:03 - 1.40
@@ -32,8 +32,8 @@
Class:BASE
Group:Misc
License: LGPL
-Version: 2.1.1
-Release: 20050615
+Version: 2.2
+Release: 20050625
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/bochs/bochs-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/bochs/ bochs.patch bochs.spec
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:
RevisionChanges 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 - 1.6
+++ openpkg-src/bochs/bochs.patch 15 Jun 2005 15:04:08 - 1.7
@@ -4,11 +4,23 @@
#include
#include
#include
--#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
#else
#include
+Index: reg_ld_str.c
+--- fpu/reg_ld_str.c.orig2004-06-03 14:34:47.0 +0200
fpu/reg_ld_str.c 2004-06-03 14:34:53.0 +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 - 1.38
+++ openpkg-src/bochs/bochs.spec 15 Jun 2005 15:04:09 - 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 Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/bochs/ bochs.patch bochs.spec
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: 13-Jun-2005 19:40:19
Branch: HEAD Handle: 2005061318401900
Modified files:
openpkg-src/bochs bochs.patch bochs.spec
Log:
upgrading package: bochs 2.1.1 -> 2.2
Summary:
RevisionChanges Path
1.6 +1 -13 openpkg-src/bochs/bochs.patch
1.38+2 -2 openpkg-src/bochs/bochs.spec
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.patch
$ cvs diff -u -r1.5 -r1.6 bochs.patch
--- openpkg-src/bochs/bochs.patch 9 Jun 2004 15:01:33 - 1.5
+++ openpkg-src/bochs/bochs.patch 13 Jun 2005 17:40:19 - 1.6
@@ -4,23 +4,11 @@
#include
#include
#include
--#if defined(__FreeBSD__) || defined(__APPLE__) // Should be fixed for
other *BSD
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||
defined(__APPLE__) // Should be fixed for other *BSD
+#if !defined(__LINUX__) // Should be more carefully written
#include
#else
#include
-Index: reg_ld_str.c
fpu/reg_ld_str.c.orig2004-06-03 14:34:47.0 +0200
-+++ fpu/reg_ld_str.c 2004-06-03 14:34:53.0 +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.37 -r1.38 bochs.spec
--- openpkg-src/bochs/bochs.spec 24 Mar 2005 11:18:29 - 1.37
+++ openpkg-src/bochs/bochs.spec 13 Jun 2005 17:40:19 - 1.38
@@ -32,8 +32,8 @@
Class:BASE
Group:Misc
License: LGPL
-Version: 2.1.1
-Release: 20041011
+Version: 2.2
+Release: 20050613
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/bochs/bochs-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/bochs/ bochs.patch bochs.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Jun-2004 17:01:37
Branch: HEAD Handle: 2004060916013301
Modified files:
openpkg-src/bochs bochs.patch bochs.spec
Log:
correct order of libraries still important on some systems
Summary:
RevisionChanges Path
1.5 +12 -0 openpkg-src/bochs/bochs.patch
1.32+1 -1 openpkg-src/bochs/bochs.spec
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.patch
$ cvs diff -u -r1.4 -r1.5 bochs.patch
--- openpkg-src/bochs/bochs.patch 3 Jun 2004 14:00:48 - 1.4
+++ openpkg-src/bochs/bochs.patch 9 Jun 2004 15:01:33 - 1.5
@@ -21,3 +21,15 @@
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
+@@ -100,7 +100,7 @@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ XPM_LIB = @XPM_LIB@
+-GUI_LINK_OPTS_X = $(X_LIBS) $(X_PRE_LIBS) -lX11 $(XPM_LIB)
++GUI_LINK_OPTS_X = $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11
+ GUI_LINK_OPTS_SDL = `sdl-config --cflags --libs`
+ GUI_LINK_OPTS_SVGA = -lvga -lvgagl
+ GUI_LINK_OPTS_BEOS = -lbe
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.spec
$ cvs diff -u -r1.31 -r1.32 bochs.spec
--- openpkg-src/bochs/bochs.spec 3 Jun 2004 14:00:48 - 1.31
+++ openpkg-src/bochs/bochs.spec 9 Jun 2004 15:01:34 - 1.32
@@ -34,7 +34,7 @@
Group:Misc
License: LGPL
Version: 2.1.1
-Release: 20040603
+Release: 20040609
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/bochs/bochs-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/bochs/ bochs.patch bochs.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Jun-2004 16:00:49
Branch: HEAD Handle: 2004060315004800
Modified files:
openpkg-src/bochs bochs.patch bochs.spec
Log:
fixed declaration incompatibility
Summary:
RevisionChanges Path
1.4 +12 -0 openpkg-src/bochs/bochs.patch
1.31+1 -1 openpkg-src/bochs/bochs.spec
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.patch
$ cvs diff -u -r1.3 -r1.4 bochs.patch
--- openpkg-src/bochs/bochs.patch 27 Jan 2004 11:49:00 - 1.3
+++ openpkg-src/bochs/bochs.patch 3 Jun 2004 14:00:48 - 1.4
@@ -9,3 +9,15 @@
#include
#else
#include
+Index: reg_ld_str.c
+--- fpu/reg_ld_str.c.orig2004-06-03 14:34:47.0 +0200
fpu/reg_ld_str.c 2004-06-03 14:34:53.0 +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;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.spec
$ cvs diff -u -r1.30 -r1.31 bochs.spec
--- openpkg-src/bochs/bochs.spec 9 Feb 2004 07:43:18 - 1.30
+++ openpkg-src/bochs/bochs.spec 3 Jun 2004 14:00:48 - 1.31
@@ -34,7 +34,7 @@
Group:Misc
License: LGPL
Version: 2.1.1
-Release: 20040209
+Release: 20040603
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/bochs/bochs-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
