[packages/gnumeric] - updated to 1.12.61
qboosh
qboosh at pld-linux.org
Tue May 5 19:38:31 CEST 2026
commit 0724b63cbc1ac515c2594d4b4f96aa7b6d151fc0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue May 5 19:38:25 2026 +0200
- updated to 1.12.61
gnumeric-bool.patch | 12 ------------
gnumeric-psiconv.patch | 23 +++++++++++++++++++++++
gnumeric.spec | 44 +++++++++++++++++++-------------------------
3 files changed, 42 insertions(+), 37 deletions(-)
---
diff --git a/gnumeric.spec b/gnumeric.spec
index d006c93..bb30d41 100644
--- a/gnumeric.spec
+++ b/gnumeric.spec
@@ -18,35 +18,35 @@ Summary(ru.UTF-8): Электронные таблицы для GNOME
Summary(uk.UTF-8): Електронні таблиці для GNOME
Summary(zh_CN.UTF-8): Linux下的Excel -- GNOME电子表格
Name: gnumeric
-Version: 1.12.60
+Version: 1.12.61
Release: 1
Epoch: 1
License: GPL v2+
Group: X11/Applications
Source0: https://download.gnome.org/sources/gnumeric/1.12/%{name}-%{version}.tar.xz
-# Source0-md5: 6fef90fa329332b8776bd66e98473f27
+# Source0-md5: 8c6cbffb41eb2a8ffb97708e21482d7f
Patch0: %{name}-gnomedb.patch
-Patch1: %{name}-bool.patch
+Patch1: %{name}-psiconv.patch
URL: http://www.gnumeric.org/
BuildRequires: autoconf >= 2.54
BuildRequires: automake
BuildRequires: bison
BuildRequires: flex
BuildRequires: gcc >= 5:3.2
-BuildRequires: gettext-tools
+BuildRequires: gettext-tools >= 0.13
BuildRequires: glib2-devel >= 1:2.40.0
BuildRequires: gobject-introspection-devel >= 1.0.0
-BuildRequires: gtk+3-devel >= 3.8.7
+BuildRequires: gtk+3-devel >= 3.20.0
%{?with_guile:BuildRequires: guile-devel >= 1.5}
BuildRequires: intltool >= 0.35
BuildRequires: itstool
-BuildRequires: libgoffice-devel >= 0.10.57
+BuildRequires: libgoffice-devel >= 0.10.61
%if %{with gda}
BuildRequires: libgda6-devel >= 6.0.0
BuildRequires: libgda6-ui-devel >= 6.0.0
%endif
BuildRequires: libglade2-devel >= 1:2.6.0
-BuildRequires: libgsf-devel >= 1.14.33
+BuildRequires: libgsf-devel >= 1.14.45
BuildRequires: libtool >= 2:2.2.6
BuildRequires: libxml2-devel >= 1:2.6.26
# disabled by default - still experimental
@@ -60,7 +60,7 @@ BuildRequires: popt-devel
BuildRequires: pxlib-devel >= 0.4.0
BuildRequires: rpm-perlprov
%if %{with python}
-BuildRequires: python3-devel >= 1:2.7
+BuildRequires: python3-devel >= 1:3.2
BuildRequires: python3-pygobject3-devel >= 3.0.0
%endif
BuildRequires: rpmbuild(macros) >= 1.213
@@ -114,9 +114,9 @@ Summary: libspreadsheet library
Summary(pl.UTF-8): Biblioteka libspreadsheet
Group: Libraries
Requires: glib2 >= 1:2.40.0
-Requires: gtk+3 >= 3.8.7
-Requires: libgoffice >= 0.10.57
-Requires: libgsf >= 1.14.33
+Requires: gtk+3 >= 3.20.0
+Requires: libgoffice >= 0.10.61
+Requires: libgsf >= 1.14.45
Requires: libxml2 >= 1:2.6.26
Requires: pango >= 1:1.46.0
@@ -132,9 +132,9 @@ Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libspreadsheet
Group: Development/Libraries
Requires: libspreadsheet = %{epoch}:%{version}-%{release}
Requires: glib2-devel >= 1:2.40.0
-Requires: gtk+3-devel >= 3.8.7
-Requires: libgoffice-devel >= 0.10.57
-Requires: libgsf-devel >= 1.14.33
+Requires: gtk+3-devel >= 3.20.0
+Requires: libgoffice-devel >= 0.10.61
+Requires: libgsf-devel >= 1.14.45
Requires: libxml2-devel >= 1:2.6.26
%description -n libspreadsheet-devel
@@ -179,7 +179,6 @@ Summary: MS Excel (tm) plugin
Summary(pl.UTF-8): Wtyczka MS Excel (tm)
Group: X11/Applications
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: libspreadsheet = %{epoch}:%{version}-%{release}
%description plugin-excel
Imports/exports MS Excel (tm) files.
@@ -432,7 +431,7 @@ Summary: Python plugin
Summary(pl.UTF-8): Wtyczka Pythona
Group: X11/Applications
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: python-modules
+Requires: python3-modules >= 1:3.2
%description plugin-python
Sample Python plugin providing some (useless) functions.
@@ -447,8 +446,8 @@ Summary: Gnumeric plugin for goffice
Summary(pl.UTF-8): Wtyczka dla goffice
Group: X11/Applications
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: libgoffice >= 0.10.57
-Requires: libgsf >= 1.14.33
+Requires: libgoffice >= 0.10.61
+Requires: libgsf >= 1.14.45
Requires: libspreadsheet = %{epoch}:%{version}-%{release}
%description plugin-goffice
@@ -461,7 +460,7 @@ Wtyczka dla goffice.
%setup -q
# actually libgnomedb is not required to build gnomedb plugin
# ... but it expects gnome-database-properties-4.0 tool, which no longer exists
-#patch0 -p1
+#patch -P0 -p1
%patch -P1 -p1
%build
@@ -583,11 +582,6 @@ rm -rf $RPM_BUILD_ROOT
# R: zlib
%{_libdir}/gnumeric/%{version}/plugins/excel/excel.so
%{_libdir}/gnumeric/%{version}/plugins/excel/plugin.xml
-%dir %{_libdir}/gnumeric/%{version}/plugins/excelplugins
-# R: libspreadsheet libgoffice
-%{_libdir}/gnumeric/%{version}/plugins/excelplugins/plugin.so
-%{_libdir}/gnumeric/%{version}/plugins/excelplugins/xlcall32.so
-%{_libdir}/gnumeric/%{version}/plugins/excelplugins/plugin.xml
%if %{with gda}
# gda
@@ -745,7 +739,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/gnumeric/%{version}/plugins/py-func/py_func.py
%{_libdir}/gnumeric/%{version}/plugins/py-func/plugin.xml
%dir %{_libdir}/gnumeric/%{version}/plugins/python-loader
-# R: python-libs
+# R: python3-libs
%{_libdir}/gnumeric/%{version}/plugins/python-loader/python_loader.so
%{_libdir}/gnumeric/%{version}/plugins/python-loader/plugin.xml
%{_libdir}/gnumeric/%{version}/plugins/python-loader/ui-console-menu.xml
diff --git a/gnumeric-bool.patch b/gnumeric-bool.patch
deleted file mode 100644
index 309586a..0000000
--- a/gnumeric-bool.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-bool requires <stdbool.h> or C23; whole remaining code uses gboolean
---- gnumeric-1.12.60/src/sstest.c.orig 2026-02-11 03:07:03.000000000 +0100
-+++ gnumeric-1.12.60/src/sstest.c 2026-02-12 21:06:49.556061858 +0100
-@@ -898,7 +898,7 @@ test_insert_delete (void)
- /* ------------------------------------------------------------------------- */
-
- static gboolean
--check_help_expression (const char *text, GnmFunc const *fd, bool localized)
-+check_help_expression (const char *text, GnmFunc const *fd, gboolean localized)
- {
- GnmConventions const *convs = gnm_conventions_default;
- GnmParsePos pp;
diff --git a/gnumeric-psiconv.patch b/gnumeric-psiconv.patch
new file mode 100644
index 0000000..dc11007
--- /dev/null
+++ b/gnumeric-psiconv.patch
@@ -0,0 +1,23 @@
+Readd code fragment lost during AI-driven refactor
+--- gnumeric-1.12.61/plugins/psiconv/psiconv-read.c.orig 2026-05-05 18:28:38.506635966 +0200
++++ gnumeric-1.12.61/plugins/psiconv/psiconv-read.c 2026-05-05 18:29:16.676429183 +0200
+@@ -57,6 +57,19 @@ psi_new_string (psiconv_ucs2 const *data
+ }
+
+
++static GnmCellRef *
++p_cellref_init (GnmCellRef *res,
++ int row, gboolean row_abs,
++ int col, gboolean col_abs)
++{
++ res->sheet = NULL;
++ res->row = row;
++ res->col = col;
++ res->row_relative = row_abs ? 0 : 1;
++ res->col_relative = col_abs ? 0 : 1;
++ return res;
++}
++
+ static void
+ set_format (GnmStyle *style, const psiconv_sheet_numberformat psi_numberformat)
+ {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnumeric.git/commitdiff/0724b63cbc1ac515c2594d4b4f96aa7b6d151fc0
More information about the pld-cvs-commit
mailing list