[PR PATCH] GraphicsMagick: update to 1.3.36.

[PR PATCH] GraphicsMagick: update to 1.3.36.

[ndowens]

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

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

https://github.com/ndowens/void-packages graphicsmagick
https://github.com/void-linux/void-packages/pull/27478

GraphicsMagick: update to 1.3.36.


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

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

From a321e5a7493649977778407e4f42558414724266 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 27 Dec 2020 13:36:20 -0600
Subject: [PATCH] GraphicsMagick: update to 1.3.36.

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

diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template
index a1c4e4e93d4..2a7d304109f 100644
--- a/srcpkgs/GraphicsMagick/template
+++ b/srcpkgs/GraphicsMagick/template
@@ -1,6 +1,6 @@
 # Template file for 'GraphicsMagick'
 pkgname=GraphicsMagick
-version=1.3.35
+version=1.3.36
 revision=1
 build_style=gnu-configure
 configure_args="--with-quantum-depth=16 --with-gs-font-dir=/usr/share/fonts/Type1
@@ -17,7 +17,7 @@ license="MIT"
 homepage="http://www.graphicsmagick.org/"
 changelog="http://www.graphicsmagick.org/NEWS.html"
 distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz"
-checksum=d96d5ce2ef7e0e90166551e38742713728bfd33d6f18495a9ddda938700fc055
+checksum=1e6723c48c4abbb31197fadf8396b2d579d97e197123edc70a4f057f0533d563
 keep_libtool_archives=yes
 
 post_install() {

Re: [PR PATCH] [Updated] GraphicsMagick: update to 1.3.36.

[ndowens]

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

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

https://github.com/ndowens/void-packages graphicsmagick
https://github.com/void-linux/void-packages/pull/27478

GraphicsMagick: update to 1.3.36.


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

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

From cab1adcdf91fb6bec7352c46b1a979b5bf056cba Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 27 Dec 2020 13:36:20 -0600
Subject: [PATCH] GraphicsMagick: update to 1.3.36.

---
 srcpkgs/GraphicsMagick/INSTALL.msg |  5 -----
 srcpkgs/GraphicsMagick/template    | 25 ++++++++++++++++++++++---
 srcpkgs/PerlMagick                 |  1 +
 3 files changed, 23 insertions(+), 8 deletions(-)
 create mode 120000 srcpkgs/PerlMagick

diff --git a/srcpkgs/GraphicsMagick/INSTALL.msg b/srcpkgs/GraphicsMagick/INSTALL.msg
index 8edd2838f58..e42da0a6362 100644
--- a/srcpkgs/GraphicsMagick/INSTALL.msg
+++ b/srcpkgs/GraphicsMagick/INSTALL.msg
@@ -4,9 +4,4 @@
 
    /usr/share/doc/GraphicsMagick/www
 
- - GraphicsMagick PERL extension.
-   To install this extension follow the instructions in:
-
-   /usr/share/doc/GraphicsMagick/PerlMagick/README.txt
-
   The Void Linux Team
diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template
index a1c4e4e93d4..a54f1a5f525 100644
--- a/srcpkgs/GraphicsMagick/template
+++ b/srcpkgs/GraphicsMagick/template
@@ -1,8 +1,9 @@
 # Template file for 'GraphicsMagick'
 pkgname=GraphicsMagick
-version=1.3.35
+version=1.3.36
 revision=1
 build_style=gnu-configure
+make_build_target="all all-perl"
 configure_args="--with-quantum-depth=16 --with-gs-font-dir=/usr/share/fonts/Type1
  --with-modules --with-perl --without-lcms --without-jp2 --enable-shared --disable-static"
 hostmakedepends="pkg-config perl"
@@ -17,9 +18,18 @@ license="MIT"
 homepage="http://www.graphicsmagick.org/"
 changelog="http://www.graphicsmagick.org/NEWS.html"
 distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz"
-checksum=d96d5ce2ef7e0e90166551e38742713728bfd33d6f18495a9ddda938700fc055
+checksum=1e6723c48c4abbb31197fadf8396b2d579d97e197123edc70a4f057f0533d563
 keep_libtool_archives=yes
 
+# Build does not automaticly build PerlMagick
+# like it should using --with-perl
+
+post_build() {
+	cd PerlMagick
+	perl Makefile.PL
+	make DESTDIR=${DESTDIR} install
+}
+
 post_install() {
 	vlicense Copyright.txt LICENSE
 }
@@ -32,6 +42,7 @@ libgraphicsmagick_package() {
 		vmove "usr/share/GraphicsMagick*"
 	}
 }
