Version 3.7.12.0

3 files changed, 59 insertions, 72 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3aaf5c0aca94..f32ab37529aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,45 +1,39 @@
-# Generated by mksrcinfo v8
-# Mon Feb 13 10:58:08 UTC 2017
 pkgbase = gridcoinresearch
-	pkgdesc = GridCoin is a cryptocurrency that helps science via BOINC
-	pkgver = 3.5.8.6
+	pkgdesc = A cryptocurrency that rewards users for participating on the BOINC network
+	pkgver = 3.7.12.0
 	pkgrel = 1
-	url = http://gridcoin.us
+	url = https://gridcoin.us
 	arch = i686
 	arch = x86_64
 	arch = armv7h
+	arch = aarch64
 	license = custom:gridcoin
 	makedepends = boost
-	makedepends = qt5-base
 	makedepends = qt5-tools
-	makedepends = openssl
-	makedepends = libzip
 	makedepends = qrencode
 	makedepends = db
-	makedepends = curl
-	makedepends = miniupnpc
-	source = gridcoinresearch-3.5.8.6.tar.gz::https://github.com/gridcoin/Gridcoin-Research/archive/3.5.8.6.tar.gz
+	makedepends = icoutils
+	source = gridcoinresearch-3.7.12.0.tar.gz::https://github.com/gridcoin/Gridcoin-Research/archive/3.7.12.0.tar.gz
 	source = gridcoinresearch-qt.desktop
-	sha256sums = d798ea60f87d4daf78c154dde650f0cb08cc28cc34fa8ee876c2e37948efb393
+	sha256sums = 534f92d6bfb783f652aa512c1b886c527cf0035e62838aa6615f8a2def22a4c1
 	sha256sums = 1c547e531726d3172895683f9673379fc51639689989e49494aa0f40fc6cb053
 
-pkgname = gridcoinresearch-daemon
-	pkgdesc = GridCoin is a cryptocurrency that helps science via BOINC - Daemon
-	install = gridcoin.install
-	depends = boost-libs
-	depends = libzip
-	depends = miniupnpc
-	depends = curl
-	depends = boinc
-
 pkgname = gridcoinresearch-qt
-	pkgdesc = GridCoin is a cryptocurrency that helps science via BOINC - Qt
-	install = gridcoin.install
+	pkgdesc = A cryptocurrency that rewards users for participating on the BOINC network (Qt GUI)
 	depends = boost-libs
+	depends = db
+	depends = miniupnpc
 	depends = qrencode
 	depends = qt5-base
-	depends = libzip
+	depends = qt5-charts
+	optdepends = boinc: to earn Gridcoin rewards by doing computational research
+
+pkgname = gridcoinresearchd
+	pkgdesc = A cryptocurrency that rewards users for participating on the BOINC network (Daemon/CLI)
+	depends = boost-libs
+	depends = db
 	depends = miniupnpc
-	depends = curl
-	depends = boinc
+	optdepends = boinc: to earn Gridcoin rewards by doing computational research
+	conflicts = gridcoinresearch-daemon
+	replaces = gridcoinresearch-daemon
 
diff --git a/PKGBUILD b/PKGBUILD
index 021ccd9927dd..8a88fbedee08 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,68 +1,64 @@
 # Maintainer: Albert Mikaelyan <tahvok at gmail dot com>
+# Contributor: mrypsilon
 
 pkgbase=gridcoinresearch
-pkgname=('gridcoinresearch-daemon' 'gridcoinresearch-qt')
-pkgver=3.5.8.6
+pkgname=(gridcoinresearch-qt gridcoinresearchd)
+pkgver=3.7.12.0
 pkgrel=1
-pkgdesc="GridCoin is a cryptocurrency that helps science via BOINC"
-arch=('i686' 'x86_64' 'armv7h')
-url="http://gridcoin.us"
+pkgdesc="A cryptocurrency that rewards users for participating on the BOINC network"
+makedepends=('boost' 'qt5-tools' 'qrencode' 'db' 'icoutils')
+
+arch=('i686' 'x86_64' 'armv7h' 'aarch64')
+url="https://gridcoin.us"
 license=('custom:gridcoin')
 
 _sourcename="Gridcoin-Research-$pkgver"
 
-makedepends=('boost' 'qt5-base' 'qt5-tools' 'openssl' 'libzip' 'qrencode' 'db' 'curl'
-             'miniupnpc')
-source=("gridcoinresearch-${pkgver}.tar.gz::https://github.com/gridcoin/Gridcoin-Research/archive/${pkgver}.tar.gz"
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/gridcoin/Gridcoin-Research/archive/$pkgver.tar.gz"
         'gridcoinresearch-qt.desktop')
 
