24788889 Update ImageMagick to 6.9.6-7 s11u3-sru
authorVladimir Marek <Vladimir.Marek@oracle.com>
Thu, 08 Dec 2016 17:02:09 +0100
changeset 7538 1668450ff96c
parent 7537 ae530156d261
child 7543 c28bd8192b99
24788889 Update ImageMagick to 6.9.6-7 24788980 problem in UTILITY/IMAGEMAGICK 25231110 Imagemgick needs minor modifications
--- a/components/imagemagick/Makefile	Mon Nov 28 19:00:18 2016 -0800
+++ b/components/imagemagick/Makefile	Thu Dec 08 17:02:09 2016 +0100
@@ -27,19 +27,19 @@
 include ../../make-rules/shared-macros.mk
 COMPONENT_NAME=			ImageMagick
 COMPONENT_MAJOR_VERSION=	$(shell echo $(COMPONENT_VERSION) | $(GSED) -e 's/\([0-9]\+\)\.[0-9]\+\.[0-9]\+/\1/')
 COMPONENT_PROJECT_URL=		http://www.imagemagick.org/
-    sha256:468419fea538ba1dcd2dc69334e8981cf41417f9a9938973884dccaedc403b39
+    sha256:6a677b917bab99e9ad6a370e75726525909167d646f7902bcaf546053ecd540f
 COMPONENT_BUGDB=	utility/imagemagick
-TPNO=			29915
+TPNO=			32077
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
@@ -109,6 +109,8 @@
 CONFIGURE_OPTIONS.32+= --with-perl-options="INSTALLDIRS=vendor"
 CONFIGURE_OPTIONS.64+= --without-perl
 build:		$(BUILD_32_and_64)
 install:	$(INSTALL_32_and_64)
--- a/components/imagemagick/TESTING	Mon Nov 28 19:00:18 2016 -0800
+++ b/components/imagemagick/TESTING	Thu Dec 08 17:02:09 2016 +0100
@@ -2,6 +2,29 @@
 convert -list font | wc -l  # ~ 200 lines of output
+# Make sure that all the config files can be found. The next line should print
+# no output
+for i in $(convert -list list); do convert -list $i; done 2>&1 | grep 'convert: unable to access'
+# List all xml files opened during the operation. Both files found and not
+# found
+   for i in $(convert -list list); do
+      truss -'t!all' -t open convert -list $i
+   done 2>&1 |
+   grep ".xml\"," |
+   sed -e 's,.*/,,' |
+   sort -u
+# Sort the files to found ones and not found ones
+FOUND=$( ggrep -P '\d$' <<<"$A" | sed -e 's/".*//' )
+NOT_FOUND=$( ggrep -v -P '\d$' <<<"$A" | sed -e 's/".*//' )
+# Now for every not_found file there has to be the same file found, else
+# display it's name. The output should be empty
+ggrep -F -x -v -f <(echo "$FOUND") <(echo "$NOT_FOUND")
 convert -size 170x100 xc:black \
    -fill white -draw 'circle 50,50 13,50' \
    -draw 'circle 120,50 157,50' \
--- a/components/imagemagick/imagemagick.copyrights	Mon Nov 28 19:00:18 2016 -0800
+++ b/components/imagemagick/imagemagick.copyrights	Thu Dec 08 17:02:09 2016 +0100
@@ -1,3 +1,5 @@
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 1. ImageMagick copyright:
 Copyright 1999-2016 ImageMagick Studio LLC, a non-profit organization dedicated
@@ -206,7 +208,7 @@
 10. Libsquish copyright (this copyright is limited to the compression used in
     coder/dds.c, incorporated from the libsquish library):
