remove patch, use gcc8

3 files changed, 7 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 442819cebaab..aac5b489f2e3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 pkgbase = neoleo-git
 	pkgdesc = Lightweight curses spreadsheet based on GNU oleo
-	pkgver = 9.0.r95.g72bb0d9
+	pkgver = 10.0.r121.g6bf8a2e
 	pkgrel = 1
 	url = https://github.com/blippy/neoleo
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = git
+	makedepends = gcc8
 	depends = ncurses
 	provides = neoleo
 	conflicts = neoleo
 	options = !makeflags
 	source = git+https://github.com/blippy/neoleo.git
-	source = return_values.patch
 	sha256sums = SKIP
-	sha256sums = a226af78cfd27541ef3ad4255b435667e412787f5b2cea8490cec93ad1929951
 
 pkgname = neoleo-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 40e172832231..69120981c5a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=neoleo-git
-pkgver=9.0.r95.g72bb0d9
+pkgver=10.0.r121.g6bf8a2e
 pkgrel=1
 pkgdesc="Lightweight curses spreadsheet based on GNU oleo"
 arch=('i686' 'x86_64')
@@ -11,26 +11,19 @@ conflicts=(${pkgname%-git})
 provides=(${pkgname%-git})
 license=('GPL')
 depends=('ncurses')
-makedepends=('git')
-source=("git+$url.git" return_values.patch)
+makedepends=('git' 'gcc8')
+source=("git+$url.git")
 options=('!makeflags')
-sha256sums=('SKIP'
-            'a226af78cfd27541ef3ad4255b435667e412787f5b2cea8490cec93ad1929951')
+sha256sums=('SKIP')
 
 pkgver() {
   cd ${pkgname%-git}
   git describe --tags | sed 's+-+.r+' |tr - . | cut -c2-
 }
-
-prepare() {
-  cd ${pkgname%-git}
-  git apply "$srcdir"/return_values.patch
-}
-
 build() {
   cd ${pkgname%-git}
   autoreconf -iv
-  ./configure --prefix=/usr
+  CXX=g++-8 LIBS+="-lstdc++fs"  ./configure --prefix=/usr
   make
 }
 
diff --git a/return_values.patch b/return_values.patch
deleted file mode 100644
index 3b1eb5628d8e..000000000000
--- a/return_values.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/io-curses.cc b/src/io-curses.cc
-index 5ee74ed..0c0d9d8 100644
---- a/src/io-curses.cc
-+++ b/src/io-curses.cc
-@@ -144,7 +144,7 @@ test_curses_suspension()
- 	scr_dump(filename);
- 	//clear();
- 	endwin();
--	(void) system("man man");
-+int i=	system("man man");
- 	reset_prog_mode();
- 	scr_restore(filename);
- 	refresh();
-diff --git a/src/logging.cc b/src/logging.cc
-index 5dfb9e0..ff0e494 100644
---- a/src/logging.cc
-+++ b/src/logging.cc
-@@ -27,7 +27,7 @@ Log m_log;
- Log::Log()
- {
- 	//if(!m_ofs.is_open()) {
--		(void) system("mkdir -p $HOME/.neoleo/logs");
-+		int i= system("mkdir -p $HOME/.neoleo/logs");
- 		std::string logname = std::string(getenv("HOME")) 
- 			+ "/.neoleo/logs/log.txt";
- 		m_ofs.open(logname, std::ofstream::out | std::ofstream::app);