+
 libgraphicsmagick-devel_package() {
 	short_desc="GraphicsMagick image manipulation libraries - development files"
 	depends="libgraphicsmagick>=${version}_${revision}"
@@ -43,6 +54,14 @@ libgraphicsmagick-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.la"
 		vmove "usr/share/man/man1/*-config.1"
-		vcopy ${wrksrc}/PerlMagick usr/share/doc/GraphicsMagick*/
+	}
+}
+
+PerlMagick_package() {
+	depends="${sourcepkg}>=${version}_${revision} perl"
+	short_desc+=" - perl module"
+	pkg_install() {
+		vmove usr/lib/perl5
+		vmove usr/share/man/man3/Graphics::Magick.3p
 	}
 }
diff --git a/srcpkgs/PerlMagick b/srcpkgs/PerlMagick
new file mode 120000
index 00000000000..012eba99f80
--- /dev/null
+++ b/srcpkgs/PerlMagick
@@ -0,0 +1 @@
+GraphicsMagick
\ No newline at end of file

Re: [PR REVIEW] GraphicsMagick: update to 1.3.36.

[ndowens]

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

New review comment by ndowens on void-packages repository

https://github.com/void-linux/void-packages/pull/27478#discussion_r549161870

Comment:
Document did not exist when I was investigating PerlMagick

Re: [PR PATCH] [Updated] GraphicsMagick: update to 1.3.36.

[ndowens]

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

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

https://github.com/ndowens/void-packages graphicsmagick
https://github.com/void-linux/void-packages/pull/27478

GraphicsMagick: update to 1.3.36.


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

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

From b72e284097aa480a5ff67b272e0e617bc50fe319 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 27 Dec 2020 13:36:20 -0600
Subject: [PATCH] GraphicsMagick: update to 1.3.36.

---
 srcpkgs/GraphicsMagick/INSTALL.msg |  5 -----
 srcpkgs/GraphicsMagick/template    | 26 +++++++++++++++++++++++---
 srcpkgs/PerlMagick                 |  1 +
 3 files changed, 24 insertions(+), 8 deletions(-)
 create mode 120000 srcpkgs/PerlMagick

diff --git a/srcpkgs/GraphicsMagick/INSTALL.msg b/srcpkgs/GraphicsMagick/INSTALL.msg
index 8edd2838f58..e42da0a6362 100644
--- a/srcpkgs/GraphicsMagick/INSTALL.msg
+++ b/srcpkgs/GraphicsMagick/INSTALL.msg
@@ -4,9 +4,4 @@
 
    /usr/share/doc/GraphicsMagick/www
 
- - GraphicsMagick PERL extension.
-   To install this extension follow the instructions in:
-
-   /usr/share/doc/GraphicsMagick/PerlMagick/README.txt
-
   The Void Linux Team
diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template
index a1c4e4e93d4..78f65ad44c3 100644
--- a/srcpkgs/GraphicsMagick/template
+++ b/srcpkgs/GraphicsMagick/template
@@ -1,8 +1,9 @@
 # Template file for 'GraphicsMagick'
 pkgname=GraphicsMagick
-version=1.3.35
+version=1.3.36
 revision=1
 build_style=gnu-configure
+make_build_target="all all-perl"
 configure_args="--with-quantum-depth=16 --with-gs-font-dir=/usr/share/fonts/Type1
  --with-modules --with-perl --without-lcms --without-jp2 --enable-shared --disable-static"
 hostmakedepends="pkg-config perl"