-Copyright (c) 2006 Simon Brown                          [email protected]
+Copyright (c) 2006 Simon Brown			   [email protected]
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -234,3 +236,111 @@
 Bootstrap v3.3.5 (http://getbootstrap.com)
 Copyright 2011-2015 Twitter, Inc.
 Licensed under the MIT license
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+Before we get to the text of the license, lets just review what the license says in simple terms:
+It allows you to:
+  * freely download and use ImageMagick software, in whole or in part, for personal, company internal, or commercial purposes;
+  * use ImageMagick software in packages or distributions that you create;
+  * link against a library under a different license;
+  * link code under a different license against a library under this license;
+  * merge code into a work under a different license;
+  * extend patent grants to any code using code under this license;
+  * and extend patent protection.
+It forbids you to:
+  * redistribute any piece of ImageMagick-originated software without proper attribution;
+  * use any marks owned by ImageMagick Studio LLC in any way that might state or imply that ImageMagick Studio LLC endorses your distribution;
+  * use any marks owned by ImageMagick Studio LLC in any way that might state or imply that you created the ImageMagick software in question.
+It requires you to:
+  * include a copy of the license in any redistribution you may make that includes ImageMagick software;
+  * provide clear attribution to ImageMagick Studio LLC for any distributions that include ImageMagick software.
+It does not require you to:
+  * include the source of the ImageMagick software itself, or of any modifications you may have made to it, in any redistribution you may assemble that includes it;
+  * submit changes that you make to the software back to the ImageMagick Studio LLC (though such feedback is encouraged).
+A few other clarifications include:
+  * ImageMagick is freely available without charge;
+  * you may include ImageMagick on a DVD as long as you comply with the terms of the license;
+  * you can give modified code away for free or sell it under the terms of the ImageMagick license or distribute the result under a different license, but you need to acknowledge the use of the ImageMagick software;
+  * the license is compatible with the GPL V3.
+  * when exporting the ImageMagick software, review its export classification.
+Terms and Conditions for Use, Reproduction, and Distribution
+The legally binding and authoritative terms and conditions for use, reproduction, and distribution of ImageMagick follow:
+Copyright 1999-2016 ImageMagick Studio LLC, a non-profit organization dedicated to making software imaging solutions freely available.
+1. Definitions.
+License shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+Licensor shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+Legal Entity shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, control means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+You (or Your) shall mean an individual or Legal Entity exercising permissions granted by this License.
+Source form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+Object form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+Work shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+Derivative Works shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+Contribution shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as Not a Contribution.
+Contributor shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+  * You must give any other recipients of the Work or Derivative Works a copy of this License; and
+  * You must cause any modified files to carry prominent notices stating that You changed the files; and
+  * You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+  * If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+How to Apply the License to your Work
+To apply the ImageMagick License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information (don't include the brackets). The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
+   Copyright [yyyy] [name of copyright owner]
+   Licensed under the ImageMagick License (the "License"); you may not use
+   this file except in compliance with the License.	You may obtain a copy
+   of the License at
+	http://www.imagemagick.org/script/license.php
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	See the
+   License for the specific language governing permissions and limitations
+   under the License.
--- a/components/imagemagick/imagemagick.p5m	Mon Nov 28 19:00:18 2016 -0800
+++ b/components/imagemagick/imagemagick.p5m	Thu Dec 08 17:02:09 2016 +0100
@@ -189,23 +189,37 @@
 file path=usr/include/ImageMagick-$(COMPONENT_MAJOR_VERSION)/wand/pixel-wand.h
 file path=usr/include/ImageMagick-$(COMPONENT_MAJOR_VERSION)/wand/stream.h
 file path=usr/include/ImageMagick-$(COMPONENT_MAJOR_VERSION)/wand/wand-view.h
-file ImageMagick-$(COMPONENT_VERSION)/config/colors.xml \
+file usr/etc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/coder.xml \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config-Q16/coder.xml
+file usr/etc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/colors.xml \
 file build/$(MACH64)/config/configure.xml \
 file build/$(MACH64)/config/delegates.xml \
-file ImageMagick-$(COMPONENT_VERSION)/config/english.xml \
+file usr/share/ImageMagick-$(COMPONENT_MAJOR_VERSION)/english.xml \
-file ImageMagick-$(COMPONENT_VERSION)/config/locale.xml \
+file usr/share/ImageMagick-$(COMPONENT_MAJOR_VERSION)/locale.xml \
-file build/$(MACH64)/config/type-dejavu.xml \
+file usr/etc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/log.xml \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config-Q16/log.xml
+file usr/etc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/magic.xml \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config-Q16/magic.xml
+file usr/etc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/mime.xml \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config-Q16/mime.xml
+file usr/etc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/policy.xml \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config-Q16/policy.xml
+file usr/etc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/quantization-table.xml \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config-Q16/quantization-table.xml
+file usr/etc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/thresholds.xml \
+    path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/config-Q16/thresholds.xml
+file usr/etc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/type-dejavu.xml \
-file build/$(MACH64)/config/type-ghostscript.xml \
+file usr/etc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/type-ghostscript.xml \
-file build/$(MACH64)/config/type-windows.xml \
+file usr/etc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/type-windows.xml \
-file build/$(MACH64)/config/type.xml \
+file usr/etc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/type.xml \
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/aai.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/art.so
@@ -245,10 +259,12 @@
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/ipl.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/jnx.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/jpeg.so
+file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/json.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/label.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/mac.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/magick.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/map.so
+file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/mask.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/mat.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/matte.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/meta.so
@@ -284,12 +300,14 @@
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/pwp.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/raw.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/rgb.so
+file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/rgf.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/rla.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/rle.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/scr.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/sct.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/sfw.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/sgi.so
+file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/sixel.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/stegano.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/sun.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/svg.so
@@ -306,6 +324,7 @@
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/vicar.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/vid.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/viff.so
+file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/vips.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/wbmp.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/wpg.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/x.so
@@ -314,6 +333,7 @@
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xcf.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xpm.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xps.so
+file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xtrn.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xwd.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/ycbcr.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/yuv.so
@@ -345,29 +365,29 @@
 file path=usr/lib/$(MACH64)/pkgconfig/MagickWand.pc
 file path=usr/lib/$(MACH64)/pkgconfig/Wand-6.Q16.pc
 file path=usr/lib/$(MACH64)/pkgconfig/Wand.pc
-file usr/etc/ImageMagick-6/coder.xml \
+file usr/etc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/coder.xml \
-file ImageMagick-$(COMPONENT_VERSION)/config/colors.xml \
+file usr/etc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/colors.xml \
 file build/$(MACH32)/config/configure.xml \
 file build/$(MACH32)/config/delegates.xml \
-file ImageMagick-$(COMPONENT_VERSION)/config/english.xml \
+file usr/share/ImageMagick-$(COMPONENT_MAJOR_VERSION)/english.xml \
-file ImageMagick-$(COMPONENT_VERSION)/config/locale.xml \
+file usr/share/ImageMagick-$(COMPONENT_MAJOR_VERSION)/locale.xml \
-file usr/etc/ImageMagick-6/log.xml \
+file usr/etc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/log.xml \
-file usr/etc/ImageMagick-6/magic.xml \
+file usr/etc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/magic.xml \
-file usr/etc/ImageMagick-6/mime.xml \
+file usr/etc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/mime.xml \
-file usr/etc/ImageMagick-6/policy.xml \
-    path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/config-Q16/pilocy.xml
-file usr/etc/ImageMagick-6/quantization-table.xml \
+file usr/etc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/policy.xml \
+    path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/config-Q16/policy.xml
+file usr/etc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/quantization-table.xml \
-file usr/etc/ImageMagick-6/thresholds.xml \
+file usr/etc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/thresholds.xml \
 file build/$(MACH32)/config/type-dejavu.xml \
@@ -415,10 +435,12 @@
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/ipl.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/jnx.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/jpeg.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/json.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/label.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/mac.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/magick.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/map.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/mask.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/mat.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/matte.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/meta.so
@@ -454,12 +476,14 @@
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/pwp.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/raw.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/rgb.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/rgf.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/rla.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/rle.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/scr.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/sct.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/sfw.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/sgi.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/sixel.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/stegano.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/sun.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/svg.so
@@ -476,13 +500,16 @@
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/vicar.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/vid.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/viff.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/vips.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/wbmp.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/wpg.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/x.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xbm.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xc.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xcf.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xpm.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xps.so
+file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xtrn.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/xwd.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/ycbcr.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/yuv.so
@@ -512,11 +539,10 @@
 file path=usr/perl5/$(PERL_VERSION)/man/man3/Image::Magick::Q16.3
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Image/Magick.pm
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Image/Magick/Q16.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Magick.bs
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Magick.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Q16/Q16.bs
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Q16/Q16.so
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Q16/autosplit.ix
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/autosplit.ix
 # Compatibility links
@@ -547,6 +573,9 @@
 file ImageMagick-$(COMPONENT_VERSION)/config/thresholds.xml \
+file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/ChangeLog
+file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/LICENSE
+file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/NEWS.txt
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/images/ImageMagick.ico
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/images/affine.png
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/images/annotate.png
@@ -1518,8 +1547,10 @@
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/links.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/magick++.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/magick-core.html
+file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/magick-script.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/magick-vector-graphics.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/magick-wand.html
+file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/magick.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/miff.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/mogrify.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/montage.html
@@ -1556,7 +1587,6 @@
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/source/type-windows.xml
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/source/type.xml
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/source/wand.c
-file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/sponsors.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/stream.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/support.html
 file path=usr/share/doc/ImageMagick-$(COMPONENT_MAJOR_VERSION)/www/wand.png
--- a/components/imagemagick/patches/png.patch	Mon Nov 28 19:00:18 2016 -0800
+++ b/components/imagemagick/patches/png.patch	Thu Dec 08 17:02:09 2016 +0100
@@ -1,7 +1,10 @@
---- ImageMagick-6.3.4/coders/png.c.orig	Mon Aug 23 12:50:12 2010
-+++ ImageMagick-6.3.4/coders/png.c	Mon Aug 23 12:51:35 2010
[email protected]@ -76,6 +76,10 @@
- #if defined(HasPNG)
+The history of this patch is unknown: it existed when ImageMagick was
+migrated to Userland.
+--- ImageMagick-6.8.3/coders/png.c.~1~	2013-02-15 04:48:48.000000000 -0800
++++ ImageMagick-6.8.3/coders/png.c	2015-02-10 20:39:14.131500401 -0800
[email protected]@ -100,6 +100,10 @@
  #include "png.h"
  #include "zlib.h"
 +#if PNG_LIBPNG_VER >= 10400