Finally figured out ticemu

3 files changed, 254 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0e65eca4be0e..8279fc7bebba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
-pkgbase = cemu-git
-	pkgdesc = An open-source third-party TI-84 Plus CE / TI-83 Premium CE calculator emulator
-	pkgver = 2.0dev.r2072.0b6f6b06
+pkgbase = ticemu
+	pkgdesc = Third-party TI-84 Plus CE / TI-83 Premium CE emulator, focused on developer features
+	pkgver = 1.3
 	pkgrel = 1
-	url = https://github.com/MateoConLechuga/CEmu
-	arch = i686
+	url = https://ce-programming.github.io/CEmu/
 	arch = x86_64
 	license = GPL
 	makedepends = git
 	depends = qt5-base
-	depends = qt5-declarative
-	provides = cemu
-	conflicts = cemu
-	source = cemu::git+https://github.com/MateoConLechuga/CEmu
-	source = cemu.desktop
-	md5sums = SKIP
-	md5sums = 3b347a05abc3d1a3a047a68988c659b7
+	depends = libarchive
+	source = ticemu-1.3.tar.gz::https://github.com/CE-Programming/CEmu/archive/v1.3.tar.gz
+	source = https://github.com/CE-Programming/zdis/archive/7eb89e56d219bbca5ca5cd82c98dce69bd75004b.tar.gz
+	source = include-stdexcept.patch
+	md5sums = cf8bfb755ea28c91a2a5b4abba14bc09
+	md5sums = f4e1cb5120afda89b90d8867d7c89b10
+	md5sums = ff15d1a9d6feeeb6252332976ddbbc1b
 
-pkgname = cemu-git
+pkgname = ticemu
 
diff --git a/PKGBUILD b/PKGBUILD
index 775e71820842..64a17e543e27 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,41 @@
-# Maintainer: Julien Savard <juju at juju2143 dot ca>
-pkgname=cemu-git
-pkgver=2.0dev.r2072.0b6f6b06
+# Maintainer: Julien Savard <juju@juju2143.ca>
+# Contributor: Nathaniel van Diepen <eeems@eeems.codes>
+
+pkgname=ticemu
+pkgver=1.3
+url='https://ce-programming.github.io/CEmu/'
 pkgrel=1
-pkgdesc="An open-source third-party TI-84 Plus CE / TI-83 Premium CE calculator emulator"
-arch=("i686" "x86_64")
-url="https://github.com/MateoConLechuga/CEmu"
+makedepends=('git')
+depends=('qt5-base' 'libarchive')
+pkgdesc='Third-party TI-84 Plus CE / TI-83 Premium CE emulator, focused on developer features'
 license=('GPL')
