Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gnome-tetravex for openSUSE:Factory checked in at 2022-02-04 21:49:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-tetravex (Old) and /work/SRC/openSUSE:Factory/.gnome-tetravex.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-tetravex" Fri Feb 4 21:49:09 2022 rev:30 rq:951428 version:3.38.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-tetravex/gnome-tetravex.changes 2020-11-29 12:27:15.285930963 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-tetravex.new.1898/gnome-tetravex.changes 2022-02-04 21:52:20.435174690 +0100 @@ -1,0 +2,11 @@ +Wed Feb 2 12:05:20 UTC 2022 - Bj??rn Lie <[email protected]> + +- Add 991ed9c9592047704efa436a34b84d392c9562d4.patch: Reference of + [GtkChild] fields is handled by GtkBuilder, type must be unowned. +- Add 20.patch: Fix build with meson 0.60.0 and newer. +- Drop ancient gnotravex and gnotravex-lang Obsoletes, no longer + needed, we can expect everyone to have upgraded by now. +- Stop marking enduser help files as docs. They are not + documentation, and at the same time silence rpmlint. + +------------------------------------------------------------------- New: ---- 20.patch 991ed9c9592047704efa436a34b84d392c9562d4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-tetravex.spec ++++++ --- /var/tmp/diff_new_pack.bTKnQM/_old 2022-02-04 21:52:20.919171360 +0100 +++ /var/tmp/diff_new_pack.bTKnQM/_new 2022-02-04 21:52:20.923171334 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnome-tetravex # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,10 @@ Group: Amusements/Games/Board/Puzzle URL: https://live.gnome.org/Tetravex Source0: https://download.gnome.org/sources/gnome-tetravex/3.38/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM 991ed9c9592047704efa436a34b84d392c9562d4.patch -- Reference of [GtkChild] fields is handled by GtkBuilder, type must be unowned +Patch0: https://gitlab.gnome.org/GNOME/gnome-tetravex/-/commit/991ed9c9592047704efa436a34b84d392c9562d4.patch +# PATCH-FIX-UPSTREAM 20.patch -- Fix build with meson 0.60.0 and newer +Patch1: https://gitlab.gnome.org/GNOME/gnome-tetravex/-/merge_requests/20.patch BuildRequires: fdupes BuildRequires: hicolor-icon-theme @@ -34,9 +38,6 @@ BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.23 BuildRequires: pkgconfig(librsvg-2.0) >= 2.32.0 BuildRequires: pkgconfig(vapigen) >= 0.24 -# gnome-tetravex used to be called 'gnotravex' and was part of gnome-games until 3.7.x -Obsoletes: gnotravex < %{version} -Obsoletes: gnotravex-lang < %{version} %description Tetravex is a simple puzzle game in which pieces have numbers on each @@ -62,8 +63,8 @@ %files %license COPYING %doc NEWS -%doc %{_datadir}/help/C/%{name}/ %{_bindir}/%{name} +%{_datadir}/help/C/%{name}/ %{_datadir}/metainfo/org.gnome.Tetravex.appdata.xml %{_datadir}/applications/org.gnome.Tetravex.desktop %{_datadir}/dbus-1/services/org.gnome.Tetravex.service ++++++ 20.patch ++++++ >From 80912d06f5e588f6aca966fa516103275e58d94e Mon Sep 17 00:00:00 2001 From: Jan Beich <[email protected]> Date: Mon, 24 Jan 2022 11:48:22 +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:37:0: ERROR: Function does not take positional arguments. data/meson.build:59:0: ERROR: Function does not take positional arguments. --- data/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/meson.build b/data/meson.build index bb77248..b881e8a 100644 --- a/data/meson.build +++ b/data/meson.build @@ -34,7 +34,7 @@ endif # Desktop file if get_option('build_gui') - desktop_file = i18n.merge_file ('desktop-file', + desktop_file = i18n.merge_file ( input: project_id + '.desktop.in', output: project_id + '.desktop', install: true, @@ -56,7 +56,7 @@ endif # AppData file if get_option('build_gui') - appdata_file = i18n.merge_file ('appdata-file', + appdata_file = i18n.merge_file ( input: project_id + '.appdata.xml.in', output: project_id + '.appdata.xml', install: true, -- GitLab ++++++ 991ed9c9592047704efa436a34b84d392c9562d4.patch ++++++ >From 991ed9c9592047704efa436a34b84d392c9562d4 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz <[email protected]> Date: Wed, 17 Mar 2021 11:35:45 +0100 Subject: [PATCH] Reference of [GtkChild] fields is handled by GtkBuilder, type must be unowned --- src/score-overlay.vala | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/score-overlay.vala b/src/score-overlay.vala index fbb55cc..9dfb5f5 100644 --- a/src/score-overlay.vala +++ b/src/score-overlay.vala @@ -38,10 +38,10 @@ private class ScoreOverlay : Grid * * updating labels \*/ - [GtkChild] private ScoreOverlayEntry score_0; - [GtkChild] private ScoreOverlayEntry score_1; - [GtkChild] private ScoreOverlayEntry score_2; - [GtkChild] private ScoreOverlayEntry score_3; + [GtkChild] private unowned ScoreOverlayEntry score_0; + [GtkChild] private unowned ScoreOverlayEntry score_1; + [GtkChild] private unowned ScoreOverlayEntry score_2; + [GtkChild] private unowned ScoreOverlayEntry score_3; internal void set_score (uint8 puzzle_size, uint /* [1[ */ position, @@ -184,8 +184,8 @@ private class ScoreOverlay : Grid [GtkTemplate (ui = "/org/gnome/Tetravex/score-overlay-entry.ui")] private class ScoreOverlayEntry : Grid { - [GtkChild] private Label place_label; - [GtkChild] private Label value_label; + [GtkChild] private unowned Label place_label; + [GtkChild] private unowned Label value_label; internal void set_place_label (string label) { -- GitLab
