Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

graphics/ImageMagick6: don't append version extras twice #71

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions graphics/ImageMagick6/distinfo
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@ SHA1 (ImageMagick-6.9.11-7.tar.xz) = f47291d0100b5c30d2294aaca2dc4cd297f8d6dd
RMD160 (ImageMagick-6.9.11-7.tar.xz) = 4e4df5aa941906519bec04324d2928144e1bd244
SHA512 (ImageMagick-6.9.11-7.tar.xz) = 7eb169679846ae18cc16fbf66d3e5903f4ad38373a4e24c1219fab7a5fe323afd60bd1c540c75931c069116ea8367a89d25c68283276dbfeda67cc4d601b2888
Size (ImageMagick-6.9.11-7.tar.xz) = 9075300 bytes
SHA1 (patch-Magick++_lib_Magick++.pc.in) = 6842e28fbfe54641b975fd1b79dd42b0c3494be5
SHA1 (patch-Makefile.in) = bb747b5e062f2a59e307289b5b33861dd5f96ab0
SHA1 (patch-config_policy.xml) = 2c446a00fc00f85ab33eae0691d4d8989a46289f
SHA1 (patch-wand_MagickWand.pc.in) = 50e1b64a0f6ec256471922b00f994c6e8ff66a6f
13 changes: 13 additions & 0 deletions graphics/ImageMagick6/patches/patch-Magick++_lib_Magick++.pc.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
$NetBSD$

--- Magick++/lib/Magick++.pc.in.orig 2020-04-19 01:03:03.000000000 +0000
+++ Magick++/lib/Magick++.pc.in
@@ -8,7 +8,7 @@ libname=Magick++-@MAGICK_MAJOR_VERSION@.
Name: Magick++
Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
Version: @PACKAGE_VERSION@
-Requires: MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
+Requires: MagickWand
Libs: -L${libdir} -l${libname}
Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
13 changes: 13 additions & 0 deletions graphics/ImageMagick6/patches/patch-wand_MagickWand.pc.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
$NetBSD$

--- wand/MagickWand.pc.in.orig 2020-04-19 01:03:03.000000000 +0000
+++ wand/MagickWand.pc.in
@@ -9,7 +9,7 @@ Name: MagickWand
Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
URL: https://github.com/ImageMagick/ImageMagick6
Version: @PACKAGE_VERSION@
-Requires: MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
+Requires: MagickCore
Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
Libs: -L${libdir} -l${libname}
Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@