update to cairomm 1.9.2

proactive fallout handling and ok ajacoutot@ jasper@ landry@
This commit is contained in:
eric 2010-10-11 08:15:48 +00:00
parent b51f2a4445
commit 379abc15fd
4 changed files with 183 additions and 31 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.10 2010/06/02 09:59:38 kili Exp $
# $OpenBSD: Makefile,v 1.11 2010/10/11 08:15:48 eric Exp $
COMMENT= C++ interface for cairo
DISTNAME= cairomm-1.8.2
PKGNAME= ${DISTNAME}p2
SHARED_LIBS= cairomm-1.0 3.0 # .5.0
DISTNAME= cairomm-1.9.2
SHARED_LIBS= cairomm-1.0 4.0 # .5.0
CATEGORIES= graphics
HOMEPAGE= http://cairographics.org/cairomm/
@ -15,22 +14,23 @@ 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 stdc++ xcb xcb-render \
xcb-render-util z
WANTLIB= GL X11 X11-xcb Xau Xdamage Xdmcp Xext Xfixes Xrender \
Xxf86vm drm cairo expat fontconfig freetype glib-2.0 \
gobject-2.0 gthread-2.0 m pixman-1 pcre png \
pthread-stubs sigc-2.0 stdc++ xcb xcb-render xcb-shm z
MASTER_SITES= http://cairographics.org/releases/
LIB_DEPENDS= cairo:cairo->=1.2:graphics/cairo \
sigc-2.0.>=2:libsigc++->=2,<3:devel/libsigc++-2
LIB_DEPENDS= ::graphics/cairo \
::devel/libsigc++-2
MODULES= devel/gettext
SEPARATE_BUILD= concurrent
USE_X11= Yes
USE_LIBTOOL= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
# no documentation (doc dirs are empty)
CONFIGURE_ARGS+= --disable-docs
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
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
MD5 (cairomm-1.9.2.tar.gz) = JLDTXeQVQZW4t4zx9IuF5w==
RMD160 (cairomm-1.9.2.tar.gz) = 2/MtGQ+GXSb+R7RH+T9lILDO2dY=
SHA1 (cairomm-1.9.2.tar.gz) = jcddiLfS0Qv06YAyqjKbeRtRllc=
SHA256 (cairomm-1.9.2.tar.gz) = Br4TWmOL6eJ5kFzGKHwGbak6ti8nOkpmhYrzeWISiPY=
SIZE (cairomm-1.9.2.tar.gz) = 856678

View File

@ -1,12 +0,0 @@
$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<ScaledFont>&
// 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<void*>(true), NULL);
+ cairo_font_face_set_user_data(cobj(), &USER_DATA_KEY_DEFAULT_TEXT_TO_GLYPHS, (void *) (true), NULL);
return CAIRO_STATUS_SUCCESS;
}

View File

