Update to 3.5.6.0 and remove upgrade

4 files changed, 38 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5471142cee5f..f9af81c1e386 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = gridcoinresearch-git
-	pkgver = 3.4.2.5.r443.78d83b2
+	pkgver = 3.5.6.0.r654.a20e6a6
 	pkgrel = 1
 	url = http://gridcoin.us
 	arch = i686
@@ -15,7 +15,7 @@ pkgbase = gridcoinresearch-git
 	makedepends = protobuf
 	makedepends = miniupnpc
 	source = gridcoinresearch::git+https://github.com/gridcoin/Gridcoin-Research.git
-	source = fix-upnp.patch
+	source = 01_qt5_fixes.patch
 	source = gridcoinresearch-qt.desktop
 	sha1sums = SKIP
 	sha1sums = 46006c634ef57189b9a9e6607ca392cb17b933b4
diff --git a/01_qt5_fixes.patch b/01_qt5_fixes.patch
new file mode 100644
index 000000000000..f17c57f7b007
--- /dev/null
+++ b/01_qt5_fixes.patch
@@ -0,0 +1,26 @@
+Subject: Comment out win only qt5 modules
+Description: QT5 modules for windows causing compile errors in linux
+Author: Richard Leckinger <richard.leckinger@riseup.net>
+
+--- a/gridcoinresearch.pro
++++ b/gridcoinresearch.pro
+@@ -7,9 +7,9 @@ CONFIG += no_include_pwd
+ CONFIG += thread
+ #QT += sql (Future Use)
+ QT += core gui network
+-QT += qaxcontainer
++#QT += qaxcontainer
+ #QT += axcontainer
+-QT += axserver
++#QT += axserver
+ QT += widgets
+ 
+ 
+@@ -18,7 +18,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
+     DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+ }
+ 
+-CONFIG += qaxcontainer
++#CONFIG += qaxcontainer
+ CONFIG += exceptions
+ 
diff --git a/PKGBUILD b/PKGBUILD
index dd2107379bc2..60cad0b5cb67 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: L <alaviss0 at gmail dot com>
+# Maintainer: Albert Mikaelyan <tahvok at gmail dot com>
 
 pkgbase=gridcoinresearch-git
-pkgname=('gridcoinresearch-daemon-git' 'gridcoinresearch-qt-git' 'gridcoinresearch-upgrader-git')
-pkgver=3.4.2.5.r443.78d83b2
+pkgname=('gridcoinresearch-daemon-git' 'gridcoinresearch-qt-git')
+pkgver=3.5.6.0.r654.a20e6a6
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://gridcoin.us"
@@ -10,11 +10,11 @@ license=('custom:gridcoin')
 makedepends=('boost' 'git' 'qt4' 'openssl' 'qrencode' 'db' 'curl'
              'protobuf' 'miniupnpc')
 source=('gridcoinresearch::git+https://github.com/gridcoin/Gridcoin-Research.git'
-        'fix-upnp.patch'
+        '01_qt5_fixes.patch'
         'gridcoinresearch-qt.desktop')
 
 sha1sums=('SKIP'
-          '46006c634ef57189b9a9e6607ca392cb17b933b4'
+          'c8492e0244fb95214887aa432b52347dbd96879c'
           '931e82ce57cf9099d73534f969f49ba4e524e671')
 
 pkgver() {
@@ -28,10 +28,11 @@ pkgver() {
 prepare() {
   cd "$srcdir/${pkgbase%-git}"
 
-  # Fix miniupnpc header path
-  patch -Np1 -i "$srcdir"/fix-upnp.patch
+  patch -Np1 -i "$srcdir"/01_qt5_fixes.patch
 
-  mkdir -p src/obj/zerocoin
+  mkdir -p src/obj
+
+  chmod 755 src/leveldb/build_detect_platform
 }
 
 build() {
@@ -40,10 +41,8 @@ build() {
   cd src
   make ${MAKEFLAGS} -f makefile.unix DEBUGFLAGS="" USE_UPNP=1
 
-  make ${MAKEFLAGS} -f makefile_upgrader.unix DEBUGFLAGS=""
-
   cd ..
-  qmake-qt4 "USE_QRCODE=1 USE_UPNP=1"
+  qmake "USE_QRCODE=1 USE_UPNP=1 NO_UPGRADE=1"
   make ${MAKEFLAGS}
 }
 
@@ -73,12 +72,3 @@ package_gridcoinresearch-qt-git() {
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-package_gridcoinresearch-upgrader-git() {
-  pkgdesc="Stub program for Gridcoin Daemon"
-  depends=('curl' 'boost-libs' 'libzip')
-
-  cd "${srcdir}/${pkgbase%-git}/src"
-  install -Dm755 gridcoinupgrader "${pkgdir}/usr/bin/gridcoinupgrader"
-
-  install -Dm644 ../COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
diff --git a/fix-upnp.patch b/fix-upnp.patch
deleted file mode 100644
index 5d26093cd500..000000000000
--- a/fix-upnp.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2868f6e39247b4a2c81f893aed49f95ec16fc559 Mon Sep 17 00:00:00 2001
-From: Matthias Bach <marix@marix.org>
-Date: Thu, 1 Jan 2015 19:35:37 +0100
-Subject: [PATCH] Fix compilation of UPNP support
-
-Miniupnpc stores its headers in a directory miniupnpc, which was missing
-where the headers where included.
----
- src/net.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/net.cpp b/src/net.cpp
-index 2a25bf4..b8efad3 100644
---- a/src/net.cpp
-+++ b/src/net.cpp
-@@ -16,10 +16,10 @@
- #endif
- 
- #ifdef USE_UPNP
--#include <miniwget.h>
--#include <miniupnpc.h>
--#include <upnpcommands.h>
--#include <upnperrors.h>
-+#include <miniupnpc/miniwget.h>
-+#include <miniupnpc/miniupnpc.h>
-+#include <miniupnpc/upnpcommands.h>
-+#include <miniupnpc/upnperrors.h>
- #endif
- 
- using namespace std;