From 6c645203a123c8b96751e543fb385aa3ed675196 Mon Sep 17 00:00:00 2001 From: caodongxia <315816521@qq.com> Date: Tue, 3 Jan 2023 15:31:22 +0800 Subject: [PATCH] Fix the x86 compilation failure of zbar caused by missing magic_types --- GraphicsMagick.spec | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec index a98a7af..78290f3 100644 --- a/GraphicsMagick.spec +++ b/GraphicsMagick.spec @@ -26,7 +26,7 @@ Summary: An ImageMagick fork, offering faster image generation and better quality Name: GraphicsMagick Version: 1.3.38 -Release: 1 +Release: 2 License: MIT Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.xz @@ -248,7 +248,20 @@ mv %{buildroot}%{_includedir}/GraphicsMagick/magick/magick_types.h \ %{buildroot}%{_includedir}/GraphicsMagick/magick/magick_types-%{__isa_bits}.h cat >%{buildroot}%{_includedir}/GraphicsMagick/magick/magick_types.h < + +#if __WORDSIZE == 32 +# include "magick/magick_types-32.h" +#elif __WORDSIZE == 64 +# include "magick/magick_types-64.h" +#else +# error "unexpected value for __WORDSIZE macro" +#endif + +#endif EOF %endif @@ -327,6 +340,9 @@ exit 1 %{_mandir}/man3/* %changelog +* Tue Jan 3 2023 caodongxia - 1.3.38-2 +- Fix the x86 compilation failure of zbar caused by missing magic_types + * Tue Nov 1 2022 huyab<1229981468@qq.com> - 1.3.38-1 - update version to 1.3.38-1 -- Gitee