@@ -11,15 +12,25 @@ makedepends="perl libjpeg-turbo-devel libpng-devel tiff-devel
  libXt-devel libltdl-devel libxml2-devel libwmf-devel liblzma-devel libgomp-devel
  ghostscript-devel"
 depends="ghostscript"
+checkdepends="PerlMagick"
 short_desc="GraphicsMagick Image Processing System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.graphicsmagick.org/"
 changelog="http://www.graphicsmagick.org/NEWS.html"
 distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz"
-checksum=d96d5ce2ef7e0e90166551e38742713728bfd33d6f18495a9ddda938700fc055
+checksum=1e6723c48c4abbb31197fadf8396b2d579d97e197123edc70a4f057f0533d563
 keep_libtool_archives=yes
 
+# Build does not automaticly build PerlMagick
+# like it should using --with-perl
+
+post_build() {
+	cd PerlMagick
+	perl Makefile.PL
+	make DESTDIR=${DESTDIR} install
+}
+
 post_install() {
 	vlicense Copyright.txt LICENSE
 }
@@ -32,6 +43,7 @@ libgraphicsmagick_package() {
 		vmove "usr/share/GraphicsMagick*"
 	}
 }
+
 libgraphicsmagick-devel_package() {
 	short_desc="GraphicsMagick image manipulation libraries - development files"
 	depends="libgraphicsmagick>=${version}_${revision}"
@@ -43,6 +55,14 @@ libgraphicsmagick-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.la"
 		vmove "usr/share/man/man1/*-config.1"
-		vcopy ${wrksrc}/PerlMagick usr/share/doc/GraphicsMagick*/
+	}
+}
+
+PerlMagick_package() {
+	depends="${sourcepkg}>=${version}_${revision} perl"
+	short_desc+=" - perl module"
+	pkg_install() {
+		vmove usr/lib/perl5
+		vmove usr/share/man/man3/Graphics::Magick.3p
 	}
 }
diff --git a/srcpkgs/PerlMagick b/srcpkgs/PerlMagick
new file mode 120000
index 00000000000..012eba99f80
--- /dev/null
+++ b/srcpkgs/PerlMagick
@@ -0,0 +1 @@
+GraphicsMagick
\ No newline at end of file

Re: [PR PATCH] [Updated] GraphicsMagick: update to 1.3.36.

[ndowens]

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

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

https://github.com/ndowens/void-packages graphicsmagick
https://github.com/void-linux/void-packages/pull/27478

GraphicsMagick: update to 1.3.36.


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

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

From 6d6a317e48967ba1f1e488db28592a21f3f23c10 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 27 Dec 2020 13:36:20 -0600
Subject: [PATCH] GraphicsMagick: update to 1.3.36.

---
 srcpkgs/GraphicsMagick/INSTALL.msg |  5 -----
 srcpkgs/GraphicsMagick/template    | 30 +++++++++++++++++++++++++++---
 srcpkgs/PerlMagick                 |  1 +
 3 files changed, 28 insertions(+), 8 deletions(-)
 create mode 120000 srcpkgs/PerlMagick

diff --git a/srcpkgs/GraphicsMagick/INSTALL.msg b/srcpkgs/GraphicsMagick/INSTALL.msg
index 8edd2838f58..e42da0a6362 100644
--- a/srcpkgs/GraphicsMagick/INSTALL.msg
+++ b/srcpkgs/GraphicsMagick/INSTALL.msg
@@ -4,9 +4,4 @@
 
    /usr/share/doc/GraphicsMagick/www
 
- - GraphicsMagick PERL extension.
-   To install this extension follow the instructions in:
-
-   /usr/share/doc/GraphicsMagick/PerlMagick/README.txt
-
   The Void Linux Team
diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template
index a1c4e4e93d4..562855599c4 100644
--- a/srcpkgs/GraphicsMagick/template
+++ b/srcpkgs/GraphicsMagick/template
@@ -1,6 +1,6 @@
 # Template file for 'GraphicsMagick'
 pkgname=GraphicsMagick
