summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorScore_Under2020-04-22 22:47:13 +0100
committerScore_Under2020-04-22 22:47:13 +0100
commitb3f05c4289efb12a239c04f27459bdd48b7486fe (patch)
tree8c345df2217af7293f8112bd5daa6e6a358e2101
parent1780c428b59574b77d5b6cdf39e012520b76f265 (diff)
downloadaur-b3f05c4289efb12a239c04f27459bdd48b7486fe.tar.gz
Update for v394
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD8
-rw-r--r--paths-in-opt.patch41
3 files changed, 30 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b9a53e3f3cf..b895061c58f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = hydrus
pkgdesc = Danbooru-like image tagging and searching system for the desktop
- pkgver = 393
- pkgrel = 2
+ pkgver = 394
+ pkgrel = 1
url = http://hydrusnetwork.github.io/hydrus/
install = hydrus.install
arch = any
@@ -34,13 +34,13 @@ pkgbase = hydrus
conflicts = hydrus-docs
conflicts = hydrus-sources
options = !strip
- source = hydrus::git+https://github.com/hydrusnetwork/hydrus.git#commit=eabff1015b714d1ab455a8fad6bf1f85a0d19a16
+ source = hydrus::git+https://github.com/hydrusnetwork/hydrus.git#commit=1976391fd0a37c9caf607127b7a9a2d86a197d3c
source = paths-in-opt.patch
source = hydrus-client
source = hydrus-server
source = hydrus.desktop
sha256sums = SKIP
- sha256sums = c6802327827cf77acefa8cdff1b9b45097e4754349ef187d94695f4095ef34dd
+ sha256sums = 62958435b7d7040abfa38547887bdc8c354ead15b26285e84ded515ac04068a1
sha256sums = 7b0dbc6f38f9aaff409e435ba807199575166976b52715d6b54418f89dbde634
sha256sums = 463841cc16059b516cc327cfbc30d3383e2236b085ba2d503e82f5be39444806
sha256sums = 9b8c2603a8040ae80152ff9a718ad3e8803fdc3029a939e3c0e932ea35ded923
diff --git a/PKGBUILD b/PKGBUILD
index 19d0eb667dc..ba05fd629b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@ DOC_DIRS=(opt/hydrus/help)
pkgbase=hydrus
pkgname=(hydrus)
-pkgver=393
-pkgrel=2
+pkgver=394
+pkgrel=1
pkgdesc="Danbooru-like image tagging and searching system for the desktop"
arch=(any)
license=(WTFPL)
@@ -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'
)
-source=("${pkgbase}::git+https://github.com/hydrusnetwork/${pkgbase}.git#commit=eabff1015b714d1ab455a8fad6bf1f85a0d19a16"
+source=("${pkgbase}::git+https://github.com/hydrusnetwork/${pkgbase}.git#commit=1976391fd0a37c9caf607127b7a9a2d86a197d3c"
paths-in-opt.patch
hydrus-client
hydrus-server
hydrus.desktop)
sha256sums=('SKIP'
- 'c6802327827cf77acefa8cdff1b9b45097e4754349ef187d94695f4095ef34dd'
+ '62958435b7d7040abfa38547887bdc8c354ead15b26285e84ded515ac04068a1'
'7b0dbc6f38f9aaff409e435ba807199575166976b52715d6b54418f89dbde634'
'463841cc16059b516cc327cfbc30d3383e2236b085ba2d503e82f5be39444806'
'9b8c2603a8040ae80152ff9a718ad3e8803fdc3029a939e3c0e932ea35ded923')
diff --git a/paths-in-opt.patch b/paths-in-opt.patch
index 7e413609680..d9edc30266b 100644
--- a/paths-in-opt.patch
+++ b/paths-in-opt.patch
@@ -1,8 +1,8 @@
-diff --git a/hydrus/ClientGUI.py b/hydrus/ClientGUI.py
-index 7cec25b..b4e24e5 100644
---- a/hydrus/ClientGUI.py
-+++ b/hydrus/ClientGUI.py
-@@ -739,7 +739,7 @@ class FrameGUI( ClientGUITopLevelWindows.MainFrameThatResizes ):
+diff --git a/hydrus/client/gui/ClientGUI.py b/hydrus/client/gui/ClientGUI.py
+index 2c3933e..c84a039 100644
+--- a/hydrus/client/gui/ClientGUI.py
++++ b/hydrus/client/gui/ClientGUI.py
+@@ -772,7 +772,7 @@ class FrameGUI( ClientGUITopLevelWindows.MainFrameThatResizes ):
python_executable = python_executable.replace( 'pythonw', 'python' )
@@ -11,24 +11,24 @@ index 7cec25b..b4e24e5 100644
cmd = [ python_executable, server_script_path, db_param ]
-diff --git a/hydrus/ClientGUIStyle.py b/hydrus/ClientGUIStyle.py
-index 63510b1..b5fc2f6 100644
---- a/hydrus/ClientGUIStyle.py
-+++ b/hydrus/ClientGUIStyle.py
-@@ -4,7 +4,7 @@ from . import HydrusExceptions
- import os
- from qtpy import QtWidgets as QW
+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/HydrusConstants.py b/hydrus/HydrusConstants.py
-index a8684e2..717b3cc 100644
---- a/hydrus/HydrusConstants.py
-+++ b/hydrus/HydrusConstants.py
-@@ -4,31 +4,8 @@ import sys
+diff --git a/hydrus/core/HydrusConstants.py b/hydrus/core/HydrusConstants.py
+index f14ed6e..4d7a20e 100644
+--- a/hydrus/core/HydrusConstants.py
++++ b/hydrus/core/HydrusConstants.py
+@@ -5,33 +5,9 @@ import typing
# old method of getting frozen dir, doesn't work for symlinks looks like:
# BASE_DIR = getattr( sys, '_MEIPASS', None )
@@ -46,7 +46,9 @@ index a8684e2..717b3cc 100644
-
- hc_realpath_dir = os.path.dirname( os.path.realpath( __file__ ) )
-
-- BASE_DIR = os.path.split( hc_realpath_dir )[0]
+- HYDRUS_MODULE_DIR = os.path.split( hc_realpath_dir )[0]
+-
+- BASE_DIR = os.path.split( HYDRUS_MODULE_DIR )[0]
-
- except NameError: # if __file__ is not defined due to some weird OS
-
@@ -58,11 +60,12 @@ index a8684e2..717b3cc 100644
- BASE_DIR = os.getcwd()
-
+RUNNING_FROM_FROZEN_BUILD = False
++HYDRUS_MODULE_DIR = '/opt/hydrus/hydrus'
+BASE_DIR = os.path.expanduser("~/.local/share/hydrus")
PLATFORM_WINDOWS = False
PLATFORM_MACOS = False
-@@ -41,23 +18,16 @@ elif sys.platform == 'linux': PLATFORM_LINUX = True
+@@ -44,23 +20,16 @@ elif sys.platform == 'linux': PLATFORM_LINUX = True
RUNNING_FROM_SOURCE = sys.argv[0].endswith( '.py' ) or sys.argv[0].endswith( '.pyw' )
RUNNING_FROM_MACOS_APP = os.path.exists( os.path.join( BASE_DIR, 'running_from_app' ) )