games/higan: Updated for version 110.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 75 insertions, 84 deletions

diff --git a/games/higan/higan-flags.diff b/games/higan/higan-flags.diff
index aaca8d0e2f..890a2c0bc2 100644
--- a/games/higan/higan-flags.diff
+++ b/games/higan/higan-flags.diff
@@ -1,49 +1,23 @@
-diff -rupN higan_v106-source.orig/higan/GNUmakefile higan_v106-source/higan/GNUmakefile
---- higan_v106-source.orig/higan/GNUmakefile	2017-12-27 23:12:21.263872763 +0100
-+++ higan_v106-source/higan/GNUmakefile	2017-12-27 23:12:30.243627883 +0100
-@@ -1,4 +1,4 @@
--build := optimize
-+build := release
- include ../nall/GNUmakefile
+From 6d0f100d25fecae89a48c76f55371730a51c10fe Mon Sep 17 00:00:00 2001
+From: Maxime Gauduin <alucryd@archlinux.org>
+Date: Wed, 18 Mar 2020 17:08:25 +0100
+Subject: [PATCH] use system flags
+
+---
+ nall/GNUmakefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/nall/GNUmakefile b/nall/GNUmakefile
+index 67fb3a15..fddec93d 100755
+--- a/nall/GNUmakefile
++++ b/nall/GNUmakefile
+@@ -127,7 +127,8 @@ endif
  
