summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD7
-rw-r--r--qtgui-wrong-package.patch13
3 files changed, 4 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0338da2fdb8..76769f5fdae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = hydrus
pkgdesc = Danbooru-like image tagging and searching system for the desktop
- pkgver = 383
+ pkgver = 384
pkgrel = 1
url = http://hydrusnetwork.github.io/hydrus/
install = hydrus.install
@@ -33,15 +33,13 @@ pkgbase = hydrus
conflicts = hydrus-docs
conflicts = hydrus-sources
options = !strip
- source = hydrus::git+https://github.com/hydrusnetwork/hydrus.git#commit=00dbc2daca7d4f0a3a680cf4a3d24caf98307aee
+ source = hydrus::git+https://github.com/hydrusnetwork/hydrus.git#commit=b6e0948fda39b6b3daab20dcf8dffe17b3d44485
source = paths-in-opt.patch
- source = qtgui-wrong-package.patch
source = hydrus-client
source = hydrus-server
source = hydrus.desktop
sha256sums = SKIP
sha256sums = e6c77ba667604cfb2e7d9959e79d3ad05c976dcc6297f25a8fcad730a63d2f11
- sha256sums = 305b1540d1449fa785ca36288a8e7bd8fd7e3d80cbc1bb08760a95c9a4c98c44
sha256sums = 7b0dbc6f38f9aaff409e435ba807199575166976b52715d6b54418f89dbde634
sha256sums = 463841cc16059b516cc327cfbc30d3383e2236b085ba2d503e82f5be39444806
sha256sums = 9b8c2603a8040ae80152ff9a718ad3e8803fdc3029a939e3c0e932ea35ded923
diff --git a/PKGBUILD b/PKGBUILD
index 0c7d5253383..fd8b9e2504d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ DOC_DIRS=(opt/hydrus/help)
pkgbase=hydrus
pkgname=(hydrus)
-pkgver=383
+pkgver=384
pkgrel=1
pkgdesc="Danbooru-like image tagging and searching system for the desktop"
arch=(any)
@@ -22,15 +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=00dbc2daca7d4f0a3a680cf4a3d24caf98307aee"
+source=("${pkgbase}::git+https://github.com/hydrusnetwork/${pkgbase}.git#commit=b6e0948fda39b6b3daab20dcf8dffe17b3d44485"
paths-in-opt.patch
- qtgui-wrong-package.patch
hydrus-client
hydrus-server
hydrus.desktop)
sha256sums=('SKIP'
'e6c77ba667604cfb2e7d9959e79d3ad05c976dcc6297f25a8fcad730a63d2f11'
- '305b1540d1449fa785ca36288a8e7bd8fd7e3d80cbc1bb08760a95c9a4c98c44'
'7b0dbc6f38f9aaff409e435ba807199575166976b52715d6b54418f89dbde634'
'463841cc16059b516cc327cfbc30d3383e2236b085ba2d503e82f5be39444806'
'9b8c2603a8040ae80152ff9a718ad3e8803fdc3029a939e3c0e932ea35ded923')
@@ -38,7 +36,6 @@ sha256sums=('SKIP'
prepare() {
cd "$pkgbase"
git apply < ../paths-in-opt.patch
- git apply < ../qtgui-wrong-package.patch
# Fix permissions
chmod a-x include/*.py
diff --git a/qtgui-wrong-package.patch b/qtgui-wrong-package.patch
deleted file mode 100644
index d846631bfad..00000000000
--- a/qtgui-wrong-package.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/include/ClientGUICanvas.py b/include/ClientGUICanvas.py
-index 7b176bb..15894d7 100755
---- a/include/ClientGUICanvas.py
-+++ b/include/ClientGUICanvas.py
-@@ -5300,7 +5300,7 @@ class MediaContainer( QW.QWidget ):
- self._static_image_window = StaticImage( self )
-
- self._volume_control.adjustSize()
-- self._volume_control.setCursor( QG.Qt.ArrowCursor )
-+ self._volume_control.setCursor( QC.Qt.ArrowCursor )
-
- self._animation_window.hide()
- self._animation_bar.hide()