[arch-commits] Commit in bochs/repos (3 files)

Kevin Piche kevin at archlinux.org
Sat Jun 14 03:31:09 UTC 2008


    Date: Friday, June 13, 2008 @ 23:31:09
  Author: kevin
Revision: 2740

Merged revisions 2-2739 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/bochs/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r2739 | kevin | 2008-06-13 23:30:48 -0400 (Fri, 13 Jun 2008) | 1 line
  
  upgpkg: bochs 2.3.7-1
........

Added:
  bochs/repos/extra-i686/bochs-2.3.7-typo-fixes.patch
    (from rev 2739, bochs/trunk/bochs-2.3.7-typo-fixes.patch)
Modified:
  bochs/repos/extra-i686/	(properties)
  bochs/repos/extra-i686/PKGBUILD

------------------------------+
 PKGBUILD                     |    7 ++++---
 bochs-2.3.7-typo-fixes.patch |   24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)


Property changes on: bochs/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /bochs/trunk:1
   + /bochs/trunk:1-2739

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-06-14 03:30:48 UTC (rev 2739)
+++ extra-i686/PKGBUILD	2008-06-14 03:31:09 UTC (rev 2740)
@@ -3,18 +3,19 @@
 # Maintainer: Kevin Piche <kevin at archlinux.org>
 
 pkgname=bochs
-pkgver=2.3.6
+pkgver=2.3.7
 pkgrel=1
 pkgdesc="A portable x86 PC emulation software package"
 arch=(i686 x86_64)
 license=('LGPL')
 url="http://bochs.sourceforge.net/"
-source=(http://dl.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+source=(http://dl.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz bochs-2.3.7-typo-fixes.patch)
 depends=('gcc-libs' 'libxpm')
-md5sums=('5b666fb64d7ccf9baa0122ec15a3f4b9')
+md5sums=('a2e5f922505bf16cabd36bb9d571a2c4')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np1 -i ../bochs-2.3.7-typo-fixes.patch || return 1
   ./configure --prefix=/usr --enable-vbe --without-wx --enable-cpu-level=6 \
         --enable-4meg-pages --enable-global-pages --enable-pae --enable-fpu \
         --enable-mmx --enable-3dnow --enable-sse --enable-sep

Copied: bochs/repos/extra-i686/bochs-2.3.7-typo-fixes.patch (from rev 2739, bochs/trunk/bochs-2.3.7-typo-fixes.patch)
===================================================================
--- extra-i686/bochs-2.3.7-typo-fixes.patch	                        (rev 0)
+++ extra-i686/bochs-2.3.7-typo-fixes.patch	2008-06-14 03:31:09 UTC (rev 2740)
@@ -0,0 +1,24 @@
+diff -NaurwB bochs-2.3.7.orig/cpu/ia_opcodes.h bochs-2.3.7/cpu/ia_opcodes.h
+--- bochs-2.3.7.orig/cpu/ia_opcodes.h	2008-05-30 22:35:08.000000000 +0200
++++ bochs-2.3.7/cpu/ia_opcodes.h	2008-06-04 14:56:46.000000000 +0200
+@@ -891,7 +891,7 @@
+ bx_define_opcode(BX_IA_PF2ID_PqQq, BX_CPU_C::PF2ID_PqQq)
+ bx_define_opcode(BX_IA_PF2IW_PqQq, BX_CPU_C::PF2IW_PqQq)
+ bx_define_opcode(BX_IA_PFACC_PqQq, BX_CPU_C::PFACC_PqQq)
+-bx_define_opcode(BX_IA_PFADD_PqQq, BX_CPU_C::BX_PFADD_PqQq)
++bx_define_opcode(BX_IA_PFADD_PqQq, BX_CPU_C::PFADD_PqQq)
+ bx_define_opcode(BX_IA_PFCMPEQ_PqQq, BX_CPU_C::PFCMPEQ_PqQq)
+ bx_define_opcode(BX_IA_PFCMPGE_PqQq, BX_CPU_C::PFCMPGE_PqQq)
+ bx_define_opcode(BX_IA_PFCMPGT_PqQq, BX_CPU_C::PFCMPGT_PqQq)
+diff -NaurwB bochs-2.3.7.orig/iodev/iodebug.h bochs-2.3.7/iodev/iodebug.h
+--- bochs-2.3.7.orig/iodev/iodebug.h	2008-05-01 22:46:58.000000000 +0200
++++ bochs-2.3.7/iodev/iodebug.h	2008-06-04 14:45:50.000000000 +0200
+@@ -18,7 +18,7 @@
+   virtual void init(void);
+   virtual void reset (unsigned type) {}
+   static void mem_write(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, void *data);
+-  static void mem_read(BX_CPU_C *cpu, bx_phy_addressu addr, unsigned len, void *data);
++  static void mem_read(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, void *data);
+ 
+ private:
+   static Bit32u read_handler(void *this_ptr, Bit32u address, unsigned io_len);





More information about the arch-commits mailing list