Accepting request 818346 from devel:tools:building

OBS-URL: https://build.opensuse.org/request/show/818346
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/meson?expand=0&rev=61

meson-fix-gnome-test.patch

@@ -0,0 +1,32 @@
+From 5157ef0f2c8ca4074d91e345b53abe60f014b543 Mon Sep 17 00:00:00 2001
+From: Mike Gorse <mgorse@suse.com>
+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
+

meson.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun 26 16:51:35 UTC 2020 - Michael Gorse <mgorse@suse.com>
+
+- Add meson-fix-gnome-test.patch: fix GNOME test that sometimes
+  fails (bsc#1173025).
+
 -------------------------------------------------------------------
 Tue Jun 16 08:09:40 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
 

meson.spec

@@ -49,6 +49,8 @@ Patch3:         meson-suse-fix-llvm-3.8.patch
 Patch4:         meson-fix-gcc48.patch
 # PATCH-FEATURE-OPENSUSE meson-distutils.patch tchvatal@suse.com -- build and install using distutils instead of full setuptools
 Patch5:         meson-distutils.patch
+# PATCH-FIX-UPSTREAM meson-fix-gnome-test.patch bsc#1173025 mgorse@suse.com -- 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 @@ This package provides support for meson.build files in Vim.
 %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" \