Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cinnamon for openSUSE:Factory
checked in at 2022-03-02 21:12:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon (Old)
and /work/SRC/openSUSE:Factory/.cinnamon.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon"
Wed Mar 2 21:12:01 2022 rev:56 rq:958506 version:5.2.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/cinnamon/cinnamon.changes 2022-01-10
23:53:02.964775206 +0100
+++ /work/SRC/openSUSE:Factory/.cinnamon.new.1958/cinnamon.changes
2022-03-02 21:12:02.586663340 +0100
@@ -1,0 +2,6 @@
+Wed Mar 2 16:10:19 UTC 2022 - Dominique Leuenberger <dims...@opensuse.org>
+
+- Add cinnamon-meson-0.61.patch: Fix build using meson 0.61, which
+ became stricter about the used syntax.
+
+-------------------------------------------------------------------
New:
----
cinnamon-meson-0.61.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon.spec ++++++
--- /var/tmp/diff_new_pack.dRDnCV/_old 2022-03-02 21:12:03.614663361 +0100
+++ /var/tmp/diff_new_pack.dRDnCV/_new 2022-03-02 21:12:03.622663361 +0100
@@ -40,6 +40,8 @@
# For gnome-background-properties.
# PATCH-FIX-OPENSUSE support_yast_settings.patch shenlebantongy...@gmail.com
gh#linuxmint/cinnamon#9590 -- Fix cinnamon-settings cannot invoke YaST commands.
Patch8: support_yast_settings.patch
+# PATCH-FIX-UPSTREAM cinnamon-meson-0.61.patch -- Fix build using meson 0.61
+Patch9: cinnamon-meson-0.61.patch
BuildRequires: cmake
BuildRequires: desktop-data-openSUSE-extra
BuildRequires: fdupes
@@ -139,7 +141,9 @@
Summary: GNU/Linux Desktop featuring a traditional layout -- GSchemas
Group: System/Libraries
Requires: %{name}-gschemas-branding = %{version}
+%if 0%{?suse_version} < 1500
%glib2_gsettings_schema_requires
+%endif
%description gschemas
This package provides GSettings schemas for
@@ -174,6 +178,7 @@
%patch4 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
cp -a %{SOURCE1} .
for file in files%{_datadir}/%{name}/%{name}-settings/bin/*.py
files%{_datadir}/%{name}/%{name}-looking-glass/*.py \
++++++ cinnamon-meson-0.61.patch ++++++
>From aac7baf119dc48b685aefb3438e5ba3e61c8cb09 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwa...@archlinux.org>
Date: Thu, 3 Feb 2022 09:11:39 -0500
Subject: [PATCH] Revert "build: disable gir install via list to pacify meson
>= 0.60.2 (#10489)" (#10596)
This reverts commit 8fc2df08b40aa3e1958ed2fde853c50676d8cf48.
This commit was wrong, because it tried to work around a bug in a single
version of meson by using something that isn't, wasn't, and won't be a
valid value.
The fixed version of meson 0.60.x has been out for a while now, which
once again accepts `false`, and 0.61.0 also accepts `false` but was
known at the time of this workaround to not work in meson-git master
(now meson 0.61.0).
Using `false` is acceptable and the failure to accept it has been
qualified as a meson regression. Using `[false]` is just... trying to
fuzz meson with random objects until you get something that slips its
way through the argument checker and produces desired effects on the
python implementation level.
---
src/meson.build | 2 +-
src/st/meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/meson.build b/src/meson.build
index 7999c0a67b..34b130d50f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -196,7 +196,7 @@ cinnamon_gir = gnome.generate_gir(
includes: cinnamon_gir_includes,
install: true,
install_dir_typelib: pkglibdir,
- install_dir_gir: [false],
+ install_dir_gir: false,
extra_args: [
'-DST_COMPILATION',
'--quiet',
diff --git a/src/st/meson.build b/src/st/meson.build
index d299727d06..ec7d7b30a1 100644
--- a/src/st/meson.build
+++ b/src/st/meson.build
@@ -213,7 +213,7 @@ st_gir = gnome.generate_gir(
includes: st_gir_includes,
install: true,
install_dir_typelib: pkglibdir,
- install_dir_gir: [false],
+ install_dir_gir: false,
extra_args: [
'-DST_COMPILATION',
'--quiet',
