Version bump to 5.0.5

3 files changed, 38 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5330b22e7c32..d098816a55e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = sasview
 	pkgdesc = Small-Angle Scattering Analysis
-	pkgver = 5.0.4
-	pkgrel = 2
+	pkgver = 5.0.5
+	pkgrel = 1
 	url = https://sasview.org
 	arch = x86_64
 	license = BSD
 	checkdepends = python-unittest-xml-reporting
+	makedepends = texlive-latexextra
 	depends = python-setuptools
 	depends = python-pyparsing
 	depends = python-html5lib
@@ -29,7 +30,11 @@ pkgbase = sasview
 	depends = python-service-identity
 	depends = python-pytest
 	depends = sasmodels
-	source = sasview-5.0.4.tar.gz::https://github.com/SasView/sasview/archive/v5.0.4.tar.gz
-	md5sums = bd43ab43e5fc6a4a1ea4a8f44277147a
+	source = sasview-5.0.5.tar.gz::https://github.com/SasView/sasview/archive/v5.0.5.tar.gz
+	source = sphinx-docs.patch
+	md5sums = 52da09f7ec3ea63c7d5ab4f7a989ef1f
+	md5sums = SKIP
+	sha256sums = 8c92ecc113cf861f675a4ff5024920e036b58d178fd6e7afb77bd2fac41d5077
+	sha256sums = SKIP
 
 pkgname = sasview
diff --git a/PKGBUILD b/PKGBUILD
index 42455c726ba7..77af1e0c2a1b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: András Wacha <awacha@gmail.com>
 pkgname=sasview
-pkgver=5.0.4
-pkgrel=2
+pkgver=5.0.5
+pkgrel=1
 pkgdesc="Small-Angle Scattering Analysis"
 arch=(x86_64)
 url="https://sasview.org"
@@ -32,14 +32,23 @@ depends=( python-setuptools
 )
 checkdepends=(python-unittest-xml-reporting)
 
-makedepends=()
-source=("$pkgname-$pkgver.tar.gz::https://github.com/SasView/sasview/archive/v${pkgver}.tar.gz")
-md5sums=('bd43ab43e5fc6a4a1ea4a8f44277147a')
+makedepends=(texlive-latexextra)
+source=("$pkgname-$pkgver.tar.gz::https://github.com/SasView/sasview/archive/v${pkgver}.tar.gz"
+	'sphinx-docs.patch'
+)
+md5sums=('52da09f7ec3ea63c7d5ab4f7a989ef1f' 'SKIP')
+sha256sums=('8c92ecc113cf861f675a4ff5024920e036b58d178fd6e7afb77bd2fac41d5077' 'SKIP')
+
+prepare() {
+	cd "${pkgname}-${pkgver}"
+	patch --forward --strip=1 --input="${srcdir}/sphinx-docs.patch"
+}
 
 build() {
 	cd "$pkgname-$pkgver"
 	python setup.py build
-	python setup.py build_sphinx
+	(cd docs/sphinx-docs && make html )
+	(cd docs/sphinx-docs && make latexpdf )
 }
 
 check() {
@@ -50,8 +59,8 @@ check() {
 package() {
 	cd "$pkgname-$pkgver"
 	mkdir -p ${pkgdir}/usr/share/doc/sasview/tutorials
-	cp ${srcdir}/${pkgname}-${pkgver}/docs/sasview/*.pdf ${pkgdir}/usr/share/doc/sasview/tutorials/
-	cp -R ${srcdir}/${pkgname}-${pkgver}/build/sphinx/html ${pkgdir}/usr/share/doc/sasview/
+	cp ${srcdir}/${pkgname}-${pkgver}/docs/sphinx-docs/build/latex/SasView.pdf ${pkgdir}/usr/share/doc/sasview/SasView.pdf
+	cp -R ${srcdir}/${pkgname}-${pkgver}/docs/sphinx-docs/build/html ${pkgdir}/usr/share/doc/sasview/
 	python setup.py install --root="$pkgdir/" --optimize=1
 	
 }
diff --git a/sphinx-docs.patch b/sphinx-docs.patch
new file mode 100644
index 000000000000..f828d00a5e97
--- /dev/null
+++ b/sphinx-docs.patch
@@ -0,0 +1,12 @@
+diff '--color=auto' --unified --recursive --text sasview-5.0.5/docs/sphinx-docs/Makefile sasview-5.0.5_patched/docs/sphinx-docs/Makefile
+--- sasview-5.0.5/docs/sphinx-docs/Makefile	2022-05-31 21:48:18.000000000 +0200
++++ sasview-5.0.5_patched/docs/sphinx-docs/Makefile	2022-06-09 09:25:31.143137109 +0200
+@@ -15,7 +15,7 @@
+ # Internal variables.
+ PAPEROPT_a4     = -D latex_paper_size=a4
+ PAPEROPT_letter = -D latex_paper_size=letter
+-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source-temp
++ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+ # the i18n builder cannot share the environment and doctrees with the others
+ I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+