1 files changed, 22 insertions, 39 deletions
diff --git a/games/higan/higan-paths.diff b/games/higan/higan-paths.diff
index 65fe4a24ebdda..dcb3eaf89d2ca 100644
--- a/games/higan/higan-paths.diff
+++ b/games/higan/higan-paths.diff
@@ -1,43 +1,26 @@
-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};
+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};
    if(inode::exists(location)) return location;
  
--  directory::create({Path::userData(), "icarus/"});
--  return {Path::userData(), "icarus/", name};
-+  return {Path::sharedData(), "icarus/", name};
++  location = {Path::shared(), "higan/", name};
++  if(inode::exists(location)) return location;
++
+   directory::create({Path::local(), "higan/"});
+   return {Path::local(), "higan/", 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;
  
- auto operator+=(string& lhs, const string& rhs) -> string& {
-
++  location = {Path::shared(), "icarus/", name};
++  if(inode::exists(location)) return location;
++
+   directory::create({Path::local(), "icarus/"});
+   return {Path::local(), "icarus/", name};
+ }