* Re: [PR REVIEW] ImageMagick: update to 7.1.0.43.
2022-07-13 23:23 [PR PATCH] ImageMagick: update to 7.1.0.43 MouadCharradi
@ 2022-07-15 5:08 ` classabbyamp
2022-07-15 5:08 ` classabbyamp
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2022-07-15 5:08 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] ImageMagick: update to 7.1.0.43.
2022-07-13 23:23 [PR PATCH] ImageMagick: update to 7.1.0.43 MouadCharradi
2022-07-15 5:08 ` [PR REVIEW] " classabbyamp
@ 2022-07-15 5:08 ` classabbyamp
2022-07-15 10:05 ` MouadCharradi
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2022-07-15 5:08 UTC (permalink / raw)
To: ml
[-- 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?
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] ImageMagick: update to 7.1.0.43.
2022-07-13 23:23 [PR PATCH] ImageMagick: update to 7.1.0.43 MouadCharradi
2022-07-15 5:08 ` [PR REVIEW] " classabbyamp
2022-07-15 5:08 ` classabbyamp
@ 2022-07-15 10:05 ` MouadCharradi
2022-07-15 13:40 ` classabbyamp
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: MouadCharradi @ 2022-07-15 10:05 UTC (permalink / raw)
To: ml
[-- 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?
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] ImageMagick: update to 7.1.0.43.
2022-07-13 23:23 [PR PATCH] ImageMagick: update to 7.1.0.43 MouadCharradi
` (2 preceding siblings ...)
2022-07-15 10:05 ` MouadCharradi
@ 2022-07-15 13:40 ` classabbyamp
2022-07-15 15:09 ` [PR PATCH] [Updated] " MouadCharradi
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2022-07-15 13:40 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] ImageMagick: update to 7.1.0.43.
2022-07-13 23:23 [PR PATCH] ImageMagick: update to 7.1.0.43 MouadCharradi
` (3 preceding siblings ...)
2022-07-15 13:40 ` classabbyamp
@ 2022-07-15 15:09 ` MouadCharradi
2022-07-15 15:12 ` MouadCharradi
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: MouadCharradi @ 2022-07-15 15:09 UTC (permalink / raw)
To: ml
[-- 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)
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] ImageMagick: update to 7.1.0.43.
2022-07-13 23:23 [PR PATCH] ImageMagick: update to 7.1.0.43 MouadCharradi
` (4 preceding siblings ...)
2022-07-15 15:09 ` [PR PATCH] [Updated] " MouadCharradi
@ 2022-07-15 15:12 ` MouadCharradi
2022-07-15 15:32 ` MouadCharradi
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: MouadCharradi @ 2022-07-15 15:12 UTC (permalink / raw)
To: ml
[-- 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)
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: ImageMagick: update to 7.1.0.43.
2022-07-13 23:23 [PR PATCH] ImageMagick: update to 7.1.0.43 MouadCharradi
` (5 preceding siblings ...)
2022-07-15 15:12 ` MouadCharradi
@ 2022-07-15 15:32 ` MouadCharradi
2022-07-15 15:35 ` classabbyamp
2022-07-15 15:36 ` [PR PATCH] [Merged]: " classabbyamp
8 siblings, 0 replies; 10+ messages in thread
From: MouadCharradi @ 2022-07-15 15:32 UTC (permalink / raw)
To: ml
[-- 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?
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: ImageMagick: update to 7.1.0.43.
2022-07-13 23:23 [PR PATCH] ImageMagick: update to 7.1.0.43 MouadCharradi
` (6 preceding siblings ...)
2022-07-15 15:32 ` MouadCharradi
@ 2022-07-15 15:35 ` classabbyamp
2022-07-15 15:36 ` [PR PATCH] [Merged]: " classabbyamp
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2022-07-15 15:35 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Merged]: ImageMagick: update to 7.1.0.43.
2022-07-13 23:23 [PR PATCH] ImageMagick: update to 7.1.0.43 MouadCharradi
` (7 preceding siblings ...)
2022-07-15 15:35 ` classabbyamp
@ 2022-07-15 15:36 ` classabbyamp
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2022-07-15 15:36 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 10+ messages in thread