-groups=()
-depends=('qt5-base' 'qt5-declarative')
-makedepends=('git') # 'bzr', 'git', 'mercurial' or 'subversion'
-provides=("cemu")
-conflicts=("cemu")
-replaces=()
-backup=()
-options=()
-install=
-source=('cemu::git+https://github.com/MateoConLechuga/CEmu' 'cemu.desktop')
-noextract=()
-md5sums=('SKIP'
-         '3b347a05abc3d1a3a047a68988c659b7')
+arch=('x86_64')
+_subpkgver=('7eb89e56d219bbca5ca5cd82c98dce69bd75004b')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/CE-Programming/CEmu/archive/v$pkgver.tar.gz"
+	"https://github.com/CE-Programming/zdis/archive/${_subpkgver[0]}.tar.gz"
+	"include-stdexcept.patch")
+md5sums=('cf8bfb755ea28c91a2a5b4abba14bc09'
+         'f4e1cb5120afda89b90d8867d7c89b10'
+         'ff15d1a9d6feeeb6252332976ddbbc1b')
+prepare(){
+  cd "$srcdir/CEmu-$pkgver"
 
-pkgver() {
-	cd "$srcdir/${pkgname%-git}/gui/qt"
-	printf "%s.r%s.%s" "$(cat CEmu.pro | grep 'CEMU_VERSION =' | grep -o '[^=]*$' | tail -n1 |sed 's# ##g'|sed 's#^v##g')" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
+  rm -r core/debug/zdis
+  cp -r "${srcdir}"/zdis-${_subpkgver[0]} core/debug/zdis
 
-build() {
-	cd "$srcdir/${pkgname%-git}"
-	git submodule init
-	git submodule update
-	cd "$srcdir/${pkgname%-git}/gui/qt"
-	qmake-qt5 -r CEmu.pro
-	make
+  patch --forward --strip=1 --input="${srcdir}/include-stdexcept.patch"
 }
+build() {
+  cd "$srcdir/CEmu-$pkgver/gui/qt"
 
+  qmake -r CEmu.pro "PREFIX=$pkgdir/usr" "CEMU_VERSION=v$pkgver"
+  make
+}
 package() {
-	cd "$srcdir/${pkgname%-git}/gui/qt"
-	install -D -m755 "${srcdir}/${pkgname%-git}/gui/qt/CEmu" "$pkgdir/usr/bin/cemu"
-	install -D -m644 "${srcdir}/${pkgname%-git}/README.md" "$pkgdir/usr/share/${pkgname%-git}/README"
-	install -D -m644 "${srcdir}/${pkgname%-git}/LICENSE" "$pkgdir/usr/share/licenses/${pkgname%-git}/LICENSE"
-	install -D -m644 "${srcdir}/${pkgname%-git}/gui/qt/resources/icons/icon.png" "$pkgdir/usr/share/pixmaps/${pkgname%-git}.png"
-	install -D -m644 "${srcdir}/${pkgname%-git}.desktop" "$pkgdir/usr/share/applications/${pkgname%-git}.desktop"
+  install -Dm644 "$srcdir/CEmu-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 "$srcdir/CEmu-$pkgver/gui/qt/resources/linux/cemu.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 "$srcdir/CEmu-$pkgver/gui/qt/resources/icons/linux/cemu-512x512.png" "$pkgdir/usr/share/pixmaps/cemu.png"
+
+  cd "$srcdir/CEmu-$pkgver/gui/qt"
+  make install
 }
diff --git a/include-stdexcept.patch b/include-stdexcept.patch
new file mode 100644
index 000000000000..e3183791f12b
--- /dev/null
+++ b/include-stdexcept.patch
@@ -0,0 +1,209 @@
+diff --unified --recursive --text CEmu-1.3.orig/gui/qt/tivarslib/BinaryFile.cpp CEmu-1.3.new/gui/qt/tivarslib/BinaryFile.cpp
+--- CEmu-1.3.orig/gui/qt/tivarslib/BinaryFile.cpp	2019-06-22 05:20:44.000000000 -0400
++++ CEmu-1.3.new/gui/qt/tivarslib/BinaryFile.cpp	2020-06-13 19:36:45.059220626 -0400
+@@ -7,6 +7,7 @@
+ 
+ #include "BinaryFile.h"
+ #include "tivarslib_utils.h"
++#include <stdexcept>
+ 
+ namespace tivars
+ {
+diff --unified --recursive --text CEmu-1.3.orig/gui/qt/tivarslib/TIModel.cpp CEmu-1.3.new/gui/qt/tivarslib/TIModel.cpp
+--- CEmu-1.3.orig/gui/qt/tivarslib/TIModel.cpp	2019-06-22 05:20:44.000000000 -0400
++++ CEmu-1.3.new/gui/qt/tivarslib/TIModel.cpp	2020-06-13 19:44:19.819550769 -0400
+@@ -7,6 +7,7 @@
+ 
+ #include "TIModel.h"
+ #include "TIModels.h"
++#include <stdexcept>
+ 
+ namespace tivars
+ {
+diff --unified --recursive --text CEmu-1.3.orig/gui/qt/tivarslib/TIVarFile.cpp CEmu-1.3.new/gui/qt/tivarslib/TIVarFile.cpp
+--- CEmu-1.3.orig/gui/qt/tivarslib/TIVarFile.cpp	2019-06-22 05:20:44.000000000 -0400
++++ CEmu-1.3.new/gui/qt/tivarslib/TIVarFile.cpp	2020-06-13 19:33:55.574238461 -0400
+@@ -10,6 +10,7 @@
+ #include "TIModels.h"
+ #include <numeric>
+ #include <regex>
++#include <stdexcept>
+ 
+ namespace tivars
+ {
+diff --unified --recursive --text CEmu-1.3.orig/gui/qt/tivarslib/TIVarType.cpp CEmu-1.3.new/gui/qt/tivarslib/TIVarType.cpp
+--- CEmu-1.3.orig/gui/qt/tivarslib/TIVarType.cpp	2019-06-22 05:20:44.000000000 -0400
++++ CEmu-1.3.new/gui/qt/tivarslib/TIVarType.cpp	2020-06-13 19:44:35.466351352 -0400
+@@ -7,6 +7,7 @@
+ 
+ #include "TIVarType.h"
+ #include "TIVarTypes.h"
++#include <stdexcept>
+ 
+ namespace tivars
+ {
+diff --unified --recursive --text CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/DummyHandler.cpp CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/DummyHandler.cpp
+--- CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/DummyHandler.cpp	2019-06-22 05:20:44.000000000 -0400
++++ CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/DummyHandler.cpp	2020-06-13 19:35:29.837124961 -0400
+@@ -7,6 +7,7 @@
+ 
+ #include "../CommonTypes.h"
+ #include "TypeHandlers.h"
++#include <stdexcept>
+ 
+ namespace tivars
+ {
+diff --unified --recursive --text CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/STH_DataAppVar.cpp CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/STH_DataAppVar.cpp
+--- CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/STH_DataAppVar.cpp	2019-06-22 05:20:44.000000000 -0400
++++ CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/STH_DataAppVar.cpp	2020-06-13 19:45:21.705760880 -0400
+@@ -8,6 +8,7 @@
+ #include "TypeHandlers.h"
+ #include "../tivarslib_utils.h"
+ #include <regex>
++#include <stdexcept>
+ 
+ namespace tivars
+ {
+diff --unified --recursive --text CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/STH_ExactFraction.cpp CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/STH_ExactFraction.cpp
+--- CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/STH_ExactFraction.cpp	2019-06-22 05:20:44.000000000 -0400
++++ CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/STH_ExactFraction.cpp	2020-06-13 19:34:38.542733845 -0400
+@@ -8,6 +8,7 @@
+ #include "TypeHandlers.h"
+ #include "../tivarslib_utils.h"
+ #include <regex>
++#include <stdexcept>
+ 
+ namespace tivars
+ {
+diff --unified --recursive --text CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/STH_ExactFractionPi.cpp CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/STH_ExactFractionPi.cpp
+--- CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/STH_ExactFractionPi.cpp	2019-06-22 05:20:44.000000000 -0400
++++ CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/STH_ExactFractionPi.cpp	2020-06-13 19:35:14.437308473 -0400
+@@ -8,6 +8,7 @@
+ #include "TypeHandlers.h"
+ #include "../tivarslib_utils.h"
+ #include <regex>
++#include <stdexcept>
+ 
+ namespace tivars
+ {
+diff --unified --recursive --text CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/STH_ExactPi.cpp CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/STH_ExactPi.cpp
+--- CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/STH_ExactPi.cpp	2019-06-22 05:20:44.000000000 -0400
++++ CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/STH_ExactPi.cpp	2020-06-13 19:35:04.045431961 -0400
+@@ -8,6 +8,7 @@
+ #include "TypeHandlers.h"
+ #include "../tivarslib_utils.h"
+ #include <regex>
++#include <stdexcept>
+ 
+ namespace tivars
+ {
+diff --unified --recursive --text CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/STH_ExactRadical.cpp CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/STH_ExactRadical.cpp
+--- CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/STH_ExactRadical.cpp	2019-06-22 05:20:44.000000000 -0400
++++ CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/STH_ExactRadical.cpp	2020-06-13 19:34:49.965598839 -0400
+@@ -8,6 +8,7 @@
+ #include "TypeHandlers.h"
+ #include "../tivarslib_utils.h"
+ #include <regex>
++#include <stdexcept>
+ 
+ namespace tivars
+ {
+diff --unified --recursive --text CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/STH_FP.cpp CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/STH_FP.cpp
+--- CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/STH_FP.cpp	2019-06-22 05:20:44.000000000 -0400
++++ CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/STH_FP.cpp	2020-06-13 19:46:04.408214124 -0400
+@@ -10,6 +10,7 @@
+ #include "TypeHandlers.h"
+ #include "../tivarslib_utils.h"
+ #include <regex>
++#include <stdexcept>
+ 
+ static bool parseSign(std::string::const_iterator &i, const std::string::const_iterator &e) {
+     bool sign = false;
+diff --unified --recursive --text CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/STH_PythonAppVar.cpp CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/STH_PythonAppVar.cpp
+--- CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/STH_PythonAppVar.cpp	2019-06-22 05:20:44.000000000 -0400
++++ CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/STH_PythonAppVar.cpp	2020-06-13 19:45:06.689952815 -0400
+@@ -9,6 +9,7 @@
+ #include "../tivarslib_utils.h"
+ 
+ #include <cstring>
++#include <stdexcept>
+ 
+ // TODO: handle filename stuff
+ // TODO: handle UTF8 BOM stuff
+diff --unified --recursive --text CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/TH_GenericAppVar.cpp CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/TH_GenericAppVar.cpp
+--- CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/TH_GenericAppVar.cpp	2019-06-22 05:20:44.000000000 -0400
++++ CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/TH_GenericAppVar.cpp	2020-06-13 19:46:53.728581020 -0400
+@@ -9,6 +9,7 @@
+ #include "../tivarslib_utils.h"
+ 
+ #include <cstring>
++#include <stdexcept>
+ 
+ namespace tivars
+ {
+diff --unified --recursive --text CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/TH_GenericComplex.cpp CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/TH_GenericComplex.cpp
+--- CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/TH_GenericComplex.cpp	2019-06-22 05:20:44.000000000 -0400
++++ CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/TH_GenericComplex.cpp	2020-06-13 19:34:16.649991597 -0400
+@@ -10,6 +10,7 @@
+ 
+ #include <regex>
+ #include <unordered_map>
++#include <stdexcept>
+ 
+ namespace tivars
+ {
+diff --unified --recursive --text CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/TH_GenericList.cpp CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/TH_GenericList.cpp
+--- CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/TH_GenericList.cpp	2019-06-22 05:20:44.000000000 -0400
++++ CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/TH_GenericList.cpp	2020-06-13 19:36:25.820453131 -0400
+@@ -7,6 +7,7 @@
+ 
+ #include "TypeHandlers.h"
+ #include "../tivarslib_utils.h"
++#include <stdexcept>
+ 
+ namespace tivars
+ {
+diff --unified --recursive --text CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/TH_GenericReal.cpp CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/TH_GenericReal.cpp
+--- CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/TH_GenericReal.cpp	2019-06-22 05:20:44.000000000 -0400
++++ CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/TH_GenericReal.cpp	2020-06-13 19:36:14.572588684 -0400
+@@ -9,6 +9,7 @@
+ #include "../tivarslib_utils.h"
+ 
+ #include <unordered_map>
++#include <stdexcept>
+ 
+ namespace tivars
+ {
+diff --unified --recursive --text CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/TH_Matrix.cpp CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/TH_Matrix.cpp
+--- CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/TH_Matrix.cpp	2019-06-22 05:20:44.000000000 -0400
++++ CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/TH_Matrix.cpp	2020-06-13 19:46:24.608955015 -0400
+@@ -7,6 +7,7 @@
+ 
+ #include "TypeHandlers.h"
+ #include "../tivarslib_utils.h"
++#include <stdexcept>
+ 
+ namespace tivars
+ {
+diff --unified --recursive --text CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/TH_TempEqu.cpp CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/TH_TempEqu.cpp
+--- CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/TH_TempEqu.cpp	2019-06-22 05:20:44.000000000 -0400
++++ CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/TH_TempEqu.cpp	2020-06-13 19:35:58.676779774 -0400
+@@ -7,6 +7,7 @@
+ 
+ #include "TypeHandlers.h"
+ #include <cstring>
++#include <stdexcept>
+ 
+ namespace tivars
+ {
+diff --unified --recursive --text CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/TH_Tokenized.cpp CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/TH_Tokenized.cpp
+--- CEmu-1.3.orig/gui/qt/tivarslib/TypeHandlers/TH_Tokenized.cpp	2019-06-22 05:20:44.000000000 -0400
++++ CEmu-1.3.new/gui/qt/tivarslib/TypeHandlers/TH_Tokenized.cpp	2020-06-13 19:35:49.180893653 -0400
+@@ -14,6 +14,7 @@
+ #include <iostream>
+ #include <regex>
+ #include <fstream>
++#include <stdexcept>
+ 
+ namespace tivars
+ {