From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: GraphicsMagick: bump to 1.3.36
Date: Sun, 14 Feb 2021 20:48:59 +0100 [thread overview]
Message-ID: <20210214194859.f2VujjgIHixB3_ghSL-i1wrW1FDlIDDokiTV-Hrpjlo@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28748@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 3182 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28748#issuecomment-778831439
Comment:
I tried adding this to the template instead of the patching:
```
diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template
index 35f5269eac..d1d42ecf8d 100644
--- a/srcpkgs/GraphicsMagick/template
+++ b/srcpkgs/GraphicsMagick/template
@@ -22,6 +22,10 @@ distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgnam
checksum=1e6723c48c4abbb31197fadf8396b2d579d97e197123edc70a4f057f0533d563
keep_libtool_archives=yes
+pre_check() {
+ export PATH="${wrksrc}/utilities/.libs:$PATH"
+}
+
post_install() {
vlicense Copyright.txt LICENSE
}
```
Which made the test suite fail in:
```
FAIL: PerlMagick/PerlMagickCheck
================================
Resource Limits: MAGICK_LIMIT_MEMORY=256MB MAGICK_LIMIT_WIDTH=2592 MAGICK_LIMIT_HEIGHT=3508 MAGICK_LIMIT_DISK=0
=== Environment ===
LD_LIBRARY_PATH='/builddir/GraphicsMagick-1.3.36/magick/.libs:'
MAGICK_CODER_MODULE_PATH='/builddir/GraphicsMagick-1.3.36/coders'
MAGICK_CONFIGURE_PATH='/builddir/GraphicsMagick-1.3.36/config:/builddir/GraphicsMagick-1.3.36/config'
MAGICK_FILTER_MODULE_PATH='/builddir/GraphicsMagick-1.3.36/filters'
MAKE='make'
MAKEFLAGS='w -- TEST_LOGS=PerlMagick/PerlMagickCheck.log\ tests/constitute.log\ tests/drawtests.log\ tests/rwblob.log\ tests/rwblob_sized.log\ tests/rwfile.log\ tests/rwfile_sized.log\ tests/rwfile_miff.log\ tests/rwfile_pdf.log\ tests/rwfile_deep.log\ Magick++/tests/tests.log\ Magick++/demo/demos.log\ wand/wandtests.log\ utilities/tests/effects.log\ utilities/tests/pipe.log\ utilities/tests/hald-clut.log\ utilities/tests/help.log\ utilities/tests/icc-transform.log\ utilities/tests/identify.log\ utilities/tests/list.log\ utilities/tests/montage.log\ utilities/tests/msl_composite.log\ utilities/tests/preview.log\ utilities/tests/resize.log'
MEMCHECK=''
PATH='/builddir/GraphicsMagick-1.3.36/utilities:/builddir/GraphicsMagick-1.3.36/utilities/.libs:/usr/lib/ccache/bin:/usr/bin:/usr/lib/ccache/bin:/home/ericonr/.local/bin:/usr/local/bin:/bin:/usr/bin:/home/ericonr/.cargo/bin:/home/ericonr/.emacs.d/bin:/home/ericonr/void/void-packages/masterdir/usr/bin'
SRCDIR=''
srcdir='.'
===================
++ dirname ./PerlMagick/PerlMagickCheck.sh
+ SRCDIR=./PerlMagick
++ cd ./PerlMagick
++ pwd
+ SRCDIR=/builddir/GraphicsMagick-1.3.36/PerlMagick
++ cd .
++ pwd
+ TOPSRCDIR=/builddir/GraphicsMagick-1.3.36
+ cd PerlMagick
+ test -z make
+ test -x PerlMagick -a -f Makefile.aperl
+ test -f Makefile -a -f Magick.o
+ echo 'PerlMagick has not been built!'
PerlMagick has not been built!
+ exit 1
FAIL PerlMagick/PerlMagickCheck.sh (exit status: 1)
```
which, given how weirdly we ship the PerlMagick stuff, looks reasonable.
I did this before looking at your link (SourceForge was being spotty), and now I think your patches make sense. If you could coalesce them into a single patch and add a link at the top pointing to that issue, it would be great!
And as a minor nit, we tend to go with `: update to` in commits instead of `bump` ;)
next prev parent reply other threads:[~2021-02-14 19:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-14 7:26 [PR PATCH] " heliocat
2021-02-14 7:48 ` [WIP] " heliocat
2021-02-14 8:56 ` [PR PATCH] [Updated] " heliocat
2021-02-14 9:03 ` heliocat
2021-02-14 19:48 ` ericonr [this message]
2021-02-14 20:20 ` [PR PATCH] [Updated] GraphicsMagick: update " heliocat
2021-02-14 20:27 ` heliocat
2021-02-14 20:28 ` [PR PATCH] [Merged]: " ericonr
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=20210214194859.f2VujjgIHixB3_ghSL-i1wrW1FDlIDDokiTV-Hrpjlo@z \
--to=ericonr@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).