diff options
| author |   Daniel Gryniewicz <dang@gentoo.org> | 2007-03-02 16:45:49 +0000 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@gentoo.org> | 2007-03-02 16:45:49 +0000 |
| commit | 9e5e69552cec40873c824b0cf1fee8ae3b910231 (patch) | |
| tree | 404ec3fcffe5a5c50a990d5fd3235f7882271436 /dev-util/meld/files | |
| parent | New upstream release. (diff) | |
| download | historical-9e5e69552cec40873c824b0cf1fee8ae3b910231.tar.gz historical-9e5e69552cec40873c824b0cf1fee8ae3b910231.tar.bz2 historical-9e5e69552cec40873c824b0cf1fee8ae3b910231.zip | |
Bump to 1.1.4-r1
- Add patch to fix syntax highlighing by fixing mime type detection
Package-Manager: portage-2.1.2-r12
Diffstat (limited to 'dev-util/meld/files')
| -rw-r--r-- | dev-util/meld/files/digest-meld-1.1.4-r1 | 3 | ||||
| -rw-r--r-- | dev-util/meld/files/meld-1.1.4-syntax.patch | 41 |
2 files changed, 44 insertions, 0 deletions
diff --git a/dev-util/meld/files/digest-meld-1.1.4-r1 b/dev-util/meld/files/digest-meld-1.1.4-r1 new file mode 100644 index 000000000000..86dc17b3f05c --- /dev/null +++ b/dev-util/meld/files/digest-meld-1.1.4-r1 @@ -0,0 +1,3 @@ +MD5 e780a8f67183acf7f51b13aa4a62ac85 meld-1.1.4.tar.bz2 599912 +RMD160 ae327557458cae31660d3c30bcd6640f0406f1fa meld-1.1.4.tar.bz2 599912 +SHA256 040c7a633b8abfe646425be4835790d4515952ce0e2ffe8523c36751d93a472f meld-1.1.4.tar.bz2 599912 diff --git a/dev-util/meld/files/meld-1.1.4-syntax.patch b/dev-util/meld/files/meld-1.1.4-syntax.patch new file mode 100644 index 000000000000..9c8b6431a307 --- /dev/null +++ b/dev-util/meld/files/meld-1.1.4-syntax.patch @@ -0,0 +1,41 @@ +diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN meld-1.1.4.orig/filediff.py meld-1.1.4/filediff.py +--- meld-1.1.4.orig/filediff.py 2006-05-27 18:45:47.000000000 -0400 ++++ meld-1.1.4/filediff.py 2007-03-02 11:37:55.000000000 -0500 +@@ -45,30 +45,15 @@ for sourceview in "gtksourceview sourcev + pass + + if sourceview_available: ++ import gnomevfs + def set_highlighting_enabled(buf, fname, enabled): +- # gnome.vfs.get_mime_type seems to be broken. fake it. +- extmap = { "xml":"text/xml", +- "glade":"text/xml", +- "cpp":"text/x-cpp", +- "cxx":"text/x-cpp", +- "cc":"text/x-cpp", +- "C":"text/x-cpp", +- "c":"text/x-c", +- "hpp":"text/x-cpp", +- "hxx":"text/x-cpp", +- "hh":"text/x-cpp", +- "H":"text/x-cpp", +- "h":"text/x-cpp", +- "inl":"text/x-cpp", +- "desktop": "application/x-desktop", +- "diff": "text/x-diff", +- "patch": "text/x-diff", +- "html": "text/html", +- "po": "text/x-po", +- "py": "text/x-python" } +- ext = fname.split(".")[-1] + man = gsv.SourceLanguagesManager() +- gsl = man.get_language_from_mime_type( extmap.get(ext, "text/plain") ) ++ cwd = gnomevfs.URI(os.getcwd()) ++ if str(cwd)[-1] != '/': ++ cwd = cwd.append_string('/') ++ file = cwd.resolve_relative(fname) ++ file_info = gnomevfs.get_file_info(file, gnomevfs.FILE_INFO_GET_MIME_TYPE) ++ gsl = man.get_language_from_mime_type( file_info.mime_type ) + if gsl: + buf.set_language(gsl) + buf.set_highlight(enabled) |