[PR PATCH] ripright: build with imagemagick7

[paper42 <paper42@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages ripright-im7
https://github.com/void-linux/void-packages/pull/32418

ripright: build with imagemagick7
@jcgruenhage could you test this?

A patch file from https://github.com/void-linux/void-packages/pull/32418.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ripright-im7-32418.patch --]
[-- Type: text/x-diff, Size: 2404 bytes --]

From 0303e924ad13eb2592c5bd4b4cd3319fd72757d2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 3 Jul 2021 12:04:04 +0200
Subject: [PATCH] ripright: build with imagemagick7

---
 srcpkgs/ripright/patches/imagemagick7.patch | 22 +++++++++++++++++++++
 srcpkgs/ripright/template                   | 14 ++++++++-----
 2 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/ripright/patches/imagemagick7.patch

diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
new file mode 100644
index 000000000000..756744d1a951
--- /dev/null
+++ b/srcpkgs/ripright/patches/imagemagick7.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+ PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
+-PKG_CHECK_MODULES([MagickWand], [Wand])
++PKG_CHECK_MODULES([MagickWand], [MagickWand])
+ PKG_CHECK_MODULES([libcurl], [libcurl])
+ PKG_CHECK_MODULES([libdiscid], [libdiscid])
+ AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
+--- a/src/art.c
++++ b/src/art.c
+@@ -24,7 +24,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index d44f96166e18..fcdec80435b4 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,13 +1,17 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config autoconf automake"
+makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="http://www.mcternan.me.uk/ripright/"
-distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="https://www.mcternan.me.uk/ripright/"
+distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
+
+pre_configure() {
+	autoreconf -fi
+}