Update for v167

5 files changed, 25 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3eb5c08a41b6..57043f02bf79 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = hydrus
 	pkgdesc = Danbooru-like image tagging and searching system for the desktop
-	pkgver = 166
+	pkgver = 167
 	pkgrel = 1
 	url = http://hydrusnetwork.github.io/hydrus/
 	install = hydrus.install
@@ -25,7 +25,7 @@ pkgbase = hydrus
 	optdepends = ffmpeg: show duration and other information on video thumbnails
 	optdepends = miniupnpc: automatic port forwarding
 	options = !strip
-	source = hydrus::git+https://github.com/hydrusnetwork/hydrus.git#commit=8ab2aa1a19a78b43797bfba7d7606b30df0e253f
+	source = hydrus::git+https://github.com/hydrusnetwork/hydrus.git#commit=5719c4d4f8d2a96a0ab430f18a7d2d0d6cbdb9bc
 	source = paths-in-opt.patch
 	source = running-the-server.patch
 	source = cython-workarounds.patch
@@ -33,9 +33,9 @@ pkgbase = hydrus
 	source = hydrus-server
 	source = hydrus.desktop
 	sha256sums = SKIP
-	sha256sums = 503b5d833b05ade15bc9ff51180a5eceebbf3482afdb9f1f9a56d4c6588a46f9
-	sha256sums = b4cd358402ac8f225fe77a60aeb89dde88ba8ad050c5b04f11c1ffd44242e9d8
-	sha256sums = bebb633fe4f0c449fba373d09990d32d3c16ab222fc22b5dd292b5d6eee02e26
+	sha256sums = 4bac39be818c31c5e1a2b553fda4007a9a23e9c694634ca884431eb863bc7378
+	sha256sums = 4cac6ffb5c9b219129d29a7d7630a13da7a80078710a26b7004caae151e904ce
+	sha256sums = caac7b25ea136b8282f05501b395013ebfc1f9d7ef84a35a8fd9178baad57b5d
 	sha256sums = b2bf66b1068969e9598742d5c128cb04fd609512b0cff0ad5e25ecb6cdd35678
 	sha256sums = ac7254e3cdb359ebae302655b72b9f74b85d9e817c326fa28173791b3fb4f114
 	sha256sums = 9ba3942ac1a37f6b39c98ae6592573402bf08d8376f64554d0696c0fed6fd0e2
diff --git a/PKGBUILD b/PKGBUILD
index e6591beca7db..0420f063c4f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ $build_cython || options=(!strip)  # Don't strip libs because there aren't any;
 DOC_DIRS=(opt/hydrus/help)
 
 pkgname=hydrus
-pkgver=166
+pkgver=167
 pkgrel=1
 pkgdesc="Danbooru-like image tagging and searching system for the desktop"
 arch=(any)
@@ -26,7 +26,7 @@ makedepends=(git)
 $build_cython && makedepends+=(cython2 parallel)
 optdepends=('ffmpeg: show duration and other information on video thumbnails'
             'miniupnpc: automatic port forwarding')
