summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD6
-rw-r--r--paths-in-opt.patch13
3 files changed, 6 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 610284d95979..517a191124fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = hydrus
pkgdesc = Danbooru-like image tagging and searching system for the desktop
- pkgver = 421
+ pkgver = 422
pkgrel = 1
url = http://hydrusnetwork.github.io/hydrus/
install = hydrus.install
@@ -34,13 +34,13 @@ pkgbase = hydrus
conflicts = hydrus-docs
conflicts = hydrus-sources
options = !strip
- source = hydrus::git+https://github.com/hydrusnetwork/hydrus.git#commit=c3100f7a881b8a8b9ab4dd238d2696500c343d45
+ source = hydrus::git+https://github.com/hydrusnetwork/hydrus.git#commit=ff51cf492e589f654ce98779ef850001400e2183
source = paths-in-opt.patch
source = hydrus-client
source = hydrus-server
source = hydrus.desktop
sha256sums = SKIP
- sha256sums = c3a171448f6904434d720a394c11ff405a960f17079a7ae2c4ef6e0395198ee0
+ sha256sums = bac23f99d7ac1fea5c1fea4c3ff478c1fc327017b6a68be1212d752390f252fd
sha256sums = d2cb826ce0dd1892ab95fc3b14dbe6bd312210f653d0aea31938eeb7e361fdc5
sha256sums = 463841cc16059b516cc327cfbc30d3383e2236b085ba2d503e82f5be39444806
sha256sums = 9b8c2603a8040ae80152ff9a718ad3e8803fdc3029a939e3c0e932ea35ded923
diff --git a/PKGBUILD b/PKGBUILD
index cdadc00af4be..edbb955a9393 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ DOC_DIRS=(opt/hydrus/help)
pkgbase=hydrus
pkgname=(hydrus)
-pkgver=421
+pkgver=422
pkgrel=1
pkgdesc="Danbooru-like image tagging and searching system for the desktop"
arch=(any)
@@ -23,13 +23,13 @@ optdepends=('ffmpeg: show duration and other information on video thumbnails'
'desktop-file-utils: to add Hydrus to your desktop environment menus'
'python-cloudscraper: bypass cloudflare "checking your browser" challenges'
'python-pyqtchart: display bandwidth usage charts')
-source=("${pkgbase}::git+https://github.com/hydrusnetwork/${pkgbase}.git#commit=c3100f7a881b8a8b9ab4dd238d2696500c343d45"
+source=("${pkgbase}::git+https://github.com/hydrusnetwork/${pkgbase}.git#commit=ff51cf492e589f654ce98779ef850001400e2183"
paths-in-opt.patch
hydrus-client
hydrus-server
hydrus.desktop)
sha256sums=('SKIP'
- 'c3a171448f6904434d720a394c11ff405a960f17079a7ae2c4ef6e0395198ee0'
+ 'bac23f99d7ac1fea5c1fea4c3ff478c1fc327017b6a68be1212d752390f252fd'
'd2cb826ce0dd1892ab95fc3b14dbe6bd312210f653d0aea31938eeb7e361fdc5'
'463841cc16059b516cc327cfbc30d3383e2236b085ba2d503e82f5be39444806'
'9b8c2603a8040ae80152ff9a718ad3e8803fdc3029a939e3c0e932ea35ded923')
diff --git a/paths-in-opt.patch b/paths-in-opt.patch
index cf2736e86b32..80ad33684de4 100644
--- a/paths-in-opt.patch
+++ b/paths-in-opt.patch
@@ -11,19 +11,6 @@ index db9fd6f..c925431 100644
cmd = [ python_executable, server_script_path, db_param ]
-diff --git a/hydrus/client/gui/ClientGUIStyle.py b/hydrus/client/gui/ClientGUIStyle.py
-index 7de8ef2..1196c62 100644
---- a/hydrus/client/gui/ClientGUIStyle.py
-+++ b/hydrus/client/gui/ClientGUIStyle.py
-@@ -6,7 +6,7 @@ from hydrus.core import HydrusConstants as HC
- from hydrus.core import HydrusData
- from hydrus.core import HydrusExceptions
-
--STYLESHEET_DIR = os.path.join( HC.BASE_DIR, 'static', 'qss' )
-+STYLESHEET_DIR = os.path.join( HC.STATIC_DIR, 'qss' )
-
- DEFAULT_HYDRUS_STYLESHEET = ''
- ORIGINAL_STYLE_NAME = None
diff --git a/hydrus/core/HydrusConstants.py b/hydrus/core/HydrusConstants.py
index 857715d..ff6a7ae 100644
--- a/hydrus/core/HydrusConstants.py