Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package glade for openSUSE:Factory checked 
in at 2022-02-06 23:53:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/glade (Old)
 and      /work/SRC/openSUSE:Factory/.glade.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "glade"

Sun Feb  6 23:53:50 2022 rev:43 rq:951427 version:3.38.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/glade/glade.changes      2021-12-16 
21:20:21.146544987 +0100
+++ /work/SRC/openSUSE:Factory/.glade.new.1898/glade.changes    2022-02-06 
23:54:50.894592673 +0100
@@ -1,0 +2,5 @@
+Wed Feb  2 11:35:49 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com>
+
+- Add 117.patch: Fix build with meson 0.61.0 and newer.
+
+-------------------------------------------------------------------

New:
----
  117.patch

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

Other differences:
------------------
++++++ glade.spec ++++++
--- /var/tmp/diff_new_pack.4HOa8n/_old  2022-02-06 23:54:51.378589400 +0100
+++ /var/tmp/diff_new_pack.4HOa8n/_new  2022-02-06 23:54:51.382589373 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package glade
 #
-# 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
@@ -28,6 +28,8 @@
 Source0:        
https://download.gnome.org/sources/glade/3.38/%{name}-%{version}.tar.xz
 # PATCH-FIX-UPSTREAM 9db1fba1fa93905c9169c1e29049e4b2f6337c39.patch -- 
GladeProject: Segfault in gnome-builder when widget doesn't have a name
 Patch0:         
https://gitlab.gnome.org/GNOME/glade/-/commit/9db1fba1fa93905c9169c1e29049e4b2f6337c39.patch
+# PATCH-FIX-UPSTREAM  117.patch -- Fix build with meson 0.61.0 and newer
+Patch1:         https://gitlab.gnome.org/GNOME/glade/-/merge_requests/117.patch
 
 BuildRequires:  fdupes
 BuildRequires:  gobject-introspection-devel

++++++ 117.patch ++++++
>From 61304b2e8bac8ded76643cb7c3e781f73881dd2b Mon Sep 17 00:00:00 2001
From: Mike Gilbert <flop...@gentoo.org>
Date: Thu, 20 Jan 2022 14:18:09 -0500
Subject: [PATCH 1/2] meson: i18n.merge_file() does not take a positional
 argument

---
 data/meson.build | 2 --
 1 file changed, 2 deletions(-)

diff --git a/data/meson.build b/data/meson.build
index 9f244566..bfbc514c 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -2,7 +2,6 @@ desktop_conf = configuration_data()
 desktop_conf.set('VERSION', glade_version)
 
 i18n.merge_file(
-  'desktop',
   type: 'desktop',
   input: configure_file(
     input: 'org.gnome.Glade.desktop.in.in',
@@ -18,7 +17,6 @@ i18n.merge_file(
 appdata = glade_name + '.appdata.xml'
 
 i18n.merge_file(
-  'appdata',
   input: 'org.gnome.Glade.appdata.xml.in',
   output: '@BASENAME@',
   po_dir: po_dir,
-- 
GitLab


>From 04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb Mon Sep 17 00:00:00 2001
From: Mike Gilbert <flop...@gentoo.org>
Date: Thu, 20 Jan 2022 14:19:03 -0500
Subject: [PATCH 2/2] Remove duplicate entry for 'da' from help/LINGUAS

---
 help/LINGUAS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/help/LINGUAS b/help/LINGUAS
index fc3cd4c3..d67e42c8 100644
--- a/help/LINGUAS
+++ b/help/LINGUAS
@@ -1,6 +1,5 @@
 # please keep this list sorted alphabetically
 #
-da
 bg
 ca
 cs
-- 
GitLab

Reply via email to