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

[qboosh]

commit 6efee312bb7289964f8f9679f47a354e5161367f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed May 31 19:56:06 2023 +0200

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

 gnome-books-gnome-desktop.patch | 20 ++++++++++++++++++++
 gnome-books-meson.patch         | 18 ++++++++++++++++++
 gnome-books.spec                | 15 ++++++++++++---
 3 files changed, 50 insertions(+), 3 deletions(-)
---
diff --git a/gnome-books.spec b/gnome-books.spec
index d7de542..90f4183 100644
--- a/gnome-books.spec
+++ b/gnome-books.spec
@@ -1,19 +1,22 @@
+# TODO: obsoletes gnome-documents?
 Summary:	E-book manager for GNOME
 Summary(pl.UTF-8):	Zarządca e-booków dla GNOME
 Name:		gnome-books
 Version:	40.0
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	https://download.gnome.org/sources/gnome-books/40/%{name}-%{version}.tar.xz
 # Source0-md5:	8a4e112280421373f3233101bf5cf28e
+Patch0:		%{name}-gnome-desktop.patch
+Patch1:		%{name}-meson.patch
 URL:		https://wiki.gnome.org/Apps/Books
 BuildRequires:	evince-devel >= 3.14.0
 BuildRequires:	gdk-pixbuf2-devel >= 2.39.1
 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:	gobject-introspection-devel >= 1.32.0
 BuildRequires:	gtk+3-devel >= 3.22.15
 BuildRequires:	gtk-webkit4-devel >= 2.6.0
@@ -33,7 +36,7 @@ Requires:	evince >= 3.14.0
 Requires:	gdk-pixbuf2 >= 2.39.1
 Requires:	gjs >= 1.48.0
 Requires:	glib2 >= 1:2.40.0
-Requires:	gnome-desktop >= 3.2.0
+Requires:	gnome-desktop >= 43
 Requires:	gobject-introspection >= 1.32.0
 Requires:	gtk+3 >= 3.22.15
 Requires:	gtk-webkit4 >= 2.6.0
@@ -52,6 +55,12 @@ Books to aplikacja dla GNOME służąca do zarządzania e-bookami.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -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-books-gnome-desktop.patch b/gnome-books-gnome-desktop.patch
new file mode 100644
index 0000000..0eddce6
--- /dev/null
+++ b/gnome-books-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-books-meson.patch b/gnome-books-meson.patch
new file mode 100644
index 0000000..3df887a
--- /dev/null
+++ b/gnome-books-meson.patch
@@ -0,0 +1,18 @@
+--- gnome-books-40.0/data/meson.build.orig	2023-05-31 17:42:29.080153592 +0200
++++ gnome-books-40.0/data/meson.build	2023-05-31 17:44:14.389445082 +0200
+@@ -54,7 +54,6 @@ sources += gnome.compile_resources(
+ appdata = 'org.gnome.Books.appdata.xml'
+ 
+ appdata_file = i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: appdata,
+   po_dir: po_dir,
+@@ -74,7 +73,6 @@ if appstream_util.found()
+ desktop = 'org.gnome.Books.desktop'
+ 
+ desktop_file = i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop + '.in',
+   output: desktop,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnome-books.git/commitdiff/6efee312bb7289964f8f9679f47a354e5161367f