Update for v539a

Also remove hydrus-docs-dummy if present, and break hard dependency on
hydrus docs now that it no longer causes breakage in the help system
when those files are missing

2 files changed, 11 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 49491efdca67..f8da7ce60838 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = hydrus
 	pkgdesc = Danbooru-like image tagging and searching system for the desktop
-	pkgver = 538
+	pkgver = 539.a
 	pkgrel = 1
 	url = http://hydrusnetwork.github.io/hydrus/
 	arch = any
@@ -29,21 +29,23 @@ pkgbase = hydrus
 	depends = qt6-multimedia
 	depends = qt6-svg
 	depends = python-pyqt6
-	depends = hydrus-docs>=538
 	optdepends = ffmpeg: show duration and other information on video thumbnails
 	optdepends = miniupnpc: automatic port forwarding
 	optdepends = desktop-file-utils: to add Hydrus to your desktop environment menus
+	optdepends = hydrus-docs: offline documentation
 	optdepends = python-cbor2: cbor support in client-server communication
 	optdepends = python-chardet: detect text encoding more accurately
 	optdepends = python-cloudscraper: bypass cloudflare "checking your browser" challenges
 	optdepends = python-dateutil: improved fuzzy date search
+	optdepends = python-psd-tools: handle PSD files and extract thumbnails
 	optdepends = python-pympler: debug menus to profile memory usage
 	optdepends = python-pyqt6-charts: display bandwidth usage charts
 	optdepends = python-cryptography: to generate certificates for accessing client API and server via HTTPS
 	optdepends = python-pyopenssl: to generate certificates for accessing client API and server via HTTPS
 	optdepends = swftools: to display SWF thumbnails
+	conflicts = hydrus-docs-dummy
 	options = !strip
-	source = hydrus::git+https://github.com/hydrusnetwork/hydrus.git#commit=6efda30e6b52ea688326769485c4e2728f3c3cde
+	source = hydrus::git+https://github.com/hydrusnetwork/hydrus.git#commit=23ac2f59679e470ea530255cbebe89e6a4a17ba4
 	source = paths-in-opt.patch
 	source = hydrus-client
 	source = hydrus-server
diff --git a/PKGBUILD b/PKGBUILD
index 24ba541bf851..d775b62f0ed6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ options=(!strip)  # Don't strip libs because there aren't any
 
 pkgname=hydrus
 _pkgname=hydrus
-pkgver=538
+pkgver=539.a
 pkgrel=1
 pkgdesc="Danbooru-like image tagging and searching system for the desktop"
 arch=(any)
@@ -17,15 +17,17 @@ depends=(python python-opencv python-beautifulsoup4 python-yaml
          python-service-identity  # required by twisted for https hostname verification
          qt6-multimedia  # https://aur.archlinux.org/packages/hydrus#comment-914337
          qt6-svg  # https://aur.archlinux.org/packages/hydrus#comment-923550
-         python-pyqt6 "hydrus-docs>=$pkgver")
+         python-pyqt6)
 makedepends=(git)
 optdepends=('ffmpeg: show duration and other information on video thumbnails'
             'miniupnpc: automatic port forwarding'
             'desktop-file-utils: to add Hydrus to your desktop environment menus'
+            'hydrus-docs: offline documentation'
             'python-cbor2: cbor support in client-server communication'
             'python-chardet: detect text encoding more accurately'
             'python-cloudscraper: bypass cloudflare "checking your browser" challenges'
             'python-dateutil: improved fuzzy date search'
+            'python-psd-tools: handle PSD files and extract thumbnails'
             'python-pympler: debug menus to profile memory usage'
             'python-pyqt6-charts: display bandwidth usage charts'
             'python-cryptography: to generate certificates for accessing client API and server via HTTPS'
@@ -33,7 +35,8 @@ optdepends=('ffmpeg: show duration and other information on video thumbnails'
             # 'python-pyparsing: currently unused'
             # 'speedcopy: may speed up file transfers'
             'swftools: to display SWF thumbnails')
-source=("${_pkgname}::git+https://github.com/hydrusnetwork/${_pkgname}.git#commit=6efda30e6b52ea688326769485c4e2728f3c3cde"
+conflicts=(hydrus-docs-dummy)
+source=("${_pkgname}::git+https://github.com/hydrusnetwork/${_pkgname}.git#commit=23ac2f59679e470ea530255cbebe89e6a4a17ba4"
         paths-in-opt.patch
         hydrus-client
         hydrus-server