cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-update to gnome-calculator-3.8.1

Browse Source
This commit is contained in:
jasper 2013-04-14 19:35:52 +00:00
parent f7d0f3a22b
commit 2c91b6e20b
4 changed files with 4 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnome/calculator/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2013/03/29 15:08:03 jasper Exp $
# $OpenBSD: Makefile,v 1.2 2013/04/14 19:35:52 jasper Exp $
COMMENT= GNOME desktop calculator
GNOME_PROJECT= gnome-calculator
GNOME_VERSION= 3.8.0
GNOME_VERSION= 3.8.1
CATEGORIES= math

4
x11/gnome/calculator/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gnome/gnome-calculator-3.8.0.tar.xz) = fbGGKb1+F6tlt3HVVO7vDNPPeYWoblqCx1XELBsJKCQ=
SIZE (gnome/gnome-calculator-3.8.0.tar.xz) = 1053972
SHA256 (gnome/gnome-calculator-3.8.1.tar.xz) = JK6FbJCj32LFLcQTzrLJutFeetFG3gRptTxwaBpK1DU=
SIZE (gnome/gnome-calculator-3.8.1.tar.xz) = 1053096

26
x11/gnome/calculator/patches/patch-src_equation-lexer_vala
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-src_equation-lexer_vala,v 1.1.1.1 2013/03/29 15:08:03 jasper Exp $
commit 3c55d33e6953fb49b2dc5f3ea4dd72438e106539
Author: PioneerAxon <arth.svnit@gmail.com>
Date: Tue Mar 26 02:01:54 2013 +0530
Fix crash issues due to null pointer dereference
--- src/equation-lexer.vala.orig Tue Jan 15 09:56:45 2013
+++ src/equation-lexer.vala Fri Mar 29 16:03:56 2013
@@ -276,12 +276,9 @@ public class Lexer
/* Get next token interface. Will be called by parser to get pointer to next token in token stream. */
public LexerToken get_next_token ()
{
- var token = tokens.nth_data (next_token);
- next_token++;
if (next_token >= tokens.length ())
- next_token = tokens.length ();
-
- return token;
+ return tokens.nth_data (tokens.length () - 1);
+ return tokens.nth_data (next_token++);
}
/* Roll back one lexer token. */

38
x11/gnome/calculator/patches/patch-src_equation-parser_vala
View File

@ -1,38 +0,0 @@
$OpenBSD: patch-src_equation-parser_vala,v 1.1.1.1 2013/03/29 15:08:03 jasper Exp $
commit 6f7526822afc9eb73a4544c8141961b66085e4c6
Author: PioneerAxon <arth.svnit@gmail.com>
Date: Tue Mar 26 18:26:09 2013 +0530
Fix error reporting bug for malformed expression
--- src/equation-parser.vala.orig Tue Jan 15 09:56:45 2013
+++ src/equation-parser.vala Fri Mar 29 16:04:32 2013
@@ -777,7 +777,7 @@ public class Parser
if (token.type != LexerTokenType.PL_EOS)
{
/* Full string is not parsed. */
- if (error == 0)
+ if (error == ErrorCode.NONE)
set_error (ErrorCode.INVALID, token.text, token.start_index, token.end_index);
error_code = error;
@@ -790,7 +790,7 @@ public class Parser
if (token.type != LexerTokenType.PL_EOS)
{
/* Full string is not parsed. */
- if (error == 0)
+ if (error == ErrorCode.NONE)
set_error (ErrorCode.INVALID, token.text, token.start_index, token.end_index);
error_code = error;
@@ -803,6 +803,9 @@ public class Parser
/* Input can't be parsed with grammar. */
if (!ret)
{
+ if (error == ErrorCode.NONE)
+ set_error (ErrorCode.INVALID);
+
error_code = error;
error_token = this.error_token;
error_start = error_token_start;