From 52c64489c2dc6842ba8f4d5a023d17c5be3bb7ce Mon Sep 17 00:00:00 2001
From: kth5 <alex.bldck@gmail.com>
Date: Thu, 25 Jul 2024 20:13:03 +0200
Subject: [PATCH] * update genxrdpattern to 1.1-4

---
 genxrdpattern/.SRCINFO        | 17 +++++++++++++++++
 genxrdpattern/.nvchecker.toml |  4 ++++
 genxrdpattern/PKGBUILD        | 34 +++++++++++++++++-----------------
 3 files changed, 38 insertions(+), 17 deletions(-)
 create mode 100644 genxrdpattern/.SRCINFO
 create mode 100644 genxrdpattern/.nvchecker.toml

diff --git a/genxrdpattern/.SRCINFO b/genxrdpattern/.SRCINFO
new file mode 100644
index 0000000000..f0698e5acf
--- /dev/null
+++ b/genxrdpattern/.SRCINFO
@@ -0,0 +1,17 @@
+pkgbase = genxrdpattern
+	pkgdesc = Uses ObjCryst++ to generate a theoretical XRD pattern
+	pkgver = 1.1
+	pkgrel = 4
+	url = https://github.com/psavery/genXrdPattern
+	arch = x86_64
+	license = GPL-2.0-or-later
+	makedepends = cmake
+	makedepends = git
+	depends = gcc-libs
+	depends = glibc
+	source = git+https://github.com/psavery/genXrdPattern#tag=1.1-linux
+	source = https://github.com/psavery/genXrdPattern/releases/download/1.1-linux/objcryst.tgz
+	sha256sums = 02de8acb488a9a51e09882bf67dbbea89406a98c92bebdc1de66cf2aad74cc91
+	sha256sums = 5523eae9937388260b3e491a1a11a443ab00a0961318ec92eee08f9366a0953f
+
+pkgname = genxrdpattern
diff --git a/genxrdpattern/.nvchecker.toml b/genxrdpattern/.nvchecker.toml
new file mode 100644
index 0000000000..9d650c5324
--- /dev/null
+++ b/genxrdpattern/.nvchecker.toml
@@ -0,0 +1,4 @@
+[genxrdpattern]
+source = 'github'
+github = 'psavery/genXrdPattern'
+use_max_tag = true
diff --git a/genxrdpattern/PKGBUILD b/genxrdpattern/PKGBUILD
index 10898be5b7..20ee2b76a6 100644
--- a/genxrdpattern/PKGBUILD
+++ b/genxrdpattern/PKGBUILD
@@ -3,32 +3,32 @@
 
 pkgname=genxrdpattern
 pkgver=1.1
-pkgrel=3
-pkgdesc="Uses ObjCryst++ to generate a theoretical XRD pattern"
+pkgrel=4
+pkgdesc='Uses ObjCryst++ to generate a theoretical XRD pattern'
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
-url="https://github.com/psavery/genXrdPattern"
-license=(GPL)
-depends=(gcc-libs)
-makedepends=(cmake)
-source=($pkgname-$pkgver.tar.gz::"https://github.com/psavery/genXrdPattern/archive/$pkgver-linux.tar.gz"
-        https://github.com/psavery/genXrdPattern/releases/download/$pkgver-linux/objcryst.tgz
-	pointer-nullcheck.patch)
-sha256sums=('9bc01dbf637d6520d8e2f5743bb1b46f8319432af5ce2d2a484a36615c1586d3'
-            '5523eae9937388260b3e491a1a11a443ab00a0961318ec92eee08f9366a0953f'
-	    'b2e983b0923ada70d0fa95e511f11b0e372e7b3bdd30a0da59ab91fa03f02af9')
+url='https://github.com/psavery/genXrdPattern'
+license=(GPL-2.0-or-later)
+depends=(gcc-libs
+         glibc)
+makedepends=(cmake
+             git)
+source=(git+https://github.com/psavery/genXrdPattern#tag=$pkgver-linux
+        https://github.com/psavery/genXrdPattern/releases/download/$pkgver-linux/objcryst.tgz)
+sha256sums=('02de8acb488a9a51e09882bf67dbbea89406a98c92bebdc1de66cf2aad74cc91'
+            '5523eae9937388260b3e491a1a11a443ab00a0961318ec92eee08f9366a0953f')
 
 prepare() {
   sed -e 's|/user/psavery/src/objcryst/Fox/src|.|g' -i objcryst/Fox/src/Fox.dep
   sed -e 's|-march=native||' -i objcryst/ObjCryst/*.mak # Don't use -march=native
   sed -e 's|set(CMAKE_EXE_LINKER_FLAGS \"-static\")|set(CMAKE_EXE_LINKER_FLAGS "$ENV{LDFLAGS}")|' \
-    -i genXrdPattern-$pkgver-linux/CMakeLists.txt # Honor system LDFLAGS
+    -i genXrdPattern/CMakeLists.txt # Honor system LDFLAGS
+  sed -e 's/indx > 0/*indx > 0/' -i objcryst/newmat/newmat6.cpp
+  sed -e "s|CPPFLAGS = -w -ffast-math.*|CPPFLAGS = ${CXXFLAGS}|" -i objcryst/ObjCryst/*.mak # Honor system CFLAGS
+  sed -e "s|CXXFLAGS = -O2 -Wall|CXXFLAGS = ${CXXFLAGS}|" -i objcryst/{cctbx/gnu.mak,newmat/nm_gnu.mak}
 
   if [ "${CARCH}" != 'x86_64' ]; then
     sed -e 's@-DHAVE_SSE_MATHFUN -DUSE_SSE2@@g' -i objcryst/ObjCryst/rules.mak
   fi
-
-  cd objcryst/newmat
-  patch -p0 -i ../../pointer-nullcheck.patch
 }
 
 build() {
@@ -36,7 +36,7 @@ build() {
   make Fox-nogui shared=0 -j1
 
   cd "$srcdir"
-  cmake -B build -S genXrdPattern-$pkgver-linux \
+  cmake -B build -S genXrdPattern \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DObjCryst_ROOT="$srcdir"/objcryst
   cmake --build build