- binary := application
-@@ -26,7 +26,6 @@ else ifneq ($(filter $(platform),linux b
-   flags += -fopenmp
-   link += -fopenmp
-   ifeq ($(binary),application)
--    flags += -march=native
-     link += -Wl,-export-dynamic
-     link += -lX11 -lXext
-   else ifeq ($(binary),library)
-diff -rupN higan_v106-source.orig/icarus/GNUmakefile higan_v106-source/icarus/GNUmakefile
---- higan_v106-source.orig/icarus/GNUmakefile	2017-12-27 23:12:21.280538976 +0100
-+++ higan_v106-source/icarus/GNUmakefile	2017-12-27 23:12:30.243627883 +0100
-@@ -1,4 +1,4 @@
--build := optimize
-+build := release
- include ../nall/GNUmakefile
- include ../hiro/GNUmakefile
- 
-diff -rupN higan_v106-source.orig/nall/GNUmakefile higan_v106-source/nall/GNUmakefile
---- higan_v106-source.orig/nall/GNUmakefile	2017-12-27 23:12:21.283872217 +0100
-+++ higan_v106-source/nall/GNUmakefile	2017-12-27 23:12:44.326577547 +0100
-@@ -40,8 +40,8 @@ cflags := -x c -std=c11
- objcflags := -x objective-c -std=c11
- cppflags := -x c++ -std=c++14
- objcppflags := -x objective-c++ -std=c++14
--flags :=
--link :=
-+flags := $(CXXFLAGS)
-+link := $(LDFLAGS)
- 
- # compiler detection
- ifeq ($(compiler),)
-@@ -120,7 +120,7 @@ ifeq ($(threaded),true)
+ # linux settings
+ ifeq ($(platform),linux)
+-  options += -ldl
++  flags += ${CXXFLAGS}
++  options += ${LDFLAGS} -ldl
  endif
  
- # paths
--prefix := $(HOME)/.local
-+prefix := /usr
- 
- # function rwildcard(directory, pattern)
- rwildcard = \
+ # bsd settings
diff --git a/games/higan/higan-paths.diff b/games/higan/higan-paths.diff
index dcb3eaf89d..65fe4a24eb 100644
--- a/games/higan/higan-paths.diff
+++ b/games/higan/higan-paths.diff
@@ -1,26 +1,43 @@
-diff -rupN higan_v106-source.orig/higan/target-tomoko/tomoko.cpp higan_v106-source/higan/target-tomoko/tomoko.cpp
---- higan_v106-source.orig/higan/target-tomoko/tomoko.cpp	2017-12-27 23:48:31.103245742 +0100
-+++ higan_v106-source/higan/target-tomoko/tomoko.cpp	2017-12-27 23:49:19.728586352 +0100
-@@ -11,6 +11,9 @@ auto locate(string name) -> string {
-   location = {Path::config(), "higan/", name};
+kFrom c0495ce121ab0c3eeffdf08614e18bd4f0c455f2 Mon Sep 17 00:00:00 2001
+From: Maxime Gauduin <alucryd@archlinux.org>
+Date: Wed, 18 Mar 2020 12:19:31 +0100
+Subject: [PATCH] use more sensible paths
+
+---
+ higan/target-higan/higan.cpp | 5 ++---
+ icarus/icarus.cpp            | 3 +--
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/higan/target-higan/higan.cpp b/higan/target-higan/higan.cpp
+index 1ce9b991..7d1ae122 100644
+--- a/higan/target-higan/higan.cpp
++++ b/higan/target-higan/higan.cpp
+@@ -43,11 +43,10 @@ auto nall::main(Arguments arguments) -> void {
+     Path::data = document["data"].text();
+   }
+   if(!directory::exists(Path::templates)) {
+-    Path::templates = {Path::userData(), "higan/"};
+-    directory::create(Path::templates);
++    Path::templates = {Path::sharedData(), "higan/Templates/"};
+   }
+   if(!directory::exists(Path::data)) {
+-    Path::data = {Path::user(), "higan/"};
++    Path::data = {Path::userData(), "higan/Systems/"};
+     directory::create(Path::data);
+   }
+   file::write({Path::settings, "paths.bml"}, string{
+diff --git a/icarus/icarus.cpp b/icarus/icarus.cpp
+index 95435f38..a46744e5 100644
+--- a/icarus/icarus.cpp
++++ b/icarus/icarus.cpp
+@@ -8,8 +8,7 @@ auto locate(string name) -> string {
+   string location = {Path::program(), name};
    if(inode::exists(location)) return location;
  
-+  location = {Path::shared(), "higan/", name};
-+  if(inode::exists(location)) return location;
-+
-   directory::create({Path::local(), "higan/"});
-   return {Path::local(), "higan/", name};
+-  directory::create({Path::userData(), "icarus/"});
+-  return {Path::userData(), "icarus/", name};
++  return {Path::sharedData(), "icarus/", name};
  }
-diff -rupN higan_v106-source.orig/icarus/icarus.cpp higan_v106-source/icarus/icarus.cpp
---- higan_v106-source.orig/icarus/icarus.cpp	2017-12-27 23:48:31.109912227 +0100
-+++ higan_v106-source/icarus/icarus.cpp	2017-12-27 23:49:02.672384569 +0100
-@@ -11,6 +11,9 @@ auto locate(string name) -> string {
-   location = {Path::config(), "icarus/", name};
-   if(inode::exists(location)) return location;
  
-+  location = {Path::shared(), "icarus/", name};
-+  if(inode::exists(location)) return location;
-+
-   directory::create({Path::local(), "icarus/"});
-   return {Path::local(), "icarus/", name};
- }
+ auto operator+=(string& lhs, const string& rhs) -> string& {
+
diff --git a/games/higan/higan.SlackBuild b/games/higan/higan.SlackBuild
index d4675f6351..97169db74c 100644
--- a/games/higan/higan.SlackBuild
+++ b/games/higan/higan.SlackBuild
@@ -34,7 +34,7 @@
 # This update would not have happened without assistance and moral support
 # from Yossi Ne'eman. Thanks!
 # - Take over maintenance.
-# - Update for v106.
+# - Update for v110.
 # - Use the gtk frontend, not the *broken* qt one.
 # - Make OpenAL dep optional & autodetected (and OPENAL=no to force-disable).
 # - Add OSS (default no) and PULSE (default yes) env vars.
@@ -47,8 +47,8 @@
 #   page sources!
 
 PRGNAM=higan
-VERSION=${VERSION:-106}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-110}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -102,7 +102,9 @@ patch -p1 -i $CWD/higan-paths.diff
 
 # 20181212 bkw: audio system stuff. Upstream doesn't give us a way to
 # disable these on the make command line, but hacking this file works:
-HACKFILE=higan/target-tomoko/GNUmakefile
+HACKFILE=higan/target-higan/GNUmakefile
+
+sed 's|/usr/local/lib/qt5/bin/moc|moc-qt5|' -i hiro/GNUmakefile
 
 # Who actually uses OSS?
 if [ "${OSS:-no}" = "no" ]; then
@@ -130,13 +132,13 @@ CXXFLAGS="$SLKCFLAGS" \
 make -C icarus \
   prefix=/usr \
   platform=linux \
-  hiro=gtk
+  hiro=qt5
 
 CXXFLAGS="$SLKCFLAGS" \
 make -C $PRGNAM \
   prefix=/usr \
   platform=linux \
-  hiro=gtk
+  hiro=qt5
 
 mkdir -p $PKG/usr/games \
   $PKG/usr/share/applications \
@@ -144,9 +146,9 @@ mkdir -p $PKG/usr/games \
   $PKG/usr/share/pixmaps
 
 install -s -m 755 $PRGNAM/out/$PRGNAM icarus/out/icarus $PKG/usr/games/
-install -m 644 $PRGNAM/data/$PRGNAM.desktop $PKG/usr/share/applications/
-install -m 644 $PRGNAM/data/$PRGNAM.png $PKG/usr/share/pixmaps/
-cp -dr $PRGNAM/systems/* $PKG/usr/share/$PRGNAM/
+install -m 644 $PRGNAM/target-higan/resource/$PRGNAM.desktop $PKG/usr/share/applications/
+install -m 644 $PRGNAM/target-higan/resource/$PRGNAM.png $PKG/usr/share/pixmaps/
+cp -dr $PRGNAM/System/* $PKG/usr/share/$PRGNAM/
 
 # Man pages by B. Watson. higan.6 is basically the higan-cli.md from the
 # git repo, reformatted as RST & converted to a man page. icarus.6 was
@@ -156,10 +158,8 @@ for i in $PRGNAM icarus; do
   gzip -9c < $CWD/$i.6 > $PKG/usr/man/man6/$i.6.gz
 done
 
-# Sadly there are no docs in v106. I found a docs/ dir in git, but it's not
-# in the release 7z archive. Apparently this is because the git archive is
-# somehow unofficial...?
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp *.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/higan/higan.info b/games/higan/higan.info
index 2b56695513..17051ccc54 100644
--- a/games/higan/higan.info
+++ b/games/higan/higan.info
@@ -1,10 +1,10 @@
 PRGNAM="higan"
-VERSION="106"
+VERSION="110"
 HOMEPAGE="https://byuu.org/emulation/higan/"
-DOWNLOAD="https://github.com/higan-emu/higan/archive/v106/higan-106.tar.gz"
-MD5SUM="4a68c6b9671089b4a7fde0b234531d61"
+DOWNLOAD="https://github.com/higan-emu/higan/archive/v110/higan-110.tar.gz"
+MD5SUM="e2e2073f93b522365579108442af9de4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gtksourceview"
+REQUIRES=""
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"