Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 25 Oct 2020 20:07:12 +1000
From:      Dima Panov <fluffy@FreeBSD.org>
To:        Martin Matuska <mm@FreeBSD.org>, svn-ports-all@freebsd.org,  svn-ports-head@freebsd.org, ports-committers@freebsd.org
Subject:   Re: svn commit: r553245 - in head/graphics/pecl-imagick: . files
Message-ID:  <442a6820-e234-49be-969a-d8f8338f0eb5@Canary>
In-Reply-To: <202010250821.09P8LS2Z088327@repo.freebsd.org>
References:  <202010250821.09P8LS2Z088327@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help 
--5f954e4f_5bd062c2_71f
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

Moin=21

Did you noticed about PR=3F
https://bugs.freebsd.org/bugzilla/show=5Fbug.cgi=3Fid=3D250527
getting patchfiles from official git repo is better :)
your patch didn=E2=80=99t reflect some php internal structures changes

--
Dima. (desktop, kde, x11, office, ports-secteam)=40=46reeBSD team
(fluffy=40=46reeBSD.org, https://t.me/dima=5Fpanov)

> On Sunday, Oct 25, 2020 at 6:21 PM, Martin Matuska <mm=40=46reeBSD.org =
(mailto:mm=40=46reeBSD.org)> wrote:
> Author: mm
> Date: Sun Oct 25 08:21:28 2020
> New Revision: 553245
> URL: https://svnweb.freebsd.org/changeset/ports/553245
>
> Log:
> graphics/pecl-imagick: unbreak build with PHP 8
>
> Added:
> head/graphics/pecl-imagick/files/
> head/graphics/pecl-imagick/files/patch-imagick=5F=5Fclass.c (contents, =
props changed)
> head/graphics/pecl-imagick/files/patch-imagick=5F=5Fhelpers.c (contents=
, props changed)
> head/graphics/pecl-imagick/files/patch-php=5F=5Fimagick.h (contents, pr=
ops changed)
> head/graphics/pecl-imagick/files/patch-php=5F=5Fimagick=5F=5Fdefs.h (co=
ntents, props changed)
> Modified:
> head/graphics/pecl-imagick/Makefile
>
> Modified: head/graphics/pecl-imagick/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/graphics/pecl-imagick/Makefile Sun Oct 25 07:42:20 2020 (r5532=
44)
> +++ head/graphics/pecl-imagick/Makefile Sun Oct 25 08:21:28 2020 (r5532=
45)
> =40=40 -3,6 +3,7 =40=40
>
> PORTNAME=3D imagick
> PORTVERSION=3D 3.4.4
> +PORTREVISION=3D 1
> CATEGORIES=3D graphics
>
> MAINTAINER=3D mm=40=46reeBSD.org
>
> Added: head/graphics/pecl-imagick/files/patch-imagick=5F=5Fclass.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/graphics/pecl-imagick/files/patch-imagick=5F=5Fclass.c Sun Oct=
 25 08:21:28 2020 (r553245)
> =40=40 -0,0 +1,12 =40=40
> +--- imagick=5Fclass.c.orig 2020-10-25 08:02:54 UTC
> ++++ imagick=5Fclass.c
> +=40=40 -12006,7 +12006,9 =40=40 PHP=5FMETHOD(imagick, setprogressmonit=
or)
> +
> + callback =3D (php=5Fimagick=5Fcallback *) emalloc(sizeof(php=5Fimagic=
k=5Fcallback));
> +
> ++=23if PHP=5FVERSION=5FID < 80000
> + TSRMLS=5FSET=5FCTX(callback->thread=5Fctx);
> ++=23endif
> + //We can't free the previous callback as we can't guarantee that
> + //ImageMagick won't use it at some point. There is no 'unbind' functi=
on
> + //for previously set 'MagickSetImageProgressMonitor'
>
> Added: head/graphics/pecl-imagick/files/patch-imagick=5F=5Fhelpers.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/graphics/pecl-imagick/files/patch-imagick=5F=5Fhelpers.c Sun O=
ct 25 08:21:28 2020 (r553245)
> =40=40 -0,0 +1,12 =40=40
> +--- imagick=5Fhelpers.c.orig 2020-10-25 08:02:44 UTC
> ++++ imagick=5Fhelpers.c
> +=40=40 -113,7 +113,9 =40=40 MagickBooleanType php=5Fimagick=5Fprogress=
=5Fmonitor=5Fcallabl
> + =23endif
> + fci.param=5Fcount =3D 2;
> + fci.params =3D zargs;
> ++=23if PHP=5FVERSION=5FID < 80000
> + fci.no=5Fseparation =3D 0;
> ++=23endif
> + =23if PHP=5FVERSION=5FID < 70100
> + fci.symbol=5Ftable =3D NULL;
> + =23endif
>
> Added: head/graphics/pecl-imagick/files/patch-php=5F=5Fimagick.h
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/graphics/pecl-imagick/files/patch-php=5F=5Fimagick.h Sun Oct 2=
5 08:21:28 2020 (r553245)
> =40=40 -0,0 +1,23 =40=40
> +--- php=5Fimagick.h.orig 2019-05-02 15:26:00 UTC
> ++++ php=5Fimagick.h
> +=40=40 -47,5 +47,20 =40=40
> + extern zend=5Fmodule=5Fentry imagick=5Fmodule=5Fentry;
> + =23define phpext=5Fimagick=5Fptr &imagick=5Fmodule=5Fentry
> +
> ++=23if PHP=5FVERSION=5FID >=3D 80000
> ++=23ifndef TSRMLS=5FC
> ++=23define TSRMLS=5FC
> ++=23endif
> ++=23ifndef TSRMLS=5FCC
> ++=23define TSRMLS=5FCC
> ++=23endif
> ++=23ifndef TSRMLS=5FD
> ++=23define TSRMLS=5FD
> ++=23endif
> ++=23ifndef TSRMLS=5FDC
> ++=23define TSRMLS=5FDC
> ++=23endif
> ++=23endif
> ++
> + =23endif /* PHP=5FIMAGICK=5FH */
> +
>
> Added: head/graphics/pecl-imagick/files/patch-php=5F=5Fimagick=5F=5Fdef=
s.h
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/graphics/pecl-imagick/files/patch-php=5F=5Fimagick=5F=5Fdefs.h=
 Sun Oct 25 08:21:28 2020 (r553245)
> =40=40 -0,0 +1,13 =40=40
> +--- php=5Fimagick=5Fdefs.h.orig 2020-10-25 08:13:09 UTC
> ++++ php=5Fimagick=5Fdefs.h
> +=40=40 -20,6 +20,10 =40=40
> + =23ifndef PHP=5FIMAGICK=5FDE=46S=5FH /* PHP=5FIMAGICK=5FDE=46S=5FH */=

> + =23 define PHP=5FIMAGICK=5FDE=46S=5FH
> +
> ++=23ifndef HAVE=5FLOCALE=5FH
> ++=23define HAVE=5FLOCALE=5FH
> ++=23endif
> ++
> + /* Include magic wand header */
> + =23if defined (IM=5FMAGICKWAND=5FHEADER=5FSTYLE=5FSEVEN)
> + =23 include <MagickWand/MagickWand.h>

--5f954e4f_5bd062c2_71f
Content-Type: application/pgp-signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: Canary PGP v2

iQJVBAABCgA/OBxEaW1hIFBhbm92IChGcmVlQlNELk9SRyBDb21taXR0ZXIpIDxm
bHVmZnlARnJlZUJTRC5PUkc+BQJflU5PAAoJEPuLoJ3VOY8pudwQANFnq0hD4qkw
BOCXSn1i9L08lavB2yae4OKuwJzabeLoYsPjHCDdu6L+yX/vf+pGZu5P2Oa3nV92
L50yFvCm2mfNl7GUNM6mdCDyhsujz7Ks8YIU1nm/K2xqG0sReraOQz6tDd1QVgq7
anZmgowtvRijv+A36INX9yme3mL4dtPsZtdBbPl1dBDSSPQC+5iHSR7Qbtk3DjRw
udjmW0tfeeSkZ2WRKxbuH3pnU4d3Fb2c6Gjex2u8oXLiwscsfmpIgkAT//jlBXqK
crQNsngmQcbsSb1n4QSTw2DV8sYaSOW3RYKka/BfsdZXc1O8UNyiE7BGrSJkbgUe
eQm4X533IPq2/QChMJANtKOB7Tu4Dq23umK0j/mvGK0vf5wRVuUTjbOXhMfXct2M
h9aXpcyCadxF6zZKEdov+HZLkcXG/qJkAZczFRe8pF0MZCdY4IBnt5zHXV5DhrvS
lNokA4iPX8aDwUT875os+idKpLyeHuVm+/bKAn51CDao9rO2FBF34wb8EJCPFtQL
TRzO6k2Ps3lMUVc0hVNiOtl1kCOAvJs1ltcfhcA4kQRvwxeLLJUDIdk8JL3ubkAw
If9YG3abTprzlNz4mqSnHjgbRfN0EqnZm5bs78rx+EeXVHjEjCjF8DxKsIfJQTrT
Ne6LgUoPUnQ4HtLpah0EQuNbYIcYVqej
=gnqg
-----END PGP SIGNATURE-----

--5f954e4f_5bd062c2_71f--

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?442a6820-e234-49be-969a-d8f8338f0eb5>