packages: libgdiplus/libgdiplus-libpng.patch, libgdiplus/libgdiplus.spec -=?UTF-8?Q?=20?=...

[gotar]

Author: gotar                        Date: Mon Jun 25 15:34:24 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- upgraded to 2.10.9, removed la file, do not use patches where stream
  processing is more appropriate (libpng adjustment), rebuild wihout libexif.la

---- Files affected:
packages/libgdiplus:
   libgdiplus-libpng.patch (1.3 -> 1.4) , libgdiplus.spec (1.76 -> 1.77) 

---- Diffs:

================================================================
Index: packages/libgdiplus/libgdiplus-libpng.patch
diff -u packages/libgdiplus/libgdiplus-libpng.patch:1.3 packages/libgdiplus/libgdiplus-libpng.patch:1.4
--- packages/libgdiplus/libgdiplus-libpng.patch:1.3	Sat Feb 11 23:03:14 2012
+++ packages/libgdiplus/libgdiplus-libpng.patch	Mon Jun 25 17:34:19 2012
@@ -1,43 +1,3 @@
---- configure.in~	2009-01-28 23:46:54.000000000 +0100
-+++ configure.in	2010-01-28 19:52:59.844022017 +0100
-@@ -293,19 +293,19 @@
- fi
- 
- dnl Test for libpng
--    AC_MSG_CHECKING(for libpng12)
--    if $PKG_CONFIG --exists libpng12 ; then
-+    AC_MSG_CHECKING(for libpng)
-+    if $PKG_CONFIG --exists libpng ; then
-         AC_MSG_RESULT(yes)
-         PNG='png'
--	PNG_DEP_CFLAGS_PACKAGES=libpng12
--	LIBPNG=`$PKG_CONFIG --libs libpng12`
-+	PNG_DEP_CFLAGS_PACKAGES=libpng
-+	LIBPNG=`$PKG_CONFIG --libs libpng`
-     else
-       AC_MSG_RESULT(no)
-       AC_CHECK_LIB(png, png_read_info,
-         [AC_CHECK_HEADER(png.h,
-           png_ok=yes,
-           png_ok=no)],
--        AC_MSG_ERROR(*** libpng12 not found. See http://www.libpng.org/pub/png/libpng.html.), -lz -lm)
-+        AC_MSG_ERROR(*** libpng not found. See http://www.libpng.org/pub/png/libpng.html.), -lz -lm)
-       if test "$png_ok" = yes; then
-         AC_MSG_CHECKING([for png_structp in png.h])
-         AC_TRY_COMPILE([#include <png.h>],
-@@ -316,10 +316,10 @@
-         if test "$png_ok" = yes; then
-           PNG='png'; LIBPNG='-lpng -lz'
-         else
--          AC_MSG_ERROR(*** libpng12 found, but it is too old. See http://www.libpng.org/pub/png/libpng.html.)
-+          AC_MSG_ERROR(*** libpng found, but it is too old. See http://www.libpng.org/pub/png/libpng.html.)
-         fi
-       else
--          AC_MSG_ERROR(*** libpng12 not found. See http://www.libpng.org/pub/png/libpng.html.)
-+          AC_MSG_ERROR(*** libpng not found. See http://www.libpng.org/pub/png/libpng.html.)
-       fi
-     fi
- 
 $NetBSD: patch-aa,v 1.8 2011/01/21 10:21:51 wiz Exp $
 
 Fix build with png-1.5.

================================================================
Index: packages/libgdiplus/libgdiplus.spec
diff -u packages/libgdiplus/libgdiplus.spec:1.76 packages/libgdiplus/libgdiplus.spec:1.77
--- packages/libgdiplus/libgdiplus.spec:1.76	Sat Feb 11 23:03:59 2012
+++ packages/libgdiplus/libgdiplus.spec	Mon Jun 25 17:34:19 2012
@@ -9,8 +9,8 @@
 Summary:	An Open Source implementation of the GDI+ API
 Summary(pl.UTF-8):	Otwarta implementacja API GDI+
 Name:		libgdiplus
-Version:	2.10
-Release:	5
+Version:	2.10.9
+Release:	1
 %if %{with internal_cairo}
 License:	LGPL v2.1 or MPL 1.1
 %else
@@ -18,8 +18,8 @@
 %endif
 Group:		Libraries
 # latest downloads summary at http://ftp.novell.com/pub/mono/sources-stable/
-Source0:	http://ftp.novell.com/pub/mono/sources/libgdiplus/%{name}-%{version}.tar.bz2
-# Source0-md5:	451966e8f637e3a1f02d1d30f900255d
+Source0:	http://download.mono-project.com/sources/libgdiplus/%{name}-%{version}.tar.bz2
+# Source0-md5:	b4615c14584b5d73cbb9757c28887654
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-lt.patch
 Patch2:		%{name}-libpng.patch
@@ -97,6 +97,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
+%{__sed} -e 's/png14/png/g' -i configure.in
 
 %build
 cd cairo
@@ -123,6 +124,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgdiplus.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -139,7 +142,6 @@
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/libgdiplus.la
 %{_pkgconfigdir}/libgdiplus.pc
 
 %files static
@@ -152,6 +154,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.77  2012/06/25 15:34:19  gotar
+- upgraded to 2.10.9, removed la file, do not use patches where stream
+  processing is more appropriate (libpng adjustment), rebuild wihout libexif.la
+
 Revision 1.76  2012/02/11 22:03:59  megabajt
 - release 5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/libgdiplus/libgdiplus-libpng.patch?r1=1.3&r2=1.4
    http://cvs.pld-linux.org/packages/libgdiplus/libgdiplus.spec?r1=1.76&r2=1.77