From 6982ecb4a52fc3370f63523407b458681e8c082a Mon Sep 17 00:00:00 2001
From: Packit Service <user-cont-team+packit-service@redhat.com>
Date: Dec 09 2020 19:34:04 +0000
Subject: Apply patch libmatchbox-1.9-libpng.patch


patch_name: libmatchbox-1.9-libpng.patch
present_in_specfile: true

---

diff --git a/configure.ac b/configure.ac
index 36afdf3..b19be6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,14 +155,14 @@ fi
 dnl ------ Check for PNG ---------------------------------------------------
 
 if test x$enable_png != xno; then
-  AC_MSG_CHECKING(for libpng12)
-  if test x$PKG_CONFIG != xno && $PKG_CONFIG --exists libpng12; then 
+  AC_MSG_CHECKING(for libpng)
+  if test x$PKG_CONFIG != xno && $PKG_CONFIG --exists libpng; then 
         AC_MSG_RESULT(yes)
-        PNG_LIBS=`$PKG_CONFIG --libs libpng12`
-	PNG_CFLAGS=`$PKG_CONFIG --cflags libpng12`
+        PNG_LIBS=`$PKG_CONFIG --libs libpng`
+	PNG_CFLAGS=`$PKG_CONFIG --cflags libpng`
         AC_DEFINE(USE_PNG, [1], [Use Png])
 	SUPPORTS_PNG=1
-	PNG_REQUIRED="libpng12"
+	PNG_REQUIRED="libpng"
   else
 	AC_MSG_RESULT(no)
         # AC_CHECK_HEADERS(png.h, [ have_png_h="yes" ], [ have_png_h="no" ] )
diff --git a/libmb/mbpixbuf.c b/libmb/mbpixbuf.c
index 2d0df5e..3811d08 100644
--- a/libmb/mbpixbuf.c
+++ b/libmb/mbpixbuf.c
@@ -247,7 +247,7 @@ _load_png_file( const char *file,
     return NULL;
   }
 
-  if ( setjmp( png_ptr->jmpbuf ) ) {
+  if ( setjmp( png_jmpbuf(png_ptr) ) ) {
     png_destroy_read_struct( &png_ptr, &info_ptr, NULL);
     fclose(fd);
     return NULL;
@@ -269,8 +269,8 @@ _load_png_file( const char *file,
       ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA ))
     png_set_gray_to_rgb(png_ptr);
  
-  if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA 
-       || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA
+  if ( png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA 
+       || png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA
        )
     *has_alpha = 1;
   else