-version=1.3.35
+version=1.3.36
 revision=1
 build_style=gnu-configure
 configure_args="--with-quantum-depth=16 --with-gs-font-dir=/usr/share/fonts/Type1
@@ -11,15 +11,30 @@ makedepends="perl libjpeg-turbo-devel libpng-devel tiff-devel
  libXt-devel libltdl-devel libxml2-devel libwmf-devel liblzma-devel libgomp-devel
  ghostscript-devel"
 depends="ghostscript"
+checkdepends="PerlMagick"
 short_desc="GraphicsMagick Image Processing System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.graphicsmagick.org/"
 changelog="http://www.graphicsmagick.org/NEWS.html"
 distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz"
-checksum=d96d5ce2ef7e0e90166551e38742713728bfd33d6f18495a9ddda938700fc055
+checksum=1e6723c48c4abbb31197fadf8396b2d579d97e197123edc70a4f057f0533d563
 keep_libtool_archives=yes
 
+# Build does not automaticly build PerlMagick
+# like it should using --with-perl
+
+post_build() {
+	cd PerlMagick
+	perl Makefile.PL
+	make DESTDIR=${DESTDIR} install
+}
+
+pre_check() {
+	# Locally test pass but fails in GH
+	vsed -i '/test ::/, /$(NOOP)/d' PerlMagick/Makefile
+}
+
 post_install() {
 	vlicense Copyright.txt LICENSE
 }
@@ -32,6 +47,7 @@ libgraphicsmagick_package() {
 		vmove "usr/share/GraphicsMagick*"
 	}
 }
+
 libgraphicsmagick-devel_package() {
 	short_desc="GraphicsMagick image manipulation libraries - development files"
 	depends="libgraphicsmagick>=${version}_${revision}"
@@ -43,6 +59,14 @@ libgraphicsmagick-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.la"
 		vmove "usr/share/man/man1/*-config.1"
-		vcopy ${wrksrc}/PerlMagick usr/share/doc/GraphicsMagick*/
+	}
+}
+
+PerlMagick_package() {
+	depends="${sourcepkg}>=${version}_${revision} perl"
+	short_desc+=" - perl module"
+	pkg_install() {
+		vmove usr/lib/perl5
+		vmove usr/share/man/man3/Graphics::Magick.3p
 	}
 }
diff --git a/srcpkgs/PerlMagick b/srcpkgs/PerlMagick
new file mode 120000
index 00000000000..012eba99f80
--- /dev/null
+++ b/srcpkgs/PerlMagick
@@ -0,0 +1 @@
+GraphicsMagick
\ No newline at end of file

Re: [PR PATCH] [Updated] GraphicsMagick: update to 1.3.36.

[ndowens]

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

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

https://github.com/ndowens/void-packages graphicsmagick
https://github.com/void-linux/void-packages/pull/27478

GraphicsMagick: update to 1.3.36.


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

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

From 45577eaf8ea6cdc0cc92e82e2c85869f22cc84be Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 27 Dec 2020 13:36:20 -0600
Subject: [PATCH] GraphicsMagick: update to 1.3.36.

---
 srcpkgs/GraphicsMagick/INSTALL.msg |  5 -----
 srcpkgs/GraphicsMagick/template    | 28 +++++++++++++++++++++++++---
 srcpkgs/PerlMagick                 |  1 +
 3 files changed, 26 insertions(+), 8 deletions(-)
 create mode 120000 srcpkgs/PerlMagick

diff --git a/srcpkgs/GraphicsMagick/INSTALL.msg b/srcpkgs/GraphicsMagick/INSTALL.msg
index 8edd2838f58..e42da0a6362 100644
--- a/srcpkgs/GraphicsMagick/INSTALL.msg
+++ b/srcpkgs/GraphicsMagick/INSTALL.msg
@@ -4,9 +4,4 @@
 
    /usr/share/doc/GraphicsMagick/www
 
- - GraphicsMagick PERL extension.
-   To install this extension follow the instructions in:
-
-   /usr/share/doc/GraphicsMagick/PerlMagick/README.txt
-
   The Void Linux Team
diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template
index a1c4e4e93d4..5d9d0478408 100644
--- a/srcpkgs/GraphicsMagick/template
+++ b/srcpkgs/GraphicsMagick/template
@@ -1,6 +1,6 @@
 # Template file for 'GraphicsMagick'
 pkgname=GraphicsMagick
-version=1.3.35
+version=1.3.36
 revision=1
 build_style=gnu-configure
 configure_args="--with-quantum-depth=16 --with-gs-font-dir=/usr/share/fonts/Type1
@@ -17,9 +17,22 @@ license="MIT"
 homepage="http://www.graphicsmagick.org/"
 changelog="http://www.graphicsmagick.org/NEWS.html"
 distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz"
-checksum=d96d5ce2ef7e0e90166551e38742713728bfd33d6f18495a9ddda938700fc055
+checksum=1e6723c48c4abbb31197fadf8396b2d579d97e197123edc70a4f057f0533d563
 keep_libtool_archives=yes
 
+post_build() {
+	# Build does not automaticly build PerlMagick
+	# like it should using --with-perl
+	cd PerlMagick
+	perl Makefile.PL
+	make DESTDIR=${DESTDIR} install
+}
+
+do_check() {
+	: # Locally test passes but not on GH
+		# when testing PerlMagick
+}
+
 post_install() {
 	vlicense Copyright.txt LICENSE
 }
@@ -32,6 +45,7 @@ libgraphicsmagick_package() {
 		vmove "usr/share/GraphicsMagick*"
 	}
 }
+
 libgraphicsmagick-devel_package() {
 	short_desc="GraphicsMagick image manipulation libraries - development files"
 	depends="libgraphicsmagick>=${version}_${revision}"
@@ -43,6 +57,14 @@ libgraphicsmagick-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.la"
 		vmove "usr/share/man/man1/*-config.1"
-		vcopy ${wrksrc}/PerlMagick usr/share/doc/GraphicsMagick*/
+	}
+}
+
+PerlMagick_package() {
+	depends="${sourcepkg}>=${version}_${revision} perl"
+	short_desc+=" - perl module"
+	pkg_install() {
+		vmove usr/lib/perl5
+		vmove usr/share/man/man3/Graphics::Magick.3p
 	}
 }
diff --git a/srcpkgs/PerlMagick b/srcpkgs/PerlMagick
new file mode 120000
index 00000000000..012eba99f80
--- /dev/null
+++ b/srcpkgs/PerlMagick
@@ -0,0 +1 @@
+GraphicsMagick
\ No newline at end of file

Re: [PR PATCH] [Closed]: GraphicsMagick: update to 1.3.36.

[ndowens]

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

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

GraphicsMagick: update to 1.3.36.
https://github.com/void-linux/void-packages/pull/27478

Description:

Re: [PR PATCH] [Updated] GraphicsMagick: update to 1.3.36

[heliocat]

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

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

https://github.com/heliocat/void-packages graphicsmagick
https://github.com/void-linux/void-packages/pull/28748

GraphicsMagick: update to 1.3.36
Assorted bug fixes, enhancements, and build cleanups, full list here:
http://www.graphicsmagick.org/NEWS.html#december-26-2020

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

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 8d9fcffe9c3fb08f7387c12a825305f6d94b38ee Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 13 Feb 2021 23:00:45 -0800
Subject: [PATCH] GraphicsMagick: update to 1.3.36

Assorted bug fixes, enhancements, and build cleanups, full list here:
http://www.graphicsmagick.org/NEWS.html#december-26-2020

Additionally, PerlMagick is built but tests are disabled since there is
currently an installation order issue with the tests. Specifically,
the PerlMagick tests require GraphicsMagick to be installed for the
tests to pass but the tests are run as part of the main suite. See:
https://sourceforge.net/p/graphicsmagick/bugs/580/ for more details.
---
 .../patches/disable_perlmagick_tests.patch    | 24 +++++++++++++++++++
 srcpkgs/GraphicsMagick/template               |  8 +++----
 2 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/GraphicsMagick/patches/disable_perlmagick_tests.patch

