packages/gnome-calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!2 fix compile errors

Browse Source 
Merge pull request !2 from 李振华/master
This commit is contained in:
openeuler-ci-bot 2020-06-10 18:39:26 +08:00 committed by Gitee
commit 56b879a9ea
2 changed files with 71 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
0001-Fix-compiler-errors.patch Normal file
View File

@ -0,0 +1,66 @@
From 21cd87cee68108712aaba82e2b0c47ebdd6a70be Mon Sep 17 00:00:00 2001
From: lizhenhua <lizhenhua@sina.com>
Date: Wed, 10 Jun 2020 17:34:25 +0800
Subject: [PATCH] Fix compiler errors
---
lib/equation-parser.vala | 6 +++---
lib/math-equation.vala | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/equation-parser.vala b/lib/equation-parser.vala
index 668e1cd..f919d37 100644
--- a/lib/equation-parser.vala
+++ b/lib/equation-parser.vala
@@ -76,7 +76,7 @@ public class ParseNode : Object
public ParseNode.WithList (Parser parser, List<LexerToken> token_list, uint precedence, Associativity associativity, string? value = null)
{
this.parser = parser;
- this.token_list = token_list.copy();
+ this.token_list = token_list.copy_deep((CopyFunc) Object.ref);
this.precedence = precedence;
this.associativity = associativity;
this.value = value;
@@ -101,7 +101,7 @@ public class ParseNode : Object
public abstract class RNode : ParseNode
{
- public RNode (Parser parser, LexerToken? token, uint precedence, Associativity associativity)
+ protected RNode (Parser parser, LexerToken? token, uint precedence, Associativity associativity)
{
base (parser, token, precedence, associativity);
}
@@ -132,7 +132,7 @@ public abstract class RNode : ParseNode
public abstract class LRNode : ParseNode
{
- public LRNode (Parser parser, LexerToken? token, uint precedence, Associativity associativity)
+ protected LRNode (Parser parser, LexerToken? token, uint precedence, Associativity associativity)
{
base (parser, token, precedence, associativity);
}
diff --git a/lib/math-equation.vala b/lib/math-equation.vala
index bb9c771..65b10ab 100644
--- a/lib/math-equation.vala
+++ b/lib/math-equation.vala
@@ -824,7 +824,7 @@ public class MathEquation : Gtk.SourceBuffer
{
Gtk.TextIter iter;
get_iter_at_mark (out iter, get_insert ());
- (this as Gtk.TextBuffer).backspace (iter, true, true);
+ (this as Gtk.TextBuffer).backspace (ref iter, true, true);
insert_at_cursor ("^", -1);
return;
}
@@ -1245,7 +1245,7 @@ public class MathEquation : Gtk.SourceBuffer
{
Gtk.TextIter iter;
get_iter_at_mark (out iter, get_insert ());
- (this as Gtk.TextBuffer).backspace (iter, true, true);
+ (this as Gtk.TextBuffer).backspace (ref iter, true, true);
}
}
--
2.23.0

6
gnome-calculator.spec
View File

@ -1,11 +1,12 @@
Name: gnome-calculator
Version: 3.30.1
Release: 2
Release: 3
Summary: A GNOME desktop calculator application
License: GPLv3+
URL: https://wiki.gnome.org/Apps/Calculator
Source0: https://download.gnome.org/sources/%{name}/3.30/%{name}-%{version}.tar.xz
Patch0000: 0001-Fix-compiler-errors.patch
BuildRequires: desktop-file-utils gettext itstool libmpc-devel libsoup-devel meson mpfr-devel
BuildRequires: pkgconfig(glib-2.0) pkgconfig(gtk+-3.0) pkgconfig(gtksourceview-3.0) pkgconfig(libxml-2.0)
@ -65,5 +66,8 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.Calculator
%changelog
* Wed June 10 2020 lizhenhua <lizhenhua21@huawei.com> - 3.30.1-3
- Add patch to fix compiler errors
* Wed Nov 27 2019 huyan <hu.huyan@huawei.com> - 3.30.1-2
- Package Initialization