Hello community,
here is the log from the commit of package gnome-documents for openSUSE:Factory
checked in at 2018-12-31 09:39:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-documents (Old)
and /work/SRC/openSUSE:Factory/.gnome-documents.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-documents"
Mon Dec 31 09:39:33 2018 rev:61 rq:661751 version:3.30.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-documents/gnome-documents.changes
2018-10-17 08:11:46.527118578 +0200
+++
/work/SRC/openSUSE:Factory/.gnome-documents.new.28833/gnome-documents.changes
2018-12-31 09:39:34.682551065 +0100
@@ -1,0 +2,9 @@
+Thu Dec 27 23:55:23 UTC 2018 - [email protected]
+
+- Add upstream bug fix patches from stable branch:
+ + gnome-documents-build-Remove-unused-variable.patch: build:
+ Remove unused variable.
+ + gnome-documents-build-Ensure-Git-submodules-are-updated.patch:
+ build: Ensure that the Git submodules are kept updated.
+
+-------------------------------------------------------------------
New:
----
gnome-documents-build-Ensure-Git-submodules-are-updated.patch
gnome-documents-build-Remove-unused-variable.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-documents.spec ++++++
--- /var/tmp/diff_new_pack.p0Zr0Q/_old 2018-12-31 09:39:35.306550555 +0100
+++ /var/tmp/diff_new_pack.p0Zr0Q/_new 2018-12-31 09:39:35.310550552 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -28,6 +28,10 @@
Group: Productivity/Office/Other
URL: https://wiki.gnome.org/Apps/Documents
Source0:
https://download.gnome.org/sources/gnome-documents/3.30/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM gnome-documents-build-Remove-unused-variable.patch --
build: Remove unused variable
+Patch0: gnome-documents-build-Remove-unused-variable.patch
+# PATCH-FIX-UPSTREAM
gnome-documents-build-Ensure-Git-submodules-are-updated.patch -- build: Ensure
that the Git submodules are kept updated
+Patch1: gnome-documents-build-Ensure-Git-submodules-are-updated.patch
BuildRequires: desktop-file-utils
BuildRequires: fdupes
@@ -98,7 +102,7 @@
%lang_package
%prep
-%autosetup
+%autosetup -p1
translation-update-upstream po %{name}
%build
++++++ gnome-documents-build-Ensure-Git-submodules-are-updated.patch ++++++
>From 76cc34192d06fde59b0bf3ff58c06fcd046ba766 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <[email protected]>
Date: Wed, 12 Sep 2018 09:17:14 +0200
Subject: [PATCH] build: Ensure that the Git submodules are kept updated
It's assumed that those building release tarballs, like distributions,
might not have Git in their buildroots. Therefore, this is skipped for
'plain' builds.
https://gitlab.gnome.org/GNOME/gnome-documents/merge_requests/7
---
meson.build | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/meson.build b/meson.build
index 8a5b5f65..c6fdb563 100644
--- a/meson.build
+++ b/meson.build
@@ -30,6 +30,10 @@ documents_pkglibdir = join_paths(documents_libdir,
meson.project_name())
documents_schemadir = join_paths(documents_datadir, 'glib-2.0', 'schemas')
+if not get_option('buildtype').contains('plain')
+ run_command('git', '-C', meson.source_root(), 'submodule', 'update',
'--init', '--recursive')
+endif
+
cc = meson.get_compiler('c')
config_h = configuration_data()
--
2.18.1
++++++ gnome-documents-build-Remove-unused-variable.patch ++++++
>From a6cf71ee92809d6901919d326136917b9a674e6f Mon Sep 17 00:00:00 2001
From: Debarshi Ray <[email protected]>
Date: Wed, 12 Sep 2018 09:14:11 +0200
Subject: [PATCH] build: Remove unused variable
Fallout from bf131fd13ee2d5f77c0010b743b2fbc2dccc0e71
https://gitlab.gnome.org/GNOME/gnome-documents/merge_requests/7
---
meson.build | 2 --
1 file changed, 2 deletions(-)
diff --git a/meson.build b/meson.build
index 9d97d8cc..8a5b5f65 100644
--- a/meson.build
+++ b/meson.build
@@ -30,8 +30,6 @@ documents_pkglibdir = join_paths(documents_libdir,
meson.project_name())
documents_schemadir = join_paths(documents_datadir, 'glib-2.0', 'schemas')
-documents_debug = get_option('buildtype').contains('debug')
-
cc = meson.get_compiler('c')
config_h = configuration_data()
--
2.18.1
