Update to 303b2-1

3 files changed, 16 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3b95d5a21b1a..ad634033d34e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mprime
 	pkgdesc = A GIMPS, distributed computing project client, dedicated to finding Mersenne primes.
-	pkgver = 298b7
+	pkgver = 303b2
 	pkgrel = 1
 	url = http://www.mersenne.org
 	arch = x86_64
@@ -8,10 +8,10 @@ pkgbase = mprime
 	depends = curl
 	depends = hwloc
 	conflicts = mprime-bin
-	source = http://www.mersenne.org/ftp_root/gimps/p95v298b7.source.zip
+	source = http://www.mersenne.org/ftp_root/gimps/p95v303b2.source.zip
 	source = unfuck_makefile.patch
-	sha256sums = 5249cd2b241951a25b80992f664ccba65c632b3d49a4634fc0d6ddcb9a98ad74
-	sha256sums = 48d7d5053429eea2e95848a5c4c9c7fa8dda71135affd4ac9612bbcdbe8a0350
+	b2sums = 9e7ecca4c8a677990bdab4f298116e31f17f5a3a0df78180d55257de2258337affbf4d152b08525a8371d0d3f850e7f7f0b5eaf9157a61c8aafefccb5a762fca
+	b2sums = d948f4249bcad1d70a156cfa9dcbaf79f035aa41b86337932c79a03f9c30954ac8b21cd627b54ab18e8b7855dc2549eb377cccc3d8060e25df7bceba0c672e38
 
 pkgname = mprime
 
diff --git a/PKGBUILD b/PKGBUILD
index 8d10a986086c..03900eaa6e54 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributer: TryA -  https://bbs.archlinux.org/viewtopic.php?id=114996
 
 pkgname=mprime
-pkgver=298b7
+pkgver=303b2
 pkgrel=1
 pkgdesc="A GIMPS, distributed computing project client, dedicated to finding Mersenne primes."
 arch=('x86_64')
@@ -13,8 +13,8 @@ depends=('curl' 'hwloc')
 conflicts=('mprime-bin')
 source=("http://www.mersenne.org/ftp_root/gimps/p95v${pkgver}.source.zip"
 unfuck_makefile.patch)
-sha256sums=('5249cd2b241951a25b80992f664ccba65c632b3d49a4634fc0d6ddcb9a98ad74'
-            '48d7d5053429eea2e95848a5c4c9c7fa8dda71135affd4ac9612bbcdbe8a0350')
+b2sums=('9e7ecca4c8a677990bdab4f298116e31f17f5a3a0df78180d55257de2258337affbf4d152b08525a8371d0d3f850e7f7f0b5eaf9157a61c8aafefccb5a762fca'
+        'd948f4249bcad1d70a156cfa9dcbaf79f035aa41b86337932c79a03f9c30954ac8b21cd627b54ab18e8b7855dc2549eb377cccc3d8060e25df7bceba0c672e38')
 
 prepare () {
 	patch -Np1 -i unfuck_makefile.patch
diff --git a/unfuck_makefile.patch b/unfuck_makefile.patch
index 904c9becd3ea..ce270c31beb6 100644
--- a/unfuck_makefile.patch
+++ b/unfuck_makefile.patch
@@ -1,21 +1,24 @@
---- a/linux64/makefile	2019-08-18 15:22:12.000000000 -0400
-+++ b/linux64/makefile	2019-09-05 17:13:54.045672695 -0400
-@@ -20,15 +20,16 @@
+--- a/linux64/makefile	2020-08-10 20:33:02.000000000 -0400
++++ b/linux64/makefile	2020-08-11 07:07:32.836699309 -0400
+@@ -20,15 +20,20 @@
  #	LFLAGS = -Wl,-M
  #	LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic $(shell pkg-config --static --libs libhwloc) -Wl,-Bstatic $(shell pkg-config --static --libs libcurl) -lstdc++ -Wl,-Bdynamic -ldl
  
-+MPRIME_FLAGS=-I.. -I../gwnum -DX86_64 -march=x86-64 -O2 -Wno-unused-result
++MPRIME_FLAGS= -I.. -I../gwnum -DX86_64 -O2 -Wno-unused-result -march=x86-64
++
  CC = gcc
 -CFLAGS = -I.. -I../gwnum -I/usr/local/include -DX86_64 -Wno-unused-result -O2
++#CFLAGS = -I.. -I../gwnum -I/usr/local/include -DX86_64 -Wno-unused-result -O2
 +CFLAGS = ${MPRIME_FLAGS}
  
  CPP = g++
 -CPPFLAGS = -I.. -I../gwnum -DX86_64 -O2
++#CPPFLAGS = -I.. -I../gwnum -DX86_64 -O2
 +CPPFLAGS = ${MPRIME_FLAGS}
  
  LFLAGS = -Wl,-M -Wl,-L/usr/local/lib
- #LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lhwloc -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -lz -lxml2 -ldl -lgmp
--LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lhwloc -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -ldl -lgmp
+ LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lhwloc -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -lz -lxml2 -ldl -lgmp
+ #LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lhwloc -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -ldl -lgmp
 +LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread $(shell pkg-config --libs libcurl) -lstdc++ $(shell pkg-config --static --libs hwloc) -lgmp
  
  FACTOROBJ = factor64.o