[okular/f18] filename encoding fix (#747976, kde#313700)

Rex Dieter rdieter at fedoraproject.org
Wed Jan 23 00:21:17 UTC 2013


commit c7fab5520ee91a05d0b89479f43d73189363524f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jan 22 18:21:07 2013 -0600

    filename encoding fix (#747976, kde#313700)

 0004-Propertly-encode-the-filename.patch |   27 +++++++++++++++++++++++++++
 okular.spec                              |    7 ++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/0004-Propertly-encode-the-filename.patch b/0004-Propertly-encode-the-filename.patch
new file mode 100644
index 0000000..49dc27c
--- /dev/null
+++ b/0004-Propertly-encode-the-filename.patch
@@ -0,0 +1,27 @@
+From 00cbba3ecec708cb147e990112bb3074778eca65 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid at kde.org>
+Date: Wed, 23 Jan 2013 00:02:20 +0100
+Subject: [PATCH 4/4] Propertly encode the filename
+
+BUGS: 313700
+FIXED-IN: 4.10.0
+---
+ generators/poppler/generator_pdf.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/generators/poppler/generator_pdf.cpp b/generators/poppler/generator_pdf.cpp
+index e32f48e..7f8d1e7 100644
+--- a/generators/poppler/generator_pdf.cpp
++++ b/generators/poppler/generator_pdf.cpp
+@@ -1806,7 +1806,7 @@ void PDFGenerator::fillViewportFromSourceReference( Okular::DocumentViewport & v
+     if (!ok) line = -1;
+ 
+     // Use column == -1 for now.
+-    if( synctex_display_query( synctex_scanner, name.toLatin1(), line, -1 ) > 0 )
++    if( synctex_display_query( synctex_scanner, QFile::encodeName(name), line, -1 ) > 0 )
+     {
+         synctex_node_t node;
+         // For now use the first hit. Could possibly be made smarter
+-- 
+1.8.1
+
diff --git a/okular.spec b/okular.spec
index d674c7a..00fa575 100644
--- a/okular.spec
+++ b/okular.spec
@@ -1,7 +1,7 @@
 Name:    okular 
 Summary: A document viewer
 Version: 4.9.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kdegraphics/okular
@@ -21,6 +21,8 @@ Patch50: kdegraphics-4.5.1-okular_dt.patch
 Patch51: kdegraphics-4.5.80-OkularConfig-dont-hardcode-paths.patch
 
 ## upstream patches
+#  http://commits.kde.org/okular/00cbba3ecec708cb147e990112bb3074778eca65
+Patch104: 0004-Propertly-encode-the-filename.patch
 
 %if 0%{?fedora}
 BuildRequires: chmlib-devel
@@ -153,6 +155,9 @@ fi
 
 
 %changelog
+* Tue Jan 22 2013 Rex Dieter <rdieter at fedoraproject.org> 4.9.5-2
+- filename encoding fix (#747976, kde#313700)
+
 * Sat Dec 29 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.9.5-1
 - 4.9.5
 


More information about the scm-commits mailing list