[gentoo-commits] gentoo commit in src/patchsets/texlive/2011/texlive-core: 150_all_texdoc_update.patch series

[Alexis Ballier (aballier)]

aballier    12/05/30 23:40:32

  Modified:             series
  Added:                150_all_texdoc_update.patch
  Log:
  import upstream patch to improve DE guessing in texdoc, bug #418183

Revision  Changes    Path
1.7                  src/patchsets/texlive/2011/texlive-core/series

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/texlive-core/series?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/texlive-core/series?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/texlive-core/series?r1=1.6&r2=1.7

Index: series
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/texlive/2011/texlive-core/series,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- series	25 May 2012 18:27:30 -0000	1.6
+++ series	30 May 2012 23:40:32 -0000	1.7
@@ -4,3 +4,4 @@
 120_all_noasmpic.patch
 130_all_zlib126.patch
 140_all_poppler020.patch
+150_all_texdoc_update.patch



1.1                  src/patchsets/texlive/2011/texlive-core/150_all_texdoc_update.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/texlive-core/150_all_texdoc_update.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/texlive-core/150_all_texdoc_update.patch?rev=1.1&content-type=text/plain

Index: 150_all_texdoc_update.patch
===================================================================
Update from upstream svn.
Improves guessing of DE for opening documents.
https://bugs.gentoo.org/show_bug.cgi?id=418183

Index: texlive-20110705-source/texmf/scripts/texdoc/config.tlu
===================================================================
--- texlive-20110705-source.orig/texmf/scripts/texdoc/config.tlu
+++ texlive-20110705-source/texmf/scripts/texdoc/config.tlu
@@ -329,13 +329,18 @@ function is_in_path(name)
 end
 end
 
--- guess a viewer from a list: 
+-- guess a viewer from a list:
+-- - xdg-open from freedesktop if available
 -- - try detecting desktop environments
 -- - or return the first element of "list" whose name is found in path
 -- - or nil
 -- caches results of desktop environment detection
 do local de_viewer
 function guess_viewer(cmds)
+    -- try the freedesktop method
+    if is_in_path('xdg-open') then
+        return '(xdg-open %s) &'
+    end
     -- try desktop environment
     if not de_viewer then de_viewer = desktop_environment_viewer() end
     if de_viewer then return de_viewer end
@@ -357,7 +362,8 @@ function desktop_environment_viewer()
         return '(kfmclient exec %s) &'              -- kde < 4
     end
     if os.getenv('GNOME_DESKTOP_SESSION_ID') then   -- gnome
-        return '(gnome-open %s) &'
+        if is_in_path('gvfs-open') then return '(gvfs-open %s) &' end
+        if is_in_path('gnome-open') then return '(gnome-open %s) &' end
     end
     if not is_in_path('xprop') then return end
     local xprop_fh = io.popen('xprop -root _DT_SAVE_MODE 2>/dev/null')