Hello community, here is the log from the commit of package budgie-desktop for openSUSE:Factory checked in at 2017-12-03 10:13:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/budgie-desktop (Old) and /work/SRC/openSUSE:Factory/.budgie-desktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "budgie-desktop" Sun Dec 3 10:13:18 2017 rev:6 rq:547494 version:10.4 Changes: -------- --- /work/SRC/openSUSE:Factory/budgie-desktop/budgie-desktop.changes 2017-09-20 17:09:41.398901964 +0200 +++ /work/SRC/openSUSE:Factory/.budgie-desktop.new/budgie-desktop.changes 2017-12-03 10:13:18.847222795 +0100 @@ -1,0 +2,6 @@ +Thu Nov 30 02:35:20 UTC 2017 - [email protected] + +- Add fix-meson-build.patch: fixes gvc subproject sandbox issue + with Meson 0.43.0 + +------------------------------------------------------------------- New: ---- fix-meson-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ budgie-desktop.spec ++++++ --- /var/tmp/diff_new_pack.nQvOvb/_old 2017-12-03 10:13:19.463200400 +0100 +++ /var/tmp/diff_new_pack.nQvOvb/_new 2017-12-03 10:13:19.463200400 +0100 @@ -21,10 +21,13 @@ Version: 10.4 Release: 0 Summary: GTK3 Desktop Environment -License: GPL-2.0+ and LGPL-2.1 +License: GPL-2.0+ AND LGPL-2.1 Group: System/GUI/Other Url: https://solus-project.com/budgie/ Source: https://github.com/budgie-desktop/budgie-desktop/releases/download/v%{version}/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM: temp patch for sandbox changes in Meson 0.43.0. +# Proper fix is in upstream master (gh#budgie-desktop/budgie-desktop#1194). +Patch0: fix-meson-build.patch BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: meson >= 0.41.2 @@ -118,6 +121,8 @@ %prep %setup -q +%patch0 -p1 +cp -r src/gvc subprojects %build %meson ++++++ fix-meson-build.patch ++++++ Index: budgie-desktop-10.4/subprojects/gvc/meson.build =================================================================== --- budgie-desktop-10.4.orig/subprojects/gvc/meson.build +++ budgie-desktop-10.4/subprojects/gvc/meson.build @@ -15,17 +15,17 @@ libgvc_deps = [ ] libgvc_sources = [ - '../../src/gvc/gvc-channel-map.c', - '../../src/gvc/gvc-mixer-card.c', - '../../src/gvc/gvc-mixer-control.c', - '../../src/gvc/gvc-mixer-event-role.c', - '../../src/gvc/gvc-mixer-sink.c', - '../../src/gvc/gvc-mixer-sink-input.c', - '../../src/gvc/gvc-mixer-source.c', - '../../src/gvc/gvc-mixer-source-output.c', - '../../src/gvc/gvc-mixer-stream.c', - '../../src/gvc/gvc-mixer-ui-device.c', - '../../src/gvc/test-audio-device-selection.c', + 'gvc-channel-map.c', + 'gvc-mixer-card.c', + 'gvc-mixer-control.c', + 'gvc-mixer-event-role.c', + 'gvc-mixer-sink.c', + 'gvc-mixer-sink-input.c', + 'gvc-mixer-source.c', + 'gvc-mixer-source-output.c', + 'gvc-mixer-stream.c', + 'gvc-mixer-ui-device.c', + 'test-audio-device-selection.c', ] libgvc = static_library( @@ -35,7 +35,6 @@ libgvc = static_library( include_directories: [ include_directories('.'), include_directories(join_paths('..', '..')), - include_directories(join_paths('..', '..', 'src', 'gvc')), ], c_args: [ '-DG_LOG_DOMAIN="Gvc"', @@ -51,6 +50,5 @@ link_libgvc = declare_dependency( include_directories: [ include_directories('.'), include_directories(join_paths('..', '..')), - include_directories(join_paths('..', '..', 'src', 'gvc')), ], )
