Hello community, here is the log from the commit of package ImageMagick for openSUSE:Factory checked in at 2018-11-08 09:42:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ImageMagick (Old) and /work/SRC/openSUSE:Factory/.ImageMagick.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ImageMagick" Thu Nov 8 09:42:29 2018 rev:170 rq:645679 version:7.0.8.14 Changes: -------- --- /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick.changes 2018-10-04 18:59:12.799346569 +0200 +++ /work/SRC/openSUSE:Factory/.ImageMagick.new/ImageMagick.changes 2018-11-08 09:42:32.905516964 +0100 @@ -1,0 +2,14 @@ +Wed Oct 31 07:58:16 UTC 2018 - Petr Gajdos <pgaj...@suse.com> + +- update to 7.0.8-14: + * Adding coder headers with magic.xml will no longer be supported. + * Adding coder aliases with coder.xml will no longer be supported. + * fixing oss-fuzz issues + +------------------------------------------------------------------- +Mon Oct 22 09:40:38 UTC 2018 - Petr Gajdos <pgaj...@suse.com> + +- asan_build: build ASAN included +- debug_build: build more suitable for debugging + +------------------------------------------------------------------- Old: ---- ImageMagick-7.0.8-12.tar.bz2 ImageMagick-7.0.8-12.tar.bz2.asc New: ---- ImageMagick-7.0.8-14.tar.bz2 ImageMagick-7.0.8-14.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ImageMagick.spec ++++++ --- /var/tmp/diff_new_pack.U3RerL/_old 2018-11-08 09:42:33.741515993 +0100 +++ /var/tmp/diff_new_pack.U3RerL/_new 2018-11-08 09:42:33.741515993 +0100 @@ -12,13 +12,15 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define debug_build 0 +%define asan_build 0 %define maj 7 %define mfr_version %{maj}.0.8 -%define mfr_revision 12 +%define mfr_revision 14 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 6 @@ -148,6 +150,7 @@ Requires: libbz2-devel %endif +%if !%{debug_build} %package extra Summary: Extra codecs for the ImageMagick image viewer/converter Group: Productivity/Graphics/Other @@ -159,6 +162,7 @@ Recommends: libwmf Recommends: netpbm Recommends: transfig +%endif %package -n libMagickCore%{libspec}%{clibver} Summary: C runtime library for ImageMagick @@ -215,6 +219,7 @@ the command line as well as through C, C++, and Perl-based programming interfaces. +%if !%{debug_build} %description extra This package adds support for djvu, wmf and jpeg2000 formats and installs optional helper applications. @@ -228,6 +233,7 @@ different image formats. Image processing operations are available from the command line as well as through C, C++, and Perl-based programming interfaces. +%endif %description -n libMagickCore%{libspec}%{clibver} ImageMagick is a robust collection of tools and libraries to read, @@ -308,12 +314,20 @@ export MODULES_DIRNAME="modules%{libspec}%{clibver}" export SHAREARCH_DIRNAME="config%{libspec}%{clibver}" export CONFIGURE_RELATIVE_PATH="ImageMagick%{libspec}%{clibver}" +%if %{debug_build} +export CFLAGS="%{optflags} -O0" +export CXXFLAGS="%{optflags} -O0" +%endif %configure \ --disable-silent-rules \ --enable-shared \ --without-frozenpaths \ --with-magick_plus_plus \ +%if !%{debug_build} --with-modules \ +%else + --without-modules \ +%endif --with-threads \ %if %{urw_base35_fonts} --with-urw-base35-font-dir=/usr/share/fonts/truetype \ @@ -339,6 +353,11 @@ --enable-pipes=no \ --enable-reproducible-build=yes \ --disable-openmp +%if %{asan_build} +sed -i -e 's/\(^CFLAGS.*\)/\1 -fsanitize=address/' \ + -e 's/\(^LIBS =.*\)/\1 -lasan/' \ + Makefile +%endif # don't build together, PerlMagick could be miscompiled when using parallel build[1] # [1] http://pkgs.fedoraproject.org/cgit/ImageMagick.git/tree/ImageMagick.spec make %{?_smp_mflags} all @@ -355,6 +374,15 @@ chmod -x PerlMagick/demo/*.pl %check +%if %{debug_build} +# testsuite does not succeed with -O0 for some reason, +# research TODO +exit 0 +%endif +%if %{asan_build} +# ASAN needs /proc to be mounted +exit 0 +%endif %ifarch i586 # https://github.com/ImageMagick/ImageMagick/issues/1215 rm PerlMagick/t/montage.t @@ -427,6 +455,7 @@ %dir %{_sysconfdir}/ImageMagick* %config %{_sysconfdir}/ImageMagick*/* %dir %{_libdir}/ImageMagick* +%if !%{debug_build} %dir %{_libdir}/ImageMagick*/modules* %dir %{_libdir}/ImageMagick*/modules*/* %exclude %{_libdir}/ImageMagick*/modules*/*/wmf.* @@ -437,6 +466,7 @@ %{_libdir}/ImageMagick*/modules*/*/*.so # don't remove la files, see bnc#579798 %{_libdir}/ImageMagick*/modules*/*/*.la +%endif %{_libdir}/ImageMagick*/config* %files -n libMagickWand%{libspec}%{cwandver} @@ -445,6 +475,7 @@ %endif %{_libdir}/libMagickWand*.so.%{cwandver}* +%if !%{debug_build} %files extra %if 0%{?suse_version} < 1315 %defattr(-,root,root) @@ -457,6 +488,7 @@ %endif %{_libdir}/ImageMagick*/modules*/*/djvu.so %{_libdir}/ImageMagick*/modules*/*/djvu.la +%endif %files devel %if 0%{?suse_version} < 1315 ++++++ ImageMagick-7.0.8-12.tar.bz2 -> ImageMagick-7.0.8-14.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick-7.0.8-12.tar.bz2 /work/SRC/openSUSE:Factory/.ImageMagick.new/ImageMagick-7.0.8-14.tar.bz2 differ: char 11, line 1
