summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorScore_Under2023-09-21 12:37:35 +0100
committerScore_Under2023-09-21 12:37:35 +0100
commitaba393f869913f67dc08abd9955c4d2269b7643b (patch)
tree1bf37b395961b381b81e89a9bfa7408cfe728318
parent4b8d12f02b2e77056d6a5eddbd8556f1e741d75c (diff)
downloadaur-aba393f869913f67dc08abd9955c4d2269b7643b.tar.gz
Update for v544
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD7
-rw-r--r--unimported-types.patch13
3 files changed, 4 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 59fb49eff38e..50895a3eadcf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = hydrus
pkgdesc = Danbooru-like image tagging and searching system for the desktop
- pkgver = 543
+ pkgver = 544
pkgrel = 1
url = http://hydrusnetwork.github.io/hydrus/
arch = any
@@ -45,15 +45,13 @@ pkgbase = hydrus
optdepends = swftools: to display SWF thumbnails
conflicts = hydrus-docs-dummy
options = !strip
- source = hydrus::git+https://github.com/hydrusnetwork/hydrus.git#commit=b840d0778c0842d64967fbc877afa60dda1faf26
+ source = hydrus::git+https://github.com/hydrusnetwork/hydrus.git#commit=428372fb576e85d2a9968a9c464437519b64a039
source = paths-in-opt.patch
- source = unimported-types.patch
source = hydrus-client
source = hydrus-server
source = hydrus.desktop
sha256sums = SKIP
sha256sums = c332728ca119b1ed4e9a4f40de79087fa90f8754535718b506954d375541f9f0
- sha256sums = f1118020fc49d33703c78340d478b1a20910cf911d3eb0c335aa9850d8136bab
sha256sums = b1854ecac184385f0aa48fcefd426223fac3eeec0f1180ba58b6a58b03257d68
sha256sums = 5956d418d29fe19f54263acf47adce7c6d134d19ec65e2810d4517ce83529480
sha256sums = 9b8c2603a8040ae80152ff9a718ad3e8803fdc3029a939e3c0e932ea35ded923
diff --git a/PKGBUILD b/PKGBUILD
index bab4b51da503..fc4ff83f9b58 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=543
+pkgver=544
pkgrel=1
pkgdesc="Danbooru-like image tagging and searching system for the desktop"
arch=(any)
@@ -36,15 +36,13 @@ optdepends=('ffmpeg: show duration and other information on video thumbnails'
# 'speedcopy: may speed up file transfers'
'swftools: to display SWF thumbnails')
conflicts=(hydrus-docs-dummy)
-source=("${_pkgname}::git+https://github.com/hydrusnetwork/${_pkgname}.git#commit=b840d0778c0842d64967fbc877afa60dda1faf26"
+source=("${_pkgname}::git+https://github.com/hydrusnetwork/${_pkgname}.git#commit=428372fb576e85d2a9968a9c464437519b64a039"
paths-in-opt.patch
- unimported-types.patch
hydrus-client
hydrus-server
hydrus.desktop)
sha256sums=('SKIP'
'c332728ca119b1ed4e9a4f40de79087fa90f8754535718b506954d375541f9f0'
- 'f1118020fc49d33703c78340d478b1a20910cf911d3eb0c335aa9850d8136bab'
'b1854ecac184385f0aa48fcefd426223fac3eeec0f1180ba58b6a58b03257d68'
'5956d418d29fe19f54263acf47adce7c6d134d19ec65e2810d4517ce83529480'
'9b8c2603a8040ae80152ff9a718ad3e8803fdc3029a939e3c0e932ea35ded923')
@@ -52,7 +50,6 @@ sha256sums=('SKIP'
prepare() {
cd "${srcdir}/${_pkgname}"
patch -Np1 < ../paths-in-opt.patch
- patch -Np1 < ../unimported-types.patch
}
build() {
diff --git a/unimported-types.patch b/unimported-types.patch
deleted file mode 100644
index 7e01a22b779b..000000000000
--- a/unimported-types.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/hydrus/core/HydrusPSDHandling.py b/hydrus/core/HydrusPSDHandling.py
-index 49c573e0..b73caf15 100644
---- a/hydrus/core/HydrusPSDHandling.py
-+++ b/hydrus/core/HydrusPSDHandling.py
-@@ -107,7 +107,7 @@ def GetPSDResolutionFallback( path: str ):
- # modified from psd-tools source:
- # https://github.com/psd-tools/psd-tools/blob/main/src/psd_tools/api/pil_io.py
-
--def convert_image_data_to_pil(psd: PSDImage):
-+def convert_image_data_to_pil(psd: 'PSDImage'):
- alpha = None
-
- channel_data = psd._record.image_data.get_data(psd._record.header)