Patch adjusted

3 files changed, 14 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a838c8575344..ad92597305e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = treesheets-git
 	pkgdesc = A "hierarchical spreadsheet" as a replacement for spreadsheets, mind mappers, outliners, PIMs, text editors and small databases.
-	pkgver = r369.a962f73
+	pkgver = r451.3694b16
 	pkgrel = 1
 	url = https://strlen.com/treesheets/
 	arch = i686
@@ -17,6 +17,6 @@ pkgbase = treesheets-git
 	source = git+https://github.com/aardappel/treesheets.git
 	source = myframe.patch
 	sha512sums = SKIP
-	sha512sums = 7ea8b6947c334adebba774bcdd4db27670206a216de0c023c2b69aa3ad3b621165733a36f03f2e23bab1e7721982a24c29c4446754ba79c11c5735961ad04816
+	sha512sums = 8fc4872d8e430899d21e95d6009dea8dde50ba5854a245b4b78901cebf82e3275b23b92f5afe9c5e2f11c34e1d73cd1657d48a3f8aa937eedfc576f2e62bcd77
 
 pkgname = treesheets-git
diff --git a/PKGBUILD b/PKGBUILD
index 7ca1b6d5a906..aea45532d7a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 _pkgname=treesheets
 pkgname=$_pkgname-git
-pkgver=r369.a962f73
+pkgver=r451.3694b16
 pkgrel=1
 pkgdesc='A "hierarchical spreadsheet" as a replacement for spreadsheets, mind mappers, outliners, PIMs, text editors and small databases.'
 url="https://strlen.com/treesheets/"
@@ -20,10 +20,8 @@ source=(
   'myframe.patch'
 )
 
-sha512sums=(
-  'SKIP'
-  '7ea8b6947c334adebba774bcdd4db27670206a216de0c023c2b69aa3ad3b621165733a36f03f2e23bab1e7721982a24c29c4446754ba79c11c5735961ad04816'
-)
+sha512sums=('SKIP'
+            '8fc4872d8e430899d21e95d6009dea8dde50ba5854a245b4b78901cebf82e3275b23b92f5afe9c5e2f11c34e1d73cd1657d48a3f8aa937eedfc576f2e62bcd77')
 
 pkgver() {
   cd $_pkgname
@@ -34,7 +32,7 @@ pkgver() {
 prepare() {
   cd $_pkgname
 
-  patch -p1 < ../myframe.patch
+  patch --binary -p1 < ../myframe.patch
   find TS/images -type f ! -iname '*.png' -a ! -iname '*.svg' -delete
 }
 
diff --git a/myframe.patch b/myframe.patch
index 580ccba0ef33..f415b769e5d1 100644
--- a/myframe.patch
+++ b/myframe.patch
@@ -1,13 +1,13 @@
-diff --git a/src/myframe.h b/src/myframe.h
-index 6673c0e..89591fc 100755
---- a/src/myframe.h
-+++ b/src/myframe.h
-@@ -79,7 +79,7 @@ struct MyFrame : wxFrame
- 

+diff --git a/src/myframe.h b/src/myframe.h

+index 6a7ba9a..afc452a 100755

+--- a/src/myframe.h

++++ b/src/myframe.h

+@@ -94,7 +94,7 @@ struct MyFrame : wxFrame {

+           watcher(nullptr),

+           zenmode(false) {

          sys->frame = this;

- 

 -        exepath_ = wxFileName(exename).GetPath();

 +        exepath_ = "/usr/share/treesheets";

          #ifdef __WXMAC__

          int cut = exepath_.Find("/MacOS");

-         if (cut > 0)

+         if (cut > 0) { exepath_ = exepath_.SubString(0, cut) + "/Resources"; }