diff options
-rw-r--r-- | graphics/libgdiplus/Makefile | 17 | ||||
-rw-r--r-- | graphics/libgdiplus/PLIST | 2 | ||||
-rw-r--r-- | graphics/libgdiplus/buildlink3.mk | 10 | ||||
-rw-r--r-- | graphics/libgdiplus/distinfo | 13 | ||||
-rw-r--r-- | graphics/libgdiplus/patches/patch-aa | 28 | ||||
-rw-r--r-- | graphics/libgdiplus/patches/patch-ab | 13 | ||||
-rw-r--r-- | graphics/libgdiplus/patches/patch-ac | 37 | ||||
-rw-r--r-- | graphics/libgdiplus/patches/patch-ad | 37 |
8 files changed, 33 insertions, 124 deletions
diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile index 2c993d479d4..91cfd2d7429 100644 --- a/graphics/libgdiplus/Makefile +++ b/graphics/libgdiplus/Makefile @@ -1,19 +1,23 @@ -# $NetBSD: Makefile,v 1.29 2006/12/15 20:32:57 joerg Exp $ -# +# $NetBSD: Makefile,v 1.30 2008/02/13 14:26:23 kefren Exp $ -DISTNAME= libgdiplus-1.1.13.6 +DISTNAME= libgdiplus-${MONO_VERSION} CATEGORIES= graphics -MASTER_SITES= http://go-mono.com/sources/libgdiplus-1.1/ +MASTER_SITES= http://go-mono.com/sources/libgdiplus/ +EXTRACT_SUFX= .tar.bz2 -MAINTAINER= recht@NetBSD.org +MAINTAINER= kefren@NetBSD.org HOMEPAGE= http://www.mono-project.com/ COMMENT= Implementation of the GDI+ API +.include "../../lang/mono/Makefile.version" + USE_PKGLOCALEDIR= yes USE_TOOLS+= autoconf gmake pkg-config USE_LIBTOOL= yes +USE_LANGUAGES+= c c++ PKGCONFIG_OVERRIDE+= libgdiplus.pc.in -PKGCONFIG_OVERRIDE+= cairo/cairo.pc.in +PKGCONFIG_OVERRIDE+= cairo/src/cairo.pc.in +PKGCONFIG_OVERRIDE+= cairo/src/cairo-backend.pc.in GNU_CONFIGURE= yes BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.5 @@ -31,6 +35,5 @@ BUILDLINK_TRANSFORM+= rm:-Werror .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" - .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libgdiplus/PLIST b/graphics/libgdiplus/PLIST index aa370b6e5b9..cda9759ed10 100644 --- a/graphics/libgdiplus/PLIST +++ b/graphics/libgdiplus/PLIST @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:35 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 2008/02/13 14:26:23 kefren Exp $ lib/libgdiplus.la lib/pkgconfig/libgdiplus.pc diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk index 2cc195978c3..0ecb2eabc6d 100644 --- a/graphics/libgdiplus/buildlink3.mk +++ b/graphics/libgdiplus/buildlink3.mk @@ -1,9 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.22 2006/12/15 20:32:57 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2008/02/13 14:26:23 kefren Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGDIPLUS_BUILDLINK3_MK:= ${LIBGDIPLUS_BUILDLINK3_MK}+ -.if !empty(BUILDLINK_DEPTH:M+) +.if ${BUILDLINK_DEPTH} == "+" BUILDLINK_DEPENDS+= libgdiplus .endif @@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgdiplus} BUILDLINK_PACKAGES+= libgdiplus BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgdiplus -.if !empty(LIBGDIPLUS_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.libgdiplus+= libgdiplus>=1.1.11 -BUILDLINK_ABI_DEPENDS.libgdiplus?= libgdiplus>=1.1.11nb3 +.if ${LIBGDIPLUS_BUILDLINK3_MK} == "+" +BUILDLINK_API_DEPENDS.libgdiplus+= libgdiplus>=1.2.6 +BUILDLINK_ABI_DEPENDS.libgdiplus?= libgdiplus>=1.2.6 BUILDLINK_PKGSRCDIR.libgdiplus?= ../../graphics/libgdiplus .endif # LIBGDIPLUS_BUILDLINK3_MK diff --git a/graphics/libgdiplus/distinfo b/graphics/libgdiplus/distinfo index 7de351637da..5ca506d965a 100644 --- a/graphics/libgdiplus/distinfo +++ b/graphics/libgdiplus/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.17 2006/10/22 21:04:07 rillig Exp $ +$NetBSD: distinfo,v 1.18 2008/02/13 14:26:23 kefren Exp $ -SHA1 (libgdiplus-1.1.13.6.tar.gz) = a41a2e8f0c5f96c6a58c16dc38146c3e45ab1c10 -RMD160 (libgdiplus-1.1.13.6.tar.gz) = de4ed4598048c19a56f0d451c1d42a567c893626 -Size (libgdiplus-1.1.13.6.tar.gz) = 1281173 bytes -SHA1 (patch-aa) = 7f63e4367b5faef0bd18e1cffee2e56e11dc88b9 -SHA1 (patch-ab) = b2fbb9ea4a25f6b550fd2a06bfe415c236bb345c -SHA1 (patch-ac) = b2ff945b9dc47563b2158a83ae4ca344786c7e39 -SHA1 (patch-ad) = 0779fe3bd83bf526a04fa28a79e73361b0ce6939 +SHA1 (libgdiplus-1.2.6.tar.bz2) = 57321ab24b9fe1f821e39e3cffdf8c16a2e9677b +RMD160 (libgdiplus-1.2.6.tar.bz2) = 9eeb1f3859017e1b73d7b49d96cb103413a806b6 +Size (libgdiplus-1.2.6.tar.bz2) = 2897855 bytes +SHA1 (patch-aa) = e381ae9c8db31d6bb64bad5b9118197a475cb5c3 diff --git a/graphics/libgdiplus/patches/patch-aa b/graphics/libgdiplus/patches/patch-aa index 09f79626270..5ee41c48c1b 100644 --- a/graphics/libgdiplus/patches/patch-aa +++ b/graphics/libgdiplus/patches/patch-aa @@ -1,16 +1,12 @@ -$NetBSD: patch-aa,v 1.5 2005/07/31 19:23:00 recht Exp $ - ---- src/tiffcodec.c.orig 2005-06-13 21:17:10.000000000 +0200 -+++ src/tiffcodec.c -@@ -102,9 +102,10 @@ gdip_tiff_fileclose (thandle_t clientDat - toff_t - gdip_tiff_filesize (thandle_t clientData) - { -+ long ret; - long cur_pos = ftell ((FILE*)clientData); - fseek ((FILE*)clientData, 0, SEEK_END); -- long ret = ftell ((FILE*)clientData); -+ ret = ftell ((FILE*)clientData); - fseek ((FILE*)clientData, cur_pos, SEEK_SET); - return (toff_t)ret; - } +$NetBSD: patch-aa,v 1.6 2008/02/13 14:26:24 kefren Exp $ +--- cairo/test/Makefile.in.orig 2007-12-06 20:53:56.000000000 +0200 ++++ cairo/test/Makefile.in 2008-02-05 16:55:32.000000000 +0200 +@@ -111,7 +111,7 @@ + $(am__EXEEXT_11) $(am__EXEEXT_12) + EXTRA_PROGRAMS = $(am__append_11) $(am__append_13) $(am__EXEEXT_9) \ + $(am__EXEEXT_10) +-@HAVE_PTHREAD_TRUE@am__append_9 = -lpthread ++@HAVE_PTHREAD_TRUE@am__append_9 = ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} + @CAIRO_CAN_TEST_PDF_SURFACE_TRUE@am__append_10 = pdf2png + @CAIRO_CAN_TEST_PDF_SURFACE_TRUE@@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_11 = pdf2svg$(EXEEXT) + @CAIRO_CAN_TEST_SVG_SURFACE_TRUE@am__append_12 = svg2png diff --git a/graphics/libgdiplus/patches/patch-ab b/graphics/libgdiplus/patches/patch-ab deleted file mode 100644 index c2ea34a6e05..00000000000 --- a/graphics/libgdiplus/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2006/04/22 18:28:04 joerg Exp $ - ---- cairo/test/Makefile.in.orig 2006-04-22 18:07:01.000000000 +0000 -+++ cairo/test/Makefile.in -@@ -44,7 +44,7 @@ host_triplet = @host@ - @CAIRO_HAS_PS_SURFACE_TRUE@am__append_3 = ps-surface - @CAIRO_HAS_XLIB_SURFACE_TRUE@am__append_4 = xlib-surface - check_PROGRAMS = $(am__EXEEXT_1) --@HAVE_PTHREAD_TRUE@am__append_5 = -lpthread -+@HAVE_PTHREAD_TRUE@am__append_5 = ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} - noinst_PROGRAMS = imagediff$(EXEEXT) - subdir = test - DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in diff --git a/graphics/libgdiplus/patches/patch-ac b/graphics/libgdiplus/patches/patch-ac deleted file mode 100644 index e6a7b8177c9..00000000000 --- a/graphics/libgdiplus/patches/patch-ac +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-ac,v 1.7 2006/10/22 20:44:53 rillig Exp $ - ---- cairo/configure.orig 2006-10-22 22:41:44.000000000 +0200 -+++ cairo/configure 2006-10-22 22:44:01.000000000 +0200 -@@ -26141,26 +26141,26 @@ WARNING_MESSAGE=' - *** to @BACKEND@-backend specific API. - ' - --if test x"$use_glitz" == "xyes" ; then -+if test x"$use_glitz" = "xyes" ; then - echo "$WARNING_MESSAGE" | sed 's/@BACKEND@/Glitz/' - fi - --if test x"$use_xcb" == "xyes" ; then -+if test x"$use_xcb" = "xyes" ; then - echo "$WARNING_MESSAGE" | sed 's/@BACKEND@/XCB/' - fi - --if test x"$use_quartz" == "xyes" ; then -+if test x"$use_quartz" = "xyes" ; then - echo "$WARNING_MESSAGE" | sed 's/@BACKEND@/Quartz/' - fi - --if test x"$use_quartz" == "xyes" ; then -+if test x"$use_quartz" = "xyes" ; then - echo "$WARNING_MESSAGE" | sed 's/@BACKEND@/ATSUI/' - fi - --if test x"$use_pdf" == "xyes" ; then -+if test x"$use_pdf" = "xyes" ; then - echo "$WARNING_MESSAGE" | sed 's/@BACKEND@/PDF/' - fi - --if test x"$use_ps" == "xyes" ; then -+if test x"$use_ps" = "xyes" ; then - echo "$WARNING_MESSAGE" | sed 's/@BACKEND@/PostScript/' - fi diff --git a/graphics/libgdiplus/patches/patch-ad b/graphics/libgdiplus/patches/patch-ad deleted file mode 100644 index aa3cfd30565..00000000000 --- a/graphics/libgdiplus/patches/patch-ad +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-ad,v 1.4 2006/10/22 21:04:07 rillig Exp $ - ---- cairo/configure.in.orig 2006-10-22 22:43:31.000000000 +0200 -+++ cairo/configure.in 2006-03-14 07:52:10.000000000 +0100 -@@ -554,26 +554,26 @@ WARNING_MESSAGE=' - *** to @BACKEND@-backend specific API. - ' - --if test x"$use_glitz" == "xyes" ; then -+if test x"$use_glitz" = "xyes" ; then - echo "$WARNING_MESSAGE" | sed 's/@BACKEND@/Glitz/' - fi - --if test x"$use_xcb" == "xyes" ; then -+if test x"$use_xcb" = "xyes" ; then - echo "$WARNING_MESSAGE" | sed 's/@BACKEND@/XCB/' - fi - --if test x"$use_quartz" == "xyes" ; then -+if test x"$use_quartz" = "xyes" ; then - echo "$WARNING_MESSAGE" | sed 's/@BACKEND@/Quartz/' - fi - --if test x"$use_quartz" == "xyes" ; then -+if test x"$use_quartz" = "xyes" ; then - echo "$WARNING_MESSAGE" | sed 's/@BACKEND@/ATSUI/' - fi - --if test x"$use_pdf" == "xyes" ; then -+if test x"$use_pdf" = "xyes" ; then - echo "$WARNING_MESSAGE" | sed 's/@BACKEND@/PDF/' - fi - --if test x"$use_ps" == "xyes" ; then -+if test x"$use_ps" = "xyes" ; then - echo "$WARNING_MESSAGE" | sed 's/@BACKEND@/PostScript/' - fi |