[SCM] inkscape/experimental: Add patch to fix some typos
mattia at users.alioth.debian.org
mattia at users.alioth.debian.org
Sat Jan 7 22:08:01 UTC 2017
The following commit has been merged in the experimental branch:
commit 3f0ed3a65a630dae386fb4ccac9baa03afc2e4ac
Author: Mattia Rizzolo <mattia at debian.org>
Date: Sat Jan 7 22:40:12 2017 +0100
Add patch to fix some typos
diff --git a/debian/patches/0004-typos-libcroco.patch b/debian/patches/0004-typos-libcroco.patch
new file mode 100644
index 0000000..631895a
--- /dev/null
+++ b/debian/patches/0004-typos-libcroco.patch
@@ -0,0 +1,211 @@
+From: Mattia Rizzolo <mattia at debian.org>
+Date: Sat, 7 Jan 2017 21:56:44 +0100
+Subject: typos libcroco
+
+These typos are in the embedded library libcroco.
+Patch sent to libcroco upstream, hopefully at some point a release of
+libcroco will happen, and later inkscape will probably merge it.
+
+Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=776798
+Bug: https://bugs.launchpad.net/inkscape/+bug/1653371
+---
+ src/libcroco/cr-fonts.c | 2 +-
+ src/libcroco/cr-input.c | 6 +++---
+ src/libcroco/cr-om-parser.c | 2 +-
+ src/libcroco/cr-parser.c | 2 +-
+ src/libcroco/cr-prop-list.c | 2 +-
+ src/libcroco/cr-sel-eng.c | 2 +-
+ src/libcroco/cr-statement.c | 12 ++++++------
+ src/libcroco/cr-style.c | 6 +++---
+ src/libcroco/cr-tknzr.c | 2 +-
+ 9 files changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/src/libcroco/cr-fonts.c b/src/libcroco/cr-fonts.c
+index 78e2611..db41b9b 100644
+--- a/src/libcroco/cr-fonts.c
++++ b/src/libcroco/cr-fonts.c
+@@ -685,7 +685,7 @@ cr_font_size_adjust_to_string (CRFontSizeAdjust const * a_this)
+ if (a_this->num)
+ str = (gchar *) cr_num_to_string (a_this->num);
+ else
+- str = g_strdup ("unknow font-size-adjust property value"); /* Should raise an error no?*/
++ str = g_strdup ("unknown font-size-adjust property value"); /* Should raise an error no?*/
+ break;
+ case FONT_SIZE_ADJUST_INHERIT:
+ str = g_strdup ("inherit");
+diff --git a/src/libcroco/cr-input.c b/src/libcroco/cr-input.c
+index 732068a..49000b1 100644
+--- a/src/libcroco/cr-input.c
++++ b/src/libcroco/cr-input.c
+@@ -231,8 +231,8 @@ cr_input_new_from_uri (const gchar * a_file_uri, enum CREncoding a_enc)
+ /*we reached eof */
+ loop = FALSE;
+ } else {
+- /*a pb occured !! */
+- cr_utils_trace_debug ("an io error occured");
++ /*a pb occurred !! */
++ cr_utils_trace_debug ("an io error occurred");
+ status = CR_ERROR;
+ goto cleanup;
+ }
+@@ -874,7 +874,7 @@ cr_input_peek_byte2 (CRInput const * a_this, gulong a_offset, gboolean * a_eof)
+ *Gets the memory address of the byte located at a given offset
+ *in the input stream.
+ *
+- *Returns the address, otherwise NULL if an error occured.
++ *Returns the address, otherwise NULL if an error occurred.
+ */
+ guchar *
+ cr_input_get_byte_addr (CRInput * a_this, gulong a_offset)
+diff --git a/src/libcroco/cr-om-parser.c b/src/libcroco/cr-om-parser.c
+index 596cd6e..978f561 100644
+--- a/src/libcroco/cr-om-parser.c
++++ b/src/libcroco/cr-om-parser.c
+@@ -824,7 +824,7 @@ cr_om_parser_new (CRInput * a_input)
+ PRIVATE (result)->parser = cr_parser_new_from_input (a_input);
+
+ if (!PRIVATE (result)->parser) {
+- cr_utils_trace_info ("parsing instanciation failed");
++ cr_utils_trace_info ("parsing instantiation failed");
+ goto error;
+ }
+
+diff --git a/src/libcroco/cr-parser.c b/src/libcroco/cr-parser.c
+index 544b35a..9bdb9c3 100644
+--- a/src/libcroco/cr-parser.c
++++ b/src/libcroco/cr-parser.c
+@@ -2747,7 +2747,7 @@ cr_parser_parse_stylesheet (CRParser * a_this)
+ *coming the input stream given in parameter.
+ *
+ *Returns the newly created instance of #CRParser,
+- *or NULL if an error occured.
++ *or NULL if an error occurred.
+ */
+ CRParser *
+ cr_parser_new (CRTknzr * a_tknzr)
+diff --git a/src/libcroco/cr-prop-list.c b/src/libcroco/cr-prop-list.c
+index dc575d6..5a61133 100644
+--- a/src/libcroco/cr-prop-list.c
++++ b/src/libcroco/cr-prop-list.c
+@@ -71,7 +71,7 @@ cr_prop_list_allocate (void)
+ *Appends a property list to the current one.
+ *
+ *Returns the resulting prop list, or NULL if an error
+- *occured
++ *occurred
+ */
+ CRPropList *
+ cr_prop_list_append (CRPropList * a_this, CRPropList * a_to_append)
+diff --git a/src/libcroco/cr-sel-eng.c b/src/libcroco/cr-sel-eng.c
+index 6f496df..9bf00cf 100644
+--- a/src/libcroco/cr-sel-eng.c
++++ b/src/libcroco/cr-sel-eng.c
+@@ -797,7 +797,7 @@ sel_matches_node_real (CRSelEng * a_this, CRSimpleSel * a_sel,
+ *case, *a_len is set to the actual number of ruleset found.
+ *@return CR_BAD_PARAM_ERROR in case any of the given parameter are
+ *bad (e.g null pointer).
+- *@return CR_ERROR if any other error occured.
++ *@return CR_ERROR if any other error occurred.
+ */
+ static enum CRStatus
+ cr_sel_eng_get_matched_rulesets_real (CRSelEng * a_this,
+diff --git a/src/libcroco/cr-statement.c b/src/libcroco/cr-statement.c
+index e31123a..d064cd8 100644
+--- a/src/libcroco/cr-statement.c
++++ b/src/libcroco/cr-statement.c
+@@ -1210,14 +1210,14 @@ cr_statement_at_media_rule_parse_from_buf (const guchar * a_buf,
+ parser = cr_parser_new_from_buf ((guchar*)a_buf, strlen ((const char *) a_buf),
+ a_enc, FALSE);
+ if (!parser) {
+- cr_utils_trace_info ("Instanciation of the parser failed");
++ cr_utils_trace_info ("Instantiation of the parser failed");
+ goto cleanup;
+ }
+
+ sac_handler = cr_doc_handler_new ();
+ if (!sac_handler) {
+ cr_utils_trace_info
+- ("Instanciation of the sac handler failed");
++ ("Instantiation of the sac handler failed");
+ goto cleanup;
+ }
+
+@@ -1396,7 +1396,7 @@ cr_statement_at_import_rule_parse_from_buf (const guchar * a_buf,
+ parser = cr_parser_new_from_buf ((guchar*)a_buf, strlen ((const char *) a_buf),
+ a_encoding, FALSE);
+ if (!parser) {
+- cr_utils_trace_info ("Instanciation of parser failed.");
++ cr_utils_trace_info ("Instantiation of parser failed.");
+ goto cleanup;
+ }
+
+@@ -1523,14 +1523,14 @@ cr_statement_at_page_rule_parse_from_buf (const guchar * a_buf,
+ parser = cr_parser_new_from_buf ((guchar*)a_buf, strlen ((const char *) a_buf),
+ a_encoding, FALSE);
+ if (!parser) {
+- cr_utils_trace_info ("Instanciation of the parser failed.");
++ cr_utils_trace_info ("Instantiation of the parser failed.");
+ goto cleanup;
+ }
+
+ sac_handler = cr_doc_handler_new ();
+ if (!sac_handler) {
+ cr_utils_trace_info
+- ("Instanciation of the sac handler failed.");
++ ("Instantiation of the sac handler failed.");
+ goto cleanup;
+ }
+
+@@ -1639,7 +1639,7 @@ cr_statement_at_charset_rule_parse_from_buf (const guchar * a_buf,
+ parser = cr_parser_new_from_buf ((guchar*)a_buf, strlen ((const char *) a_buf),
+ a_encoding, FALSE);
+ if (!parser) {
+- cr_utils_trace_info ("Instanciation of the parser failed.");
++ cr_utils_trace_info ("Instantiation of the parser failed.");
+ goto cleanup;
+ }
+
+diff --git a/src/libcroco/cr-style.c b/src/libcroco/cr-style.c
+index 2b865c2..d4dabcf 100644
+--- a/src/libcroco/cr-style.c
++++ b/src/libcroco/cr-style.c
+@@ -982,7 +982,7 @@ set_prop_float (CRStyle * a_style, CRTerm * a_value)
+ || !a_value->content.str
+ || !a_value->content.str->stryng
+ || !a_value->content.str->stryng->str) {
+- /*unknow type, the float type is set to it's default value */
++ /*unknown type, the float type is set to it's default value */
+ return CR_OK;
+ }
+
+@@ -1528,7 +1528,7 @@ set_prop_font_size_from_value (CRStyle * a_style, CRTerm * a_value)
+ a_style->font_size.sv.type = INHERITED_FONT_SIZE;
+
+ } else {
+- cr_utils_trace_info ("Unknow value of font-size") ;
++ cr_utils_trace_info ("Unknown value of font-size") ;
+ status = init_style_font_size_field (a_style);
+ return CR_UNKNOWN_PROP_VAL_ERROR;
+ }
+@@ -2636,7 +2636,7 @@ cr_style_white_space_type_to_string (enum CRWhiteSpaceType a_code,
+ str = (gchar *) "inherited";
+ break;
+ default:
+- str = (gchar *) "unknow white space property value";
++ str = (gchar *) "unknown white space property value";
+ break;
+ }
+ cr_utils_dump_n_chars2 (' ', a_str, a_nb_indent);
+diff --git a/src/libcroco/cr-tknzr.c b/src/libcroco/cr-tknzr.c
+index 83f6ab3..10c8176 100644
+--- a/src/libcroco/cr-tknzr.c
++++ b/src/libcroco/cr-tknzr.c
+@@ -524,7 +524,7 @@ cr_tknzr_parse_comment (CRTknzr * a_this,
+ *Error code can be either CR_PARSING_ERROR if the string
+ *parsed just doesn't
+ *respect the production or another error if a
+- *lower level error occured.
++ *lower level error occurred.
+ */
+ static enum CRStatus
+ cr_tknzr_parse_unicode_escape (CRTknzr * a_this,
diff --git a/debian/patches/0005-Fix-typo-in-a-variable-name.patch b/debian/patches/0005-Fix-typo-in-a-variable-name.patch
new file mode 100644
index 0000000..3a712b1
--- /dev/null
+++ b/debian/patches/0005-Fix-typo-in-a-variable-name.patch
@@ -0,0 +1,71 @@
+From: Mattia Rizzolo <mattia at debian.org>
+Date: Sat, 7 Jan 2017 22:43:27 +0100
+Subject: Fix typo in a variable name
+
+Bug: https://bugs.launchpad.net/inkscape/+bug/1653371
+Forwarded: https://code.launchpad.net/~mapreri/inkscape/typo/+merge/314287
+---
+ src/live_effects/lpe-transform_2pts.cpp | 14 +++++++-------
+ src/live_effects/lpe-transform_2pts.h | 2 +-
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/live_effects/lpe-transform_2pts.cpp b/src/live_effects/lpe-transform_2pts.cpp
+index 3c4ce07..70458d9 100644
+--- a/src/live_effects/lpe-transform_2pts.cpp
++++ b/src/live_effects/lpe-transform_2pts.cpp
+@@ -36,7 +36,7 @@ LPETransform2Pts::LPETransform2Pts(LivePathEffectObject *lpeobject) :
+ flip_vertical(_("Flip vertical"), _("Flip vertical"), "flip_vertical", &wr, this, false,"", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")),
+ start(_("Start"), _("Start point"), "start", &wr, this, "Start point"),
+ end(_("End"), _("End point"), "end", &wr, this, "End point"),
+- strech(_("Stretch"), _("Stretch the result"), "strech", &wr, this, 1),
++ stretch(_("Stretch"), _("Stretch the result"), "stretch", &wr, this, 1),
+ offset(_("Offset"), _("Offset from knots"), "offset", &wr, this, 0),
+ first_knot(_("First Knot"), _("First Knot"), "first_knot", &wr, this, 1),
+ last_knot(_("Last Knot"), _("Last Knot"), "last_knot", &wr, this, 1),
+@@ -54,7 +54,7 @@ LPETransform2Pts::LPETransform2Pts(LivePathEffectObject *lpeobject) :
+ registerParameter(&first_knot);
+ registerParameter(&last_knot);
+ registerParameter(&helper_size);
+- registerParameter(&strech);
++ registerParameter(&stretch);
+ registerParameter(&offset);
+ registerParameter(&start);
+ registerParameter(&end);
+@@ -75,9 +75,9 @@ LPETransform2Pts::LPETransform2Pts(LivePathEffectObject *lpeobject) :
+ offset.param_set_range(-999999.0, 999999.0);
+ offset.param_set_increments(1, 1);
+ offset.param_set_digits(2);
+- strech.param_set_range(0, 999.0);
+- strech.param_set_increments(0.01, 0.01);
+- strech.param_set_digits(4);
++ stretch.param_set_range(0, 999.0);
++ stretch.param_set_increments(0.01, 0.01);
++ stretch.param_set_digits(4);
+ apply_to_clippath_and_mask = true;
+ }
+
+@@ -382,9 +382,9 @@ LPETransform2Pts::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const
+ m *= Geom::Scale(-1,1);
+ m *= Geom::Rotate(original_angle);
+ }
+- if(strech != 1){
++ if(stretch != 1){
+ m *= Geom::Rotate(-original_angle);
+- m *= Geom::Scale(1,strech);
++ m *= Geom::Scale(1,stretch);
+ m *= Geom::Rotate(original_angle);
+ }
+ if(elastic) {
+diff --git a/src/live_effects/lpe-transform_2pts.h b/src/live_effects/lpe-transform_2pts.h
+index c20d562..0f88e6b 100644
+--- a/src/live_effects/lpe-transform_2pts.h
++++ b/src/live_effects/lpe-transform_2pts.h
+@@ -57,7 +57,7 @@ private:
+ ToggleButtonParam flip_vertical;
+ PointParam start;
+ PointParam end;
+- ScalarParam strech;
++ ScalarParam stretch;
+ ScalarParam offset;
+ ScalarParam first_knot;
+ ScalarParam last_knot;
diff --git a/debian/patches/series b/debian/patches/series
index d8e3c77..dc66ca1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
0001-Drop_PS_and_PDF_support_in_MimeType.patch
0002-Fix-lintian-s-executable-not-elf-or-script.patch
0003-Install-the-localized-manpages-in-the-correct-path.patch
+0004-typos-libcroco.patch
+0005-Fix-typo-in-a-variable-name.patch
--
inkscape packaging
More information about the pkg-multimedia-commits
mailing list