From f4fb6cf55b995a290e615f9297036dab968ae79f Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Fri, 18 Sep 2009 10:22:51 +0000 Subject: [PATCH] Major update to cairomm-1.8.2 Remove wilfried@ from maintainer per his request. (see HOMEPAGE for complete ChangeLog) ok jasper@ landry@ wilfried@ (former maintainer) --- graphics/cairomm/Makefile | 15 +++++++-------- graphics/cairomm/distinfo | 10 +++++----- .../cairomm/patches/patch-cairomm_fontface_cc | 12 ++++++++++++ graphics/cairomm/pkg/PLIST | 14 +++++++++++++- 4 files changed, 37 insertions(+), 14 deletions(-) create mode 100644 graphics/cairomm/patches/patch-cairomm_fontface_cc diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile index 1567bb7c31d..fce34d10d89 100644 --- a/graphics/cairomm/Makefile +++ b/graphics/cairomm/Makefile @@ -1,34 +1,33 @@ -# $OpenBSD: Makefile,v 1.6 2009/08/10 06:31:44 kili Exp $ +# $OpenBSD: Makefile,v 1.7 2009/09/18 10:22:51 ajacoutot Exp $ COMMENT= C++ interface for cairo -DISTNAME= cairomm-1.4.4 -PKGNAME= ${DISTNAME}p1 -SHARED_LIBS= cairomm-1.0 2.0 +DISTNAME= cairomm-1.8.2 +SHARED_LIBS= cairomm-1.0 3.0 # .5.0 CATEGORIES= graphics HOMEPAGE= http://cairographics.org/cairomm/ -MAINTAINER= Peter Stromberg - # LGPL PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes + WANTLIB= X11 Xau Xdmcp Xrender expat fontconfig freetype glitz \ m pixman-1 png pthread-stubs xcb z MASTER_SITES= http://cairographics.org/releases/ -LIB_DEPENDS= cairo:cairo->=1.2:graphics/cairo +LIB_DEPENDS= cairo:cairo->=1.2:graphics/cairo \ + sigc-2.0.>=2::devel/libsigc++-2 SEPARATE_BUILD= concurrent USE_X11= Yes USE_LIBTOOL= Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --disable-dependency-tracking +# no documentation (doc dirs are empty) CONFIGURE_ARGS+= --disable-docs .include diff --git a/graphics/cairomm/distinfo b/graphics/cairomm/distinfo index 9926d302948..6619fccc025 100644 --- a/graphics/cairomm/distinfo +++ b/graphics/cairomm/distinfo @@ -1,5 +1,5 @@ -MD5 (cairomm-1.4.4.tar.gz) = pblH6yaSsLbDCJ/Pps4Wfg== -RMD160 (cairomm-1.4.4.tar.gz) = QvkyChAqSmECnWCZqt5lUL7+/Kk= -SHA1 (cairomm-1.4.4.tar.gz) = XgQRpn2PQnp/tRTye40VKY9t/+Y= -SHA256 (cairomm-1.4.4.tar.gz) = 7Jo9EurZMg8sqs+Xv3+yW3OG7Qjenxl7RMqxZFS5Wq4= -SIZE (cairomm-1.4.4.tar.gz) = 677392 +MD5 (cairomm-1.8.2.tar.gz) = JKpGpPkr2yr3zYDmszXwfw== +RMD160 (cairomm-1.8.2.tar.gz) = jTqPh7JagRf1OAW8crfu07lnOYQ= +SHA1 (cairomm-1.8.2.tar.gz) = 8zJMFlnAKTM1yxC3Qxxzo9TZlK8= +SHA256 (cairomm-1.8.2.tar.gz) = m/ERUoIn3UFJJuzFHkp6FVochkC5GdQZUL7qXgqVY68= +SIZE (cairomm-1.8.2.tar.gz) = 1125381 diff --git a/graphics/cairomm/patches/patch-cairomm_fontface_cc b/graphics/cairomm/patches/patch-cairomm_fontface_cc new file mode 100644 index 00000000000..4aaa8d8de79 --- /dev/null +++ b/graphics/cairomm/patches/patch-cairomm_fontface_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-cairomm_fontface_cc,v 1.1 2009/09/18 10:22:51 ajacoutot Exp $ +--- cairomm/fontface.cc.orig Sat Dec 20 18:37:46 2008 ++++ cairomm/fontface.cc Sun Sep 13 14:04:31 2009 +@@ -309,7 +309,7 @@ UserFontFace::text_to_glyphs(const RefPtr& + // bool value in the user_data, which we can read back in the + // text_to_glyphs_cb and used as a signal to return -1 for the num_glyphs + // parameter. +- cairo_font_face_set_user_data(cobj(), &USER_DATA_KEY_DEFAULT_TEXT_TO_GLYPHS, reinterpret_cast(true), NULL); ++ cairo_font_face_set_user_data(cobj(), &USER_DATA_KEY_DEFAULT_TEXT_TO_GLYPHS, (void *) (true), NULL); + return CAIRO_STATUS_SUCCESS; + } + diff --git a/graphics/cairomm/pkg/PLIST b/graphics/cairomm/pkg/PLIST index 09584381af0..5aa3c6f7c43 100644 --- a/graphics/cairomm/pkg/PLIST +++ b/graphics/cairomm/pkg/PLIST @@ -1,22 +1,34 @@ -@comment $OpenBSD: PLIST,v 1.2 2007/07/17 08:14:35 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.3 2009/09/18 10:22:51 ajacoutot Exp $ %%SHARED%% include/cairomm-1.0/ include/cairomm-1.0/cairomm/ include/cairomm-1.0/cairomm/cairomm.h +include/cairomm-1.0/cairomm/cairommconfig.h include/cairomm-1.0/cairomm/context.h include/cairomm-1.0/cairomm/enums.h include/cairomm-1.0/cairomm/exception.h include/cairomm-1.0/cairomm/fontface.h include/cairomm-1.0/cairomm/fontoptions.h +include/cairomm-1.0/cairomm/matrix.h include/cairomm-1.0/cairomm/path.h include/cairomm-1.0/cairomm/pattern.h +include/cairomm-1.0/cairomm/quartz_font.h include/cairomm-1.0/cairomm/quartz_surface.h include/cairomm-1.0/cairomm/refptr.h include/cairomm-1.0/cairomm/scaledfont.h include/cairomm-1.0/cairomm/surface.h +include/cairomm-1.0/cairomm/types.h +include/cairomm-1.0/cairomm/win32_font.h include/cairomm-1.0/cairomm/win32_surface.h include/cairomm-1.0/cairomm/xlib_surface.h lib/libcairomm-1.0.a lib/libcairomm-1.0.la lib/pkgconfig/ lib/pkgconfig/cairomm-1.0.pc +lib/pkgconfig/cairomm-ft-1.0.pc +lib/pkgconfig/cairomm-pdf-1.0.pc +lib/pkgconfig/cairomm-png-1.0.pc +lib/pkgconfig/cairomm-ps-1.0.pc +lib/pkgconfig/cairomm-svg-1.0.pc +lib/pkgconfig/cairomm-xlib-1.0.pc +lib/pkgconfig/cairomm-xlib-xrender-1.0.pc