Bump to 2.7

3 files changed, 9 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8de719f1a09e..75cac68cbb29 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bochs-sdl
 	pkgdesc = A portable x86 PC emulation software package, including GUI debugger, with sdl support
-	pkgver = 2.6.11
-	pkgrel = 4
+	pkgver = 2.7
+	pkgrel = 1
 	url = http://bochs.sourceforge.net/
 	arch = x86_64
 	license = LGPL
@@ -11,10 +11,7 @@ pkgbase = bochs-sdl
 	depends = gtk2
 	provides = bochs
 	conflicts = bochs
-	source = https://downloads.sourceforge.net/sourceforge/bochs/bochs-2.6.11.tar.gz
-	source = fix-build.patch
-	md5sums = 61dbf6d5c0384712e1f3e51e88381b4c
-	md5sums = 0ae4954b32d49ac3c7a2431ea7935d1c
+	source = https://downloads.sourceforge.net/sourceforge/bochs/bochs-2.7.tar.gz
+	md5sums = d77a43c21cfd8aa013eb2eaa35644f80
 
 pkgname = bochs-sdl
-
diff --git a/PKGBUILD b/PKGBUILD
index 60d7bd1bf679..29d54c46d732 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer: Phi11ipus <phi11ipus AT bensherman DOT io>
+# Maintainer: Benjamin Sherman <benjamin AT bensherman DOT io>
 # Modified from PKGBUILD in official repositories
 
 pkgname=bochs-sdl
-pkgver=2.6.11
-pkgrel=4
+pkgver=2.7
+pkgrel=1
 pkgdesc="A portable x86 PC emulation software package, including GUI debugger, with sdl support"
 arch=('x86_64')
 url="http://bochs.sourceforge.net/"
@@ -11,17 +11,13 @@ license=('LGPL')
 depends=('gcc-libs' 'libxrandr' 'libxpm' 'gtk2')
 conflicts=('bochs')
 provides=('bochs')
-source=("https://downloads.sourceforge.net/sourceforge/bochs/bochs-$pkgver.tar.gz"
-        "fix-build.patch")
-md5sums=('61dbf6d5c0384712e1f3e51e88381b4c'
-	       '0ae4954b32d49ac3c7a2431ea7935d1c')
+source=("https://downloads.sourceforge.net/sourceforge/bochs/bochs-$pkgver.tar.gz")
+md5sums=('d77a43c21cfd8aa013eb2eaa35644f80')
 
 prepare() {
     cd "$srcdir/bochs-$pkgver"
     # 4.X kernel is basically 3.20
     sed -i 's/2\.6\*|3\.\*)/2.6*|3.*|4.*)/' configure*
-
-		patch -p1 < ../fix-build.patch # https://sourceforge.net/p/bochs/bugs/1411/
 }
 
 build() {
diff --git a/fix-build.patch b/fix-build.patch
deleted file mode 100644
index 6291546f91d9..000000000000
--- a/fix-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Fix the build with SMP enabled
-Origin: https://sourceforge.net/p/bochs/code/13778/
-
-Index: bochs/bx_debug/dbg_main.cc
-===================================================================
---- bochs/bx_debug/dbg_main.cc	(revision 13777)
-+++ bochs/bx_debug/dbg_main.cc	(working copy)
-@@ -1494,11 +1494,11 @@
- {
-   char cpu_param_name[16];
-
--  Bit32u index = BX_ITLB_INDEX_OF(laddr);
-+  Bit32u index = BX_CPU(dbg_cpu)->ITLB.get_index_of(laddr);
-   sprintf(cpu_param_name, "ITLB.entry%d", index);
-   bx_dbg_show_param_command(cpu_param_name, 0);
-
--  index = BX_DTLB_INDEX_OF(laddr, 0);
-+  index = BX_CPU(dbg_cpu)->DTLB.get_index_of(laddr);
-   sprintf(cpu_param_name, "DTLB.entry%d", index);
-   bx_dbg_show_param_command(cpu_param_name, 0);
- }
-