Update to t45, thanks user @FredBezies

Also switch to clang++ as the C++ compiler in order to fix the following
error message:

> g++ -o x16emu build/x16emu/cpu/fake6502.o […] -flto
> build/x16emu/cpu/fake6502.o: file not recognized: file format not recognized
> collect2: error: ld returned 1 exit status

4 files changed, 23 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ce38d2f7c589..1e861d383335 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = x16-emulator
 	pkgdesc = An emulator for The 8-Bit Guy's Commander X16
-	pkgver = r43
+	pkgver = r45
 	pkgrel = 1
 	url = http://commanderx16.com/
 	arch = x86_64
@@ -10,12 +10,12 @@ pkgbase = x16-emulator
 	makedepends = gendesk
 	makedepends = pandoc
 	depends = sdl2
-	depends = x16-rom=r43
-	source = x16-emulator-r43.tar.gz::https://github.com/X16Community/x16-emulator/archive/r43.tar.gz
+	depends = x16-rom=r45
+	source = x16-emulator-r45.tar.gz::https://github.com/X16Community/x16-emulator/archive/r45.tar.gz
 	source = fix-git-rev.patch
 	source = modify-base-path.patch
-	md5sums = 4b4f8f2aa02d074b4c7f1686dca65ea5
-	md5sums = c0b5ba5190ef5ee4dd8e58433f261e35
-	md5sums = 5cd0550d2af1b4267c9b9f30eed9691e
+	md5sums = 4e77ff14a94d067a4d94980e74e6decd
+	md5sums = 26c41ecd2e2676eaa7237334c8cb4bd7
+	md5sums = 0e76560b039fb58a85b4448ff6b64eb6
 
 pkgname = x16-emulator
diff --git a/PKGBUILD b/PKGBUILD
index cebad3365890..ff25e6af7db7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Claudia Pellegrino <aur ät cpellegrino.de>
 # Contributor: Julien Savard <juju@juju2143.ca>
 pkgname=x16-emulator
-pkgver=r43
+pkgver=r45
 pkgrel=1
 pkgdesc="An emulator for The 8-Bit Guy's Commander X16"
 arch=('x86_64')
@@ -18,15 +18,15 @@ source=(
 )
 
 md5sums=(
-    '4b4f8f2aa02d074b4c7f1686dca65ea5'
-    'c0b5ba5190ef5ee4dd8e58433f261e35'
-    '5cd0550d2af1b4267c9b9f30eed9691e'
+    '4e77ff14a94d067a4d94980e74e6decd'
+    '26c41ecd2e2676eaa7237334c8cb4bd7'
+    '0e76560b039fb58a85b4448ff6b64eb6'
 )
 
 prepare() {
     cd "$pkgname-$pkgver"
-    patch -uN < ../fix-git-rev.patch
-    patch -uN src/main.c ../modify-base-path.patch
+    patch -uN -p1 < ../fix-git-rev.patch
+    patch -uN -p1 < ../modify-base-path.patch
     sed -i -e 's/^\(LDFLAGS=.*\)/\1 '"${LDFLAGS}/" Makefile
     gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name "X16 Emulator" --icon "$pkgname" --exec "x16emu" --categories "Game;Emulator"
 }
@@ -34,7 +34,9 @@ prepare() {
 build() {
     cd "$pkgname-$pkgver"
     # https://aur.archlinux.org/packages/x16-emulator#comment-827725
-    CC="clang ${CFLAGS} -Wno-macro-redefined" make
+    export CC="clang ${CFLAGS} -Wno-macro-redefined"
+    export CXX="clang++ ${CXXFLAGS}"
+    make
     pandoc --from gfm --to html -c github-pandoc.css --standalone --metadata pagetitle="X16 Emulator" README.md --output README.html
 }
 
diff --git a/fix-git-rev.patch b/fix-git-rev.patch
index 186ce1e616ba..f510297685b9 100644
--- a/fix-git-rev.patch
+++ b/fix-git-rev.patch
@@ -1,12 +1,12 @@
 diff --git a/Makefile b/Makefile
-index 6b1f4fe..ee65ed2 100644
+index 3eccc85..3712f75 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -42,7 +42,7 @@ endif
+@@ -33,7 +33,7 @@ endif
  X16_OUTPUT=x16emu
  MAKECART_OUTPUT=makecart
  
--GIT_REV=$(shell git diff --quiet && echo -n $$(git rev-parse --short=8 HEAD || /bin/echo "00000000") || /bin/echo -n $$( /bin/echo -n $$(git rev-parse --short=7 HEAD || /bin/echo "0000000"); /bin/echo -n '+'))
+-GIT_REV=$(shell git diff --quiet && /bin/echo -n $$(git rev-parse --short=8 HEAD || /bin/echo "00000000") || /bin/echo -n $$( /bin/echo -n $$(git rev-parse --short=7 HEAD || /bin/echo "0000000"); /bin/echo -n '+'))
 +GIT_REV=0000000
  
  CFLAGS+=-D GIT_REV='"$(GIT_REV)"'
diff --git a/modify-base-path.patch b/modify-base-path.patch
index 00a356f0b305..902d58d91227 100644
--- a/modify-base-path.patch
+++ b/modify-base-path.patch
@@ -1,6 +1,8 @@
---- main.c.old	2019-09-20 16:32:26.460096000 -0400
-+++ main.c	2019-09-20 16:32:10.830095139 -0400
-@@ -303,7 +303,7 @@
+diff --git a/src/main.c b/src/main.c
+index 6943e0c..f78306e 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -508,7 +508,7 @@ main(int argc, char **argv)
  
  	run_after_load = false;