Hello community,
here is the log from the commit of package libmusicbrainz5 for openSUSE:Factory
checked in at 2020-03-31 17:31:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libmusicbrainz5 (Old)
and /work/SRC/openSUSE:Factory/.libmusicbrainz5.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmusicbrainz5"
Tue Mar 31 17:31:51 2020 rev:9 rq:788985 version:5.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libmusicbrainz5/libmusicbrainz5.changes
2018-09-26 14:53:28.931101557 +0200
+++
/work/SRC/openSUSE:Factory/.libmusicbrainz5.new.3160/libmusicbrainz5.changes
2020-03-31 17:31:57.084250160 +0200
@@ -1,0 +2,6 @@
+Fri Mar 27 10:57:12 UTC 2020 - Dominique Leuenberger <[email protected]>
+
+- Add musicbrainz-cmake-noglob.patch: do not use wildcards for
+ dependencies. Fixes build when using ninja.
+
+-------------------------------------------------------------------
New:
----
musicbrainz-cmake-noglob.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libmusicbrainz5.spec ++++++
--- /var/tmp/diff_new_pack.xnNffG/_old 2020-03-31 17:31:57.876250623 +0200
+++ /var/tmp/diff_new_pack.xnNffG/_new 2020-03-31 17:31:57.876250623 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libmusicbrainz5
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,8 @@
URL: http://musicbrainz.org/doc/libmusicbrainz
Source0:
https://github.com/metabrainz/libmusicbrainz/releases/download/release-%{version}/%{_name}-%{version}.tar.gz
Source1: baselibs.conf
+# PATCH-FIX-UPSTREAM musicbrainz-cmake-noglob.patch [email protected] -- do
not use wildcards for dependencies
+Patch0: musicbrainz-cmake-noglob.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: neon-devel
@@ -58,7 +60,7 @@
download metadata about the music they are playing.
%prep
-%setup -q -n %{_name}-%{version}
+%autosetup -n %{_name}-%{version} -p1
%build
CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64"
++++++ musicbrainz-cmake-noglob.patch ++++++
>From 36262d60fe92fe7a2c9bfb40e736bfcd29a6c3bd Mon Sep 17 00:00:00 2001
From: Abderrahim Kitouni <[email protected]>
Date: Fri, 13 Apr 2018 09:56:57 +0100
Subject: [PATCH] src/CMakelists.txt: do not use wildcards for dependencies
This is discouraged by cmake's documentation and doesn't work with the ninja
generator.
---
src/CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: libmusicbrainz-5.1.0/src/CMakeLists.txt
===================================================================
--- libmusicbrainz-5.1.0.orig/src/CMakeLists.txt
+++ libmusicbrainz-5.1.0/src/CMakeLists.txt
@@ -36,7 +36,8 @@ ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.cc
${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h
${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h
COMMAND make-c-interface ${CMAKE_CURRENT_SOURCE_DIR} cinterface.xml
${CMAKE_CURRENT_BINARY_DIR} mb5_c.cc mb5_c.h
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h
${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h
- DEPENDS make-c-interface cinterface.xml *.inc
+ DEPENDS make-c-interface cinterface.xml c-int-medium-defines.inc
c-int-query-source.inc c-int-source-funcs.inc
+ c-int-medium-source.inc c-int-release-defines.inc
c-int-query-defines.inc c-int-release-source.inc
)
ADD_CUSTOM_TARGET(src_gen DEPENDS mb5_c.h)
