[PR PATCH] ImageMagick: update to 7.1.0.41.

[PR PATCH] ImageMagick: update to 7.1.0.41.

[MouadCharradi]

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

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

https://github.com/MouadCharradi/void-packages ImageMagick
https://github.com/void-linux/void-packages/pull/37918

ImageMagick: update to 7.1.0.41.
#### Testing the changes
- I tested the changes in this PR: **briefly**


#### Local build testing
- I built this PR locally for my native architecture, x86_64, glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
  - armv7l


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

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

From 1da65e06468bd080dd33ae1bff3a09a494fad41e Mon Sep 17 00:00:00 2001
From: MouadCharradi <charradimouad58@gmail.com>
Date: Thu, 7 Jul 2022 22:38:33 +0100
Subject: [PATCH] ImageMagick: update to 7.1.0.41.

---
 srcpkgs/ImageMagick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 2b8b46987632..ea3983e5e553 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,6 +1,6 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
-version=7.1.0.27
+version=7.1.0.41
 revision=1
 _majorver=${version%.*}
 _patchver=${version##*.}
@@ -20,7 +20,7 @@ license="ImageMagick"
 homepage="https://www.imagemagick.org"
 changelog="https://imagemagick.org/script/changelog.php"
 distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=e0db0cf0d8cb93be9793f6b6ec3dac91194a753b809ff2cfca8b8ffb4072d63c
+checksum=f8ec06b5c82cbab4734b166b820f151323c78f438580daa176cedc63990c00a2
 
 subpackages="libmagick libmagick-devel"
 

Re: [PR PATCH] [Updated] ImageMagick: update to 7.1.0.41.

[MouadCharradi]

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

There is an updated pull request by MouadCharradi against master on the void-packages repository

https://github.com/MouadCharradi/void-packages ImageMagick
https://github.com/void-linux/void-packages/pull/37918

ImageMagick: update to 7.1.0.41.
#### Testing the changes
- I tested the changes in this PR: **briefly**


#### Local build testing
- I built this PR locally for my native architecture, x86_64, glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
  - armv7l


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

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

From 1da65e06468bd080dd33ae1bff3a09a494fad41e Mon Sep 17 00:00:00 2001
From: MouadCharradi <charradimouad58@gmail.com>
Date: Thu, 7 Jul 2022 22:38:33 +0100
Subject: [PATCH 1/2] ImageMagick: update to 7.1.0.41.

---
 srcpkgs/ImageMagick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 2b8b46987632..ea3983e5e553 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,6 +1,6 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
-version=7.1.0.27
+version=7.1.0.41
 revision=1
 _majorver=${version%.*}
 _patchver=${version##*.}
@@ -20,7 +20,7 @@ license="ImageMagick"
 homepage="https://www.imagemagick.org"
 changelog="https://imagemagick.org/script/changelog.php"
 distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=e0db0cf0d8cb93be9793f6b6ec3dac91194a753b809ff2cfca8b8ffb4072d63c
+checksum=f8ec06b5c82cbab4734b166b820f151323c78f438580daa176cedc63990c00a2
 
 subpackages="libmagick libmagick-devel"
 

From 19c2591da4b12fd91c5e472fd52bc374e059e07a Mon Sep 17 00:00:00 2001
From: MouadCharradi <charradimouad58@gmail.com>
Date: Thu, 7 Jul 2022 23:33:11 +0100
Subject: [PATCH 2/2] Added braces around XBPS variables

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

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index ea3983e5e553..6d8159e6095a 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -41,7 +41,7 @@ pre_check() {
 
 post_install() {
 	if [ "$CROSS_BUILD" ]; then
-		vsed -i -e "s,$XBPS_WRAPPERDIR/$XBPS_CROSS_TRIPLET-,,g" \
+		vsed -i -e "s,${XBPS_WRAPPERDIR}/${XBPS_CROSS_TRIPLET}-,,g" \
 			$DESTDIR/usr/bin/*-config
 	fi
 	vlicense LICENSE

Re: ImageMagick: update to 7.1.0.41.

[jnbr]

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

New comment by jnbr on void-packages repository

https://github.com/void-linux/void-packages/pull/37918#issuecomment-1182548950

Comment:
it looks like something has changed and the sed should be changed to something like this:

```
@@ -41,7 +41,7 @@ pre_check() {
 
 post_install() {
        if [ "$CROSS_BUILD" ]; then
-               vsed -i -e "s,$XBPS_WRAPPERDIR/$XBPS_CROSS_TRIPLET-,,g" \
+               vsed -i -e "s,${XBPS_CROSS_TRIPLET}-,,g" \
                        $DESTDIR/usr/bin/*-config
        fi
        vlicense LICENSE
```
Can you please give it a try and squash your commits?
Thanks.

Re: [PR PATCH] [Updated] ImageMagick: update to 7.1.0.41.

[MouadCharradi]

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

There is an updated pull request by MouadCharradi against master on the void-packages repository

https://github.com/MouadCharradi/void-packages ImageMagick
https://github.com/void-linux/void-packages/pull/37918

ImageMagick: update to 7.1.0.41.
#### Testing the changes
- I tested the changes in this PR: **briefly**


#### Local build testing
- I built this PR locally for my native architecture, x86_64, glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
  - armv7l


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

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

From 1011c6540a19e154e9d7ca9f12a01e9584c1302d Mon Sep 17 00:00:00 2001
From: Mouad Charradi <charradimouad58@gmail.com>
Date: Wed, 13 Jul 2022 07:20:36 +0100
Subject: [PATCH] ImageMagick: update to 7.1.0.41.

---
 srcpkgs/ImageMagick/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 2b8b46987632..6e79ba6d03d5 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,6 +1,6 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
-version=7.1.0.27
+version=7.1.0.41
 revision=1
 _majorver=${version%.*}
 _patchver=${version##*.}
@@ -20,7 +20,7 @@ license="ImageMagick"
 homepage="https://www.imagemagick.org"
 changelog="https://imagemagick.org/script/changelog.php"
 distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=e0db0cf0d8cb93be9793f6b6ec3dac91194a753b809ff2cfca8b8ffb4072d63c
+checksum=f8ec06b5c82cbab4734b166b820f151323c78f438580daa176cedc63990c00a2
 
 subpackages="libmagick libmagick-devel"
 
@@ -41,7 +41,7 @@ pre_check() {
 
 post_install() {
 	if [ "$CROSS_BUILD" ]; then
-		vsed -i -e "s,$XBPS_WRAPPERDIR/$XBPS_CROSS_TRIPLET-,,g" \
+		vsed -i -e "s,{$XBPS_CROSS_TRIPLET}-,,g" \
 			$DESTDIR/usr/bin/*-config
 	fi
 	vlicense LICENSE

Re: ImageMagick: update to 7.1.0.41.

[MouadCharradi]

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

New comment by MouadCharradi on void-packages repository

https://github.com/void-linux/void-packages/pull/37918#issuecomment-1182822627

Comment:
Thank you for your suggestion, it actually fixed the problem that was showing up, but now it yields another problem.
I appreciate your help.
Thanks.

Re: ImageMagick: update to 7.1.0.41.

[MouadCharradi]

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

New comment by MouadCharradi on void-packages repository

https://github.com/void-linux/void-packages/pull/37918#issuecomment-1182822627

Comment:
Thank you for your suggestion, it actually fixed the problem that was showing up, but now it yields another problem.
When I try cross-compiling it on my machine, I don't see these errors, that's why I'm confused.
I appreciate your help.
Thanks.

Re: ImageMagick: update to 7.1.0.41.

[MouadCharradi]

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

New comment by MouadCharradi on void-packages repository

https://github.com/void-linux/void-packages/pull/37918#issuecomment-1182825021

Comment:
No wait, it's my fault, I think I made a mistake. Let me try again

Re: [PR PATCH] [Updated] ImageMagick: update to 7.1.0.41.

[MouadCharradi]

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

There is an updated pull request by MouadCharradi against master on the void-packages repository

https://github.com/MouadCharradi/void-packages ImageMagick
https://github.com/void-linux/void-packages/pull/37918

ImageMagick: update to 7.1.0.41.
#### Testing the changes
- I tested the changes in this PR: **briefly**


#### Local build testing
- I built this PR locally for my native architecture, x86_64, glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
  - armv7l


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

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

From dbbbc6a72b3f91fd86fba7725cbc2589eeb3c2e3 Mon Sep 17 00:00:00 2001
From: Mouad Charradi <charradimouad58@gmail.com>
Date: Wed, 13 Jul 2022 07:39:04 +0100
Subject: [PATCH] ImageMagick: update to 7.1.0.41.

---
 srcpkgs/ImageMagick/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 2b8b46987632..e8d27b8b92b1 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,6 +1,6 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
-version=7.1.0.27
+version=7.1.0.41
 revision=1
 _majorver=${version%.*}
 _patchver=${version##*.}
@@ -20,7 +20,7 @@ license="ImageMagick"
 homepage="https://www.imagemagick.org"
 changelog="https://imagemagick.org/script/changelog.php"
 distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=e0db0cf0d8cb93be9793f6b6ec3dac91194a753b809ff2cfca8b8ffb4072d63c
+checksum=f8ec06b5c82cbab4734b166b820f151323c78f438580daa176cedc63990c00a2
 
 subpackages="libmagick libmagick-devel"
 
@@ -41,7 +41,7 @@ pre_check() {
 
 post_install() {
 	if [ "$CROSS_BUILD" ]; then
-		vsed -i -e "s,$XBPS_WRAPPERDIR/$XBPS_CROSS_TRIPLET-,,g" \
+		vsed -i -e "s,${XBPS_CROSS_TRIPLET}-,,g" \
 			$DESTDIR/usr/bin/*-config
 	fi
 	vlicense LICENSE

Re: ImageMagick: update to 7.1.0.41.

[MouadCharradi]

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

New comment by MouadCharradi on void-packages repository

https://github.com/void-linux/void-packages/pull/37918#issuecomment-1182832760

Comment:
It worked, thank you very much.

Re: [PR PATCH] [Merged]: ImageMagick: update to 7.1.0.41.

[jnbr]

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

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

ImageMagick: update to 7.1.0.41.
https://github.com/void-linux/void-packages/pull/37918

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**


#### Local build testing
- I built this PR locally for my native architecture, x86_64, glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
  - armv7l