[inkscape/el5] Final patch.

[Jon Ciesla]

commit de746cb126bab07a5c2a4eec18168ae673d4e7bd
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Dec 20 11:54:17 2012 -0600

    Final patch.

 inkscape-0.46-11931.patch |   31 ++++++++++---------------------
 1 files changed, 10 insertions(+), 21 deletions(-)
---
diff --git a/inkscape-0.46-11931.patch b/inkscape-0.46-11931.patch
index df72d35..056ef29 100644
--- a/inkscape-0.46-11931.patch
+++ b/inkscape-0.46-11931.patch
@@ -12,10 +12,11 @@ diff -U3 -r src.orig/preferences-skeleton.h src/preferences-skeleton.h
  "    <group id=\"forkgradientvectors\" value=\"1\"/>\n"
  "    <group id=\"grids\""
  "      no_emphasize_when_zoomedout=\"0\">\n"
-diff -U3 -r src.orig/ui/dialog/ocaldialogs.cpp src/ui/dialog/ocaldialogs.cpp
+ 
+diff -U3 -r src.orig/ui/dialog/ocaldialogs.cpp src.new/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 @@
++++ src/ui/dialog/ocaldialogs.cpp	2012-12-20 11:12:53.377305626 -0600
+@@ -446,9 +446,8 @@
      xmlDoc *doc = NULL;
      xmlNode *root_element = NULL;
  
@@ -23,31 +24,19 @@ diff -U3 -r src.orig/ui/dialog/ocaldialogs.cpp src/ui/dialog/ocaldialogs.cpp
 -        (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);
-+    if (!allowNetAccess) {
-+        parse_options |= XML_PARSE_NONET;
-+    }
-+
-+    doc = xmlReadMemory(data, (int) length, xml_uri.c_str(), NULL, parse_options);
-+
++    parse_options |= XML_PARSE_NONET;
      if (doc == NULL) {
          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
+diff -U3 -r src.orig/xml/repr-io.cpp src.new/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 @@
++++ src/xml/repr-io.cpp	2012-12-20 11:14:05.112307625 -0600
+@@ -274,12 +274,14 @@
          XmlSource src;
  
          if ( (src.setFile(filename) == 0) ) {
-+            int parse_options = XML_PARSE_HUGE; // 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);
-+            if (!allowNetAccess) {
-+                parse_options |= XML_PARSE_NONET;
-+            }
-+
++            int parse_options = XML_PARSE_RECOVER; // do not use XML_PARSE_NOENT ! see bug lp:1025185
++            parse_options |= XML_PARSE_NONET;
              doc = xmlReadIO( XmlSource::readCb,
                               XmlSource::closeCb,
                               &src,