public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sci-visualization/paraview/files: paraview-3.6.2-libpng15.patch
@ 2011-10-17 18:12 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2011-10-17 18:12 UTC (permalink / raw
  To: gentoo-commits

ssuominen    11/10/17 18:12:36

  Added:                paraview-3.6.2-libpng15.patch
  Log:
  Fix building with libpng15 wrt #387437 by Ruggero Morsucci
  
  (Portage version: 2.2.0_alpha67/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch?rev=1.1&content-type=text/plain

Index: paraview-3.6.2-libpng15.patch
===================================================================
--- VTK/IO/vtkPNGWriter.cxx
+++ VTK/IO/vtkPNGWriter.cxx
@@ -148,7 +148,7 @@
   void vtkPNGWriteErrorFunction(png_structp png_ptr,
                                 png_const_charp vtkNotUsed(error_msg))
   {
-    longjmp(png_ptr->jmpbuf, 1);
+    longjmp(png_jmpbuf(png_ptr), 1);
   }
 }
 
@@ -224,7 +224,7 @@
       png_init_io(png_ptr, this->TempFP);
       png_set_error_fn(png_ptr, png_ptr,
                        vtkPNGWriteErrorFunction, vtkPNGWriteWarningFunction);
-      if (setjmp(png_ptr->jmpbuf))
+      if (setjmp(png_jmpbuf(png_ptr)))
         {
         fclose(this->TempFP);
         this->SetErrorCode(vtkErrorCode::OutOfDiskSpaceError);
Only in ParaView3/VTK/IO: vtkPNGWriter.cxx.orig






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sci-visualization/paraview/files: paraview-3.6.2-libpng15.patch
@ 2011-10-17 18:14 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2011-10-17 18:14 UTC (permalink / raw
  To: gentoo-commits

ssuominen    11/10/17 18:14:46

  Modified:             paraview-3.6.2-libpng15.patch
  Log:
  Fix patch
  
  (Portage version: 2.2.0_alpha67/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

Revision  Changes    Path
1.2                  sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch?r1=1.1&r2=1.2

Index: paraview-3.6.2-libpng15.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paraview-3.6.2-libpng15.patch	17 Oct 2011 18:12:36 -0000	1.1
+++ paraview-3.6.2-libpng15.patch	17 Oct 2011 18:14:46 -0000	1.2
@@ -18,4 +18,3 @@
          {
          fclose(this->TempFP);
          this->SetErrorCode(vtkErrorCode::OutOfDiskSpaceError);
-Only in ParaView3/VTK/IO: vtkPNGWriter.cxx.orig






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-10-17 18:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-17 18:14 [gentoo-commits] gentoo-x86 commit in sci-visualization/paraview/files: paraview-3.6.2-libpng15.patch Samuli Suominen (ssuominen)
  -- strict thread matches above, loose matches on Subject: below --
2011-10-17 18:12 Samuli Suominen (ssuominen)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox