[SCM] inkscape/experimental: Apply patch from upstream 0.92.x branch to suppress pointless warnings with some objects
mattia at users.alioth.debian.org
mattia at users.alioth.debian.org
Mon Jan 9 11:59:44 UTC 2017
The following commit has been merged in the experimental branch:
commit 6dac9d77e8b4a7573fa16baf734ca43d92199a16
Author: Mattia Rizzolo <mattia at debian.org>
Date: Mon Jan 9 12:59:30 2017 +0100
Apply patch from upstream 0.92.x branch to suppress pointless warnings with some objects
diff --git a/debian/patches/0006-Suppress-warnings-on-symbols-dialog.patch b/debian/patches/0006-Suppress-warnings-on-symbols-dialog.patch
new file mode 100644
index 0000000..9a74e7e
--- /dev/null
+++ b/debian/patches/0006-Suppress-warnings-on-symbols-dialog.patch
@@ -0,0 +1,24 @@
+From: Mattia Rizzolo <mattia at debian.org>
+Date: Mon, 9 Jan 2017 12:57:31 +0100
+Subject: Suppress warnings on symbols dialog
+
+Origin: upstream, http://bazaar.launchpad.net/~inkscape.dev/inkscape/0.92.x/revision/15309
+---
+ src/sp-object.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/sp-object.cpp b/src/sp-object.cpp
+index 3cb29c7..e93e246 100644
+--- a/src/sp-object.cpp
++++ b/src/sp-object.cpp
+@@ -702,7 +702,9 @@ void SPObject::build(SPDocument *document, Inkscape::XML::Node *repr) {
+ object->readAttr("xml:space");
+ object->readAttr("inkscape:label");
+ object->readAttr("inkscape:collect");
+- if(object->cloned)
++ if(object->cloned && (repr->attribute("id")) ) // The cases where this happens are when the "original" has no id. This happens
++ // if it is a SPString (a TextNode, e.g. in a <title>), or when importing
++ // stuff externally modified to have no id.
+ object->clone_original = document->getObjectById(repr->attribute("id"));
+
+ for (Inkscape::XML::Node *rchild = repr->firstChild() ; rchild != NULL; rchild = rchild->next()) {
diff --git a/debian/patches/series b/debian/patches/series
index dc66ca1..e558558 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
0003-Install-the-localized-manpages-in-the-correct-path.patch
0004-typos-libcroco.patch
0005-Fix-typo-in-a-variable-name.patch
+0006-Suppress-warnings-on-symbols-dialog.patch
--
inkscape packaging
More information about the pkg-multimedia-commits
mailing list