Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package gnome-terminal for openSUSE:Factory 
checked in at 2022-02-03 23:15:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-terminal (Old)
 and      /work/SRC/openSUSE:Factory/.gnome-terminal.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gnome-terminal"

Thu Feb  3 23:15:52 2022 rev:140 rq:950762 version:3.42.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-terminal/gnome-terminal.changes    
2021-12-12 00:56:38.678544624 +0100
+++ /work/SRC/openSUSE:Factory/.gnome-terminal.new.1898/gnome-terminal.changes  
2022-02-03 23:16:10.760738559 +0100
@@ -1,0 +2,6 @@
+Wed Feb  2 07:16:22 UTC 2022 - Bj??rn Lie <[email protected]>
+
+- Add 9a168cc23962ce9fa106dc8a40407d381a3db403.patch: Fix build
+  with meson 0.61.0 and newer.
+
+-------------------------------------------------------------------

New:
----
  9a168cc23962ce9fa106dc8a40407d381a3db403.patch

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

Other differences:
------------------
++++++ gnome-terminal.spec ++++++
--- /var/tmp/diff_new_pack.4qrMYg/_old  2022-02-03 23:16:11.332734655 +0100
+++ /var/tmp/diff_new_pack.4qrMYg/_new  2022-02-03 23:16:11.340734600 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-terminal
 #
-# Copyright (c) 2021 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,13 +24,15 @@
 Group:          System/X11/Terminals
 URL:            https://wiki.gnome.org/Apps/Terminal
 Source0:        
https://download.gnome.org/sources/gnome-terminal/3.42/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM 9a168cc23962ce9fa106dc8a40407d381a3db403.patch -- Fix 
build with meson 0.61.0 and newer
+Patch0:         
https://gitlab.gnome.org/GNOME/gnome-terminal/-/commit/9a168cc23962ce9fa106dc8a40407d381a3db403.patch
 
+BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
+BuildRequires:  gcc-c++
 # Needed for search provider. It should not be needed in my opinion,
 # we have to take this up with upstream, or just provide search
 # provider interface definition file as source.
-BuildRequires:  docbook-xsl-stylesheets
-BuildRequires:  gcc-c++
 BuildRequires:  gnome-shell
 BuildRequires:  meson
 BuildRequires:  pkgconfig

++++++ 9a168cc23962ce9fa106dc8a40407d381a3db403.patch ++++++
>From 9a168cc23962ce9fa106dc8a40407d381a3db403 Mon Sep 17 00:00:00 2001
From: Christian Persch <[email protected]>
Date: Fri, 14 Jan 2022 11:33:32 +0100
Subject: [PATCH] build: Fix for newer meson

---
 data/meson.build | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/data/meson.build b/data/meson.build
index 79d97e5b..e0bcbb91 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -18,7 +18,6 @@
 metainfodir = gt_datadir / 'metainfo'
 
 i18n.merge_file(
-  gt_dns_name + '.metainfo.xml',
   input: gt_dns_name + '.metainfo.xml.in',
   output: '@BASENAME@',
   po_dir: po_dir,
@@ -27,7 +26,6 @@ i18n.merge_file(
 )
 
 i18n.merge_file(
-  gt_dns_name + '.Nautilus.metainfo.xml',
   input: gt_dns_name + '.Nautilus.metainfo.xml.in',
   output: '@BASENAME@',
   po_dir: po_dir,
@@ -40,7 +38,6 @@ i18n.merge_file(
 desktopdatadir = gt_datadir / 'applications'
 
 i18n.merge_file(
-  gt_dns_name + '.desktop',
   input: gt_dns_name + '.desktop.in',
   output: '@BASENAME@',
   type: 'desktop',
@@ -57,4 +54,4 @@ meson.add_install_script(
 
 # Subdirs
 
-subdir('icons')
\ No newline at end of file
+subdir('icons')
-- 
GitLab

Reply via email to