-sha256sums=('d798ea60f87d4daf78c154dde650f0cb08cc28cc34fa8ee876c2e37948efb393'
-          '1c547e531726d3172895683f9673379fc51639689989e49494aa0f40fc6cb053')
-
-prepare() {
-  cd "$srcdir/$_sourcename"
-
-  mkdir -p src/obj
-
-  chmod 755 src/leveldb/build_detect_platform
-}
+sha256sums=('534f92d6bfb783f652aa512c1b886c527cf0035e62838aa6615f8a2def22a4c1'
+            '1c547e531726d3172895683f9673379fc51639689989e49494aa0f40fc6cb053')
 
 build() {
   cd "$srcdir/$_sourcename"
 
-  cd src
-
-  make ${MAKEFLAGS} -f makefile.unix DEBUGFLAGS="" USE_UPNP=1
-
-  cd ..
-
-  qmake "USE_QRCODE=1" "USE_UPNP=1" "NO_UPGRADE=1"
-  make ${MAKEFLAGS}
-}
-
-package_gridcoinresearch-daemon() {
-  pkgdesc="GridCoin is a cryptocurrency that helps science via BOINC - Daemon"
-  depends=('boost-libs' 'libzip' 'miniupnpc' 'curl' 'boinc')
-  install=gridcoin.install
-
-  cd "$srcdir/$_sourcename/src"
-  install -Dm755 gridcoinresearchd "$pkgdir/usr/bin/gridcoinresearchd"
-
-  install -Dm644 ../COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  ./autogen.sh
+  mkdir build && cd build
+  ../configure --prefix=/usr --with-gui=qt5 --with-incompatible-bdb --disable-tests
+  make DESTDIR="$srcdir/$_sourcename" install
 }
 
 package_gridcoinresearch-qt() {
-  pkgdesc="GridCoin is a cryptocurrency that helps science via BOINC - Qt"
-  depends=('boost-libs' 'qrencode' 'qt5-base' 'libzip' 'miniupnpc' 'curl' 'boinc')
-  install=gridcoin.install
+  pkgdesc="A cryptocurrency that rewards users for participating on the BOINC network (Qt GUI)"
+  depends=('boost-libs' 'db' 'miniupnpc' 'qrencode' 'qt5-base' 'qt5-charts')
+  optdepends=('boinc: to earn Gridcoin rewards by doing computational research')
 
   cd "$srcdir/$_sourcename"
-  install -Dm755 gridcoinresearch "$pkgdir/usr/bin/gridcoinresearch"
 
+  install -Dm755 usr/bin/gridcoinresearch "$pkgdir/usr/bin/gridcoinresearch"
   install -Dm644 "${srcdir}/gridcoinresearch-qt.desktop" "$pkgdir/usr/share/applications/gridcoinresearch-qt.desktop"
+  install -Dm644 doc/gridcoinresearch.1 "$pkgdir/usr/share/man/man1/gridcoinresearch.1"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 
-  install -Dm644 share/pixmaps/grc-small.png "$pkgdir/usr/share/pixmaps/grc-small.png"
+  cd "$srcdir/$_sourcename/share/pixmaps"
+  icotool -x bitcoin16.ico -o bitcoin16.png
+  icotool -x bitcoin64.ico -o bitcoin64.png
+  for size in 16 32 64 128 256; do
+    install -D "bitcoin${size}.png" "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/gridcoinresearch.png"
+  done
+}
 
+package_gridcoinresearchd() {
+  pkgdesc="A cryptocurrency that rewards users for participating on the BOINC network (Daemon/CLI)"
+  depends=('boost-libs' 'db' 'miniupnpc')
+  optdepends=('boinc: to earn Gridcoin rewards by doing computational research')
+  replaces=('gridcoinresearch-daemon')
+  conflicts=('gridcoinresearch-daemon')
+
+  cd "$srcdir/$_sourcename"
+
+  install -Dm755 usr/bin/gridcoinresearchd "$pkgdir/usr/bin/gridcoinresearchd"
+  install -Dm644 doc/gridcoinresearchd.1 "$pkgdir/usr/share/man/man1/gridcoinresearchd.1"
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
-
diff --git a/gridcoin.install b/gridcoin.install
deleted file mode 100644
index 12e93b602f20..000000000000
--- a/gridcoin.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}