From 0ae9dc75a4184c49faf61e18ad1204377f1e362b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Nov 02 2011 14:44:51 +0000 Subject: Add patch to fix charls include --- diff --git a/gdcm-2.0.18-charls.patch b/gdcm-2.0.18-charls.patch new file mode 100644 index 0000000..03e5166 --- /dev/null +++ b/gdcm-2.0.18-charls.patch @@ -0,0 +1,13 @@ +diff -up gdcm-2.0.18/Examples/Cxx/FixJAIBugJPEGLS.cxx.charls gdcm-2.0.18/Examples/Cxx/FixJAIBugJPEGLS.cxx +--- gdcm-2.0.18/Examples/Cxx/FixJAIBugJPEGLS.cxx.charls 2011-06-29 01:08:45.000000000 -0600 ++++ gdcm-2.0.18/Examples/Cxx/FixJAIBugJPEGLS.cxx 2011-11-02 08:42:35.461761850 -0600 +@@ -17,8 +17,7 @@ + + #include + +-#include "gdcmcharls/stdafx.h" +-#include "gdcmcharls/interface.h" ++#include "gdcm_charls.h" + + /* + * This small example should show how one can handle the famous JAI-JPEGLS bug diff --git a/gdcm.spec b/gdcm.spec index 7a6cebe..bf4751d 100644 --- a/gdcm.spec +++ b/gdcm.spec @@ -18,6 +18,7 @@ ExcludeArch: ppc ppc64 Patch1: gdcm-2.0.14-inplacebuild.patch Patch2: gdcm-2.0.14-usecopyright.patch +Patch3: gdcm-2.0.18-charls.patch Patch6: gdcm-2.0.17-install2libarch.patch Patch10: gdcm-2.0.17-no_versioned_dir.patch @@ -77,6 +78,7 @@ used this library with python %setup -q %patch1 %patch2 +%patch3 -p 1 -b .charls %patch6 -p 1 %patch10 -p 1 @@ -175,6 +177,7 @@ ctest . - Update to 2.0.18 - Drop upstreamed patches - Add -DGDCM_USE_SYSTEM_CHARLS=ON +- Add patch to fix charls include * Fri Oct 28 2011 Rex Dieter - 2.0.17-9 - rebuild(poppler)