diff --git a/srcpkgs/GraphicsMagick/patches/disable_perlmagick_tests.patch b/srcpkgs/GraphicsMagick/patches/disable_perlmagick_tests.patch
new file mode 100644
index 00000000000..2080d6da7c9
--- /dev/null
+++ b/srcpkgs/GraphicsMagick/patches/disable_perlmagick_tests.patch
@@ -0,0 +1,24 @@
+# workaround for https://sourceforge.net/p/graphicsmagick/bugs/580/
+
+--- Makefile.am.orig    2021-02-14 00:46:02.239418403 -0800
++++ Makefile.am 2021-02-14 00:46:48.431547444 -0800
+@@ -79,7 +79,6 @@
+ 
+ # Tests to run
+ TESTS = \
+-       $(PERLMAGICK_TESTS) \
+        $(TESTS_TESTS) \
+        $(MAGICKPP_TESTS) \
+        $(WAND_TESTS) \
+
+--- Makefile.in.orig    2021-02-14 00:49:51.414058625 -0800
++++ Makefile.in 2021-02-14 00:50:19.996138472 -0800
+@@ -4767,7 +4767,7 @@
+ @WITH_PERL_TRUE@PERLMAGICK_DISTCLEAN_LOCAL_TARGETS = clean-perl
+ @WITH_PERL_TRUE@PERLMAGICK_MAINTAINER_CLEAN_LOCAL_TARGETS = distclean-local
+ #PERLMAGICK_CHECK_LOCAL_TARGETS = check-perl
+-@WITH_PERL_TRUE@PERLMAGICK_TESTS = PerlMagick/PerlMagickCheck.sh
++#@WITH_PERL_TRUE@PERLMAGICK_TESTS = PerlMagick/PerlMagickCheck.sh
+ @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@PERLMAGICK_CHECKSCRIPTS = perl-build
+ 
+ #PERLMAGICK_CHECKSCRIPTS = perl-build
diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template
index 945ed5c3aee..35f5269eac7 100644
--- a/srcpkgs/GraphicsMagick/template
+++ b/srcpkgs/GraphicsMagick/template
@@ -1,10 +1,10 @@
 # Template file for 'GraphicsMagick'
 pkgname=GraphicsMagick
-version=1.3.35
-revision=2
+version=1.3.36
+revision=1
 build_style=gnu-configure
 configure_args="--with-quantum-depth=16 --with-gs-font-dir=/usr/share/fonts/Type1
- --with-modules --with-perl --without-lcms --without-jp2 --enable-shared --disable-static"
+ --with-modules --with-perl --without-jp2 --enable-shared --disable-static"
 hostmakedepends="pkg-config perl"
 # libraries listed in GraphicsMagick++-config --libs
 _develdepends="lcms2-devel freetype-devel libXext-devel libSM-devel libICE-devel
@@ -19,7 +19,7 @@ license="MIT"
 homepage="http://www.graphicsmagick.org/"
 changelog="http://www.graphicsmagick.org/NEWS.html"
 distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz"
