Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] ImageMagick: update to 6.9.11-61.
@ 2021-02-08 20:20 jnbr
  2021-02-12 20:02 ` [PR PATCH] [Merged]: " jnbr
  0 siblings, 1 reply; 2+ messages in thread
From: jnbr @ 2021-02-08 20:20 UTC (permalink / raw)
  To: ml

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

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

https://github.com/jnbr/void-packages im
https://github.com/void-linux/void-packages/pull/28596

ImageMagick: update to 6.9.11-61.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR



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

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

From c0dc5e9a978f5e19041a90110751457844a2e6e4 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sun, 7 Feb 2021 10:07:59 +0000
Subject: [PATCH 1/3] ImageMagick: update to 6.9.11-61.

---
 common/shlibs                 | 4 ++--
 srcpkgs/ImageMagick6/template | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9c7ca7b2c51..ae3b27ee294 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -338,8 +338,8 @@ libgsf-1.so.114 libgsf-1.14.11_1
 libMagickCore-7.Q16HDRI.so.8 libmagick-7.0.10.37_1
 libMagickWand-7.Q16HDRI.so.8 libmagick-7.0.10.37_1
 libMagick++-7.Q16HDRI.so.4 libmagick-7.0.9.1_1
-libMagickCore-6.Q16.so.6 libmagick6-6.9.10.11_1
-libMagickWand-6.Q16.so.6 libmagick6-6.9.10.11_1
+libMagickCore-6.Q16.so.7 libmagick6-6.9.11.61_1
+libMagickWand-6.Q16.so.7 libmagick6-6.9.11.61_1
 libMagick++-6.Q16.so.8 libmagick6-6.9.10.11_1
 libltdl.so.7 libltdl-2.2.6_1
 libpoppler.so.102 libpoppler102-20.09.0_1
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
index d55964fb7bd..578d3843b2f 100644
--- a/srcpkgs/ImageMagick6/template
+++ b/srcpkgs/ImageMagick6/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick6'
 pkgname=ImageMagick6
 _majorver=6.9.11
-_patchver=57
+_patchver=61
 version="${_majorver}.${_patchver}"
 revision=1
 wrksrc="${pkgname}-${_majorver}-${_patchver}"
@@ -20,7 +20,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=bfa17b29fad92a859381d5e896ebb95f5212202fa345a534c70ba5150f94f896
+checksum=8621f619c5c9ce1bf7260c8fc8fa01a7414079cf7b0777a9b0a048a22c85647a
 
 keep_libtool_archives=yes
 conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
@@ -40,11 +40,6 @@ pre_configure() {
 	autoreconf -if
 }
 
-post_configure() {
-	sed -i '/VERSION/s/6\.9A/6.99/g' version.sh PerlMagick/Makefile.PL \
-		PerlMagick/*/Makefile.PL PerlMagick/quantum/quantum.pm
-}
-
 do_check() {
 	# Disable failing checks
 	sed -i '/validate-formats/d' Makefile

From a0bcc015357ab0d64e452e3fa47b6d16c9b46fa9 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sun, 7 Feb 2021 10:09:37 +0000
Subject: [PATCH 2/3] psiconv: rebuild for ImageMagick-6.9.11-61

---
 srcpkgs/psiconv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
index 6fdeb09ed74..1e574d489dc 100644
--- a/srcpkgs/psiconv/template
+++ b/srcpkgs/psiconv/template
@@ -1,7 +1,7 @@
 # Template file for 'psiconv'
 pkgname=psiconv
 version=0.9.9
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-xhtml-docs"
 hostmakedepends="pkg-config libmagick6-devel"

From 95495613f55ea2b56c3421617174e4684303246e Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sun, 7 Feb 2021 10:10:05 +0000
Subject: [PATCH 3/3] ripright: rebuild for ImageMagick-6.9.11-61

---
 srcpkgs/ripright/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index 09ec16a15d5..d44f96166e1 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,7 +1,7 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: ImageMagick: update to 6.9.11-61.
  2021-02-08 20:20 [PR PATCH] ImageMagick: update to 6.9.11-61 jnbr
@ 2021-02-12 20:02 ` jnbr
  0 siblings, 0 replies; 2+ messages in thread
From: jnbr @ 2021-02-12 20:02 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

ImageMagick: update to 6.9.11-61.
https://github.com/void-linux/void-packages/pull/28596

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-02-12 20:02 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-08 20:20 [PR PATCH] ImageMagick: update to 6.9.11-61 jnbr
2021-02-12 20:02 ` [PR PATCH] [Merged]: " jnbr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).