Dear Thomas,
At Tue, 1 Mar 2011 21:48:15 +0100,
Thomas Klausner wrote:
>
> On Tue, Mar 01, 2011 at 01:47:42PM -0400, Marko Schütz Schmuck wrote:
> > I didn't see kmymoney2-1.0.3nb3 mentioned.
> >
> > For me, directly after updating a stock price through Tools->Update
> > Stock and Currency Prices it crashes:
>
> Can you please try the attached patch for qt3-libs?
> Only compile-tested, but it's more defensive and should fill the
> unused_data variable correctly.
sorry for not getting back to you any earlier. I still have the same
behavior even with your patch applied.
Best regards,
Marko
> Thanks,
> Thomas
>
> P.S.: for the record, I only know of povray currently being broken due
> to png; povray-3.7rc3 is not broken due to png, but for other reasons,
> upstream bug report opened.
> [2 qt3.diff <text/plain; us-ascii (7bit)>]
> Index: Makefile
> ===================================================================
> RCS file: /cvsroot/pkgsrc/x11/qt3-libs/Makefile,v
> retrieving revision 1.77
> diff -u -r1.77 Makefile
> --- Makefile 13 Jan 2011 13:36:11 -0000 1.77
> +++ Makefile 1 Mar 2011 20:46:12 -0000
> @@ -59,6 +59,7 @@
> .include "../../graphics/MesaLib/buildlink3.mk"
> .include "../../graphics/glu/buildlink3.mk"
> .include "../../graphics/mng/buildlink3.mk"
> +BUILDLINK_API_DEPENDS.png+= png>=1.5.1
> .include "../../graphics/png/buildlink3.mk"
> .include "../../graphics/freetype2/buildlink3.mk"
> .include "../../x11/libSM/buildlink3.mk"
> Index: distinfo
> ===================================================================
> RCS file: /cvsroot/pkgsrc/x11/qt3-libs/distinfo,v
> retrieving revision 1.54
> diff -u -r1.54 distinfo
> --- distinfo 16 Jan 2011 12:36:59 -0000 1.54
> +++ distinfo 1 Mar 2011 20:46:12 -0000
> @@ -21,7 +21,7 @@
> SHA1 (patch-ap) = 5040628324d271abfc662c5a6eeb4f1ecf0d4758
> SHA1 (patch-aq) = c17ff8b42901ae9a3cc51c33cffe4cffa64b4e4d
> SHA1 (patch-ar) = 84c0d7153feabcab6558ba84fbaa723f1c238e40
> -SHA1 (patch-as) = b08e3ceabdc14d756e529386954e53e71ee2d299
> +SHA1 (patch-as) = 0146d7da47795ac8835d93a48fb2f6e13212ff0f
> SHA1 (patch-bb) = b6a15a4b2b7b83b89bd3610cf2e48c242dbce2e5
> SHA1 (patch-bc) = d8a84e1b66bf1953b53df57ae81d2c98cce69c41
> SHA1 (patch-bd) = a116ecf305ee5b5338bf84cb908d695f3baea830
> Index: patches/patch-as
> ===================================================================
> RCS file: /cvsroot/pkgsrc/x11/qt3-libs/patches/patch-as,v
> retrieving revision 1.2
> diff -u -r1.2 patch-as
> --- patches/patch-as 16 Jan 2011 12:36:59 -0000 1.2
> +++ patches/patch-as 1 Mar 2011 20:46:12 -0000
> @@ -6,15 +6,15 @@
> png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth,
> &color_type,
> 0, 0, 0);
>
> -+ png_colorp info_ptr_palette;
> -+ int info_ptr_num_palette;
> ++ png_colorp info_ptr_palette = NULL;
> ++ int info_ptr_num_palette = 0;
> + if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
> + png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette,
> &info_ptr_num_palette);
> + }
> +
> -+ png_bytep info_ptr_trans_alpha;
> -+ int info_ptr_num_trans;
> -+ png_color_16p info_ptr_trans_color;
> ++ png_bytep info_ptr_trans_alpha = NULL;
> ++ int info_ptr_num_trans = 0;
> ++ png_color_16p info_ptr_trans_color = NULL;
> +
> + if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
> + png_get_tRNS(png_ptr, info_ptr, &info_ptr_trans_alpha,
> &info_ptr_num_trans, &info_ptr_trans_color);
> @@ -142,7 +142,7 @@
> png_set_PLTE(png_ptr, info_ptr, palette, num_palette);
> int* trans = new int[num_palette];
> int num_trans = 0;
> -+ png_colorp info_ptr_palette;
> ++ png_colorp info_ptr_palette = NULL;
> + int tmp;
> + png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &tmp);
> for (int i=0; i<num_palette; i++) {
> @@ -194,17 +194,16 @@
> png_destroy_read_struct(&png_ptr, &info_ptr, 0);
> image = 0;
> state = MovieStart;
> -@@ -1117,7 +1147,8 @@ void QPNGFormat::end(png_structp png, pn
> +@@ -1117,7 +1147,7 @@ void QPNGFormat::end(png_structp png, pn
> consumer->frameDone(QPoint(offx,offy),r);
> consumer->end();
> state = FrameStart;
> - unused_data = (int)png->buffer_size; // Since libpng doesn't tell us
> -+#warning XXXtnn don't know how to fix this.
> -+ unused_data = 0; /* (int)png->buffer_size; // Since libpng doesn't tell
> us */
> ++ unused_data = png_process_data_pause(png, 0);
> }
>
> #ifdef PNG_USER_CHUNKS_SUPPORTED
> -@@ -1232,8 +1263,11 @@ void qInitPngIO()
> +@@ -1232,8 +1262,11 @@ void qInitPngIO()
>
> void qt_zlib_compression_hack()
> {
Attachment:
pgpvHNdlQrOw8.pgp
Description: PGP signature