From: joshuakraemer <joshuakraemer@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] ImageMagick: update to 7.1.0.2 (with soname bump)
Date: Wed, 08 Sep 2021 19:36:14 +0200 [thread overview]
Message-ID: <20210908173614.FZCSTnhekTdBXk5vv-aLe8D3o5IyX7mOb3utNSDLaRw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31986@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 448 bytes --]
There is an updated pull request by joshuakraemer against master on the void-packages repository
https://github.com/joshuakraemer/void-packages imagemagick-update
https://github.com/void-linux/void-packages/pull/31986
ImageMagick: update to 7.1.0.2 (with soname bump)
- Remove unnecessary configure options
- Add support for graphviz, jbig, lqr and raqm
A patch file from https://github.com/void-linux/void-packages/pull/31986.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imagemagick-update-31986.patch --]
[-- Type: text/x-diff, Size: 10545 bytes --]
From 0ffafde2a3bf92d6b6df0d526d48194b1ea2312b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Thu, 15 Jul 2021 18:16:34 +0200
Subject: [PATCH 1/9] ImageMagick: update to 7.1.0.6 (with soname bump)
- Remove unnecessary configure options
- Add support for graphviz, jbig, lqr and raqm
---
common/shlibs | 4 ++--
srcpkgs/ImageMagick/template | 34 +++++++++++++++-------------------
2 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index d3e078140f7b..ddd2079a1d90 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -333,8 +333,8 @@ liblcms.so.1 lcms-1.18_1
libgd.so.3 gd-2.1.0_1
libcroco-0.6.so.3 libcroco-0.6.2_1
libgsf-1.so.114 libgsf-1.14.11_1
-libMagickCore-7.Q16HDRI.so.9 libmagick-7.0.11.1_1
-libMagickWand-7.Q16HDRI.so.9 libmagick-7.0.11.1_1
+libMagickCore-7.Q16HDRI.so.10 libmagick-7.1.0.6_1
+libMagickWand-7.Q16HDRI.so.10 libmagick-7.1.0.6_1
libMagick++-7.Q16HDRI.so.5 libmagick-7.0.11.1_1
libMagickCore-6.Q16.so.7 libmagick6-6.9.11.61_1
libMagickWand-6.Q16.so.7 libmagick6-6.9.11.61_1
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 1703283ee7d2..9981bd55d3b3 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,28 +1,26 @@
# Template file for 'ImageMagick'
pkgname=ImageMagick
-version=7.0.11.12
-revision=3
+version=7.1.0.6
+revision=1
_majorver=${version%.*}
_patchver=${version##*.}
wrksrc="${pkgname}-${_majorver}-${_patchver}"
build_style=gnu-configure
-configure_args="--without-autotrace --with-wmf=yes
- --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
- --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
- --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
- --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static
- --with-openjp2"
+configure_args="--disable-static --enable-opencl --with-modules --with-gslib
+ --with-rsvg --with-wmf --with-dejavu-font-dir=/usr/share/fonts/TTF
+ --with-gs-font-dir=/usr/share/fonts/Type1"
hostmakedepends="automake libtool pkg-config autoconf"
-makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
- libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
- ocl-icd-devel pango-devel libopenjpeg2-devel"
-short_desc="Package for display and interactive manipulation of images"
+makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel
+ graphviz-devel lcms2-devel libXt-devel libgomp-devel liblqr-devel libltdl-devel
+ libopenjpeg2-devel libraqm-devel librsvg-devel libwebp-devel libwmf-devel
+ ocl-icd-devel pango-devel"
+short_desc="Create, edit, compose, or convert bitmap images"
maintainer="Orphaned <orphan@voidlinux.org>"
license="ImageMagick"
-homepage="https://www.imagemagick.org/"
+homepage="https://www.imagemagick.org"
changelog="https://imagemagick.org/script/changelog.php"
-distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=b4054e9f6b6692791f37fe6f2ab5819152210e6628e69a8dbd66a41320c3c9d3
+distfiles="https://download.imagemagick.org/ImageMagick/download/releases/ImageMagick-${_majorver}-${_patchver}.tar.xz"
+checksum=2477c6bc0f933a5bc0971d4fef7ad652fe5072a83ca39d12522f56d92f18539e
subpackages="libmagick libmagick-devel"
@@ -66,10 +64,8 @@ libmagick_package() {
}
libmagick-devel_package() {
- depends="
- fftw-devel fontconfig-devel lcms2-devel libXt-devel
- libgomp-devel libltdl-devel
- libmagick>=${version}_${revision}"
+ depends="libmagick>=${version}_${revision} fontconfig-devel lcms2-devel
+ libXt-devel libgomp-devel liblqr-devel libltdl-devel libraqm-devel"
short_desc="ImageMagick low-level image manipulation development files"
pkg_install() {
vmove usr/include
From 007798fb39b36b70b5129641ae1105ec9de90622 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Thu, 15 Jul 2021 18:32:20 +0200
Subject: [PATCH 2/9] Converseen: rebuild against libmagick-7.1.0.6
---
srcpkgs/Converseen/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Converseen/template b/srcpkgs/Converseen/template
index 7117f14e87a9..8daaa56ac67d 100644
--- a/srcpkgs/Converseen/template
+++ b/srcpkgs/Converseen/template
@@ -1,7 +1,7 @@
# Template file for 'Converseen'
pkgname=Converseen
version=0.9.9.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
makedepends="qt5-devel qt5-tools-devel libmagick-devel ImageMagick"
From 35bc50a86b8ab295622b5e82b9ae9d5e781f65f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Thu, 15 Jul 2021 18:32:20 +0200
Subject: [PATCH 3/9] libopenshot: rebuild against libmagick-7.1.0.6
---
srcpkgs/libopenshot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template
index 595ff6f7edcc..b9996036b6ed 100644
--- a/srcpkgs/libopenshot/template
+++ b/srcpkgs/libopenshot/template
@@ -1,7 +1,7 @@
# Template file for 'libopenshot'
pkgname=libopenshot
version=0.2.5
-revision=4
+revision=5
archs="i686 x86_64 ppc64le"
build_style=cmake
configure_args="-DENABLE_RUBY=OFF -DUSE_SYSTEM_JSONCPP=ON" # Builds fail with Ruby-2.4.1
From 80df6ed261fca8451ab829cca1a4258ec160cd81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Thu, 15 Jul 2021 18:32:21 +0200
Subject: [PATCH 4/9] php-imagick: rebuild against libmagick-7.1.0.6
---
srcpkgs/php-imagick/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php-imagick/template b/srcpkgs/php-imagick/template
index dba22bb860cd..f995e35f59e3 100644
--- a/srcpkgs/php-imagick/template
+++ b/srcpkgs/php-imagick/template
@@ -1,7 +1,7 @@
# Template file for 'php-imagick'
pkgname=php-imagick
version=3.4.4
-revision=3
+revision=4
wrksrc="imagick-$version"
build_style=gnu-configure
hostmakedepends="php-devel autoconf pkg-config"
From f5d83b7ab04bb6193e9dd1eccd115ad9b4c5f543 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Thu, 15 Jul 2021 18:32:21 +0200
Subject: [PATCH 5/9] vapoursynth: rebuild against libmagick-7.1.0.6
---
srcpkgs/vapoursynth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vapoursynth/template b/srcpkgs/vapoursynth/template
index 8508ca671104..f5c2ff555563 100644
--- a/srcpkgs/vapoursynth/template
+++ b/srcpkgs/vapoursynth/template
@@ -1,7 +1,7 @@
# Template file for 'vapoursynth'
pkgname=vapoursynth
version=R52
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake libtool nasm pkg-config python3-Cython"
makedepends="ffmpeg-devel python3-devel zimg-devel libass-devel libmagick-devel
From 361bc41862e928413798caa8bfc945118f79789d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Thu, 15 Jul 2021 18:43:53 +0200
Subject: [PATCH 6/9] chafa: rebuild against libmagick-7.1.0.6
---
srcpkgs/chafa/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/chafa/template b/srcpkgs/chafa/template
index 1b07026b9ea4..c6250d45d83a 100644
--- a/srcpkgs/chafa/template
+++ b/srcpkgs/chafa/template
@@ -1,7 +1,7 @@
# Template file for 'chafa'
pkgname=chafa
version=1.6.0
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libglib-devel libmagick-devel libXext-devel libxml2-devel"
From 5200bb26e42590710f63754866cd7b76f38ff6ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Thu, 15 Jul 2021 18:43:53 +0200
Subject: [PATCH 7/9] dmtx-utils: rebuild against libmagick-7.1.0.6
---
srcpkgs/dmtx-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dmtx-utils/template b/srcpkgs/dmtx-utils/template
index b251f0a2061b..c00404c8b4c3 100644
--- a/srcpkgs/dmtx-utils/template
+++ b/srcpkgs/dmtx-utils/template
@@ -1,7 +1,7 @@
# Template file for 'dmtx-utils'
pkgname=dmtx-utils
version=0.7.6
-revision=4
+revision=5
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
makedepends="libdmtx-devel libmagick-devel libXext-devel libxml2-devel"
From c0ab031bb450908f933174beef7ed3d9a6b00608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Thu, 15 Jul 2021 18:43:54 +0200
Subject: [PATCH 8/9] zbar: rebuild against libmagick-7.1.0.6
---
srcpkgs/zbar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template
index f64d87fcfe81..139f17f4ec52 100644
--- a/srcpkgs/zbar/template
+++ b/srcpkgs/zbar/template
@@ -1,7 +1,7 @@
# Template file for 'zbar'
pkgname=zbar
version=0.23.1
-revision=3
+revision=4
build_style=gnu-configure
build_helper=gir
configure_args="$(vopt_with qt) --with-gir --with-python=python3"
From 893cd2e4ab5f5e7ea72ec80daaf35777735d8869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Wed, 8 Sep 2021 19:35:42 +0200
Subject: [PATCH 9/9] sk1: update to 2.0rc5
---
srcpkgs/sk1/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/sk1/template b/srcpkgs/sk1/template
index 18804e74fc39..e95706afd4c1 100644
--- a/srcpkgs/sk1/template
+++ b/srcpkgs/sk1/template
@@ -1,7 +1,7 @@
# Template file for 'sk1'
pkgname=sk1
-version=2.0rc4
-revision=4
+version=2.0rc5
+revision=1
build_style=python2-module
pycompile_dirs="/usr/lib/sk1-wx-${version}"
hostmakedepends="pkg-config python"
@@ -12,14 +12,14 @@ short_desc="Open source multiplatform vector graphics editor"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://sk1project.net"
-distfiles="https://downloads.sk1project.net/sk1/${version}/sk1-${version}.tar.gz"
-checksum=65ef0856389d3972e758d55eea33357a4bccec8b97d95eb8dc6be186a7956063
+distfiles="https://downloads.sk1project.net/sk1/sk1-${version}.tar.gz"
+checksum=1f70dd490a62aad97118454bd18f13c3459dcbd910823835404d6b639f7ef637
python_version=2
-pre_configure() {
+#pre_configure() {
# python2: can't open file 'setup.py': [Errno 2] No such file or directory
- ln -s setup-sk1.py setup.py
-}
+ #ln -s setup-sk1.py setup.py
+#}
do_install() {
# must supply either prefix/exec-prefix/home or install-base/install-platbase -- not both
next prev parent reply other threads:[~2021-09-08 17:36 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-15 19:03 [PR PATCH] " joshuakraemer
2021-08-19 16:54 ` [PR PATCH] [Updated] " joshuakraemer
2021-08-19 17:16 ` joshuakraemer
2021-08-19 19:51 ` joshuakraemer
2021-09-08 16:03 ` joshuakraemer
2021-09-08 16:30 ` joshuakraemer
2021-09-08 17:36 ` joshuakraemer [this message]
2021-09-08 18:27 ` joshuakraemer
2021-09-16 16:42 ` [PR REVIEW] " Chocimier
2021-09-16 16:42 ` Chocimier
2021-09-25 10:46 ` [PR PATCH] [Updated] " joshuakraemer
2021-09-25 10:54 ` [PR REVIEW] " joshuakraemer
2021-09-25 10:54 ` joshuakraemer
2021-09-25 10:56 ` joshuakraemer
2021-10-01 8:36 ` [PR REVIEW] " ericonr
2021-10-01 8:36 ` ericonr
2021-10-24 16:04 ` [PR PATCH] [Updated] " joshuakraemer
2021-10-24 16:20 ` joshuakraemer
2021-10-24 16:21 ` [PR REVIEW] " joshuakraemer
2021-10-24 16:22 ` joshuakraemer
2021-10-24 18:02 ` ericonr
2021-10-24 18:02 ` ericonr
2021-10-24 21:31 ` [PR PATCH] [Updated] " joshuakraemer
2021-10-24 23:38 ` joshuakraemer
2021-10-26 19:52 ` [PR PATCH] [Merged]: " Chocimier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210908173614.FZCSTnhekTdBXk5vv-aLe8D3o5IyX7mOb3utNSDLaRw@z \
--to=joshuakraemer@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).