[arch-commits] Commit in libmusicbrainz5/repos/extra-x86_64 (3 files)

[Jan Steffens]

    Date: Saturday, May 30, 2020 @ 21:59:09
  Author: heftig
Revision: 387937

archrelease: copy trunk to extra-x86_64

Added:
  libmusicbrainz5/repos/extra-x86_64/16.patch
    (from rev 387935, libmusicbrainz5/trunk/16.patch)
  libmusicbrainz5/repos/extra-x86_64/PKGBUILD
    (from rev 387936, libmusicbrainz5/trunk/PKGBUILD)
Deleted:
  libmusicbrainz5/repos/extra-x86_64/PKGBUILD

----------+
 16.patch |   24 ++++++++++++++++++++++
 PKGBUILD |   66 ++++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 59 insertions(+), 31 deletions(-)

Copied: libmusicbrainz5/repos/extra-x86_64/16.patch (from rev 387935, libmusicbrainz5/trunk/16.patch)
===================================================================
--- 16.patch	                        (rev 0)
+++ 16.patch	2020-05-30 21:59:09 UTC (rev 387937)
@@ -0,0 +1,24 @@
+From 36262d60fe92fe7a2c9bfb40e736bfcd29a6c3bd Mon Sep 17 00:00:00 2001
+From: Abderrahim Kitouni <a.kitouni at gmail.com>
+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(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 68c04e3..f7439d3 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -37,7 +37,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)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-30 21:59:06 UTC (rev 387936)
+++ PKGBUILD	2020-05-30 21:59:09 UTC (rev 387937)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=libmusicbrainz5
-pkgver=5.1.0
-pkgrel=3
-pkgdesc="Library That Provides Access to the MusicBrainz Server"
-arch=('x86_64')
-url='https://musicbrainz.org/doc/libmusicbrainz'
-license=('LGPL2.1')
-depends=('neon' 'libxml2')
-makedepends=('cmake')
-source=("https://github.com/metabrainz/libmusicbrainz/releases/download/release-${pkgver}/libmusicbrainz-$pkgver.tar.gz")
-sha256sums=('6749259e89bbb273f3f5ad7acdffb7c47a2cf8fcaeab4c4695484cef5f4c6b46')
-
-prepare() {
-  mkdir build
-}
-
-build() {
-  cd build
-  cmake ../libmusicbrainz-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: libmusicbrainz5/repos/extra-x86_64/PKGBUILD (from rev 387936, libmusicbrainz5/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-30 21:59:09 UTC (rev 387937)
@@ -0,0 +1,35 @@
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=libmusicbrainz5
+pkgver=5.1.0
+pkgrel=4
+pkgdesc="Library That Provides Access to the MusicBrainz Server"
+arch=('x86_64')
+url='https://musicbrainz.org/doc/libmusicbrainz'
+license=('LGPL2.1')
+depends=('neon' 'libxml2')
+makedepends=('cmake')
+source=("https://github.com/metabrainz/libmusicbrainz/releases/download/release-${pkgver}/libmusicbrainz-$pkgver.tar.gz"
+        16.patch)
+sha256sums=('6749259e89bbb273f3f5ad7acdffb7c47a2cf8fcaeab4c4695484cef5f4c6b46'
+            '5ad7e45b191cceca3bb71c92adb6c767ae8079bf2814354341fae829d4328ae9')
+
+prepare() {
+  cd libmusicbrainz-$pkgver
+
+  # https://github.com/metabrainz/libmusicbrainz/pull/16
+  patch -Np1 -i ../16.patch
+}
+
+build() {
+  CFLAGS+=" $CPPFLAGS"
+  CXXFLAGS+=" $CPPFLAGS"
+  cmake -Hlibmusicbrainz-$pkgver -Bbuild \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=None
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --build build --target install
+}