Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package gnote for openSUSE:Factory checked 
in at 2022-02-11 23:07:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnote (Old)
 and      /work/SRC/openSUSE:Factory/.gnote.new.1956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gnote"

Fri Feb 11 23:07:24 2022 rev:82 rq:953247 version:41.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/gnote/gnote.changes      2022-01-11 
21:24:32.225181126 +0100
+++ /work/SRC/openSUSE:Factory/.gnote.new.1956/gnote.changes    2022-02-11 
23:08:47.578838979 +0100
@@ -1,0 +2,11 @@
+Wed Feb  2 21:13:40 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com>
+
+- Add 21.patch: Fix build with meson 0.61 and newer.
+- Stop adding category TextEditor to the desktop file, it's a notes
+  application, not a text editor as such.
+- Add appstream-glib BuildRequires and a check section and
+  meson_test macro, validate appdata, desktop file and gschemas
+  during build using upstreams included tests.
+- Add explicit generic c_compiler BuildRequires.
+
+-------------------------------------------------------------------

New:
----
  21.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnote.spec ++++++
--- /var/tmp/diff_new_pack.yoUgUm/_old  2022-02-11 23:08:48.030840287 +0100
+++ /var/tmp/diff_new_pack.yoUgUm/_new  2022-02-11 23:08:48.034840298 +0100
@@ -27,8 +27,12 @@
 URL:            https://wiki.gnome.org/Apps/Gnote
 Source0:        
https://download.gnome.org/sources/gnote/41/%{name}-%{version}.tar.xz
 Source99:       gnote-rpmlintrc
+# PATCH-FIX-UPSTREAM 21.patch -- Fix build with meson 0.60 and newer
+Patch0:         https://gitlab.gnome.org/GNOME/gnote/-/merge_requests/21.patch
 
+BuildRequires:  appstream-glib
 BuildRequires:  c++_compiler
+BuildRequires:  c_compiler
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  libboost_test-devel >= 1.5.1
@@ -74,7 +78,6 @@
 
 %install
 %meson_install
-desktop-file-edit --add-category TextEditor 
%{buildroot}%{_datadir}/applications/org.gnome.Gnote.desktop
 %fdupes %{buildroot}%{_datadir}
 %find_lang %{name} %{?no_lang_C}
 
@@ -85,6 +88,9 @@
 %postun -p /sbin/ldconfig
 %endif
 
+%check
+%meson_test
+
 %files
 %license COPYING
 %doc AUTHORS NEWS README

++++++ 21.patch ++++++
>From 32795e53681e3ecbaaa05817d4eb5fa1c124d35b Mon Sep 17 00:00:00 2001
From: Jan Beich <jbe...@freebsd.org>
Date: Mon, 24 Jan 2022 11:53:17 +0000
Subject: [PATCH] meson: drop unused argument for i18n.merge_file()

Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.

data/meson.build:4:0: ERROR: Function does not take positional arguments.
data/meson.build:41:0: ERROR: Function does not take positional arguments.
---
 data/meson.build | 2 --
 1 file changed, 2 deletions(-)

diff --git a/data/meson.build b/data/meson.build
index a6138165..8d16368a 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -2,7 +2,6 @@ install_man('gnote.1')
 
 desktop_file = 'org.gnome.Gnote.desktop'
 gnote_desktop_file = i18n.merge_file(
-  desktop_file,
   type: 'desktop',
   input: desktop_file + '.in',
   output: desktop_file,
@@ -39,7 +38,6 @@ configure_file(
 
 gnote_appdata = 'org.gnome.Gnote.appdata.xml'
 appdata_file = i18n.merge_file(
-  gnote_appdata,
   input: gnote_appdata + '.in',
   output: gnote_appdata,
   po_dir: '../po',
-- 
GitLab

Reply via email to