Fix several bugs

3 files changed, 45 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2fdf02fa5aa4..551df54a6389 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sheepshaver-git
 	pkgdesc = An Open Source PowerMac Emulator
-	pkgver = r2608.g01052ca8
+	pkgver = r2619.gcbad6f95
 	pkgrel = 2
 	url = http://sheepshaver.cebix.net
 	arch = x86_64
@@ -12,17 +12,19 @@ pkgbase = sheepshaver-git
 	source = SheepShaver.sysctl
 	source = SheepShaver.desktop
 	source = SheepShaver.png
+	source = unsigned_bug.patch
 	sha256sums = SKIP
 	sha256sums = a4aa858b95d29906873693988d5db42d5a4da8aa94a72c79374f59fc488efd51
 	sha256sums = cb002e73e864a6ca271e0bbaa6df6eb89dc1df86856fc575c20bf79367458c39
 	sha256sums = b7f67b1f8424f3e0ffa1a5e57597f368c4c4f93ea1f871ec0a76700b7519b241
+	sha256sums = 1702ef4c5ea4459268653ea7a2a76d2b3e60a9e4b17c64ea9818869124539e49
 
 pkgname = sheepshaver-git
-	provides = sheepshaver=r2608.g01052ca8
+	provides = sheepshaver=r2619.gcbad6f95
 	conflicts = sheepshaver
 
 pkgname = sheepnet-dkms-git
 	depends = dkms
-	provides = sheepnet-dkms=r2608.g01052ca8
+	provides = sheepnet-dkms=r2619.gcbad6f95
 	conflicts = sheepnet-dkms
 
diff --git a/PKGBUILD b/PKGBUILD
index 78c45e2e12e1..f4d6385de676 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=sheepshaver-git
 pkgname=(sheepshaver-git sheepnet-dkms-git)
-pkgver=r2608.g01052ca8
+pkgver=r2619.gcbad6f95
 pkgrel=2
 pkgdesc="An Open Source PowerMac Emulator"
 arch=('x86_64')
@@ -12,17 +12,24 @@ depends=('gtk2' 'sdl' 'vde2')
 source=('git+https://github.com/cebix/macemu'
         'SheepShaver.sysctl'
         'SheepShaver.desktop'
-        'SheepShaver.png')
+        'SheepShaver.png'
+		'unsigned_bug.patch')
 sha256sums=('SKIP'
             'a4aa858b95d29906873693988d5db42d5a4da8aa94a72c79374f59fc488efd51'
             'cb002e73e864a6ca271e0bbaa6df6eb89dc1df86856fc575c20bf79367458c39'
-            'b7f67b1f8424f3e0ffa1a5e57597f368c4c4f93ea1f871ec0a76700b7519b241')
+            'b7f67b1f8424f3e0ffa1a5e57597f368c4c4f93ea1f871ec0a76700b7519b241'
+            '1702ef4c5ea4459268653ea7a2a76d2b3e60a9e4b17c64ea9818869124539e49')
 
 pkgver() {
   cd macemu
   echo "r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+  cd macemu/
+  patch -p1 -i "$srcdir/unsigned_bug.patch"
+}
+
 build() {
   cd macemu/SheepShaver/src/Unix
   ./autogen.sh \
@@ -30,6 +37,7 @@ build() {
     --enable-addressing=direct \
     --enable-standalone-gui \
     --enable-sdl-audio \
+	--enable-addressing=real \
     --enable-sdl-video \
     --enable-tuntap \
     --with-bincue \
@@ -61,12 +69,12 @@ package_sheepnet-dkms-git() {
   mkdir -p "$pkgdir"/usr/src
   cp -rL macemu/SheepShaver/src/Unix/Linux/NetDriver "$pkgdir"/usr/src/sheepnet-$pkgver
 
-  cat > "$pkgdir"/usr/src/sheepnet-$pkgver/dkms.conf <<EOF
-PACKAGE_NAME="sheepnet"
-PACKAGE_VERSION="$pkgver"
-AUTOINSTALL=yes
-BUILT_MODULE_NAME="sheep_net"
-DEST_MODULE_LOCATION="/kernel/net"
+  cat > "$pkgdir"/usr/src/sheepnet-$pkgver/dkms.conf <<-EOF
+	PACKAGE_NAME="sheepnet"
+	PACKAGE_VERSION="$pkgver"
+	AUTOINSTALL=yes
+	BUILT_MODULE_NAME="sheep_net"
+	DEST_MODULE_LOCATION="/kernel/net"
 EOF
 }
 
diff --git a/unsigned_bug.patch b/unsigned_bug.patch
new file mode 100644
index 000000000000..336476ab4b1c
--- /dev/null
+++ b/unsigned_bug.patch
@@ -0,0 +1,23 @@
+From f13f25db3e952cd40b3c3aa90a24399408968e04 Mon Sep 17 00:00:00 2001
+From: Antoine Viallon <antoine@lesviallon.fr>
+Date: Sat, 20 Jun 2020 19:19:49 +0200
+Subject: [PATCH] Fix build fail under GCC 10
+
+GCC fails to build because of -Wnarrowing
+---
+ SheepShaver/src/video.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/SheepShaver/src/video.cpp b/SheepShaver/src/video.cpp
+index d0eda93d..60ef8c13 100644
+--- a/SheepShaver/src/video.cpp
++++ b/SheepShaver/src/video.cpp
+@@ -736,7 +736,7 @@ static int16 VideoStatus(uint32 pb, VidLocals *csSave)
+ 
+ 		case cscGetNextResolution: {
+ 			D(bug("GetNextResolution \n"));
+-			int work_id = ReadMacInt32(param + csPreviousDisplayModeID);
++			unsigned int work_id = ReadMacInt32(param + csPreviousDisplayModeID);
+ 			switch (work_id) {
+ 				case kDisplayModeIDCurrent:
+ 					work_id = csSave->saveData;