!3 Upgrade to 3.38.2

From: @weijin-deng
Reviewed-by: @dwl301
Signed-off-by: @dwl301

0001-Fix-compiler-errors.patch

@@ -1,66 +0,0 @@
-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
-

gnome-calculator.spec

@@ -1,16 +1,15 @@
 Name:           gnome-calculator
-Version:        3.30.1
+Version:        3.38.2
-Release:        3
+Release:        1
 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
+Source0:        https://download.gnome.org/sources/%{name}/3.38/%{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)
+BuildRequires:  pkgconfig(glib-2.0) pkgconfig(gtk+-3.0) pkgconfig(gtksourceview-4) pkgconfig(libxml-2.0)
-BuildRequires:  /usr/bin/appstream-util vala
+BuildRequires:  /usr/bin/appstream-util vala vala-devel pkgconfig(gee-0.8)
 
 Provides:  gcalctool = 6.6.2-3
 Obsoletes: gcalctool < 6.6.2-3
@@ -21,6 +20,15 @@ it is a powerful desktop calculator with logical, scientific
 and financial modes. It uses a multi-precision package to
 achieve a high degree of accuracy.
 
+%package        devel
+Summary:        Development files for %{name}
+Requires:       %{name} = %{version}-%{release}
+
+%description    devel
+The gnome-calculator-devel package contains libraries and header files for
+developing applications that use gnome-calculator.
+
+
 %package        help
 Summary:        Documents for gnome-calculator
 Requires:       man
@@ -52,20 +60,43 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.Calculator
 %license COPYING
 %doc NEWS
 %{_bindir}/*
+%{_libdir}/girepository-1.0/*.typelib
+%{_libdir}/libgcalc-2.so.1*
+%{_libdir}/libgci-1.so.0*
 %{_libexecdir}/*
 %{_datadir}/applications/*
 %{_datadir}/dbus-1/services/*
 %{_datadir}/glib-2.0/schemas/*
 %{_datadir}/gnome-shell/
-%{_datadir}/icons/hicolor/scalable/apps/gnome-calculator-symbolic.svg
+%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Calculator*.svg
-%{_datadir}/icons/hicolor/*/apps/gnome-calculator.png
+%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Calculator-symbolic.svg
 %{_datadir}/metainfo/org.gnome.Calculator.appdata.xml
 
+%files devel
+%{_includedir}/gci-2/
+%{_includedir}/gcalc-2/
+%{_libdir}/libgcalc-2.so
+%{_libdir}/libgci-1.so
+%{_libdir}/pkgconfig/gcalc-2.pc
+%{_libdir}/pkgconfig/gci-1.pc
+%{_datadir}/gir-1.0/GCalc-2.gir
+%{_datadir}/gir-1.0/GCi-1.gir
+%{_datadir}/devhelp/*
+%{_datadir}/vala/vapi/gcalc-2.deps
+%{_datadir}/vala/vapi/gcalc-2.vapi
+%{_datadir}/vala/vapi/gci-1.deps
+%{_datadir}/vala/vapi/gci-1.vapi
+
 %files help
 %{_mandir}/man1/*
 
 
 %changelog
+* Wed Jun 16 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 3.38.2-1
+- Upgrade to 3.38.2
+- Delete 0001-Fix-compiler-errors.patch which existed in version 3.38.2
+- Add sub package gnome-calculator-devel
+
 * Wed June 10 2020 lizhenhua <lizhenhua21@huawei.com> - 3.30.1-3
 - Add patch to fix compiler errors