[packages/libmatchbox] - new URLs, updated to 1.11 - removed obsolete ac,libpng15 patches

[qboosh]

commit 971ada57c4a6421a406b0bd895fa49d980995b67
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Dec 16 21:45:39 2018 +0100

    - new URLs, updated to 1.11
    - removed obsolete ac,libpng15 patches

 libmatchbox-ac.patch       | 11 -----------
 libmatchbox-libpng15.patch | 22 ----------------------
 libmatchbox.spec           | 25 +++++++++++--------------
 3 files changed, 11 insertions(+), 47 deletions(-)
---
diff --git a/libmatchbox.spec b/libmatchbox.spec
index 0abdce6..fdf69eb 100644
--- a/libmatchbox.spec
+++ b/libmatchbox.spec
@@ -1,20 +1,18 @@
 Summary:	Utility library used by Matchbox utilities
 Summary(pl.UTF-8):	Biblioteka narzędziowa używana przez narzędzia Matchbox
 Name:		libmatchbox
-Version:	1.9
-Release:	14
+Version:	1.11
+Release:	1
 License:	LGPL v2+
 Group:		X11/Libraries
-Source0:	http://projects.o-hand.com/matchbox/sources/libmatchbox/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5:	9f73e7515cc4679171a5db180dc1343b
-Patch0:		%{name}-ac.patch
-Patch1:		%{name}-libpng15.patch
-Patch2:		%{name}-libs.patch
-URL:		http://matchbox-project.org/
-BuildRequires:	autoconf
+Source0:	http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5:	fc6cc807f55a3e7c752d8013176875d7
+Patch0:		%{name}-libs.patch
+URL:		https://www.yoctoproject.org/software-item/matchbox/
+BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
 BuildRequires:	libjpeg-devel
-BuildRequires:	libpng-devel >= 1.4
+BuildRequires:	libpng-devel >= 2:1.4
 BuildRequires:	libtool
 BuildRequires:	libxsettings-client-devel
 BuildRequires:	pango-devel
@@ -36,7 +34,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Matchbox
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	libjpeg-devel
-Requires:	libpng-devel >= 1.2
+Requires:	libpng-devel >= 2:1.4
 Requires:	libxsettings-client-devel
 Requires:	pango-devel
 Requires:	xorg-lib-libX11-devel
@@ -64,10 +62,8 @@ Statyczna biblioteka Matchbox.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
-%{__sed} -i -e 's/png_check_sig( header, 8 )/!png_sig_cmp(header, 0, 8)/g' libmb/mbpixbuf.c
+#%{__sed} -i -e 's/png_check_sig( header, 8 )/!png_sig_cmp(header, 0, 8)/g' libmb/mbpixbuf.c
 
 %build
 %{__libtoolize}
@@ -78,6 +74,7 @@ Statyczna biblioteka Matchbox.
 %configure \
 	--enable-jpeg \
 	--enable-pango \
+	--disable-silent-rules \
 	--enable-xsettings
 %{__make}
 
diff --git a/libmatchbox-ac.patch b/libmatchbox-ac.patch
deleted file mode 100644
index f66eae8..0000000
--- a/libmatchbox-ac.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmatchbox-1.9/configure.ac~	2006-08-04 12:32:31.000000000 +0200
-+++ libmatchbox-1.9/configure.ac	2012-02-13 20:28:29.066938284 +0100
-@@ -316,7 +316,7 @@
- have_check=no
- 
- if test x$enable_unit_tests = xyes; then
--  AM_PATH_CHECK(,have_check=yes, have_check=no)
-+  PKG_CHECK_MODULES([CHECK], [check], have_check=yes)
- fi
- 
- AM_CONDITIONAL(HAVE_CHECK, test x$have_check = xyes)
diff --git a/libmatchbox-libpng15.patch b/libmatchbox-libpng15.patch
deleted file mode 100644
index 7115195..0000000
--- a/libmatchbox-libpng15.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- libmatchbox-1.9/libmb/mbpixbuf.c~	2012-02-12 18:34:52.776056533 +0100
-+++ libmatchbox-1.9/libmb/mbpixbuf.c	2012-02-12 18:35:53.839666279 +0100
-@@ -247,7 +247,7 @@
-     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 @@
-       ( 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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libmatchbox.git/commitdiff/971ada57c4a6421a406b0bd895fa49d980995b67