@ -1,9 +1,8 @@
@comment $OpenBSD: PLIST,v 1.3 2009/09/18 10:22:51 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.4 2010/10/11 08:15:48 eric 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
@ -15,12 +14,16 @@ 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/region.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/cairomm-1.0/
lib/cairomm-1.0/include/
lib/cairomm-1.0/include/cairommconfig.h
lib/libcairomm-1.0.a
lib/libcairomm-1.0.la
lib/pkgconfig/
@ -32,3 +35,164 @@ 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
share/devhelp/
share/devhelp/books/
share/devhelp/books/cairomm-1.0/
share/devhelp/books/cairomm-1.0/cairomm-1.0.devhelp2
share/doc/cairomm-1.0/
share/doc/cairomm-1.0/reference/
share/doc/cairomm-1.0/reference/cairomm-1.0.tag
share/doc/cairomm-1.0/reference/html/
share/doc/cairomm-1.0/reference/html/annotated.html
share/doc/cairomm-1.0/reference/html/cairomm.css
share/doc/cairomm-1.0/reference/html/classCairo_1_1Context-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1Context.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1FontFace-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1FontFace.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1FontOptions-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1FontOptions.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1FtFontFace-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1FtFontFace.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1FtScaledFont-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1FtScaledFont.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1GlitzSurface-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1GlitzSurface.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1Gradient-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1Gradient.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1ImageSurface-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1ImageSurface.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1LinearGradient-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1LinearGradient.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1Matrix-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1Matrix.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1Path-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1Path.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1Pattern-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1Pattern.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1PdfSurface-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1PdfSurface.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1PsSurface-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1PsSurface.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1QuartzFontFace-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1QuartzFontFace.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1QuartzSurface-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1QuartzSurface.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1RadialGradient-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1RadialGradient.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1RefPtr-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1RefPtr.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1Region-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1Region.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1ScaledFont-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1ScaledFont.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1SolidPattern-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1SolidPattern.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1Surface-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1Surface.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1SurfacePattern-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1SurfacePattern.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1SvgSurface-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1SvgSurface.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1ToyFontFace-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1ToyFontFace.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1UserFontFace-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1UserFontFace.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1Win32FontFace-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1Win32FontFace.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1Win32PrintingSurface-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1Win32PrintingSurface.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1Win32ScaledFont-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1Win32ScaledFont.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1Win32Surface-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1Win32Surface.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1XlibSurface-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1XlibSurface.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1logic__error-members.html
share/doc/cairomm-1.0/reference/html/classCairo_1_1logic__error.html
share/doc/cairomm-1.0/reference/html/classcairo__matrix__t.html
share/doc/cairomm-1.0/reference/html/classes.html
share/doc/cairomm-1.0/reference/html/deprecated.html
share/doc/cairomm-1.0/reference/html/doxygen.png
share/doc/cairomm-1.0/reference/html/examples.html
share/doc/cairomm-1.0/reference/html/functions.html
share/doc/cairomm-1.0/reference/html/functions_0x62.html
share/doc/cairomm-1.0/reference/html/functions_0x63.html
share/doc/cairomm-1.0/reference/html/functions_0x64.html
share/doc/cairomm-1.0/reference/html/functions_0x65.html
share/doc/cairomm-1.0/reference/html/functions_0x66.html
share/doc/cairomm-1.0/reference/html/functions_0x67.html
share/doc/cairomm-1.0/reference/html/functions_0x68.html
share/doc/cairomm-1.0/reference/html/functions_0x69.html
share/doc/cairomm-1.0/reference/html/functions_0x6c.html
share/doc/cairomm-1.0/reference/html/functions_0x6d.html
share/doc/cairomm-1.0/reference/html/functions_0x6f.html
share/doc/cairomm-1.0/reference/html/functions_0x70.html
share/doc/cairomm-1.0/reference/html/functions_0x71.html
share/doc/cairomm-1.0/reference/html/functions_0x72.html
share/doc/cairomm-1.0/reference/html/functions_0x73.html
share/doc/cairomm-1.0/reference/html/functions_0x74.html
share/doc/cairomm-1.0/reference/html/functions_0x75.html
share/doc/cairomm-1.0/reference/html/functions_0x76.html
share/doc/cairomm-1.0/reference/html/functions_0x77.html
share/doc/cairomm-1.0/reference/html/functions_0x78.html
share/doc/cairomm-1.0/reference/html/functions_0x7e.html
share/doc/cairomm-1.0/reference/html/functions_func.html
share/doc/cairomm-1.0/reference/html/functions_func_0x62.html
share/doc/cairomm-1.0/reference/html/functions_func_0x63.html
share/doc/cairomm-1.0/reference/html/functions_func_0x64.html
share/doc/cairomm-1.0/reference/html/functions_func_0x65.html
share/doc/cairomm-1.0/reference/html/functions_func_0x66.html
share/doc/cairomm-1.0/reference/html/functions_func_0x67.html
share/doc/cairomm-1.0/reference/html/functions_func_0x68.html
share/doc/cairomm-1.0/reference/html/functions_func_0x69.html
share/doc/cairomm-1.0/reference/html/functions_func_0x6c.html
share/doc/cairomm-1.0/reference/html/functions_func_0x6d.html
share/doc/cairomm-1.0/reference/html/functions_func_0x6f.html
share/doc/cairomm-1.0/reference/html/functions_func_0x70.html
share/doc/cairomm-1.0/reference/html/functions_func_0x71.html
share/doc/cairomm-1.0/reference/html/functions_func_0x72.html
share/doc/cairomm-1.0/reference/html/functions_func_0x73.html
share/doc/cairomm-1.0/reference/html/functions_func_0x74.html
share/doc/cairomm-1.0/reference/html/functions_func_0x75.html
share/doc/cairomm-1.0/reference/html/functions_func_0x76.html
share/doc/cairomm-1.0/reference/html/functions_func_0x77.html
share/doc/cairomm-1.0/reference/html/functions_func_0x78.html
share/doc/cairomm-1.0/reference/html/functions_func_0x7e.html
share/doc/cairomm-1.0/reference/html/functions_type.html
share/doc/cairomm-1.0/reference/html/functions_vars.html
share/doc/cairomm-1.0/reference/html/graph_legend.html
share/doc/cairomm-1.0/reference/html/graph_legend.png
share/doc/cairomm-1.0/reference/html/hierarchy.html
share/doc/cairomm-1.0/reference/html/image-surface.cc-example.html
share/doc/cairomm-1.0/reference/html/index.html
share/doc/cairomm-1.0/reference/html/inherit__graph__0.png
share/doc/cairomm-1.0/reference/html/inherit__graph__1.png
share/doc/cairomm-1.0/reference/html/inherit__graph__10.png
share/doc/cairomm-1.0/reference/html/inherit__graph__11.png
share/doc/cairomm-1.0/reference/html/inherit__graph__2.png
share/doc/cairomm-1.0/reference/html/inherit__graph__3.png
share/doc/cairomm-1.0/reference/html/inherit__graph__4.png
share/doc/cairomm-1.0/reference/html/inherit__graph__5.png
share/doc/cairomm-1.0/reference/html/inherit__graph__6.png
share/doc/cairomm-1.0/reference/html/inherit__graph__7.png
share/doc/cairomm-1.0/reference/html/inherit__graph__8.png
share/doc/cairomm-1.0/reference/html/inherit__graph__9.png
share/doc/cairomm-1.0/reference/html/inherits.html
share/doc/cairomm-1.0/reference/html/namespaceCairo.html
share/doc/cairomm-1.0/reference/html/namespacemembers.html
share/doc/cairomm-1.0/reference/html/namespacemembers_enum.html
share/doc/cairomm-1.0/reference/html/namespacemembers_eval.html
share/doc/cairomm-1.0/reference/html/namespacemembers_type.html
share/doc/cairomm-1.0/reference/html/namespaces.html
share/doc/cairomm-1.0/reference/html/pages.html
share/doc/cairomm-1.0/reference/html/pdf-surface.cc-example.html
share/doc/cairomm-1.0/reference/html/ps-surface.cc-example.html
share/doc/cairomm-1.0/reference/html/structCairo_1_1ColorStop-members.html
share/doc/cairomm-1.0/reference/html/structCairo_1_1ColorStop.html
share/doc/cairomm-1.0/reference/html/svg-surface.cc-example.html
share/doc/cairomm-1.0/reference/html/tab_b.gif
share/doc/cairomm-1.0/reference/html/tab_l.gif
share/doc/cairomm-1.0/reference/html/tab_r.gif
share/doc/cairomm-1.0/reference/html/tabs.css
share/doc/cairomm-1.0/reference/html/toy-text.cc-example.html
share/doc/cairomm-1.0/reference/html/user-font.cc-example.html