Accepting request 899523 from GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/899523
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gnumeric?expand=0&rev=181
This commit is contained in:
Dominique Leuenberger 2021-06-12 15:44:17 +00:00 committed by Git OBS Bridge
parent dbc95f8e3e
commit f4f5b35241
5 changed files with 23 additions and 59 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:91c072ec95c32e00b156ffe8015c93b32b8edf368f9041436193cfa32e84ed57
size 18057896

3
gnumeric-1.12.50.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:758819ba1bd6983829f9e7c6d71a7fa20cd75a3652a271e5bb003d5d8bcc14b8
size 18062104

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Fri Jun 11 16:50:55 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 1.12.50:
+ Fix undo problem with sorting and cell comments.
+ Python loader cleanups.
+ Use Python's bool type instead of rolling our own.
+ Export file:// links to html.
+ Export file:// links to xlsx.
+ Improve handling of invalid formulae from xlsx.
+ Introspection fixes.
+ Improve CELL("format",...).
+ wk4 import improvements.
+ Fix some -fsanitize=undefined problems.
+ Improve excel-specific xlsx import of validation.
- Drop libgda-6.patch: Fixed upstream.
-------------------------------------------------------------------
Mon Apr 5 11:48:42 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>

View File

@ -17,7 +17,7 @@
Name: gnumeric
Version: 1.12.49
Version: 1.12.50
Release: 0
Summary: Spreadsheet Application
License: GPL-2.0-only OR GPL-3.0-only
@ -25,8 +25,7 @@ Group: Productivity/Office/Spreadsheets
URL: http://www.gnumeric.org/
Source0: https://download.gnome.org/sources/gnumeric/1.12/%{name}-%{version}.tar.xz
Source1: gnumeric-rpmlintrc
# PATCH-FIX-UPSTREAM libgda-6.patch gmbr3@opensuse.org -- Require and support GDA 6
Patch0: libgda-6.patch
BuildRequires: bison
BuildRequires: docbook-dtds
BuildRequires: fdupes
@ -48,7 +47,7 @@ BuildRequires: pkgconfig(gthread-2.0) >= 2.38.0
BuildRequires: pkgconfig(gtk+-3.0) >= 3.8.7
BuildRequires: pkgconfig(libgda-6.0) >= 6.0.0
BuildRequires: pkgconfig(libgda-ui-6.0) >= 6.0.0
BuildRequires: pkgconfig(libgoffice-0.10) >= 0.10.47
BuildRequires: pkgconfig(libgoffice-0.10) >= 0.10.50
BuildRequires: pkgconfig(libgsf-1) >= 1.14.33
BuildRequires: pkgconfig(libxml-2.0) >= 2.4.12
BuildRequires: pkgconfig(pango) >= 1.24.0

View File

@ -1,52 +0,0 @@
From 5862048949405f02819bad6a4ff3878dca7f41a9 Mon Sep 17 00:00:00 2001
From: Callum Farmer <gmbr3@opensuse.org>
Date: Mon, 29 Mar 2021 17:32:31 +0100
Subject: [PATCH] Bump gda dependency to 6.0.0
---
configure.ac | 2 +-
plugins/gda/plugin-gda.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7e87b44b5..63af2f9e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -298,7 +298,7 @@ AC_ARG_WITH(gda,
fi
)
if test "$try_gda" = true; then
- PKG_CHECK_MODULES(GDA, [libgda-5.0 >= 5.0.0, libgda-ui-5.0 >= 5.0.0],
+ PKG_CHECK_MODULES(GDA, [libgda-6.0 >= 6.0.0, libgda-ui-6.0 >= 6.0.0],
[gda_msg=yes],
[gda_msg="NO. libgda problem"])
if test "$gda_msg" = yes; then
diff --git a/plugins/gda/plugin-gda.c b/plugins/gda/plugin-gda.c
index 3f62a1f03..f8414f7e6 100644
--- a/plugins/gda/plugin-gda.c
+++ b/plugins/gda/plugin-gda.c
@@ -69,9 +69,9 @@ gnm_value_new_from_gda (GValue const *gval,
if (t == GDA_TYPE_TIME) {
GdaTime const *time = gda_value_get_time (gval);
- res = value_new_float ( (time->hour +
- (time->minute +
- time->second / 60.) / 60.) / 24.),
+ res = value_new_float ( (g_date_time_get_hour (time) +
+ (g_date_time_get_minute (time) +
+ g_date_time_get_second (time) / 60.) / 60.) / 24.),
value_set_fmt (res, go_format_default_time ());
return res;
}
@@ -527,7 +527,7 @@ view_data_sources (GnmAction const *action, WorkbookControl *wbc)
{
char *argv[2];
- argv[0] = gda_get_application_exec_path ("gda-control-center");
+ argv[0] = "/usr/bin/env gda-control-center-6.0";
argv[1] = NULL;
if (!g_spawn_async (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL)) {
go_gtk_notice_dialog (wbcg_toplevel (WBC_GTK (wbc)), GTK_MESSAGE_INFO,
--
GitLab