summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Ratliff (jdratlif) <webmaster@technoplaza.net>2010-04-16 15:22:32 +0000
committerJohn Ratliff (jdratlif) <webmaster@technoplaza.net>2010-04-16 15:22:32 +0000
commit626e36c56b5ffa2c25fffe85819ec50585dca788 (patch)
tree195b77e3f99ee31b5b99c099e33c12d6cce529a3 /media-tv/kmttg/files/kmttg-settings.patch
parentmedia-video/bangarang: Added missing dependency to bangarang, thanks Francois... (diff)
downloadsunrise-626e36c56b5ffa2c25fffe85819ec50585dca788.tar.gz
sunrise-626e36c56b5ffa2c25fffe85819ec50585dca788.tar.bz2
sunrise-626e36c56b5ffa2c25fffe85819ec50585dca788.zip
media-tv/kmttg: Version bump for kmttg
svn path=/sunrise/; revision=10461
Diffstat (limited to 'media-tv/kmttg/files/kmttg-settings.patch')
-rw-r--r--media-tv/kmttg/files/kmttg-settings.patch35
1 files changed, 18 insertions, 17 deletions
diff --git a/media-tv/kmttg/files/kmttg-settings.patch b/media-tv/kmttg/files/kmttg-settings.patch
index 681e2f435..6e01c4360 100644
--- a/media-tv/kmttg/files/kmttg-settings.patch
+++ b/media-tv/kmttg/files/kmttg-settings.patch
@@ -1,14 +1,17 @@
-diff -ur kmttg-0.6k-original/src/com/tivo/kmttg/main/config.java kmttg-0.6k/src/com/tivo/kmttg/main/config.java
---- kmttg-0.6k-original/src/com/tivo/kmttg/main/config.java 2009-09-04 02:32:36.000000000 -0400
-+++ kmttg-0.6k/src/com/tivo/kmttg/main/config.java 2009-09-06 01:22:33.005185340 -0400
-@@ -299,23 +299,30 @@
+diff -ur kmttg-0.7j_old/src/com/tivo/kmttg/main/config.java kmttg-0.7j/src/com/tivo/kmttg/main/config.java
+--- kmttg-0.7j_old/src/com/tivo/kmttg/main/config.java 2010-03-29 14:30:14.000000000 -0400
++++ kmttg-0.7j/src/com/tivo/kmttg/main/config.java 2010-04-16 01:13:16.415035507 -0400
+@@ -326,25 +326,23 @@
+ if ( ! file.isDir(tmpDir) ) {
+ tmpDir = programDir;
}
- }
-
-+ // multi-user settings patch for SVN r497
+- }
++ }
++
++ // multi-user settings patch for SVN r1020
+ String settingsDir = System.getProperty("user.home") + s + ".kmttg";
+ (new File(settingsDir)).mkdir();
-+
+
// Try and get MAK from ~/.tivodecode_mak
String result = getMakFromFile();
if (result != null) MAK = result;
@@ -19,20 +22,18 @@ diff -ur kmttg-0.6k-original/src/com/tivo/kmttg/main/config.java kmttg-0.6k/src/
- autoLog = programDir + s + "auto.log";
- autoHistory = programDir + s + "auto.history";
- encProfDir = programDir + s + "encode";
+-
+- // File to store/restore GUI settings
+- gui_settings = programDir + s + ".kmttg_settings";
+- if (file.isDir(System.getProperty("user.home"))) {
+- // Centralize this non-critical file instead of localizing it
+- gui_settings = System.getProperty("user.home") + s + ".kmttg_settings";
+- }
+ configIni = settingsDir + s + "config.ini";
+ autoIni = settingsDir + s + "auto.ini";
+ autoLog = settingsDir + s + "auto.log";
+ autoHistory = settingsDir + s + "auto.history";
+ encProfDir = "/usr/share/kmttg/encode"; // gentoo ebuild hack!!
-
- // File to store/restore GUI settings
-+ /*
- gui_settings = programDir + s + ".kmttg_settings";
- if (file.isDir(System.getProperty("user.home"))) {
- // Centralize this non-critical file instead of localizing it
- gui_settings = System.getProperty("user.home") + s + ".kmttg_settings";
- }
-+ */
+ gui_settings = settingsDir + s + "kmttg_settings";
// Non-executable defaults