package/x11/imlib/libpng15.patch

   1 --- imlib-1.9.15/gdk_imlib/io-png.c.vanilla     2020-09-30 20:37:35.328046472 +0200
   2 +++ imlib-1.9.15/gdk_imlib/io-png.c     2020-09-30 20:38:51.439089627 +0200
   3 @@ -40,13 +40,13 @@
   4        return NULL;
   5      }
   6
   7 -  if (setjmp(png_ptr->jmpbuf))
   8 +  if (setjmp(png_jmpbuf(png_ptr)))
   9      {
  10        png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
  11        return NULL;
  12      }
  13
  14 -  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
  15 +  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
  16      {
  17        png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
  18        return NULL;
  19 @@ -275,13 +275,13 @@
  20        return NULL;
  21      }
  22
  23 -  if (setjmp(png_ptr->jmpbuf))
  24 +  if (setjmp(png_jmpbuf(png_ptr)))
  25      {
  26        png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
  27        return NULL;
  28      }
  29
  30 -  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
  31 +  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
  32      {
  33        png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
  34        return NULL;
  35 @@ -440,13 +440,13 @@
  36                 return NULL;
  37         }
  38
  39 -       if (setjmp(png_ptr->jmpbuf))
  40 +       if (setjmp(png_jmpbuf(png_ptr)))
  41         {
  42                 png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
  43                 return NULL;
  44         }
  45
  46 -       if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
  47 +       if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
  48         {
  49                 png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
  50                 return NULL;
  51 @@ -635,7 +635,7 @@
  52               png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
  53               return 0;
  54             }
  55 -         if (setjmp(png_ptr->jmpbuf))
  56 +         if (setjmp(png_jmpbuf(png_ptr)))
  57             {
  58               fclose(f);
  59               png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
  60 --- imlib-1.9.15/Imlib/utils.c.vanilla  2020-09-30 20:35:53.289329273 +0200
  61 +++ imlib-1.9.15/Imlib/utils.c  2020-09-30 20:39:24.082679241 +0200
  62 @@ -1959,13 +1959,13 @@
  63        return NULL;
  64      }
  65
  66 -  if (setjmp(png_ptr->jmpbuf))
  67 +  if (setjmp(png_jmpbuf(png_ptr)))
  68      {
  69        png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
  70        return NULL;
  71      }
  72
  73 -  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
  74 +  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
  75      {
  76        png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
  77        return NULL;
  78 --- imlib-1.9.15/Imlib/save.c.vanilla   2020-09-30 20:36:32.528835965 +0200
  79 +++ imlib-1.9.15/Imlib/save.c   2020-09-30 20:36:40.164739969 +0200
  80 @@ -342,7 +342,7 @@
  81               png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
  82               return 0;
  83             }
  84 -         if (setjmp(png_ptr->jmpbuf))
  85 +         if (setjmp(png_jmpbuf(png_ptr)))
  86             {
  87               fclose(f);
  88               png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
  89 --- imlib-1.9.15/Imlib/load.c.vanilla   2020-09-30 20:44:13.883035957 +0200
  90 +++ imlib-1.9.15/Imlib/load.c   2020-09-30 20:44:35.806760339 +0200
  91 @@ -191,12 +191,12 @@
  92        png_destroy_read_struct(&png_ptr, NULL, NULL);
  93        return NULL;
  94      }
  95 -  if (setjmp(png_ptr->jmpbuf))
  96 +  if (setjmp(png_jmpbuf(png_ptr)))
  97      {
  98        png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
  99        return NULL;
 100      }
 101 -  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
 102 +  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
 103      {
 104        png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
 105        return NULL;