From c0e9003cee237ea0cdef59f4359d79cdab36bdf6 Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Fri, 22 Feb 2019 12:23:39 +0100
Subject: pcr/qtoctave: rebuilt

---
 pcr/qtoctave/PKGBUILD              | 21 ++++++++++++++-------
 pcr/qtoctave/fix-return-type.patch | 12 ++++++++++++
 2 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 pcr/qtoctave/fix-return-type.patch

(limited to 'pcr/qtoctave')

diff --git a/pcr/qtoctave/PKGBUILD b/pcr/qtoctave/PKGBUILD
index 8f6834abe..4a91004ba 100644
--- a/pcr/qtoctave/PKGBUILD
+++ b/pcr/qtoctave/PKGBUILD
@@ -1,22 +1,29 @@
-# Maintainer (Arch): Michael Schubert <mschu.dev at gmail>
-# Contributor (Arch): Ronald van Haren <ronald.archlinux.org>
-# Contributor (Arch): Stefan Husmann <stefan-husmann@t-online.de>
+# Maintainer (AUR): Michael Schubert <mschu.dev at gmail>
+# Contributor (AUR): Ronald van Haren <ronald.archlinux.org>
+# Contributor (AUR): Stefan Husmann <stefan-husmann@t-online.de>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=qtoctave
 pkgver=0.10.1
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 pkgdesc="Qt4 frontend for octave"
 url="https://forja.rediris.es/projects/csl-qtoctave/"
 license=('GPL2')
 depends=('qt4' 'octave')
 makedepends=('cmake')
-source=("http://forja.rediris.es/frs/download.php/2054/${pkgname}-${pkgver}.tar.gz")
-md5sums=('f23afd8eb850b950f51b65f256a83835')
+source=("http://forja.rediris.es/frs/download.php/2054/${pkgname}-${pkgver}.tar.gz"
+        fix-return-type.patch)
+sha256sums=('4abd367924964887ea691f93c2c8ec90dcc64eb22827893dfb506ae43331b732'
+            '1404491b5c03ae8977441abd99c212922a5b48b0dfb410e79c4838af45979e59')
 install="qtoctave.install"
 options=('!libtool' '!emptydirs')
-      
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i "$srcdir"/fix-return-type.patch
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   sed -i "s/\"lrelease\"/\"lrelease-qt4\"/" qtoctave/src/CMakeLists.txt
diff --git a/pcr/qtoctave/fix-return-type.patch b/pcr/qtoctave/fix-return-type.patch
new file mode 100644
index 000000000..8fabdf5cb
--- /dev/null
+++ b/pcr/qtoctave/fix-return-type.patch
@@ -0,0 +1,12 @@
+diff -rupN qtoctave-0.10.1/qtoctave/src/generate_menu.cpp qtoctave-0.10.1.new/qtoctave/src/generate_menu.cpp
+--- qtoctave-0.10.1/qtoctave/src/generate_menu.cpp	2011-01-06 22:48:07.000000000 +0100
++++ qtoctave-0.10.1.new/qtoctave/src/generate_menu.cpp	2019-02-22 11:36:31.565433220 +0100
+@@ -279,7 +279,7 @@ bool GenerateMenu::process_menu_file(QSt
+ MenuExtCallBack *GenerateMenu::process_menu_file(QString _file)
+ {
+ 	QFile file(_file);
+-	if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) return false;
++	if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) return NULL;
+ 	
+ 	QString label;
+ 	MenuExtCallBack *wizard=new MenuExtCallBack();
-- 
cgit v1.2.2