summarylogtreecommitdiffstats
path: root/paths-in-opt.patch
diff options
context:
space:
mode:
authorScore_Under2015-08-27 02:59:12 +0100
committerScore_Under2015-08-27 02:59:12 +0100
commitba00f9b0a13510225b800676ad4e0bc9e6bda4ab (patch)
tree7d6d80ce29aa25a3f0d082d259b094d01c242df4 /paths-in-opt.patch
parenteb132914ab3ea3d1c9a851b3576bf7264933609b (diff)
downloadaur-ba00f9b0a13510225b800676ad4e0bc9e6bda4ab.tar.gz
Update for v171. Remove cython support as it now breaks horribly
Diffstat (limited to 'paths-in-opt.patch')
-rw-r--r--paths-in-opt.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/paths-in-opt.patch b/paths-in-opt.patch
index 469f15605728..31aa58ca949b 100644
--- a/paths-in-opt.patch
+++ b/paths-in-opt.patch
@@ -1,9 +1,9 @@
diff --git a/include/ClientGUI.py b/include/ClientGUI.py
-index 26e1eb9..35f2be4 100755
+index df287e2..af0afba 100755
--- a/include/ClientGUI.py
+++ b/include/ClientGUI.py
@@ -136,7 +136,7 @@ class FrameGUI( ClientGUICommon.FrameThatResizes ):
- aboutinfo.SetVersion( HydrusData.ToString( HC.SOFTWARE_VERSION ) )
+ aboutinfo.SetVersion( HydrusData.ToString( HC.SOFTWARE_VERSION ) + ', using network version ' + HydrusData.ToString( HC.NETWORK_VERSION ) )
aboutinfo.SetDescription( CC.CLIENT_DESCRIPTION )
- with open( HC.BASE_DIR + os.path.sep + 'license.txt', 'rb' ) as f: license = f.read()
@@ -11,7 +11,7 @@ index 26e1eb9..35f2be4 100755
aboutinfo.SetLicense( license )
-@@ -1975,7 +1975,7 @@ The password is cleartext here but obscured in the entry dialog. Enter a blank p
+@@ -1987,7 +1987,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 26e1eb9..35f2be4 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 3c03b10..3c3841a 100755
+index 57eb0a1..e178693 100755
--- a/include/ClientGUIDialogs.py
+++ b/include/ClientGUIDialogs.py
-@@ -620,7 +620,7 @@ class DialogFirstStart( Dialog ):
+@@ -628,7 +628,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 3c03b10..3c3841a 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/ClientLocalServerResources.py b/include/ClientLocalServerResources.py
-index 90fb7ea..beb17d2 100644
+index 4d8c363..b5119b6 100644
--- a/include/ClientLocalServerResources.py
+++ b/include/ClientLocalServerResources.py
@@ -242,11 +242,11 @@ class HydrusResourceCommandBooruThumbnail( HydrusResourceCommandBooru ):
@@ -62,7 +62,7 @@ index 90fb7ea..beb17d2 100644
\ No newline at end of file
+
diff --git a/include/HydrusConstants.py b/include/HydrusConstants.py
-index 83942d3..927155e 100755
+index e3fea73..5c87f83 100755
--- a/include/HydrusConstants.py
+++ b/include/HydrusConstants.py
@@ -3,9 +3,9 @@ import sys