[packages/gnome-documents] - added gnome-desktop,meson,inkscape patches; release 3 (gnome-desktop 43)

[qboosh]

commit 02b879b554a2052e358de87841ff1b807cce473b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed May 31 19:59:30 2023 +0200

    - added gnome-desktop,meson,inkscape patches; release 3 (gnome-desktop 43)

 gnome-documents-gnome-desktop.patch | 20 ++++++++++++++++++++
 gnome-documents-inkscape.patch      | 12 ++++++++++++
 gnome-documents-meson.patch         | 18 ++++++++++++++++++
 gnome-documents.spec                | 18 ++++++++++++++----
 4 files changed, 64 insertions(+), 4 deletions(-)
---
diff --git a/gnome-documents.spec b/gnome-documents.spec
index eef70aa..cdcf471 100644
--- a/gnome-documents.spec
+++ b/gnome-documents.spec
@@ -6,11 +6,14 @@ Summary:	Document manager for GNOME
 Summary(pl.UTF-8):	Zarządca dokumentów dla GNOME
 Name:		gnome-documents
 Version:	3.34.0
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-documents/3.34/%{name}-%{version}.tar.xz
 # Source0-md5:	7158db2c13ae45fe166df8c66f9d083c
+Patch0:		%{name}-gnome-desktop.patch
+Patch1:		%{name}-meson.patch
+Patch2:		%{name}-inkscape.patch
 URL:		https://wiki.gnome.org/Apps/Documents
 BuildRequires:	clutter-devel >= 1.10.0
 BuildRequires:	clutter-gtk-devel >= 1.4.0
@@ -18,7 +21,7 @@ BuildRequires:	evince-devel >= 3.14.0
 BuildRequires:	gettext-tools >= 0.19.8
 BuildRequires:	gjs-devel >= 1.48.0
 BuildRequires:	glib2-devel >= 1:2.40.0
-BuildRequires:	gnome-desktop-devel >= 3.2.0
+BuildRequires:	gnome-desktop-devel >= 43
 BuildRequires:	gnome-online-accounts-devel >= 3.2.0
 BuildRequires:	gobject-introspection-devel >= 1.32.0
 BuildRequires:	gtk+3-devel >= 3.22.15
@@ -37,7 +40,7 @@ BuildRequires:	tracker-devel >= 2.0.0
 BuildRequires:	xz
 BuildRequires:	yelp-tools
 %if %{with pdf}
-BuildRequires:	inkscape
+BuildRequires:	inkscape >= 1.0
 # pdfunite
 BuildRequires:	poppler-progs
 %endif
@@ -47,7 +50,7 @@ Requires:	clutter-gtk >= 1.4.0
 Requires:	evince >= 3.14.0
 Requires:	gjs >= 1.48.0
 Requires:	glib2 >= 1:2.40.0
-Requires:	gnome-desktop >= 3.2.0
+Requires:	gnome-desktop >= 43
 Requires:	gnome-online-accounts >= 3.2.0
 Requires:	gobject-introspection >= 1.32.0
 Requires:	gtk+3 >= 3.22.15
@@ -70,6 +73,13 @@ dokumentami.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+# workaround "data/meson.build:6:0: ERROR: Sandbox violation: Tried to grab file gd-main-view.h from a nested subproject."
+cp -p subprojects/libgd/libgd/gd-main-view{,-generic}.h data
+%{__sed} -i -e "s!join_paths(libgd_src_path, \('[^']*'\))!\1!" data/meson.build
 
 %build
 %meson build \
diff --git a/gnome-documents-gnome-desktop.patch b/gnome-documents-gnome-desktop.patch
new file mode 100644
index 0000000..0eddce6
--- /dev/null
+++ b/gnome-documents-gnome-desktop.patch
@@ -0,0 +1,20 @@
+--- gnome-books-40.0/src/lib/gd-utils.c.orig	2021-03-25 10:45:11.490234600 +0100
++++ gnome-books-40.0/src/lib/gd-utils.c	2023-05-31 06:21:16.381236833 +0200
+@@ -66,7 +66,7 @@ create_thumbnail (GTask *task,
+   factory = gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
+   pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail
+     (factory, 
+-     uri, g_file_info_get_content_type (info));
++     uri, g_file_info_get_content_type (info), NULL, NULL);
+ 
+   if (pixbuf == NULL)
+     {
+@@ -74,7 +74,7 @@ create_thumbnail (GTask *task,
+       goto out;
+     }
+ 
+-  gnome_desktop_thumbnail_factory_save_thumbnail (factory, pixbuf, uri, (time_t) mtime);
++  gnome_desktop_thumbnail_factory_save_thumbnail (factory, pixbuf, uri, (time_t) mtime, NULL, NULL);
+   g_task_return_boolean (task, TRUE);
+ 
+  out:
diff --git a/gnome-documents-inkscape.patch b/gnome-documents-inkscape.patch
new file mode 100644
index 0000000..0c87571
--- /dev/null
+++ b/gnome-documents-inkscape.patch
@@ -0,0 +1,12 @@
+Adjust options for inkscape 1.x
+--- gnome-documents-3.34.0/getting-started/meson.build.orig	2019-10-24 09:35:24.000000000 +0200
++++ gnome-documents-3.34.0/getting-started/meson.build	2023-05-31 17:40:27.894465742 +0200
+@@ -21,7 +21,7 @@ foreach lingua: linguas
+       source,
+       input: join_paths(lingua, source + '.svg'),
+       output: source + '.pdf',
+-      command: [inkscape, '-z', '-A', '@OUTPUT@', '@INPUT@']
++      command: [inkscape, '--export-type=pdf', '--export-filename', '@OUTPUT@', '@INPUT@']
+     )
+   endforeach
+ 
diff --git a/gnome-documents-meson.patch b/gnome-documents-meson.patch
new file mode 100644
index 0000000..9e3e0b8
--- /dev/null
+++ b/gnome-documents-meson.patch
@@ -0,0 +1,18 @@
+--- gnome-documents-3.34.0/data/meson.build.orig	2023-05-31 18:02:10.894609214 +0200
++++ gnome-documents-3.34.0/data/meson.build	2023-05-31 18:03:36.334765664 +0200
+@@ -56,7 +56,6 @@ foreach app: documents_apps
+   appdata = app + '.appdata.xml'
+ 
+   appdata_file = i18n.merge_file(
+-    appdata,
+     input: appdata + '.in',
+     output: appdata,
+     po_dir: po_dir,
+@@ -76,7 +75,6 @@ foreach app: documents_apps
+   desktop = app + '.desktop'
+ 
+   desktop_file = i18n.merge_file(
+-    desktop,
+     type: 'desktop',
+     input: desktop + '.in',
+     output: desktop,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnome-documents.git/commitdiff/02b879b554a2052e358de87841ff1b807cce473b