Hi @ports,

below is an update for graphics/inkscapei. Crash spotted[1] by edd@. He
descriptes two crashes in OpenBSD. bug/1587311 fixed below but
bug/1587319 is not an inkscape port or inkscape bug. It's a lib2geom
bug.

I would like to take maintainer because i care about it.

OK, COmments?

Best regards,

Rafael Sadowski


[1]: https://marc.info/?l=openbsd-ports&m=146468386132397&w=2


Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/inkscape/Makefile,v
retrieving revision 1.49
diff -u -p -u -p -r1.49 Makefile
--- Makefile    18 Apr 2016 07:57:55 -0000      1.49
+++ Makefile    4 Jun 2016 06:35:59 -0000
@@ -7,10 +7,12 @@ COMMENT=      SVG vector drawing application
 
 DISTNAME=      inkscape-0.91
 CATEGORIES=    graphics
-REVISION=      7
+REVISION=      8
 
 MASTER_SITES = https://inkscape.org/en/gallery/item/3854/
 HOMEPAGE=      http://www.inkscape.org/
+
+MAINTAINER =   Rafael Sadowski <raf...@sizeofvoid.org>
 
 # GPLv2 and LGPLv2.1
 PERMIT_PACKAGE_CDROM=  Yes
Index: patches/patch-src_util_expression-evaluator_cpp
===================================================================
RCS file: 
/cvs/ports/graphics/inkscape/patches/patch-src_util_expression-evaluator_cpp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_util_expression-evaluator_cpp
--- patches/patch-src_util_expression-evaluator_cpp     5 Feb 2016 22:27:25 
-0000       1.1
+++ patches/patch-src_util_expression-evaluator_cpp     4 Jun 2016 06:35:59 
-0000
@@ -1,10 +1,11 @@
 $OpenBSD: patch-src_util_expression-evaluator_cpp,v 1.1 2016/02/05 22:27:25 
sthen Exp $
 
-Fix g_utf8_validate call. get_text() from GtkSpinButton returns an
-string with a wrong encoding.
+- Fix g_utf8_validate call. get_text() from GtkSpinButton returns an string
+  with a wrong encoding.
+- fix https://bugs.launchpad.net/inkscape/+bug/1587311
 
 --- src/util/expression-evaluator.cpp.orig     Sun Nov 30 19:45:32 2014
-+++ src/util/expression-evaluator.cpp  Thu Feb  4 20:46:25 2016
++++ src/util/expression-evaluator.cpp  Sat Jun  4 08:34:35 2016
 @@ -28,6 +28,8 @@
  #include "util/expression-evaluator.h"
  #include "util/units.h"
@@ -23,3 +24,17 @@ string with a wrong encoding.
      unit(unit)
  {
      current_token.type  = TOKEN_END;
+@@ -206,8 +208,11 @@ EvaluatorQuantity ExpressionEvaluator::evaluateFactor(
+ {
+     EvaluatorQuantity evaluated_factor = EvaluatorQuantity();
+     EvaluatorToken consumed_token = EvaluatorToken();
+-    
+-    if (acceptToken(TOKEN_NUM, &consumed_token)) {
++
++    if (acceptToken(TOKEN_END, &consumed_token)) {
++        return evaluated_factor;
++    }
++    else if (acceptToken(TOKEN_NUM, &consumed_token)) {
+         evaluated_factor.value = consumed_token.value.fl;
+     } else if (acceptToken('(', NULL)) {
+         evaluated_factor = evaluateExpression();

Reply via email to