Hello community, here is the log from the commit of package meson for openSUSE:Factory checked in at 2020-07-06 16:12:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meson (Old) and /work/SRC/openSUSE:Factory/.meson.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "meson" Mon Jul 6 16:12:38 2020 rev:61 rq:818346 version:0.54.3 Changes: -------- --- /work/SRC/openSUSE:Factory/meson/meson.changes 2020-06-18 10:35:43.330275495 +0200 +++ /work/SRC/openSUSE:Factory/.meson.new.3060/meson.changes 2020-07-06 16:12:53.308139143 +0200 @@ -1,0 +2,6 @@ +Fri Jun 26 16:51:35 UTC 2020 - Michael Gorse <[email protected]> + +- Add meson-fix-gnome-test.patch: fix GNOME test that sometimes + fails (bsc#1173025). + +------------------------------------------------------------------- New: ---- meson-fix-gnome-test.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meson.spec ++++++ --- /var/tmp/diff_new_pack.sSNXOf/_old 2020-07-06 16:12:55.420145619 +0200 +++ /var/tmp/diff_new_pack.sSNXOf/_new 2020-07-06 16:12:55.424145630 +0200 @@ -49,6 +49,8 @@ Patch4: meson-fix-gcc48.patch # PATCH-FEATURE-OPENSUSE meson-distutils.patch [email protected] -- build and install using distutils instead of full setuptools Patch5: meson-distutils.patch +# PATCH-FIX-UPSTREAM meson-fix-gnome-test.patch bsc#1173025 [email protected] -- fix GNOME test that sometimes fails. +Patch6: meson-fix-gnome-test.patch BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-base @@ -173,6 +175,7 @@ %if !%{with setuptools} %patch5 -p1 %endif +%patch6 -p1 # We do not have gmock available at this moment - can't run the test suite for it rm -r "test cases/frameworks/3 gmock" \ ++++++ meson-fix-gnome-test.patch ++++++ >From 5157ef0f2c8ca4074d91e345b53abe60f014b543 Mon Sep 17 00:00:00 2001 From: Mike Gorse <[email protected]> Date: Fri, 26 Jun 2020 11:45:30 -0500 Subject: [PATCH] test: fix enum generation for GNOME Fixes: #7252 --- test cases/frameworks/7 gnome/mkenums/meson.build | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test cases/frameworks/7 gnome/mkenums/meson.build b/test cases/frameworks/7 gnome/mkenums/meson.build index af4a9017e..3d7adf052 100644 --- a/test cases/frameworks/7 gnome/mkenums/meson.build +++ b/test cases/frameworks/7 gnome/mkenums/meson.build @@ -126,6 +126,14 @@ enums5 = gnome.mkenums_simple('enums5', sources : 'meson-sample.h', install_header : true, decorator : 'MESON_EXPORT', header_prefix : '#include "meson-decls.h"') + +conf = configuration_data() +conf.set('ENUM_FILE', 'enums5.h') +main = configure_file( + input : 'main.c', + output : 'main5.c', + configuration : conf) + enumexe5 = executable('enumprog5', main, enums5, dependencies : gobj) # Generate template then use as input to mkenums -- 2.27.0
