summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorScore_Under2020-03-26 03:32:39 +0000
committerScore_Under2020-03-26 03:32:39 +0000
commit7ba306689420dd373472ec326ba2903d178de6fe (patch)
treef0bee32157106ad687c10f3197fbf3e2f8c4187f
parent46b5c90d941878d6d6df5ee5f2c0c2037ae50c4d (diff)
downloadaur-7ba306689420dd373472ec326ba2903d178de6fe.tar.gz
Update for v390
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD16
-rw-r--r--paths-in-opt.patch18
3 files changed, 17 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 735ce3677ce..d9cb9080dc4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = hydrus
pkgdesc = Danbooru-like image tagging and searching system for the desktop
- pkgver = 389
+ pkgver = 390
pkgrel = 1
url = http://hydrusnetwork.github.io/hydrus/
install = hydrus.install
@@ -33,13 +33,13 @@ pkgbase = hydrus
conflicts = hydrus-docs
conflicts = hydrus-sources
options = !strip
- source = hydrus::git+https://github.com/hydrusnetwork/hydrus.git#commit=5014c369b173b2a7c5f4ab5d9333b3e93a3fd0c8
+ source = hydrus::git+https://github.com/hydrusnetwork/hydrus.git#commit=e5318a2c08548af8ca7caa07b6beeb4f8ec6c028
source = paths-in-opt.patch
source = hydrus-client
source = hydrus-server
source = hydrus.desktop
sha256sums = SKIP
- sha256sums = 6f580d7a4313484fde4b085debe7e9657f01a2d31c4d5202e08ad33701a9d594
+ sha256sums = ea26711bb5d4ea1c769727ae8e4e1f2d2b4cd9cb130fb90d392ee7f0b8a85028
sha256sums = 7b0dbc6f38f9aaff409e435ba807199575166976b52715d6b54418f89dbde634
sha256sums = 463841cc16059b516cc327cfbc30d3383e2236b085ba2d503e82f5be39444806
sha256sums = 9b8c2603a8040ae80152ff9a718ad3e8803fdc3029a939e3c0e932ea35ded923
diff --git a/PKGBUILD b/PKGBUILD
index a0103e20f6d..6080f34cb14 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ DOC_DIRS=(opt/hydrus/help)
pkgbase=hydrus
pkgname=(hydrus)
-pkgver=389
+pkgver=390
pkgrel=1
pkgdesc="Danbooru-like image tagging and searching system for the desktop"
arch=(any)
@@ -22,13 +22,13 @@ 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'
)
-source=("${pkgbase}::git+https://github.com/hydrusnetwork/${pkgbase}.git#commit=5014c369b173b2a7c5f4ab5d9333b3e93a3fd0c8"
+source=("${pkgbase}::git+https://github.com/hydrusnetwork/${pkgbase}.git#commit=e5318a2c08548af8ca7caa07b6beeb4f8ec6c028"
paths-in-opt.patch
hydrus-client
hydrus-server
hydrus.desktop)
sha256sums=('SKIP'
- '6f580d7a4313484fde4b085debe7e9657f01a2d31c4d5202e08ad33701a9d594'
+ 'ea26711bb5d4ea1c769727ae8e4e1f2d2b4cd9cb130fb90d392ee7f0b8a85028'
'7b0dbc6f38f9aaff409e435ba807199575166976b52715d6b54418f89dbde634'
'463841cc16059b516cc327cfbc30d3383e2236b085ba2d503e82f5be39444806'
'9b8c2603a8040ae80152ff9a718ad3e8803fdc3029a939e3c0e932ea35ded923')
@@ -37,14 +37,8 @@ prepare() {
cd "$pkgbase"
git apply < ../paths-in-opt.patch
- # Fix permissions
- chmod a-x include/*.py
-
- # Remove strange file
- rm -f "include/pyconfig.h"
-
# Remove unit tests
- rm -f "include/Test"*.py
+ rm -f "hydrus/Test"*.py
rm -rf "static/testing"
}
@@ -60,7 +54,7 @@ package_hydrus() {
# Create /opt/hydrus and copy hydrus files to there
install -m755 -d "${pkgdir}/opt/hydrus"
- cp -r help include static client.pyw server.py "${pkgdir}/opt/hydrus/"
+ cp -r help hydrus static client.pyw server.py "${pkgdir}/opt/hydrus/"
# Create and populate /opt/hydrus/bin
install -d -m755 "${pkgdir}/opt/hydrus/bin"
diff --git a/paths-in-opt.patch b/paths-in-opt.patch
index c76252842e9..0d98948a6ac 100644
--- a/paths-in-opt.patch
+++ b/paths-in-opt.patch
@@ -1,8 +1,8 @@
-diff --git a/include/ClientGUI.py b/include/ClientGUI.py
-index 87a1213..ce62212 100755
---- a/include/ClientGUI.py
-+++ b/include/ClientGUI.py
-@@ -740,7 +740,7 @@ class FrameGUI( ClientGUITopLevelWindows.MainFrameThatResizes ):
+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 ):
python_executable = python_executable.replace( 'pythonw', 'python' )
@@ -11,10 +11,10 @@ index 87a1213..ce62212 100755
cmd = [ python_executable, server_script_path, db_param ]
-diff --git a/include/HydrusConstants.py b/include/HydrusConstants.py
-index 5b0aa75..10b528c 100755
---- a/include/HydrusConstants.py
-+++ b/include/HydrusConstants.py
+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
# old method of getting frozen dir, doesn't work for symlinks looks like:
# BASE_DIR = getattr( sys, '_MEIPASS', None )