[inkscape/el5] Update patch.

[Jon Ciesla]

commit b50a42f24488ad53c3866f185e9c575062186185
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Dec 19 12:57:30 2012 -0600

    Update patch.

 inkscape-0.46-11931.patch |   50 ++++++++++++++++++++++----------------------
 1 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/inkscape-0.46-11931.patch b/inkscape-0.46-11931.patch
index e1d0ef6..df72d35 100644
--- a/inkscape-0.46-11931.patch
+++ b/inkscape-0.46-11931.patch
@@ -1,27 +1,27 @@
-=== modified file 'src/preferences-skeleton.h'
---- src/preferences-skeleton.h	2012-05-23 12:00:49 +0000
-+++ src/preferences-skeleton.h	2012-12-05 22:39:22 +0000
-@@ -337,6 +337,10 @@
- "           check_on_reading=\"0\" "
- "           check_on_editing=\"0\" "
- "           check_on_writing=\"0\"/>\n"
+diff -U3 -r src.orig/preferences-skeleton.h src/preferences-skeleton.h
+--- src.orig/preferences-skeleton.h	2008-03-10 23:20:06.000000000 -0500
++++ src/preferences-skeleton.h	2012-12-19 12:52:10.311910582 -0600
+@@ -247,6 +247,10 @@
+ "           clips=\"16711935\"" // 00ff00ff
+ "           masks=\"65535\"/>\n" // 0x0000ffff
+ "    <group id=\"svgoutput\" usenamedcolors=\"0\" numericprecision=\"8\" minimumexponent=\"-8\" inlineattrs=\"0\" indent=\"2\"/>\n"
 +"    <group id=\"externalresources\">\n"
 +"      <group id=\"xml\" "
 +"           allow_net_access=\"0\"/>\n"
 +"    </group>\n"
  "    <group id=\"forkgradientvectors\" value=\"1\"/>\n"
- "    <group id=\"iconrender\" named_nodelay=\"0\"/>\n"
- "    <group id=\"autosave\" enable=\"0\" interval=\"10\" path=\"\" max=\"10\"/>\n"
-
-=== modified file 'src/ui/dialog/ocaldialogs.cpp'
---- src/ui/dialog/ocaldialogs.cpp	2012-11-26 10:33:19 +0000
-+++ src/ui/dialog/ocaldialogs.cpp	2012-12-05 22:39:22 +0000
-@@ -1112,8 +1112,14 @@
+ "    <group id=\"grids\""
+ "      no_emphasize_when_zoomedout=\"0\">\n"
+diff -U3 -r src.orig/ui/dialog/ocaldialogs.cpp src/ui/dialog/ocaldialogs.cpp
+--- src.orig/ui/dialog/ocaldialogs.cpp	2008-03-10 23:20:43.000000000 -0500
++++ src/ui/dialog/ocaldialogs.cpp	2012-12-19 12:53:56.081013991 -0600
+@@ -446,9 +446,15 @@
      xmlDoc *doc = NULL;
      xmlNode *root_element = NULL;
  
--    doc = xmlReadMemory(data, (int) length, xml_uri.c_str(), NULL,
--            XML_PARSE_RECOVER + XML_PARSE_NOWARNING + XML_PARSE_NOERROR);
+-    doc = xmlReadIO ((xmlInputReadCallback) vfs_read_callback,
+-        (xmlInputCloseCallback) gnome_vfs_close, from_handle, uri.c_str(), NULL,
+-        XML_PARSE_RECOVER);
 +    int parse_options = XML_PARSE_RECOVER + XML_PARSE_NOWARNING + XML_PARSE_NOERROR;  // do not use XML_PARSE_NOENT ! see bug lp:1025185
 +    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 +    bool allowNetAccess = prefs->getBool("/options/externalresources/xml/allow_net_access", false);
@@ -30,14 +30,14 @@
 +    }
 +
 +    doc = xmlReadMemory(data, (int) length, xml_uri.c_str(), NULL, parse_options);
-         
++
      if (doc == NULL) {
-         // If nothing is returned, no results could be found
-
-=== modified file 'src/xml/repr-io.cpp'
---- src/xml/repr-io.cpp	2012-05-12 11:16:29 +0000
-+++ src/xml/repr-io.cpp	2012-12-05 22:39:22 +0000
-@@ -297,12 +297,18 @@
+         sp_ui_error_dialog(_("Server supplied malformed Clip Art feed"));
+         g_warning("Failed to parse %s\n", uri.c_str());
+diff -U3 -r src.orig/xml/repr-io.cpp src/xml/repr-io.cpp
+--- src.orig/xml/repr-io.cpp	2008-03-10 23:19:47.000000000 -0500
++++ src/xml/repr-io.cpp	2012-12-19 12:56:41.825176036 -0600
+@@ -274,12 +274,19 @@
          XmlSource src;
  
          if ( (src.setFile(filename) == 0) ) {
@@ -47,14 +47,14 @@
 +            if (!allowNetAccess) {
 +                parse_options |= XML_PARSE_NONET;
 +            }
++
              doc = xmlReadIO( XmlSource::readCb,
                               XmlSource::closeCb,
                               &src,
                               localFilename,
                               src.getEncoding(),
--                             XML_PARSE_NOENT | XML_PARSE_HUGE);
+-                             XML_PARSE_NOENT );
 +                             parse_options);
          }
      }
  
-