[PR PATCH] ImageMagick: update to 7.1.0.43.

[PR PATCH] ImageMagick: update to 7.1.0.43.

[MouadCharradi]

[-- Attachment #1: Type: text/plain, Size: 598 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/38054

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

#### 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


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

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

From 7061f299363c059b4b7b65e0e3ab036d8d031807 Mon Sep 17 00:00:00 2001
From: Mouad Charradi <charradimouad58@gmail.com>
Date: Thu, 14 Jul 2022 00:17:57 +0100
Subject: [PATCH] ImageMagick: update to 7.1.0.43.

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

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index e8d27b8b92b1..15f9d59993d6 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,10 +1,10 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
-version=7.1.0.41
+version=7.1.0.43
 revision=1
 _majorver=${version%.*}
 _patchver=${version##*.}
-wrksrc="${pkgname}-${_majorver}-${_patchver}"
+wrksrc="${pkgname}-${_majorver}.${_patchver}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib
  --with-rsvg --with-wmf --with-dejavu-font-dir=/usr/share/fonts/TTF
@@ -19,8 +19,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 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=f8ec06b5c82cbab4734b166b820f151323c78f438580daa176cedc63990c00a2
+distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_majorver}.${_patchver}.tar.gz"
+checksum=62eccb3e8c89acc66c2b10a2bea843b6659a2ddce275c7d2ffee8c34af6114fd
 
 subpackages="libmagick libmagick-devel"
 

Re: [PR REVIEW] ImageMagick: update to 7.1.0.43.

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/38054#discussion_r921815098

Comment:
same thing here, you should just be able to use $version

Re: [PR REVIEW] ImageMagick: update to 7.1.0.43.

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/38054#discussion_r921814920

Comment:
I think this is the default wrksrc value now, can you remove this line to check that? 

Re: [PR REVIEW] ImageMagick: update to 7.1.0.43.

[MouadCharradi]

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

New review comment by MouadCharradi on void-packages repository

https://github.com/void-linux/void-packages/pull/38054#discussion_r922017920

Comment:
You mean I should get rid off the _patchver and _majorver variables and just use version as is?

Re: [PR REVIEW] ImageMagick: update to 7.1.0.43.

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/38054#discussion_r922176616

Comment:
yes, unless it's used later in the template

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

[MouadCharradi]

[-- Attachment #1: Type: text/plain, Size: 603 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/38054

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

#### 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


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

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

From 40dd9cbfeb00e0ad2ee7b815be39b0349533836e Mon Sep 17 00:00:00 2001
From: Mouad Charradi <charradimouad58@gmail.com>
Date: Fri, 15 Jul 2022 16:08:35 +0100
Subject: [PATCH] ImageMagick: update to 7.1.0.43.

---
 srcpkgs/ImageMagick/template | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index e8d27b8b92b1..90d647341985 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,10 +1,8 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
-version=7.1.0.41
+version=7.1.0.43
 revision=1
-_majorver=${version%.*}
-_patchver=${version##*.}
-wrksrc="${pkgname}-${_majorver}-${_patchver}"
+wrksrc="${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib
  --with-rsvg --with-wmf --with-dejavu-font-dir=/usr/share/fonts/TTF
@@ -19,13 +17,13 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 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=f8ec06b5c82cbab4734b166b820f151323c78f438580daa176cedc63990c00a2
+distfiles="https://github.com/ImageMagick/ImageMagick/archive/${version}.tar.gz"
+checksum=62eccb3e8c89acc66c2b10a2bea843b6659a2ddce275c7d2ffee8c34af6114fd
 
 subpackages="libmagick libmagick-devel"
 
 keep_libtool_archives=yes
-conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
+conf_files="/etc/ImageMagick-${version%%.*}/*.xml"
 
 if [ -z "$CROSS_BUILD" ]; then
 	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)

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

[MouadCharradi]

[-- Attachment #1: Type: text/plain, Size: 603 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/38054

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

#### 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


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

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

From e191779157d36789e7638f2bafdf429c57b1be20 Mon Sep 17 00:00:00 2001
From: Mouad Charradi <charradimouad58@gmail.com>
Date: Fri, 15 Jul 2022 16:11:01 +0100
Subject: [PATCH] ImageMagick: update to 7.1.0.43.

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

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index e8d27b8b92b1..3f987cbcfa60 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,10 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
-version=7.1.0.41
+version=7.1.0.43
 revision=1
-_majorver=${version%.*}
-_patchver=${version##*.}
-wrksrc="${pkgname}-${_majorver}-${_patchver}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib
  --with-rsvg --with-wmf --with-dejavu-font-dir=/usr/share/fonts/TTF
@@ -19,13 +16,13 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 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=f8ec06b5c82cbab4734b166b820f151323c78f438580daa176cedc63990c00a2
+distfiles="https://github.com/ImageMagick/ImageMagick/archive/${version}.tar.gz"
+checksum=62eccb3e8c89acc66c2b10a2bea843b6659a2ddce275c7d2ffee8c34af6114fd
 
 subpackages="libmagick libmagick-devel"
 
 keep_libtool_archives=yes
-conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
+conf_files="/etc/ImageMagick-${version%%.*}/*.xml"
 
 if [ -z "$CROSS_BUILD" ]; then
 	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)

Re: ImageMagick: update to 7.1.0.43.

[MouadCharradi]

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

New comment by MouadCharradi on void-packages repository

https://github.com/void-linux/void-packages/pull/38054#issuecomment-1185658638

Comment:
Is this how it should be now?

Re: ImageMagick: update to 7.1.0.43.

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/38054#issuecomment-1185661010

Comment:
yeah looks good 

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

[classabbyamp]

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

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

ImageMagick: update to 7.1.0.43.
https://github.com/void-linux/void-packages/pull/38054

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

#### 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