-source=("${pkgname}::git+https://github.com/hydrusnetwork/${pkgname}.git#commit=8ab2aa1a19a78b43797bfba7d7606b30df0e253f"
+source=("${pkgname}::git+https://github.com/hydrusnetwork/${pkgname}.git#commit=5719c4d4f8d2a96a0ab430f18a7d2d0d6cbdb9bc"
         paths-in-opt.patch
         running-the-server.patch
         cython-workarounds.patch
@@ -34,9 +34,9 @@ source=("${pkgname}::git+https://github.com/hydrusnetwork/${pkgname}.git#commit=
         hydrus-server
         hydrus.desktop)
 sha256sums=('SKIP'
-            '503b5d833b05ade15bc9ff51180a5eceebbf3482afdb9f1f9a56d4c6588a46f9'
-            'b4cd358402ac8f225fe77a60aeb89dde88ba8ad050c5b04f11c1ffd44242e9d8'
-            'bebb633fe4f0c449fba373d09990d32d3c16ab222fc22b5dd292b5d6eee02e26'
+            '4bac39be818c31c5e1a2b553fda4007a9a23e9c694634ca884431eb863bc7378'
+            '4cac6ffb5c9b219129d29a7d7630a13da7a80078710a26b7004caae151e904ce'
+            'caac7b25ea136b8282f05501b395013ebfc1f9d7ef84a35a8fd9178baad57b5d'
             'b2bf66b1068969e9598742d5c128cb04fd609512b0cff0ad5e25ecb6cdd35678'
             'ac7254e3cdb359ebae302655b72b9f74b85d9e817c326fa28173791b3fb4f114'
             '9ba3942ac1a37f6b39c98ae6592573402bf08d8376f64554d0696c0fed6fd0e2')
diff --git a/cython-workarounds.patch b/cython-workarounds.patch
index f1f9f29f01fc..7f317efb54a4 100644
--- a/cython-workarounds.patch
+++ b/cython-workarounds.patch
@@ -1,8 +1,8 @@
 diff --git a/include/ClientDB.py b/include/ClientDB.py
-index f2f1209..87d6bc9 100755
+index 4f8d36d..a1a5c2d 100755
 --- a/include/ClientDB.py
 +++ b/include/ClientDB.py
-@@ -2596,7 +2596,7 @@ class DB( HydrusDB.HydrusDB ):
+@@ -2611,7 +2611,7 @@ class DB( HydrusDB.HydrusDB ):
                  counts_iterable = self._c.execute( nonzero_counts_query )
                  
              
@@ -12,7 +12,7 @@ index f2f1209..87d6bc9 100755
          
          #
 diff --git a/include/ClientGUICanvas.py b/include/ClientGUICanvas.py
-index 155bf4a..9cb413b 100755
+index a459170..7ec0a30 100755
 --- a/include/ClientGUICanvas.py
 +++ b/include/ClientGUICanvas.py
 @@ -48,7 +48,8 @@ NON_ZOOMABLE_MIMES = list( HC.AUDIO ) + [ HC.APPLICATION_PDF ]
@@ -26,10 +26,10 @@ index 155bf4a..9cb413b 100755
      ( media_width, media_height ) = media.GetResolution()
      
 diff --git a/include/ClientGUIDialogs.py b/include/ClientGUIDialogs.py
-index 372eccc..d37d098 100755
+index b73c6ef..f1ea71c 100755
 --- a/include/ClientGUIDialogs.py
 +++ b/include/ClientGUIDialogs.py
-@@ -241,7 +241,8 @@ class Dialog( wx.Dialog ):
+@@ -242,7 +242,8 @@ class Dialog( wx.Dialog ):
      
      def EventDialogButton( self, event ): self.EndModal( event.GetId() )
      
@@ -40,7 +40,7 @@ index 372eccc..d37d098 100755
          wx.Dialog.SetInitialSize( self, ( width, height ) )
          
 diff --git a/include/ClientGUIManagement.py b/include/ClientGUIManagement.py
-index 31c884d..6801f64 100755
+index 2fa9574..ae5a9cb 100755
 --- a/include/ClientGUIManagement.py
 +++ b/include/ClientGUIManagement.py
 @@ -64,26 +64,6 @@ def CreateManagementController( management_type, file_service_key = None ):
@@ -806,7 +806,7 @@ index 31c884d..6801f64 100755
  class ManagementPanelImport( ManagementPanel ):
      
 diff --git a/include/ClientImporting.py b/include/ClientImporting.py
-index c991bd3..a1f5fff 100644
+index 6da6748..7cd6636 100644
 --- a/include/ClientImporting.py
 +++ b/include/ClientImporting.py
 @@ -113,26 +113,6 @@ class ImportController( HydrusSerialisable.SerialisableBase ):
diff --git a/paths-in-opt.patch b/paths-in-opt.patch
index fe55c4b98149..64866d266c2c 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 6811311..8abf9a2 100755
+index f102d86..3564325 100755
 --- a/include/ClientGUI.py
 +++ b/include/ClientGUI.py
-@@ -132,7 +132,7 @@ class FrameGUI( ClientGUICommon.FrameThatResizes ):
+@@ -134,7 +134,7 @@ class FrameGUI( ClientGUICommon.FrameThatResizes ):
          aboutinfo.SetVersion( HydrusData.ToString( HC.SOFTWARE_VERSION ) )
          aboutinfo.SetDescription( CC.CLIENT_DESCRIPTION )
          
@@ -11,7 +11,7 @@ index 6811311..8abf9a2 100755
          
          aboutinfo.SetLicense( license )
          
-@@ -1942,7 +1942,7 @@ The password is cleartext here but obscured in the entry dialog. Enter a blank p
+@@ -1945,7 +1945,7 @@ The password is cleartext here but obscured in the entry dialog. Enter a blank p
                  
              elif command == '8chan_board': webbrowser.open( 'http://8ch.net/hydrus/index.html' )
              elif command == 'file_integrity': self._CheckFileIntegrity()
@@ -21,10 +21,10 @@ index 6811311..8abf9a2 100755
              elif command == 'help_shortcuts': wx.MessageBox( CC.SHORTCUT_HELP )
              elif command == 'import_files': self._ImportFiles()
 diff --git a/include/ClientGUIDialogs.py b/include/ClientGUIDialogs.py
-index d025f7b..372eccc 100755
+index 465fc3e..b73c6ef 100755
 --- a/include/ClientGUIDialogs.py
 +++ b/include/ClientGUIDialogs.py
-@@ -619,7 +619,7 @@ class DialogFirstStart( Dialog ):
+@@ -620,7 +620,7 @@ class DialogFirstStart( Dialog ):
          self._ok.SetForegroundColour( ( 0, 128, 0 ) )
          
          message1 = 'Hi, this looks like the first time you have started the hydrus client. Don\'t forget to check out the'
@@ -34,7 +34,7 @@ index d025f7b..372eccc 100755
          message3 = 'When you close this dialog, the client will start its local http server. You will probably get a firewall warning.'
          message4 = 'You can block it if you like, or you can allow it. It doesn\'t phone home, or expose your files to your network; it just provides another way to locally export your files.'
 diff --git a/include/HydrusConstants.py b/include/HydrusConstants.py
-index ecb6cff..563d416 100755
+index 981583d..0aca093 100755
 --- a/include/HydrusConstants.py
 +++ b/include/HydrusConstants.py
 @@ -3,9 +3,9 @@ import sys
diff --git a/running-the-server.patch b/running-the-server.patch
index b7a7f00052e3..9bea9b6b053c 100644
--- a/running-the-server.patch
+++ b/running-the-server.patch
@@ -1,8 +1,8 @@
 diff --git a/include/ClientGUI.py b/include/ClientGUI.py
-index 08b3e1e..7bdf441 100755
+index 3564325..07b7240 100755
 --- a/include/ClientGUI.py
 +++ b/include/ClientGUI.py
-@@ -237,18 +237,7 @@ class FrameGUI( ClientGUICommon.FrameThatResizes ):
+@@ -239,18 +239,7 @@ class FrameGUI( ClientGUICommon.FrameThatResizes ):
                      
                      my_scriptname = sys.argv[0]