-checksum=d96d5ce2ef7e0e90166551e38742713728bfd33d6f18495a9ddda938700fc055
+checksum=1e6723c48c4abbb31197fadf8396b2d579d97e197123edc70a4f057f0533d563
 keep_libtool_archives=yes
 
 post_install() {

Re: [PR PATCH] [Updated] GraphicsMagick: update to 1.3.36

[heliocat]

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

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

https://github.com/heliocat/void-packages graphicsmagick
https://github.com/void-linux/void-packages/pull/28748

GraphicsMagick: update to 1.3.36
Assorted bug fixes, enhancements, and build cleanups, full list here:
http://www.graphicsmagick.org/NEWS.html#december-26-2020

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

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 1fd5436471d55c2f02e59292da46f40d0eee9670 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 13 Feb 2021 23:00:45 -0800
Subject: [PATCH] GraphicsMagick: update to 1.3.36

Assorted bug fixes, enhancements, and build cleanups, full list here:
http://www.graphicsmagick.org/NEWS.html#december-26-2020

Additionally, PerlMagick is built but tests are disabled since there is
currently an installation order issue with the tests. Specifically,
the PerlMagick tests require GraphicsMagick to be installed for the
tests to pass but the tests are run as part of the main suite. See:
https://sourceforge.net/p/graphicsmagick/bugs/580/ for more details.
---
 .../patches/disable_perkmagick_tests.patch    | 24 +++++++++++++++++++
 srcpkgs/GraphicsMagick/template               |  8 +++----
 2 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/GraphicsMagick/patches/disable_perkmagick_tests.patch

diff --git a/srcpkgs/GraphicsMagick/patches/disable_perkmagick_tests.patch b/srcpkgs/GraphicsMagick/patches/disable_perkmagick_tests.patch
new file mode 100644
index 00000000000..2080d6da7c9
--- /dev/null
+++ b/srcpkgs/GraphicsMagick/patches/disable_perkmagick_tests.patch
@@ -0,0 +1,24 @@
+# workaround for https://sourceforge.net/p/graphicsmagick/bugs/580/
+
+--- Makefile.am.orig    2021-02-14 00:46:02.239418403 -0800
++++ Makefile.am 2021-02-14 00:46:48.431547444 -0800
+@@ -79,7 +79,6 @@
+ 
+ # Tests to run
+ TESTS = \
+-       $(PERLMAGICK_TESTS) \
+        $(TESTS_TESTS) \
+        $(MAGICKPP_TESTS) \
+        $(WAND_TESTS) \
+
+--- Makefile.in.orig    2021-02-14 00:49:51.414058625 -0800
++++ Makefile.in 2021-02-14 00:50:19.996138472 -0800
+@@ -4767,7 +4767,7 @@
+ @WITH_PERL_TRUE@PERLMAGICK_DISTCLEAN_LOCAL_TARGETS = clean-perl
+ @WITH_PERL_TRUE@PERLMAGICK_MAINTAINER_CLEAN_LOCAL_TARGETS = distclean-local
+ #PERLMAGICK_CHECK_LOCAL_TARGETS = check-perl
+-@WITH_PERL_TRUE@PERLMAGICK_TESTS = PerlMagick/PerlMagickCheck.sh
++#@WITH_PERL_TRUE@PERLMAGICK_TESTS = PerlMagick/PerlMagickCheck.sh
+ @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@PERLMAGICK_CHECKSCRIPTS = perl-build
+ 
+ #PERLMAGICK_CHECKSCRIPTS = perl-build
diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template
index 945ed5c3aee..35f5269eac7 100644
--- a/srcpkgs/GraphicsMagick/template
+++ b/srcpkgs/GraphicsMagick/template
@@ -1,10 +1,10 @@
 # Template file for 'GraphicsMagick'
 pkgname=GraphicsMagick
-version=1.3.35
-revision=2
+version=1.3.36
+revision=1
 build_style=gnu-configure
 configure_args="--with-quantum-depth=16 --with-gs-font-dir=/usr/share/fonts/Type1
- --with-modules --with-perl --without-lcms --without-jp2 --enable-shared --disable-static"
+ --with-modules --with-perl --without-jp2 --enable-shared --disable-static"
 hostmakedepends="pkg-config perl"
 # libraries listed in GraphicsMagick++-config --libs
 _develdepends="lcms2-devel freetype-devel libXext-devel libSM-devel libICE-devel
@@ -19,7 +19,7 @@ license="MIT"
 homepage="http://www.graphicsmagick.org/"
 changelog="http://www.graphicsmagick.org/NEWS.html"
 distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz"
-checksum=d96d5ce2ef7e0e90166551e38742713728bfd33d6f18495a9ddda938700fc055
+checksum=1e6723c48c4abbb31197fadf8396b2d579d97e197123edc70a4f057f0533d563
 keep_libtool_archives=yes
 
 post_install() {