Package: php-imagick
Version: 3.4.2-2
Severity: wishlist
Tags: patch
User: [email protected]
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Merge with Debian unstable (LP: #1590618). Remaining changes:
- Use libmagickwand-6.q16-dev | libmagickwand-dev as the test
dependency instead of hard-coding an soname that will require us
to update the tests file for each new ABI.
[ This is ostensibly cleaner than what I provided to Debian in Bug
#816724 ]
- debian/patches/no-openmp-threads.patch: limit the number of openmp
threads used to 1.
[ As is this. If we can't trust the tests to run with > 1 OpenMP
threads, we should probably limit it at all times with this library.
]
- Fix failures in autopkgtests (LP #1549942)
+ imagick-3.4.0RC6/tests/025-get-color.phpt: Do not do version
check, as Ubuntu has backported the referenced fixes.
[ I did not include this delta here, but I would like to. I do not
believe there has been any movement in Debian wrt. my submissions in
Debian #811308 or #816701.
And, in fact, #811308 has been re-marked fix, but that seems false,
as the version that fixes it is wheezy-security upload? I might just
missing something in the Debian process. ]
* Do not manually set MAGICK_THREAD_LIMIT in d/t/control, as the
number of threads are limited in the source.
[ superseded by the source change ]
* d/patches/: update 3.4.0RC6 to 3.4.2 for new upstream version.
[ if the imagemagick changes get picked by Debian, I'll send this with
a follow-on debdiff. ]
Thanks for considering the patch.
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-22-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru php-imagick-3.4.2/debian/patches/no-openmp-threads.patch php-imagick-3.4.2/debian/patches/no-openmp-threads.patch
--- php-imagick-3.4.2/debian/patches/no-openmp-threads.patch 1969-12-31 16:00:00.000000000 -0800
+++ php-imagick-3.4.2/debian/patches/no-openmp-threads.patch 2016-06-09 16:47:41.000000000 -0700
@@ -0,0 +1,23 @@
+Description: limit the number of openmp threads used to 1
+ The php-imagick 3.4.0 test suite fails with various segfaults when openmp
+ threads are in use. Force the openmp thread count to 1 to avoid this
+ problem.
+ .
+ This patch is a workaround only; it is currently unknown if the root bug
+ lies in php-imagick or in imagemagick.
+Author: Steve Langasek <[email protected]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1549942
+
+Index: php-imagick-3.4.0~rc6/imagick-3.4.2/imagick.c
+===================================================================
+--- php-imagick-3.4.0~rc6.orig/imagick-3.4.2/imagick.c
++++ php-imagick-3.4.0~rc6/imagick-3.4.2/imagick.c
+@@ -3579,6 +3579,8 @@
+ checkImagickVersion();
+ }
+
++ SetMagickResourceLimit(ThreadResource, 1);
++
+ return SUCCESS;
+ }
+
diff -Nru php-imagick-3.4.2/debian/patches/series php-imagick-3.4.2/debian/patches/series
--- php-imagick-3.4.2/debian/patches/series 2016-04-29 02:17:36.000000000 -0700
+++ php-imagick-3.4.2/debian/patches/series 2016-06-09 16:47:41.000000000 -0700
@@ -1 +1,2 @@
0001-Hardcode-path-to-usrsharefontstruetypettf-dejavuDeja.patch
+no-openmp-threads.patch
diff -Nru php-imagick-3.4.2/debian/tests/control php-imagick-3.4.2/debian/tests/control
--- php-imagick-3.4.2/debian/tests/control 2016-04-29 02:17:36.000000000 -0700
+++ php-imagick-3.4.2/debian/tests/control 2016-06-09 16:47:41.000000000 -0700
@@ -1,2 +1,2 @@
-Test-Command: cd imagick-*/tests && MAGICK_THREAD_LIMIT=1 phpunit --verbose .
-Depends: php-cli, php-imagick, gsfonts, libmagickcore-6.q16-2-extra, phpunit
+Test-Command: cd imagick-*/tests && phpunit --verbose .
+Depends: php-cli, php-imagick, gsfonts, libmagickwand-6.q16-dev | libmagickwand-dev, phpunit
