Date: Saturday, January 16, 2010 @ 17:52:58
Author: jgc
Revision: 63303
upgpkg: libgdiplus 2.6-2
Fix package to work with libpng14
Added:
libgdiplus/trunk/gdiplus-png14.patch
Modified:
libgdiplus/trunk/PKGBUILD
Deleted:
libgdiplus/trunk/system-cairo.patch
---------------------+
PKGBUILD | 19 ++++++++------
gdiplus-png14.patch | 20 ++++++++++++++
system-cairo.patch | 67 --------------------------------------------------
3 files changed, 31 insertions(+), 75 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-01-16 22:39:53 UTC (rev 63302)
+++ PKGBUILD 2010-01-16 22:52:58 UTC (rev 63303)
@@ -3,20 +3,23 @@
pkgname=libgdiplus
pkgver=2.6
-pkgrel=1
+pkgrel=2
pkgdesc="An Open Source Implementation of the GDI+ API"
arch=(i686 x86_64)
license=('MPL' 'LGPL')
url="http://www.mono-project.com";
-depends=('libtiff>=3.8.2-5' 'cairo>=1.8.6' 'giflib' 'glib2>=2.20.0' 'libexif')
-makedepends=('automake' 'pkgconfig')
+depends=('libtiff>=3.9.2-2' 'cairo>=1.8.8-2' 'giflib' 'glib2>=2.22.3'
'libexif')
+makedepends=('pkgconfig')
options=('!libtool')
-source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('9107b4429fdafde914bd23405544c58d')
+source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+ gdiplus-png14.patch)
+md5sums=('9107b4429fdafde914bd23405544c58d'
+ '8393904b1a1a79a51cb8b29d61dc090f')
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
- ./configure --prefix=/usr --with-cairo=system
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np0 -i "${srcdir}/gdiplus-png14.patch" || return 1
+ ./configure --prefix=/usr --with-cairo=system || return 1
make || return 1
- make DESTDIR=${startdir}/pkg install || return 1
+ make DESTDIR="${pkgdir}" install || return 1
}
Added: gdiplus-png14.patch
===================================================================
--- gdiplus-png14.patch (rev 0)
+++ gdiplus-png14.patch 2010-01-16 22:52:58 UTC (rev 63303)
@@ -0,0 +1,20 @@
+--- src/pngcodec.c.orig 2010-01-16 23:47:17.000000000 +0100
++++ src/pngcodec.c 2010-01-16 23:49:49.000000000 +0100
+@@ -352,7 +352,7 @@
+ info_ptr->palette[i].blue,
+ info_ptr->palette[i].green,
+ info_ptr->palette[i].red,
+- info_ptr->trans[i]); /* alpha */
++ info_ptr->trans_alpha[i]); /*
alpha */
+ }
+ }
+
+@@ -418,7 +418,7 @@
+ }
+
+ if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) {
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+ }
+
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
Deleted: system-cairo.patch
===================================================================
--- system-cairo.patch 2010-01-16 22:39:53 UTC (rev 63302)
+++ system-cairo.patch 2010-01-16 22:52:58 UTC (rev 63303)
@@ -1,67 +0,0 @@
-diff -ur libgdiplus-1.1.15-old/Makefile.am libgdiplus-1.1.15/Makefile.am
---- libgdiplus-1.1.15-old/Makefile.am 2006-04-14 10:04:55.000000000 -0700
-+++ libgdiplus-1.1.15/Makefile.am 2006-04-21 18:06:49.000000000 -0700
-@@ -1,4 +1,4 @@
--SUBDIRS = cairo src tests
-+SUBDIRS = src tests
- #libpixman
-
- pkgconfigdir = $(libdir)/pkgconfig
-diff -ur libgdiplus-1.1.15-old/configure.in libgdiplus-1.1.15/configure.in
---- libgdiplus-1.1.15-old/configure.in 2006-04-14 10:04:55.000000000 -0700
-+++ libgdiplus-1.1.15/configure.in 2006-04-21 18:06:49.000000000 -0700
-@@ -18,32 +18,32 @@
- AC_MSG_ERROR("Did not find Glib >= 2.2.3");
- fi
-
--AC_CONFIG_SUBDIRS(cairo)
--CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la'
--CAIRO_CFLAGS='-I$(top_builddir)/cairo/pixman/src
-I$(top_srcdir)/cairo/pixman/src -I$(top_builddir)/cairo/src
-I$(top_srcdir)/cairo/src'
--AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus])
-+#AC_CONFIG_SUBDIRS(cairo)
-+#CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la'
-+#CAIRO_CFLAGS='-I$(top_builddir)/cairo/pixman/src
-I$(top_srcdir)/cairo/pixman/src -I$(top_builddir)/cairo/src
-I$(top_srcdir)/cairo/src'
-+#AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus])
-
- # Activate this when we support linking to an already exiting Cairo
installation
--#default_cairo=included
--#AC_ARG_WITH(cairo, [
--with-cairo=included,installed],[cairo_v=$with_cairo],[cairo_v=$default_cairo])
-+default_cairo=included
-+AC_ARG_WITH(cairo, [
--with-cairo=included,installed],[cairo_v=$with_cairo],[cairo_v=$default_cairo])
- #
--#if test $cairo_v = "included";
--#then
-+if test $cairo_v = "included";
-+then
- # #AC_CONFIG_SUBDIRS(libpixman)
--# AC_CONFIG_SUBDIRS(cairo)
--# CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la'
--# CAIRO_CFLAGS='-I$(top_builddir)/cairo/pixman/src
-I$(top_srcdir)/cairo/pixman/src -I$(top_builddir)/cairo/src
-I$(top_srcdir)/cairo/src'
--# AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus])
--#else
--# if pkg-config --exact-version 0.3.0 cairo; then
--# echo Cairo installation OK
--# else
--# AC_MSG_ERROR("Did not find Cairo == 0.3.0");
--# fi
--#
--# CAIRO_LIBS="`pkg-config --libs cairo`"
--# CAIRO_CFLAGS="`pkg-config --cflags cairo`"
--#fi
-+ AC_CONFIG_SUBDIRS(cairo)
-+ CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la'
-+ CAIRO_CFLAGS='-I$(top_builddir)/cairo/pixman/src
-I$(top_srcdir)/cairo/pixman/src -I$(top_builddir)/cairo/src
-I$(top_srcdir)/cairo/src'
-+ AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus])
-+else
-+ if pkg-config --atleast-version 1.0.1 cairo; then
-+ echo Cairo installation OK
-+ else
-+ AC_MSG_ERROR("Did not find Cairo == 1.0.1");
-+ fi
-+
-+ CAIRO_LIBS="`pkg-config --libs cairo`"
-+ CAIRO_CFLAGS="`pkg-config --cflags cairo`"
-+fi
-
- GDIPLUS_LIBS="$CAIRO_LIBS `pkg-config --libs glib-2.0 ` `pkg-config freetype2
fontconfig --libs`"
- GDIPLUS_CFLAGS="$CAIRO_CFLAGS `pkg-config --cflags glib-2.0 ` `pkg-config
freetype2 fontconfig --cflags`"
