Accepting request 683886 from GNOME:Next

- Fixup meson-suse-ify-macros.patch post broken rebase.

OBS-URL: https://build.opensuse.org/request/show/683886
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=132
This commit is contained in:
Dominique Leuenberger 2019-03-11 13:12:59 +00:00 committed by Git OBS Bridge
parent 3aaf786ea6
commit 075d38a7f2
3 changed files with 12 additions and 3 deletions

View File

@ -2,8 +2,12 @@ Index: meson-0.50.0/data/macros.meson
=================================================================== ===================================================================
--- meson-0.50.0.orig/data/macros.meson --- meson-0.50.0.orig/data/macros.meson
+++ meson-0.50.0/data/macros.meson +++ meson-0.50.0/data/macros.meson
@@ -3,7 +3,11 @@ @@ -1,9 +1,15 @@
%__meson %{_bindir}/meson
%__meson_wrap_mode nodownload
%__meson_auto_features enabled %__meson_auto_features enabled
+%_vpath_srcdir .
+%_vpath_builddir build
%meson \ %meson \
- %set_build_flags \ - %set_build_flags \
@ -15,7 +19,7 @@ Index: meson-0.50.0/data/macros.meson
%{shrink:%{__meson} \ %{shrink:%{__meson} \
--buildtype=plain \ --buildtype=plain \
--prefix=%{_prefix} \ --prefix=%{_prefix} \
@@ -25,10 +29,13 @@ @@ -25,10 +31,13 @@
%{nil}} %{nil}}
%meson_build \ %meson_build \

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Mar 11 12:30:24 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
- Fixup meson-suse-ify-macros.patch post broken rebase.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Mar 10 18:57:41 UTC 2019 - klaatu <aloisio@gmx.com> Sun Mar 10 18:57:41 UTC 2019 - klaatu <aloisio@gmx.com>

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #