diff options
Diffstat (limited to 'gnome-extra/conduit/files')
7 files changed, 113 insertions, 0 deletions
diff --git a/gnome-extra/conduit/files/conduit-0.3.12_correct_firefox_path.patch b/gnome-extra/conduit/files/conduit-0.3.12_correct_firefox_path.patch new file mode 100755 index 0000000..91f01be --- /dev/null +++ b/gnome-extra/conduit/files/conduit-0.3.12_correct_firefox_path.patch @@ -0,0 +1,11 @@ +--- conduit-0.3.12/conduit/conduit.orig 2008-07-18 08:58:17.000000000 +0200 ++++ conduit-0.3.12/conduit/conduit 2008-07-18 08:58:40.000000000 +0200 +@@ -8,7 +8,7 @@ + # Run mozilla takes care of settin up the appropriate environment variables + # to run a program using mozilla libs + +-for d in `ls -d /usr/lib*/firefox* | sort -r` ++for d in `ls -d /usr/lib*/mozilla-firefox* | sort -r` + do + if [ -x $d/run-mozilla.sh ]; then + echo INFO: FOUND FIREFOX LIBS AT $d diff --git a/gnome-extra/conduit/files/conduit-0.3.13_correct_firefox_path.patch b/gnome-extra/conduit/files/conduit-0.3.13_correct_firefox_path.patch new file mode 100755 index 0000000..6b5ee19 --- /dev/null +++ b/gnome-extra/conduit/files/conduit-0.3.13_correct_firefox_path.patch @@ -0,0 +1,11 @@ +--- conduit-0.3.13/conduit/conduit.orig 2008-08-05 23:12:49.000000000 +0200 ++++ conduit-0.3.13/conduit/conduit 2008-08-05 23:18:03.000000000 +0200 +@@ -8,7 +8,7 @@ + # Run mozilla takes care of settin up the appropriate environment variables + # to run a program using mozilla libs + +-for d in `ls -d /usr/lib*/firefox* | sort -r` ++for d in `ls -d /usr/lib*/{mozilla-,}firefox* 2> /dev/null | sort -r` + do + if [ -x $d/run-mozilla.sh ]; then + echo INFO: FOUND FIREFOX LIBS AT $d diff --git a/gnome-extra/conduit/files/conduit-0.3.17-escaping-caracters.patch b/gnome-extra/conduit/files/conduit-0.3.17-escaping-caracters.patch new file mode 100755 index 0000000..c62c1c4 --- /dev/null +++ b/gnome-extra/conduit/files/conduit-0.3.17-escaping-caracters.patch @@ -0,0 +1,31 @@ +diff -urNad conduit~/conduit/platform/FileGio.py conduit/conduit/platform/FileGio.py +--- conduit~/conduit/platform/FileGio.py 2009-08-30 13:33:34.000000000 +0200 ++++ conduit/conduit/platform/FileGio.py 2009-08-30 14:06:49.000000000 +0200 +@@ -1,4 +1,5 @@ + import gio ++import urllib + + import conduit.platform + +@@ -200,6 +201,8 @@ + #if not relative, return abs path + if not res: + res = toURI ++ else: ++ res = urllib.quote(res) + return res + + @staticmethod +@@ -353,10 +356,10 @@ + if filetype == gio.FILE_TYPE_DIRECTORY: + #Include hidden directories + if not hidden or self.includeHidden: +- self.dirs.append(dir+"/"+filename) ++ self.dirs.append(dir+"/"+urllib.quote(filename)) + t += 1 + elif filetype == gio.FILE_TYPE_REGULAR or (filetype == gio.FILE_TYPE_SYMBOLIC_LINK and self.followSymlinks): +- uri = dir+"/"+filename ++ uri = dir+"/"+urllib.quote(filename) + #Include hidden files + if not hidden or self.includeHidden: + self.URIs.append(uri) diff --git a/gnome-extra/conduit/files/conduit-0.3.17-non-ASCII-folder-canvas.patch b/gnome-extra/conduit/files/conduit-0.3.17-non-ASCII-folder-canvas.patch new file mode 100755 index 0000000..15ad2e2 --- /dev/null +++ b/gnome-extra/conduit/files/conduit-0.3.17-non-ASCII-folder-canvas.patch @@ -0,0 +1,12 @@ +diff -urNad conduit-fix~/conduit/modules/FileModule/FileModule.py conduit-fix/conduit/modules/FileModule/FileModule.py +--- conduit-fix~/conduit/modules/FileModule/FileModule.py 2009-02-24 22:56:27.000000000 +0100 ++++ conduit-fix/conduit/modules/FileModule/FileModule.py 2009-02-24 23:03:47.000000000 +0100 +@@ -116,7 +116,7 @@ + return self.folder + + def get_name(self): +- return Vfs.uri_get_filename(self.folder) ++ return Vfs.uri_unescape(Vfs.uri_get_filename(self.folder)) + + def _monitor_folder(self): + self._monitor.add(self.folder, self._monitor.MONITOR_DIRECTORY) diff --git a/gnome-extra/conduit/files/conduit-0.3.17-programming-error-unicode.patch b/gnome-extra/conduit/files/conduit-0.3.17-programming-error-unicode.patch new file mode 100755 index 0000000..bc2c382 --- /dev/null +++ b/gnome-extra/conduit/files/conduit-0.3.17-programming-error-unicode.patch @@ -0,0 +1,14 @@ +diff -urNad conduit~/conduit/MappingDB.py conduit/conduit/MappingDB.py +--- conduit~/conduit/MappingDB.py 2009-08-30 13:33:34.000000000 +0200 ++++ conduit/conduit/MappingDB.py 2009-08-30 13:40:49.000000000 +0200 +@@ -38,8 +38,8 @@ + self.sinkRid = rid + + def values(self): +- return (self.sourceUID,self.sourceRid.get_UID(),self.sourceRid.get_mtime(),self.sourceRid.get_hash(), +- self.sinkUID,self.sinkRid.get_UID(),self.sinkRid.get_mtime(),self.sinkRid.get_hash()) ++ return (unicode(self.sourceUID),unicode(self.sourceRid.get_UID()),self.sourceRid.get_mtime(),self.sourceRid.get_hash(), ++ unicode(self.sinkUID),unicode(self.sinkRid.get_UID()),self.sinkRid.get_mtime(),self.sinkRid.get_hash()) + + class MappingDB: + """ diff --git a/gnome-extra/conduit/files/conduit-0.3.17-rhythmbox-new-path.patch b/gnome-extra/conduit/files/conduit-0.3.17-rhythmbox-new-path.patch new file mode 100755 index 0000000..d5c35ec --- /dev/null +++ b/gnome-extra/conduit/files/conduit-0.3.17-rhythmbox-new-path.patch @@ -0,0 +1,23 @@ +diff -urNad conduit-0.3.17~/conduit/modules/RhythmboxModule/RhythmboxModule.py conduit-0.3.17/conduit/modules/RhythmboxModule/RhythmboxModule.py +--- conduit-0.3.17~/conduit/modules/RhythmboxModule/RhythmboxModule.py 2010-01-07 17:10:30.000000000 +0100 ++++ conduit-0.3.17/conduit/modules/RhythmboxModule/RhythmboxModule.py 2010-03-28 14:37:12.034777215 +0200 +@@ -50,8 +50,8 @@ + _icon_ = "rhythmbox" + _configurable_ = True + +- PLAYLIST_PATH="~/.gnome2/rhythmbox/playlists.xml" +- RHYTHMDB_PATH="~/.gnome2/rhythmbox/rhythmdb.xml" ++ PLAYLIST_PATH="~/.local/share/rhythmbox/playlists.xml" ++ RHYTHMDB_PATH="~/.local/share/rhythmbox/rhythmdb.xml" + + def __init__(self, *args): + DataProvider.DataSource.__init__(self) +@@ -150,7 +150,7 @@ + '''Wrapper around the standard Audio datatype that implements + the rating, playcount, and cover location tags. + ''' +- COVER_ART_PATH="~/.gnome2/rhythmbox/covers/" ++ COVER_ART_PATH="~/.cache/rhythmbox/covers" + def __init__(self, URI, **kwargs): + Audio.Audio.__init__(self, URI, **kwargs) + self._songdata = kwargs['songdata'] or {} diff --git a/gnome-extra/conduit/files/conduit-0.3.9_correct_firefox_path.patch b/gnome-extra/conduit/files/conduit-0.3.9_correct_firefox_path.patch new file mode 100755 index 0000000..d2e4cf3 --- /dev/null +++ b/gnome-extra/conduit/files/conduit-0.3.9_correct_firefox_path.patch @@ -0,0 +1,11 @@ +--- conduit-0.3.9/conduit/conduit.orig 2007-11-29 01:29:17.000000000 +0100 ++++ conduit-0.3.9/conduit/conduit 2008-03-03 02:17:58.000000000 +0100 +@@ -7,7 +7,7 @@ + + # Run mozilla takes care of settin up the appropriate environment variables + # to run a program using mozilla libs +-FF_PATH=`ls -d /usr/lib/firefox* | tail -n 1` ++FF_PATH=`ls -d /usr/lib/mozilla-firefox* | tail -n 1` + RUN_MOZILLA=$FF_PATH/run-mozilla.sh + + if [ -x $RUN_MOZILLA ]; then |