diff options
Diffstat (limited to 'graphics')
68 files changed, 1198 insertions, 450 deletions
diff --git a/graphics/Makefile b/graphics/Makefile index fdcea3838653..f2026b95f215 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -223,6 +223,7 @@ SUBDIR += gdal-grass SUBDIR += gdchart SUBDIR += gdk-pixbuf + SUBDIR += gdk-pixbuf2 SUBDIR += gdtclft SUBDIR += geeqie SUBDIR += gegl diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 0f748c619795..ddc7f2b1809e 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -3,12 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/cairo/Makefile,v 1.93 2010/04/03 05:40:01 marcus Exp $ +# $MCom: ports/graphics/cairo/Makefile,v 1.101 2010/10/29 15:40:04 kwm Exp $ # PORTNAME= cairo -PORTVERSION= 1.8.10 -PORTREVISION?= 1 +PORTVERSION= 1.10.0 +PORTREVISION= 2 PORTEPOCH?= 1 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ @@ -24,17 +24,17 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ pixman-1.9:${PORTSDIR}/x11/pixman +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \ --disable-directfb \ - --enable-pdf \ - --enable-ps -USE_GNOME= gnomehack ltverhack referencehack + --enable-gobject +USE_GNOME= glib20 gnomehack ltverhack referencehack USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \ - LDFLAGS="${PTHREAD_LIBS}" \ - png_REQUIRES="libpng" +CPPFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} .if defined(WITHOUT_X11) CONFIGURE_ARGS+=--disable-xlib @@ -44,24 +44,25 @@ USE_XORG+= xrender PLIST_SUB+= X11="" .endif -OPTIONS+= GLITZ "Enable Glitz OpenGL Support" Off \ +OPTIONS+= GL "Enable OpenGL Support" Off \ XCB "Enable XCB (X C-language Binding) Support" On .include <bsd.port.pre.mk> -.if defined(WITH_GLITZ) -LIB_DEPENDS+= glitz-glx.1:${PORTSDIR}/graphics/glitz -CONFIGURE_ARGS+= --enable-glitz -PLIST_SUB+= GLITZ="" +.if defined(WITH_GL) +USE_GL= gl +CONFIGURE_ARGS+= --enable-gl +PLIST_SUB+= GL="" .else -CONFIGURE_ARGS+= --disable-glitz -PLIST_SUB+= GLITZ="@comment " +CONFIGURE_ARGS+= --disable-gl +PLIST_SUB+= GL="@comment " .endif -.ifdef(WITH_XCB) +.if defined(WITH_XCB) BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util CONFIGURE_ARGS+= --enable-xcb +# this option exposes a bug --enable-xlib-xcb=auto PLIST_SUB+= XCB="" .else CONFIGURE_ARGS+= --disable-xcb @@ -69,13 +70,17 @@ PLIST_SUB+= XCB="@comment " .endif post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \ - ${WRKSRC}/test/Makefile.in + @${REINPLACE_CMD} -e '/test/s/==/=/g' \ + -e '/LIBS/s/-lrt//' \ + ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-lcairo|-lcairo ${PTHREAD_LIBS}|' \ ${WRKSRC}/src/*.pc.in - @${REINPLACE_CMD} -e 's|src test doc|src doc|; \ - s|@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = test||' \ + @${REINPLACE_CMD} -e '/@CAIRO_HAS_PNG_FUNCTIONS_TRUE@.*=/d' \ ${WRKSRC}/Makefile.in +.if defined(WITH_GL) + @${REINPLACE_CMD} 's|@CAIRO_CFLAGS@|-I$$(top_srcdir)/src/glew &|' \ + ${WRKSRC}/src/Makefile.in +.endif .include <bsd.port.post.mk> diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo index 4d008ca43cd3..10a0e78cde6c 100644 --- a/graphics/cairo/distinfo +++ b/graphics/cairo/distinfo @@ -1,3 +1,3 @@ -MD5 (cairo-1.8.10.tar.gz) = b60a82f405f9400bbfdcf850b1728d25 -SHA256 (cairo-1.8.10.tar.gz) = 572bada15596ec8708392db1af8b93a1af75ca47690348154e2841f3a6f08439 -SIZE (cairo-1.8.10.tar.gz) = 7102657 +MD5 (cairo-1.10.0.tar.gz) = 70a2ece66cf473d976e2db0f75bf199e +SHA256 (cairo-1.10.0.tar.gz) = 0f2ce4cc4615594088d74eb8b5360bad7c3cc3c3da9b61af9bfd979ed1ed94b2 +SIZE (cairo-1.10.0.tar.gz) = 24022822 diff --git a/graphics/cairo/files/patch-src_cairo.h b/graphics/cairo/files/patch-src_cairo.h new file mode 100644 index 000000000000..5e12601a0509 --- /dev/null +++ b/graphics/cairo/files/patch-src_cairo.h @@ -0,0 +1,11 @@ +--- src/cairo.h.orig 2010-10-29 16:27:48.000000000 +0200 ++++ src/cairo.h 2010-10-29 16:28:07.000000000 +0200 +@@ -1973,7 +1973,7 @@ typedef enum _cairo_device_type { + CAIRO_DEVICE_TYPE_SCRIPT, + CAIRO_DEVICE_TYPE_XCB, + CAIRO_DEVICE_TYPE_XLIB, +- CAIRO_DEVICE_TYPE_XML, ++ CAIRO_DEVICE_TYPE_XML + } cairo_device_type_t; + + cairo_public cairo_device_type_t diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist index ec0206e6a37d..9271bf93e961 100644 --- a/graphics/cairo/pkg-plist +++ b/graphics/cairo/pkg-plist @@ -1,28 +1,48 @@ +bin/cairo-trace include/cairo/cairo-deprecated.h include/cairo/cairo-features.h include/cairo/cairo-ft.h -%%GLITZ%%include/cairo/cairo-glitz.h +%%GL%%include/cairo/cairo-gl.h +include/cairo/cairo-gobject.h include/cairo/cairo-pdf.h include/cairo/cairo-ps.h +include/cairo/cairo-script-interpreter.h include/cairo/cairo-svg.h include/cairo/cairo-version.h -%%XCB%%include/cairo/cairo-xcb-xrender.h %%XCB%%include/cairo/cairo-xcb.h %%X11%%include/cairo/cairo-xlib-xrender.h %%X11%%include/cairo/cairo-xlib.h include/cairo/cairo.h +lib/cairo/libcairo-trace.a +lib/cairo/libcairo-trace.la +lib/cairo/libcairo-trace.so +lib/cairo/libcairo-trace.so.0 +lib/libcairo-gobject.a +lib/libcairo-gobject.la +lib/libcairo-gobject.so +lib/libcairo-gobject.so.2 +lib/libcairo-script-interpreter.a +lib/libcairo-script-interpreter.la +lib/libcairo-script-interpreter.so +lib/libcairo-script-interpreter.so.2 lib/libcairo.a lib/libcairo.la lib/libcairo.so lib/libcairo.so.2 libdata/pkgconfig/cairo.pc +libdata/pkgconfig/cairo-fc.pc libdata/pkgconfig/cairo-ft.pc -%%GLITZ%%libdata/pkgconfig/cairo-glitz.pc +%%GL%%libdata/pkgconfig/cairo-gl.pc +%%GL%%libdata/pkgconfig/cairo-glx.pc +libdata/pkgconfig/cairo-gobject.pc libdata/pkgconfig/cairo-pdf.pc libdata/pkgconfig/cairo-png.pc libdata/pkgconfig/cairo-ps.pc libdata/pkgconfig/cairo-svg.pc %%XCB%%libdata/pkgconfig/cairo-xcb.pc +%%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc %%X11%%libdata/pkgconfig/cairo-xlib.pc +@comment %%X11%%%%XCB%%libdata/pkgconfig/cairo-xlib-xcb.pc %%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc @dirrm include/cairo +@dirrm lib/cairo diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile index 9eb449539161..bf8813740064 100644 --- a/graphics/cairomm/Makefile +++ b/graphics/cairomm/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/graphics/cairomm/Makefile,v 1.4 2008/06/16 22:38:50 mezz Exp $ +# $MCom: ports/graphics/cairomm/Makefile,v 1.16 2010/10/26 09:42:43 kwm Exp $ # PORTNAME= cairomm -PORTVERSION= 1.8.4 -PORTREVISION= 1 +PORTVERSION= 1.9.6 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ @@ -18,6 +17,8 @@ COMMENT= C++ interface to cairo LIB_DEPENDS= xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26 \ cairo.2:${PORTSDIR}/graphics/cairo +LICENSE= LGPL20 +LICENSE_FILE= ${WRKSRC}/COPYING USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_GMAKE= yes diff --git a/graphics/cairomm/distinfo b/graphics/cairomm/distinfo index 6fb127edd744..15193e34ba0f 100644 --- a/graphics/cairomm/distinfo +++ b/graphics/cairomm/distinfo @@ -1,3 +1,3 @@ -MD5 (cairomm-1.8.4.tar.gz) = 559afbc47484ba3fad265e38a3dafe90 -SHA256 (cairomm-1.8.4.tar.gz) = a28ec6d9af8f93d09076f32cd77de35f9d74a517def5dea12cb8cc2ce3a6c8f1 -SIZE (cairomm-1.8.4.tar.gz) = 906632 +MD5 (cairomm-1.9.6.tar.gz) = f0c0b03142b67d798e781e3f40dea456 +SHA256 (cairomm-1.9.6.tar.gz) = b7a377273b5369118a72f2802f4fd58419db45dae89bd7d0cf2e657e220765f3 +SIZE (cairomm-1.9.6.tar.gz) = 878676 diff --git a/graphics/cairomm/files/patch-cairomm_fontface.cc b/graphics/cairomm/files/patch-cairomm_fontface.cc deleted file mode 100644 index 18d7fc85b9d3..000000000000 --- a/graphics/cairomm/files/patch-cairomm_fontface.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- cairomm/fontface.cc.orig 2009-02-24 02:40:24.000000000 -0500 -+++ cairomm/fontface.cc 2009-02-24 02:49:31.000000000 -0500 -@@ -309,7 +309,7 @@ UserFontFace::text_to_glyphs(const RefPt - // 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; - } - diff --git a/graphics/cairomm/pkg-plist b/graphics/cairomm/pkg-plist index 83d49b33573d..fb7e7566525b 100644 --- a/graphics/cairomm/pkg-plist +++ b/graphics/cairomm/pkg-plist @@ -1,5 +1,6 @@ include/cairomm-1.0/cairomm/cairomm.h include/cairomm-1.0/cairomm/context.h +include/cairomm-1.0/cairomm/device.h include/cairomm-1.0/cairomm/enums.h include/cairomm-1.0/cairomm/exception.h include/cairomm-1.0/cairomm/fontface.h @@ -10,6 +11,7 @@ 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 @@ -28,12 +30,16 @@ libdata/pkgconfig/cairomm-png-1.0.pc libdata/pkgconfig/cairomm-ps-1.0.pc libdata/pkgconfig/cairomm-svg-1.0.pc libdata/pkgconfig/cairomm-xlib-1.0.pc +libdata/pkgconfig/cairomm-xlib-xrender-1.0.pc %%PORTDOCS%%share/devhelp/books/cairomm-1.0/cairomm-1.0.devhelp2 %%PORTDOCS%%share/doc/cairomm-1.0/reference/cairomm-1.0.tag %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/annotated.html +%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/bc_s.png %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/cairomm.css %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1Context-members.html %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1Context.html +%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1Device-members.html +%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1Device.html %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1FontFace-members.html %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1FontFace.html %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1FontOptions-members.html @@ -68,6 +74,8 @@ libdata/pkgconfig/cairomm-xlib-1.0.pc %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1RadialGradient.html %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1RefPtr-members.html %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1RefPtr.html +%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1Region-members.html +%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1Region.html %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1ScaledFont-members.html %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1ScaledFont.html %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1SolidPattern-members.html @@ -96,6 +104,7 @@ libdata/pkgconfig/cairomm-xlib-1.0.pc %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1logic__error.html %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classcairo__matrix__t.html %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classes.html +%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/closed.png %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/deprecated.html %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/doxygen.png %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/examples.html @@ -153,6 +162,8 @@ libdata/pkgconfig/cairomm-xlib-1.0.pc %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__0.png %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__1.png %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__10.png +%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__11.png +%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__12.png %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__2.png %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__3.png %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__4.png @@ -168,15 +179,19 @@ libdata/pkgconfig/cairomm-xlib-1.0.pc %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/namespacemembers_eval.html %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/namespacemembers_type.html %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/namespaces.html +%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/nav_f.png +%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/nav_h.png +%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/open.png %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/pages.html %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/pdf-surface_8cc-example.html %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/ps-surface_8cc-example.html %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/structCairo_1_1ColorStop-members.html %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/structCairo_1_1ColorStop.html %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/svg-surface_8cc-example.html -%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tab_b.gif -%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tab_l.gif -%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tab_r.gif +%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tab_a.png +%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tab_b.png +%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tab_h.png +%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tab_s.png %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tabs.css %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/toy-text_8cc-example.html %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/user-font_8cc-example.html diff --git a/graphics/clutter-gtk/Makefile b/graphics/clutter-gtk/Makefile index d8487f15c1fa..1ed07187a3ce 100644 --- a/graphics/clutter-gtk/Makefile +++ b/graphics/clutter-gtk/Makefile @@ -6,10 +6,11 @@ # PORTNAME= clutter-gtk -PORTVERSION= 0.10.4 +PORTVERSION= 0.10.8 PORTREVISION= 1 CATEGORIES= graphics -MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/ +MASTER_SITES= GNOME \ + http://source.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/ MAINTAINER= gnome@FreeBSD.org COMMENT= GTK+ Integration library for Clutter @@ -28,8 +29,4 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -post-patch: - @${REINPLACE_CMD} -e 's|clutter-x11-0.9|clutter-x11-1.0|g' \ - ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/graphics/clutter-gtk/distinfo b/graphics/clutter-gtk/distinfo index 6447d72ffd06..008e8138e52e 100644 --- a/graphics/clutter-gtk/distinfo +++ b/graphics/clutter-gtk/distinfo @@ -1,3 +1,3 @@ -MD5 (clutter-gtk-0.10.4.tar.bz2) = fd015e8080e1212dacc95d0e3d776d0d -SHA256 (clutter-gtk-0.10.4.tar.bz2) = 0134a8de202c518e231f340f5f2f3e988350105de9fadd0e849f08d95ac1b912 -SIZE (clutter-gtk-0.10.4.tar.bz2) = 307429 +MD5 (clutter-gtk-0.10.8.tar.bz2) = 22b4ebddc795e40d83622d7d23669eff +SHA256 (clutter-gtk-0.10.8.tar.bz2) = 7867f951568871d9f68cbe8a3644fd53d2138f725b7ba61ffc0053eb64e80814 +SIZE (clutter-gtk-0.10.8.tar.bz2) = 321316 diff --git a/graphics/clutter-gtk/files/patch-clutter-gtk_Makefile.in b/graphics/clutter-gtk/files/patch-clutter-gtk_Makefile.in new file mode 100644 index 000000000000..80c495f4867f --- /dev/null +++ b/graphics/clutter-gtk/files/patch-clutter-gtk_Makefile.in @@ -0,0 +1,28 @@ +--- clutter-gtk/Makefile.in.orig 2010-10-07 22:59:05.000000000 +0200 ++++ clutter-gtk/Makefile.in 2010-10-07 23:01:50.000000000 +0200 +@@ -289,6 +289,7 @@ + -DCLUTTER_DISABLE_DEPRECATED \ + $(CLUTTER_GTK_DEBUG_CFLAGS) + ++common_cflags = $(CLUTTER_CFLAGS) $(GTK_CFLAGS) + + # please, keep these lists sorted alphabetically + sources_c = \ +@@ -311,7 +312,7 @@ + libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES = $(sources_c) + libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS) + libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS) +-libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(MAINTAINER_CFLAGS) $(GTK_CFLAGS) $(CLUTTER_CFLAGS) ++libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(common_cflags) $(MAINTAINER_CFLAGS) + cluttergtkheadersdir = $(includedir)/clutter-1.0/clutter-gtk + cluttergtkheaders_HEADERS = $(sources_h) $(srcdir)/clutter-gtk.h + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GtkClutter-@CLUTTER_GTK_API_VERSION@.gir +@@ -744,7 +745,7 @@ + @HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \ + @HAVE_INTROSPECTION_TRUE@ --namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \ + @HAVE_INTROSPECTION_TRUE@ --strip-prefix=GtkClutter \ +-@HAVE_INTROSPECTION_TRUE@ $(INCLUDES) $(AM_CPPFLAGS) \ ++@HAVE_INTROSPECTION_TRUE@ $(INCLUDES) $(AM_CPPFLAGS) $(common_cflags) \ + @HAVE_INTROSPECTION_TRUE@ --add-include-path=$(srcdir) --add-include=path=. \ + @HAVE_INTROSPECTION_TRUE@ --include=Clutter-1.0 \ + @HAVE_INTROSPECTION_TRUE@ --include=GdkPixbuf-2.0 \ diff --git a/graphics/clutter-qt/Makefile b/graphics/clutter-qt/Makefile index 1895eb049676..f20c1fa2cfea 100644 --- a/graphics/clutter-qt/Makefile +++ b/graphics/clutter-qt/Makefile @@ -16,6 +16,8 @@ COMMENT= QT+ Integration library for Clutter LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter +BROKEN= Doesn't build with Glib-2.26 + USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:22 diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile index 19138147f06a..1cd758a06b73 100644 --- a/graphics/clutter/Makefile +++ b/graphics/clutter/Makefile @@ -3,11 +3,11 @@ # Whom: Martin Wilke <miwi@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/graphics/clutter/Makefile,v 1.1 2010/07/15 14:48:21 kwm Exp $ +# $MCom: ports/graphics/clutter/Makefile,v 1.34 2010/09/24 16:35:42 kwm Exp $ # PORTNAME= clutter -PORTVERSION= 1.2.12 +PORTVERSION= 1.4.0 CATEGORIES= graphics MASTER_SITES= GNOME \ http://www.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/ @@ -15,15 +15,19 @@ MASTER_SITES= GNOME \ MAINTAINER= gnome@FreeBSD.org COMMENT= OpenGL based interactive canvas library +LIB_DEPENDS= json-glib-1.0.0:${PORTSDIR}/devel/json-glib + +LICENSE= LGPL21 +LICENSE_FILE= ${WRKSRC}/COPYING USE_GMAKE= yes USE_GETTEXT= yes USE_BZIP2= yes USE_AUTOTOOLS= libtool:22 -USE_GNOME= pkgconfig gtk20 gnomehack ltverhack gnomeprefix +USE_GNOME= pkgconfig gdkpixbuf2 gnomehack ltverhack gnomeprefix atk pango USE_GL= gl USE_XORG= glproto x11 xfixes xdamage xcomposite xi USE_LDCONFIG= yes -CONFIGURE_ARGS= --with-x --with-json=internal +CONFIGURE_ARGS= --with-x --enable-conformance=no CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} diff --git a/graphics/clutter/distinfo b/graphics/clutter/distinfo index 99cb48c39429..2f859197a3c4 100644 --- a/graphics/clutter/distinfo +++ b/graphics/clutter/distinfo @@ -1,3 +1,3 @@ -MD5 (clutter-1.2.12.tar.bz2) = 76f70e765adcf7146be1ceb50bafa14f -SHA256 (clutter-1.2.12.tar.bz2) = 4582e6579897374d1f8ce51daa330311ebb90033fad95d5f076c1e9392b4ae68 -SIZE (clutter-1.2.12.tar.bz2) = 2396325 +MD5 (clutter-1.4.0.tar.bz2) = 329b6ac4e14b6f63b23297cfbb05af93 +SHA256 (clutter-1.4.0.tar.bz2) = bcdb2c55a083b8f18b0205e816c303605926b03e19f380294a203ae19ec02c96 +SIZE (clutter-1.4.0.tar.bz2) = 4476562 diff --git a/graphics/clutter/files/patch-clutter_cogl_cogl_Makefile.in b/graphics/clutter/files/patch-clutter_cogl_cogl_Makefile.in new file mode 100644 index 000000000000..ec4a62547896 --- /dev/null +++ b/graphics/clutter/files/patch-clutter_cogl_cogl_Makefile.in @@ -0,0 +1,10 @@ +--- clutter/cogl/cogl/Makefile.in.orig 2010-11-20 14:38:12.000000000 +0100 ++++ clutter/cogl/cogl/Makefile.in 2010-11-20 14:47:42.000000000 +0100 +@@ -582,6 +582,7 @@ + -I$(srcdir)/winsys \ + -I$(srcdir)/driver/$(COGL_DRIVER) \ + -I$(top_builddir)/clutter/cogl \ ++ `pkg-config --cflags gl` \ + $(NULL) + + AM_CPPFLAGS = \ diff --git a/graphics/clutter/files/patch-clutter_glx_clutter-stage-glx.c b/graphics/clutter/files/patch-clutter_glx_clutter-stage-glx.c deleted file mode 100644 index fff439a43af2..000000000000 --- a/graphics/clutter/files/patch-clutter_glx_clutter-stage-glx.c +++ /dev/null @@ -1,12 +0,0 @@ ---- clutter/glx/clutter-stage-glx.c.orig 2010-07-15 15:58:02.000000000 +0000 -+++ clutter/glx/clutter-stage-glx.c 2010-07-15 15:58:25.000000000 +0000 -@@ -487,8 +487,8 @@ - (retraceCount + 1) % 2, - &retraceCount); - } -- else - #ifdef __linux__ -+ else - { - drm_wait_vblank_t blank; - diff --git a/graphics/clutter/pkg-plist b/graphics/clutter/pkg-plist index 829bcbdc4edc..59a6dba2c5fc 100644 --- a/graphics/clutter/pkg-plist +++ b/graphics/clutter/pkg-plist @@ -1,4 +1,19 @@ +include/clutter-1.0/cally/cally-actor.h +include/clutter-1.0/cally/cally-clone.h +include/clutter-1.0/cally/cally-factory.h +include/clutter-1.0/cally/cally-group.h +include/clutter-1.0/cally/cally-main.h +include/clutter-1.0/cally/cally-rectangle.h +include/clutter-1.0/cally/cally-root.h +include/clutter-1.0/cally/cally-stage.h +include/clutter-1.0/cally/cally-text.h +include/clutter-1.0/cally/cally-texture.h +include/clutter-1.0/cally/cally-util.h +include/clutter-1.0/cally/cally.h +include/clutter-1.0/clutter/clutter-action.h include/clutter-1.0/clutter/clutter-actor.h +include/clutter-1.0/clutter/clutter-actor-meta.h +include/clutter-1.0/clutter/clutter-align-constraint.h include/clutter-1.0/clutter/clutter-alpha.h include/clutter-1.0/clutter/clutter-animatable.h include/clutter-1.0/clutter/clutter-animation.h @@ -12,16 +27,25 @@ include/clutter-1.0/clutter/clutter-behaviour-rotate.h include/clutter-1.0/clutter/clutter-behaviour-scale.h include/clutter-1.0/clutter/clutter-behaviour.h include/clutter-1.0/clutter/clutter-bin-layout.h +include/clutter-1.0/clutter/clutter-bind-constraint.h include/clutter-1.0/clutter/clutter-binding-pool.h +include/clutter-1.0/clutter/clutter-blur-effect.h include/clutter-1.0/clutter/clutter-box-layout.h include/clutter-1.0/clutter/clutter-box.h include/clutter-1.0/clutter/clutter-cairo-texture.h include/clutter-1.0/clutter/clutter-child-meta.h +include/clutter-1.0/clutter/clutter-click-action.h include/clutter-1.0/clutter/clutter-clone.h include/clutter-1.0/clutter/clutter-color.h +include/clutter-1.0/clutter/clutter-colorize-effect.h include/clutter-1.0/clutter/clutter-container.h +include/clutter-1.0/clutter/clutter-constraint.h +include/clutter-1.0/clutter/clutter-deform-effect.h include/clutter-1.0/clutter/clutter-deprecated.h +include/clutter-1.0/clutter/clutter-desaturate-effect.h include/clutter-1.0/clutter/clutter-device-manager.h +include/clutter-1.0/clutter/clutter-drag-action.h +include/clutter-1.0/clutter/clutter-effect.h include/clutter-1.0/clutter/clutter-enum-types.h include/clutter-1.0/clutter/clutter-event.h include/clutter-1.0/clutter/clutter-feature.h @@ -33,23 +57,31 @@ include/clutter-1.0/clutter/clutter-group.h include/clutter-1.0/clutter/clutter-input-device.h include/clutter-1.0/clutter/clutter-interval.h include/clutter-1.0/clutter/clutter-json.h +include/clutter-1.0/clutter/clutter-keysyms-compat.h include/clutter-1.0/clutter/clutter-keysyms.h include/clutter-1.0/clutter/clutter-layout-manager.h include/clutter-1.0/clutter/clutter-layout-meta.h include/clutter-1.0/clutter/clutter-list-model.h include/clutter-1.0/clutter/clutter-main.h +include/clutter-1.0/clutter/clutter-marshal.h include/clutter-1.0/clutter/clutter-media.h include/clutter-1.0/clutter/clutter-model.h +include/clutter-1.0/clutter/clutter-offscreen-effect.h +include/clutter-1.0/clutter/clutter-page-turn-effect.h include/clutter-1.0/clutter/clutter-path.h include/clutter-1.0/clutter/clutter-rectangle.h include/clutter-1.0/clutter/clutter-score.h include/clutter-1.0/clutter/clutter-script.h include/clutter-1.0/clutter/clutter-scriptable.h +include/clutter-1.0/clutter/clutter-settings.h +include/clutter-1.0/clutter/clutter-shader-effect.h include/clutter-1.0/clutter/clutter-shader-types.h include/clutter-1.0/clutter/clutter-shader.h include/clutter-1.0/clutter/clutter-stage-manager.h include/clutter-1.0/clutter/clutter-stage-window.h include/clutter-1.0/clutter/clutter-stage.h +include/clutter-1.0/clutter/clutter-state.h +include/clutter-1.0/clutter/clutter-table-layout.h include/clutter-1.0/clutter/clutter-text.h include/clutter-1.0/clutter/clutter-texture.h include/clutter-1.0/clutter/clutter-timeline.h @@ -61,47 +93,80 @@ include/clutter-1.0/clutter/clutter-version.h include/clutter-1.0/clutter/clutter.h include/clutter-1.0/clutter/glx/clutter-glx-texture-pixmap.h include/clutter-1.0/clutter/glx/clutter-glx.h -include/clutter-1.0/clutter/json/json-generator.h -include/clutter-1.0/clutter/json/json-glib.h -include/clutter-1.0/clutter/json/json-marshal.h -include/clutter-1.0/clutter/json/json-parser.h -include/clutter-1.0/clutter/json/json-types.h include/clutter-1.0/clutter/x11/clutter-x11-enum-types.h include/clutter-1.0/clutter/x11/clutter-x11-texture-pixmap.h include/clutter-1.0/clutter/x11/clutter-x11.h include/clutter-1.0/cogl/cogl-bitmap.h include/clutter-1.0/cogl/cogl-buffer.h include/clutter-1.0/cogl/cogl-color.h -include/clutter-1.0/cogl/cogl-debug.h include/clutter-1.0/cogl/cogl-defines.h include/clutter-1.0/cogl/cogl-deprecated.h include/clutter-1.0/cogl/cogl-enum-types.h include/clutter-1.0/cogl/cogl-fixed.h include/clutter-1.0/cogl/cogl-material.h include/clutter-1.0/cogl/cogl-matrix.h +include/clutter-1.0/cogl/cogl-object.h include/clutter-1.0/cogl/cogl-offscreen.h include/clutter-1.0/cogl/cogl-pango.h include/clutter-1.0/cogl/cogl-path.h -include/clutter-1.0/cogl/cogl-pixel-buffer.h +include/clutter-1.0/cogl/cogl-pixel-array.h include/clutter-1.0/cogl/cogl-primitives.h include/clutter-1.0/cogl/cogl-shader.h +include/clutter-1.0/cogl/cogl-texture-3d.h +include/clutter-1.0/cogl/cogl-texture-pixmap-x11.h include/clutter-1.0/cogl/cogl-texture.h include/clutter-1.0/cogl/cogl-types.h +include/clutter-1.0/cogl/cogl-vector.h include/clutter-1.0/cogl/cogl-vertex-buffer.h include/clutter-1.0/cogl/cogl.h +lib/girepository-1.0/Cally-1.0.typelib lib/girepository-1.0/Clutter-1.0.typelib +lib/girepository-1.0/ClutterX11-1.0.typelib lib/girepository-1.0/Cogl-1.0.typelib -lib/girepository-1.0/ClutterJson-1.0.typelib lib/libclutter-glx-1.0.a lib/libclutter-glx-1.0.la lib/libclutter-glx-1.0.so lib/libclutter-glx-1.0.so.0 +libdata/pkgconfig/cally-1.0.pc libdata/pkgconfig/clutter-1.0.pc libdata/pkgconfig/clutter-glx-1.0.pc libdata/pkgconfig/clutter-x11-1.0.pc libdata/pkgconfig/cogl-1.0.pc libdata/pkgconfig/cogl-gl-1.0.pc +share/doc/cally/CallyActor.html +share/doc/cally/CallyClone.html +share/doc/cally/CallyGroup.html +share/doc/cally/CallyRectangle.html +share/doc/cally/CallyRoot.html +share/doc/cally/CallyStage.html +share/doc/cally/CallyText.html +share/doc/cally/CallyTexture.html +share/doc/cally/CallyUtil.html +share/doc/cally/cally-General-API.html +share/doc/cally/cally.devhelp +share/doc/cally/cally.devhelp2 +share/doc/cally/callybase.html +share/doc/cally/callyobjecthierarchy.html +share/doc/cally/callyobjectindex.html +share/doc/cally/callyobjects.html +share/doc/cally/ch01.html +share/doc/cally/ch02.html +share/doc/cally/clutter-overview.html +share/doc/cally/home.png +share/doc/cally/index.html +share/doc/cally/index.sgml +share/doc/cally/ix01.html +share/doc/cally/ix02.html +share/doc/cally/ix03.html +share/doc/cally/left.png +share/doc/cally/license.html +share/doc/cally/right.png +share/doc/cally/style.css +share/doc/cally/up.png +%%DOCSDIR%%/ClutterAction.html %%DOCSDIR%%/ClutterActor.html +%%DOCSDIR%%/ClutterActorMeta.html +%%DOCSDIR%%/ClutterAlignConstraint.html %%DOCSDIR%%/ClutterAlpha.html %%DOCSDIR%%/ClutterAnimatable.html %%DOCSDIR%%/ClutterAnimator.html @@ -113,13 +178,22 @@ libdata/pkgconfig/cogl-gl-1.0.pc %%DOCSDIR%%/ClutterBehaviourRotate.html %%DOCSDIR%%/ClutterBehaviourScale.html %%DOCSDIR%%/ClutterBinLayout.html +%%DOCSDIR%%/ClutterBindConstraint.html +%%DOCSDIR%%/ClutterBlurEffect.html %%DOCSDIR%%/ClutterBox.html %%DOCSDIR%%/ClutterBoxLayout.html %%DOCSDIR%%/ClutterCairoTexture.html %%DOCSDIR%%/ClutterChildMeta.html +%%DOCSDIR%%/ClutterClickAction.html %%DOCSDIR%%/ClutterClone.html +%%DOCSDIR%%/ClutterColorizeEffect.html %%DOCSDIR%%/ClutterContainer.html +%%DOCSDIR%%/ClutterConstraint.html +%%DOCSDIR%%/ClutterDeformEffect.html %%DOCSDIR%%/ClutterDeviceManager.html +%%DOCSDIR%%/ClutterDesaturateEffect.html +%%DOCSDIR%%/ClutterDragAction.html +%%DOCSDIR%%/ClutterEffect.html %%DOCSDIR%%/ClutterFixedLayout.html %%DOCSDIR%%/ClutterFlowLayout.html %%DOCSDIR%%/ClutterGroup.html @@ -130,12 +204,18 @@ libdata/pkgconfig/cogl-gl-1.0.pc %%DOCSDIR%%/ClutterMedia.html %%DOCSDIR%%/ClutterModel.html %%DOCSDIR%%/ClutterModelIter.html +%%DOCSDIR%%/ClutterOffscreenEffect.html +%%DOCSDIR%%/ClutterPageTurnEffect.html %%DOCSDIR%%/ClutterPath.html %%DOCSDIR%%/ClutterRectangle.html %%DOCSDIR%%/ClutterScore.html %%DOCSDIR%%/ClutterScript.html %%DOCSDIR%%/ClutterScriptable.html +%%DOCSDIR%%/ClutterSettings.html +%%DOCSDIR%%/ClutterShaderEffect.html %%DOCSDIR%%/ClutterStage.html +%%DOCSDIR%%/ClutterState.html +%%DOCSDIR%%/ClutterTableLayout.html %%DOCSDIR%%/ClutterText.html %%DOCSDIR%%/ClutterTexture.html %%DOCSDIR%%/ClutterTimeline.html @@ -156,15 +236,17 @@ libdata/pkgconfig/cogl-gl-1.0.pc %%DOCSDIR%%/ch08.html %%DOCSDIR%%/ch09.html %%DOCSDIR%%/ch10.html +%%DOCSDIR%%/ch11.html %%DOCSDIR%%/clutter-ClutterBackend.html +%%DOCSDIR%%/clutter-ClutterX11TexturePixmap.html %%DOCSDIR%%/clutter-Colors.html %%DOCSDIR%%/clutter-EGL-Specific-Support.html -%%DOCSDIR%%/clutter-EGLX-Specific-Support.html %%DOCSDIR%%/clutter-Events.html %%DOCSDIR%%/clutter-Features.html %%DOCSDIR%%/clutter-GLX-Specific-Support.html %%DOCSDIR%%/clutter-General.html %%DOCSDIR%%/clutter-Implicit-Animations.html +%%DOCSDIR%%/clutter-Intel-CE3100-CE4100-Specific-Support.html %%DOCSDIR%%/clutter-Key-Bindings.html %%DOCSDIR%%/clutter-Shaders.html %%DOCSDIR%%/clutter-Stage-Manager.html @@ -209,6 +291,7 @@ libdata/pkgconfig/cogl-gl-1.0.pc %%DOCSDIR%%/ix06.html %%DOCSDIR%%/ix07.html %%DOCSDIR%%/ix08.html +%%DOCSDIR%%/ix09.html %%DOCSDIR%%/left.png %%DOCSDIR%%/license.html %%DOCSDIR%%/migrating-ClutterEffect.html @@ -223,22 +306,36 @@ libdata/pkgconfig/cogl-gl-1.0.pc %%DOCSDIR%%/using-cairo.html share/doc/cogl/ch01.html share/doc/cogl/ch02.html +share/doc/cogl/ch03.html +share/doc/cogl/cogl-3D-textures.html share/doc/cogl/cogl-Blend-Strings.html share/doc/cogl/cogl-Buffers.html +share/doc/cogl/cogl-Clipping-(Deprecated).html share/doc/cogl/cogl-Clipping.html share/doc/cogl/cogl-Color-Type.html share/doc/cogl/cogl-Fixed-Point-API.html +share/doc/cogl/cogl-General-API-(Deprecated).html share/doc/cogl/cogl-General-API.html +share/doc/cogl/cogl-Materials-(Deprecated).html share/doc/cogl/cogl-Materials.html share/doc/cogl/cogl-Matrices.html +share/doc/cogl/cogl-Offscreen-Buffers-(Deprecated).html share/doc/cogl/cogl-Offscreen-Buffers.html +share/doc/cogl/cogl-Path-Primitives.html share/doc/cogl/cogl-Primitives.html +share/doc/cogl/cogl-Shaders-and-Programmable-Pipeline-(Deprecated).html share/doc/cogl/cogl-Shaders-and-Programmable-Pipeline.html +share/doc/cogl/cogl-Textures-(Deprecated).html share/doc/cogl/cogl-Textures.html +share/doc/cogl/cogl-Vectors.html +share/doc/cogl/cogl-Vertex-Buffers-(Deprecated).html share/doc/cogl/cogl-Vertex-Buffers.html share/doc/cogl/cogl.devhelp share/doc/cogl/cogl.devhelp2 -share/doc/cogl/fill-rule.png +share/doc/cogl/cogl_ortho.png +share/doc/cogl/coglglossary.html +share/doc/cogl/fill-rule-even-odd.png +share/doc/cogl/fill-rule-non-zero.png share/doc/cogl/home.png share/doc/cogl/index.html share/doc/cogl/index.sgml @@ -247,19 +344,28 @@ share/doc/cogl/ix02.html share/doc/cogl/ix03.html share/doc/cogl/ix04.html share/doc/cogl/ix05.html +share/doc/cogl/ix06.html share/doc/cogl/left.png share/doc/cogl/license.html +share/doc/cogl/quad-indices-order.png +share/doc/cogl/quad-indices-triangles.png share/doc/cogl/right.png share/doc/cogl/style.css share/doc/cogl/up.png +share/gir-1.0/Cally-1.0.gir share/gir-1.0/Clutter-1.0.gir -share/gir-1.0/ClutterJson-1.0.gir +share/gir-1.0/ClutterX11-1.0.gir share/gir-1.0/Cogl-1.0.gir +share/locale/de/LC_MESSAGES/clutter-1.0.mo +share/locale/it/LC_MESSAGES/clutter-1.0.mo +share/locale/pl/LC_MESSAGES/clutter-1.0.mo +share/locale/zh_CN/LC_MESSAGES/clutter-1.0.mo @dirrm share/doc/cogl +@dirrm share/doc/cally @dirrm %%DOCSDIR%% @dirrm include/clutter-1.0/clutter/x11 -@dirrm include/clutter-1.0/clutter/json @dirrm include/clutter-1.0/clutter/glx @dirrm include/clutter-1.0/clutter @dirrm include/clutter-1.0/cogl +@dirrm include/clutter-1.0/cally @dirrm include/clutter-1.0 diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile index fe68490b16a3..9fed45c5dd5e 100644 --- a/graphics/eog-plugins/Makefile +++ b/graphics/eog-plugins/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/graphics/eog-plugins/Makefile,v 1.1 2010/06/23 15:28:22 kwm Exp $ +# $MCom: ports/graphics/eog-plugins/Makefile,v 1.14 2010/09/04 18:09:30 kwm Exp $ # PORTNAME= eog-plugins PORTVERSION= 2.30.1 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -31,8 +32,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ .include <bsd.port.pre.mk> .if !defined(WITHOUT_CHAMPLAIN) || \ - (exists(${LOCALBASE}/lib/libchamplain-0.4.so)) || defined(WITH_CHAMPLIAN) -LIB_DEPENDS+= champlain-0.4.1:${PORTSDIR}/graphics/libchamplain + (exists(${LOCALBASE}/lib/libchamplain-0.8.so)) || defined(WITH_CHAMPLIAN) +LIB_DEPENDS+= champlain-0.8.1:${PORTSDIR}/graphics/libchamplain PLIST_SUB+= CHAMPLAIN="" .else PLUST_SUB+= CHAMPLAIN="@comment " @@ -55,4 +56,9 @@ CONFIGURE_ARGS+=--disable-python PLIST_SUB+= PYTHON="@comment " .endif +post-patch: + @${REINPLACE_CMD} -e 's|champlain-0.4|champlain-0.8|g' \ + -e 's|champlain-gtk-0.4|champlain-gtk-0.8|g' \ + ${WRKSRC}/configure + .include <bsd.port.post.mk> diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index 7c2d37be98da..01c15ffdca11 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/graphics/eog/Makefile,v 1.10 2010/06/23 15:24:15 kwm Exp $ +# $MCom: ports/graphics/eog/Makefile,v 1.123 2010/11/16 10:11:41 kwm Exp $ # PORTNAME= eog -PORTVERSION= 2.30.2 +PORTVERSION= 2.32.1 CATEGORIES= graphics gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -15,13 +15,15 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= The Eye Of Gnome image viewer -BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme -RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme +BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \ + update-mime-database:${PORTSDIR}/misc/shared-mime-info +RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \ + update-mime-database:${PORTSDIR}/misc/shared-mime-info USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack librsvg2 desktopfileutils \ - gnomedesktop + gconf2 gnomedesktop WANT_GNOME= yes INSTALLS_ICONS= yes USE_GETTEXT= yes @@ -59,8 +61,8 @@ PLIST_SUB+= EXIFEXEMPI="" PLIST_SUB+= EXIFEXEMPI="@comment " .endif -.if ${HAVE_GNOME:Mpygnome2}!="" -USE_GNOME+= pygnome2 +.if ${HAVE_GNOME:Mpygtk2}!="" +USE_GNOME+= pygtk2 CONFIGURE_ARGS+=--enable-python .else CONFIGURE_ARGS+=--disable-python diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo index e744a76a973f..f47a31c3ca22 100644 --- a/graphics/eog/distinfo +++ b/graphics/eog/distinfo @@ -1,3 +1,2 @@ -MD5 (gnome2/eog-2.30.2.tar.bz2) = 2f7fdf9392f24229fd82c53e8465f998 -SHA256 (gnome2/eog-2.30.2.tar.bz2) = 0f508cbc1727181122410f921f54d6c1464d0b98d544a04bd7d021d43d2ab91b -SIZE (gnome2/eog-2.30.2.tar.bz2) = 2789170 +SHA256 (gnome2/eog-2.32.1.tar.bz2) = 543672fb8e8e300bf2cf4c7eef43b5b1624e2e48e6aa0801a083ae7beb2d7078 +SIZE (gnome2/eog-2.32.1.tar.bz2) = 2804681 diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist index 0d8ca576f30b..92f6c69b22c4 100644 --- a/graphics/eog/pkg-plist +++ b/graphics/eog/pkg-plist @@ -259,6 +259,7 @@ share/locale/is/LC_MESSAGES/eog.mo share/locale/it/LC_MESSAGES/eog.mo share/locale/ja/LC_MESSAGES/eog.mo share/locale/ka/LC_MESSAGES/eog.mo +share/locale/kk/LC_MESSAGES/eog.mo share/locale/kn/LC_MESSAGES/eog.mo share/locale/ko/LC_MESSAGES/eog.mo share/locale/ks/LC_MESSAGES/eog.mo @@ -448,6 +449,8 @@ share/omf/eog/eog-zh_TW.omf @dirrmtry share/locale/ku @dirrmtry share/locale/ks/LC_MESSAGES @dirrmtry share/locale/ks +@dirrmtry share/locale/kk/LC_MESSAGES +@dirrmtry share/locale/kk @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur @dirrmtry share/locale/en@shaw/LC_MESSAGES diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index 596aeece77bc..cd85c2f72e26 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -3,12 +3,11 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/graphics/evince/Makefile,v 1.11 2010/06/24 10:03:54 kwm Exp $ +# $MCom: ports/graphics/evince/Makefile,v 1.147 2010/09/28 07:27:12 kwm Exp $ # PORTNAME= evince -PORTVERSION= 2.30.3 -PORTREVISION= 2 +PORTVERSION= 2.32.0 CATEGORIES= graphics print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 multi-format document viewer BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme -LIB_DEPENDS= poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk \ +LIB_DEPENDS= poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk \ spectre.1:${PORTSDIR}/print/libspectre RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme @@ -33,10 +32,13 @@ USE_GNOME= gnomehack intlhack gnomeprefix desktopfileutils \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -GCONF_SCHEMAS= evince.schemas \ +GLIB_SCHEMAS= org.gnome.Evince.gschema.xml +GCONF_SCHEMAS= \ evince-thumbnailer.schemas \ evince-thumbnailer-ps.schemas +PLIST_SUB+= VERSION=2.32 + MAN1= evince.1 OPTIONS= DVI "Enable DVI viewer support" off \ @@ -120,6 +122,7 @@ PLIST_SUB+= COMICS="@comment " post-patch: @${REINPLACE_CMD} -e 's|execinfo.h|#|g' \ + -e 's|" == "|" = "|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e '/^DOC_MODULE_VERSION/d' \ ${WRKSRC}/help/reference/libdocument/Makefile.in \ @@ -127,5 +130,7 @@ post-patch: post-install: @-update-desktop-database + @${INSTALL_DATA} ${WRKSRC}/data/org.gnome.Evince.gschema.xml \ + ${PREFIX}/share/glib-2.0/schemas .include <bsd.port.post.mk> diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo index 8c3b0f42b085..bee1bd741bd8 100644 --- a/graphics/evince/distinfo +++ b/graphics/evince/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/evince-2.30.3.tar.bz2) = 516748897113cd4e9638c49245c555c2 -SHA256 (gnome2/evince-2.30.3.tar.bz2) = daddd9720bf8fc0156d9a4a5a85485c232393896376707cf7fcedfcbc515732f -SIZE (gnome2/evince-2.30.3.tar.bz2) = 2180874 +MD5 (gnome2/evince-2.32.0.tar.bz2) = ebc3ce6df8dcbf29cb9492f8dd031319 +SHA256 (gnome2/evince-2.32.0.tar.bz2) = 2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7 +SIZE (gnome2/evince-2.32.0.tar.bz2) = 2295272 diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist index c5fcd85807f1..af50cbf4da50 100644 --- a/graphics/evince/pkg-plist +++ b/graphics/evince/pkg-plist @@ -1,95 +1,97 @@ bin/evince bin/evince-previewer bin/evince-thumbnailer -include/evince/2.30/evince-document.h -include/evince/2.30/evince-view.h -include/evince/2.30/libdocument/ev-annotation.h -include/evince/2.30/libdocument/ev-async-renderer.h -include/evince/2.30/libdocument/ev-attachment.h -include/evince/2.30/libdocument/ev-backends-manager.h -include/evince/2.30/libdocument/ev-document-annotations.h -include/evince/2.30/libdocument/ev-document-attachments.h -include/evince/2.30/libdocument/ev-document-factory.h -include/evince/2.30/libdocument/ev-document-find.h -include/evince/2.30/libdocument/ev-document-fonts.h -include/evince/2.30/libdocument/ev-document-forms.h -include/evince/2.30/libdocument/ev-document-images.h -include/evince/2.30/libdocument/ev-document-info.h -include/evince/2.30/libdocument/ev-document-layers.h -include/evince/2.30/libdocument/ev-document-links.h -include/evince/2.30/libdocument/ev-document-misc.h -include/evince/2.30/libdocument/ev-document-print.h -include/evince/2.30/libdocument/ev-document-security.h -include/evince/2.30/libdocument/ev-document-thumbnails.h -include/evince/2.30/libdocument/ev-document-transition.h -include/evince/2.30/libdocument/ev-document-type-builtins.h -include/evince/2.30/libdocument/ev-document.h -include/evince/2.30/libdocument/ev-file-exporter.h -include/evince/2.30/libdocument/ev-file-helpers.h -include/evince/2.30/libdocument/ev-form-field.h -include/evince/2.30/libdocument/ev-image.h -include/evince/2.30/libdocument/ev-init.h -include/evince/2.30/libdocument/ev-layer.h -include/evince/2.30/libdocument/ev-link-action.h -include/evince/2.30/libdocument/ev-link-dest.h -include/evince/2.30/libdocument/ev-link.h -include/evince/2.30/libdocument/ev-mapping.h -include/evince/2.30/libdocument/ev-page.h -include/evince/2.30/libdocument/ev-render-context.h -include/evince/2.30/libdocument/ev-selection.h -include/evince/2.30/libdocument/ev-transition-effect.h -include/evince/2.30/libdocument/ev-version.h -include/evince/2.30/libview/ev-document-model.h -include/evince/2.30/libview/ev-job-scheduler.h -include/evince/2.30/libview/ev-jobs.h -include/evince/2.30/libview/ev-print-operation.h -include/evince/2.30/libview/ev-stock-icons.h -include/evince/2.30/libview/ev-view-presentation.h -include/evince/2.30/libview/ev-view-type-builtins.h -include/evince/2.30/libview/ev-view.h -%%COMICS%%lib/evince/2/backends/comicsdocument.evince-backend -%%DJVU%%lib/evince/2/backends/djvudocument.evince-backend -%%DVI%%lib/evince/2/backends/dvidocument.evince-backend -%%IMPRESS%%lib/evince/2/backends/impressdocument.evince-backend -%%COMICS%%lib/evince/2/backends/libcomicsdocument.a -%%COMICS%%lib/evince/2/backends/libcomicsdocument.la -%%COMICS%%lib/evince/2/backends/libcomicsdocument.so -%%DJVU%%lib/evince/2/backends/libdjvudocument.a -%%DJVU%%lib/evince/2/backends/libdjvudocument.la -%%DJVU%%lib/evince/2/backends/libdjvudocument.so -%%DVI%%lib/evince/2/backends/libdvidocument.a -%%DVI%%lib/evince/2/backends/libdvidocument.la -%%DVI%%lib/evince/2/backends/libdvidocument.so -%%IMPRESS%%lib/evince/2/backends/libimpressdocument.a -%%IMPRESS%%lib/evince/2/backends/libimpressdocument.la -%%IMPRESS%%lib/evince/2/backends/libimpressdocument.so -lib/evince/2/backends/libpdfdocument.a -lib/evince/2/backends/libpdfdocument.la -lib/evince/2/backends/libpdfdocument.so -lib/evince/2/backends/libpsdocument.a -lib/evince/2/backends/libpsdocument.la -lib/evince/2/backends/libpsdocument.so -lib/evince/2/backends/libtiffdocument.a -lib/evince/2/backends/libtiffdocument.la -lib/evince/2/backends/libtiffdocument.so -lib/evince/2/backends/pdfdocument.evince-backend -lib/evince/2/backends/psdocument.evince-backend -lib/evince/2/backends/tiffdocument.evince-backend +include/evince/%%VERSION%%/evince-document.h +include/evince/%%VERSION%%/evince-view.h +include/evince/%%VERSION%%/libdocument/ev-annotation.h +include/evince/%%VERSION%%/libdocument/ev-async-renderer.h +include/evince/%%VERSION%%/libdocument/ev-attachment.h +include/evince/%%VERSION%%/libdocument/ev-backends-manager.h +include/evince/%%VERSION%%/libdocument/ev-document-annotations.h +include/evince/%%VERSION%%/libdocument/ev-document-attachments.h +include/evince/%%VERSION%%/libdocument/ev-document-factory.h +include/evince/%%VERSION%%/libdocument/ev-document-find.h +include/evince/%%VERSION%%/libdocument/ev-document-fonts.h +include/evince/%%VERSION%%/libdocument/ev-document-forms.h +include/evince/%%VERSION%%/libdocument/ev-document-images.h +include/evince/%%VERSION%%/libdocument/ev-document-info.h +include/evince/%%VERSION%%/libdocument/ev-document-layers.h +include/evince/%%VERSION%%/libdocument/ev-document-links.h +include/evince/%%VERSION%%/libdocument/ev-document-misc.h +include/evince/%%VERSION%%/libdocument/ev-document-print.h +include/evince/%%VERSION%%/libdocument/ev-document-security.h +include/evince/%%VERSION%%/libdocument/ev-document-text.h +include/evince/%%VERSION%%/libdocument/ev-document-thumbnails.h +include/evince/%%VERSION%%/libdocument/ev-document-transition.h +include/evince/%%VERSION%%/libdocument/ev-document-type-builtins.h +include/evince/%%VERSION%%/libdocument/ev-document.h +include/evince/%%VERSION%%/libdocument/ev-file-exporter.h +include/evince/%%VERSION%%/libdocument/ev-file-helpers.h +include/evince/%%VERSION%%/libdocument/ev-form-field.h +include/evince/%%VERSION%%/libdocument/ev-image.h +include/evince/%%VERSION%%/libdocument/ev-init.h +include/evince/%%VERSION%%/libdocument/ev-layer.h +include/evince/%%VERSION%%/libdocument/ev-link-action.h +include/evince/%%VERSION%%/libdocument/ev-link-dest.h +include/evince/%%VERSION%%/libdocument/ev-link.h +include/evince/%%VERSION%%/libdocument/ev-mapping-list.h +include/evince/%%VERSION%%/libdocument/ev-page.h +include/evince/%%VERSION%%/libdocument/ev-render-context.h +include/evince/%%VERSION%%/libdocument/ev-selection.h +include/evince/%%VERSION%%/libdocument/ev-transition-effect.h +include/evince/%%VERSION%%/libdocument/ev-version.h +include/evince/%%VERSION%%/libview/ev-document-model.h +include/evince/%%VERSION%%/libview/ev-job-scheduler.h +include/evince/%%VERSION%%/libview/ev-jobs.h +include/evince/%%VERSION%%/libview/ev-print-operation.h +include/evince/%%VERSION%%/libview/ev-stock-icons.h +include/evince/%%VERSION%%/libview/ev-view-presentation.h +include/evince/%%VERSION%%/libview/ev-view-type-builtins.h +include/evince/%%VERSION%%/libview/ev-view.h +%%COMICS%%lib/evince/3/backends/comicsdocument.evince-backend +%%DJVU%%lib/evince/3/backends/djvudocument.evince-backend +%%DVI%%lib/evince/3/backends/dvidocument.evince-backend +%%IMPRESS%%lib/evince/3/backends/impressdocument.evince-backend +%%COMICS%%lib/evince/3/backends/libcomicsdocument.a +%%COMICS%%lib/evince/3/backends/libcomicsdocument.la +%%COMICS%%lib/evince/3/backends/libcomicsdocument.so +%%DJVU%%lib/evince/3/backends/libdjvudocument.a +%%DJVU%%lib/evince/3/backends/libdjvudocument.la +%%DJVU%%lib/evince/3/backends/libdjvudocument.so +%%DVI%%lib/evince/3/backends/libdvidocument.a +%%DVI%%lib/evince/3/backends/libdvidocument.la +%%DVI%%lib/evince/3/backends/libdvidocument.so +%%IMPRESS%%lib/evince/3/backends/libimpressdocument.a +%%IMPRESS%%lib/evince/3/backends/libimpressdocument.la +%%IMPRESS%%lib/evince/3/backends/libimpressdocument.so +lib/evince/3/backends/libpdfdocument.a +lib/evince/3/backends/libpdfdocument.la +lib/evince/3/backends/libpdfdocument.so +lib/evince/3/backends/libpsdocument.a +lib/evince/3/backends/libpsdocument.la +lib/evince/3/backends/libpsdocument.so +lib/evince/3/backends/libtiffdocument.a +lib/evince/3/backends/libtiffdocument.la +lib/evince/3/backends/libtiffdocument.so +lib/evince/3/backends/pdfdocument.evince-backend +lib/evince/3/backends/psdocument.evince-backend +lib/evince/3/backends/tiffdocument.evince-backend lib/libevdocument.a lib/libevdocument.la lib/libevdocument.so -lib/libevdocument.so.2 +lib/libevdocument.so.3 lib/libevview.a lib/libevview.la lib/libevview.so -lib/libevview.so.2 +lib/libevview.so.3 %%NAUTILUS%%lib/nautilus/extensions-2.0/libevince-properties-page.a %%NAUTILUS%%lib/nautilus/extensions-2.0/libevince-properties-page.la %%NAUTILUS%%lib/nautilus/extensions-2.0/libevince-properties-page.so -libdata/pkgconfig/evince-document-2.30.pc -libdata/pkgconfig/evince-view-2.30.pc +libdata/pkgconfig/evince-document-%%VERSION%%.pc +libdata/pkgconfig/evince-view-%%VERSION%%.pc libexec/evince-convert-metadata libexec/evinced +share/GConf/gsettings/evince.convert share/applications/evince.desktop share/dbus-1/services/org.gnome.evince.Daemon.service %%DOCSDIR%%/EggFindBar.html @@ -284,6 +286,8 @@ share/gnome/help/evince/pt_BR/evince.xml share/gnome/help/evince/pt_BR/figures/evince_start_window.png share/gnome/help/evince/ru/evince.xml share/gnome/help/evince/ru/figures/evince_start_window.png +share/gnome/help/evince/sl/evince.xml +share/gnome/help/evince/sl/figures/evince_start_window.png share/gnome/help/evince/sr/evince.xml share/gnome/help/evince/sr/figures/evince_start_window.png share/gnome/help/evince/sv/evince.xml @@ -317,6 +321,7 @@ share/locale/da/LC_MESSAGES/evince.mo share/locale/de/LC_MESSAGES/evince.mo share/locale/dz/LC_MESSAGES/evince.mo share/locale/el/LC_MESSAGES/evince.mo +share/locale/eo/LC_MESSAGES/evince.mo share/locale/en@shaw/LC_MESSAGES/evince.mo share/locale/en_CA/LC_MESSAGES/evince.mo share/locale/en_GB/LC_MESSAGES/evince.mo @@ -336,6 +341,7 @@ share/locale/id/LC_MESSAGES/evince.mo share/locale/it/LC_MESSAGES/evince.mo share/locale/ja/LC_MESSAGES/evince.mo share/locale/ka/LC_MESSAGES/evince.mo +share/locale/kk/LC_MESSAGES/evince.mo share/locale/kn/LC_MESSAGES/evince.mo share/locale/ko/LC_MESSAGES/evince.mo share/locale/ks/LC_MESSAGES/evince.mo @@ -398,6 +404,7 @@ share/omf/evince/evince-nl.omf share/omf/evince/evince-oc.omf share/omf/evince/evince-pt_BR.omf share/omf/evince/evince-ru.omf +share/omf/evince/evince-sl.omf share/omf/evince/evince-sr.omf share/omf/evince/evince-sv.omf share/omf/evince/evince-uk.omf @@ -414,6 +421,8 @@ share/omf/evince/evince-zh_CN.omf @dirrm share/gnome/help/evince/sv @dirrm share/gnome/help/evince/sr/figures @dirrm share/gnome/help/evince/sr +@dirrm share/gnome/help/evince/sl/figures +@dirrm share/gnome/help/evince/sl @dirrm share/gnome/help/evince/ru/figures @dirrm share/gnome/help/evince/ru @dirrm share/gnome/help/evince/pt_BR/figures @@ -473,15 +482,17 @@ share/omf/evince/evince-zh_CN.omf @dirrm share/doc/libevdocument @dirrm %%DOCSDIR%% @dirrmtry share/applications -@dirrm lib/evince/2/backends -@dirrm lib/evince/2 +@dirrm lib/evince/3/backends +@dirrm lib/evince/3 @dirrm lib/evince -@dirrm include/evince/2.30/libview -@dirrm include/evince/2.30/libdocument -@dirrm include/evince/2.30 +@dirrm include/evince/%%VERSION%%/libview +@dirrm include/evince/%%VERSION%%/libdocument +@dirrm include/evince/%%VERSION%% @dirrm include/evince @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@dirrmtry share/GConf/gsettings +@dirrmtry share/GConf @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/te/LC_MESSAGES @@ -508,6 +519,8 @@ share/omf/evince/evince-zh_CN.omf @dirrmtry share/locale/ku @dirrmtry share/locale/ks/LC_MESSAGES @dirrmtry share/locale/ks +@dirrmtry share/locale/kk/LC_MESSAGES +@dirrmtry share/locale/kk @dirrmtry share/locale/en@shaw/LC_MESSAGES @dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile new file mode 100644 index 000000000000..6fa18c02cecc --- /dev/null +++ b/graphics/gdk-pixbuf2/Makefile @@ -0,0 +1,45 @@ +# New ports collection makefile for: gdk-pixbuf +# Date created: 5th October 1999 +# Whom: Ade Lovett <ade@lovett.com> +# +# $FreeBSD$ +# $MCom: ports/graphics/gdk-pixbuf2/Makefile,v 1.9 2010/11/09 09:35:01 kwm Exp $ + +PORTNAME?= gdk-pixbuf +PORTVERSION= 2.22.1 +CATEGORIES?= graphics +MASTER_SITES= GNOME +MASTER_SITE_SUBDIR= sources/gdk-pixbuf/${PORTVERSION:R} +DISTNAME= gdk-pixbuf-${PORTVERSION} +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= A graphic library for GTK+ + +BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ + tiff.4:${PORTSDIR}/graphics/tiff \ + jpeg.11:${PORTSDIR}/graphics/jpeg \ + jasper.4:${PORTSDIR}/graphics/jasper + +LATEST_LINK= gdk-pixbuf2 +USE_BZIP2= yes +USE_GMAKE= yes +USE_XORG= xt xi x11 +USE_AUTOTOOLS= libtool:22 +USE_GNOME+= gnomehack glib20 ltverhack +USE_LDCONFIG= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --enable-introspection=yes --with-libjasper + +MAN1= gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1 + +post-patch: + @${REINPLACE_CMD} -e 's|" == "|" = "|g' ${WRKSRC}/configure + +post-install: + @cd ${WRKSRC}/docs/reference/gdk-pixbuf && gmake install-man1 + +.include <bsd.port.mk> diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo new file mode 100644 index 000000000000..a2b0891c3f8f --- /dev/null +++ b/graphics/gdk-pixbuf2/distinfo @@ -0,0 +1,2 @@ +SHA256 (gnome2/gdk-pixbuf-2.22.1.tar.bz2) = 6ce87eda24af9362307b2593c154d0b660f4e26d0abf2e71d46d0ddd55fd953d +SIZE (gnome2/gdk-pixbuf-2.22.1.tar.bz2) = 1543273 diff --git a/graphics/gdk-pixbuf2/files/patch-Makefile.in b/graphics/gdk-pixbuf2/files/patch-Makefile.in new file mode 100644 index 000000000000..0b95cf6c7e6e --- /dev/null +++ b/graphics/gdk-pixbuf2/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2010-06-27 12:20:54.000000000 +0200 ++++ Makefile.in 2010-06-27 12:21:04.000000000 +0200 +@@ -362,7 +362,7 @@ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +-SUBDIRS = gdk-pixbuf po docs tests contrib ++SUBDIRS = gdk-pixbuf po tests contrib + pkgconfigdir = $(prefix)/libdata/pkgconfig + pkgconfig_DATA = gdk-pixbuf-2.0.pc + ACLOCAL_AMFLAGS = -I m4 diff --git a/graphics/gdk-pixbuf2/pkg-descr b/graphics/gdk-pixbuf2/pkg-descr new file mode 100644 index 000000000000..e3b98bcb0ed1 --- /dev/null +++ b/graphics/gdk-pixbuf2/pkg-descr @@ -0,0 +1,8 @@ +The GdkPixBuf library provides a number of features: + + - Image loading facilities. + - Rendering of a GdkPixBuf into various formats: + drawables (windows, pixmaps), GdkRGB buffers. + - A cache interface + +WWW: http://developer.gnome.org/arch/imaging/gdkpixbuf.html diff --git a/graphics/gdk-pixbuf2/pkg-plist b/graphics/gdk-pixbuf2/pkg-plist new file mode 100644 index 000000000000..fc68f34cbde4 --- /dev/null +++ b/graphics/gdk-pixbuf2/pkg-plist @@ -0,0 +1,246 @@ +bin/gdk-pixbuf-csource +bin/gdk-pixbuf-query-loaders +include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h +include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h +include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-animation.h +include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-core.h +include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h +include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-features.h +include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-io.h +include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-loader.h +include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h +include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h +include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-transform.h +include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf.h +include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ani.a +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ani.la +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ani.so +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-bmp.a +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-bmp.la +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-bmp.so +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-gif.a +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-gif.la +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-gif.so +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-icns.a +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-icns.la +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-icns.so +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ico.a +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ico.la +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ico.so +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jasper.a +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jasper.la +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jasper.so +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jpeg.a +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jpeg.la +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jpeg.so +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-pcx.a +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-pcx.la +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-pcx.so +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-png.a +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-png.la +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-png.so +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-pnm.a +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-pnm.la +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-pnm.so +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-qtif.a +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-qtif.la +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-qtif.so +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ras.a +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ras.la +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ras.so +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-tga.a +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-tga.la +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-tga.so +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-tiff.a +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-tiff.la +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-tiff.so +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-wbmp.a +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-wbmp.la +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-wbmp.so +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xbm.a +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xbm.la +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xbm.so +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xpm.a +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xpm.la +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xpm.so +lib/girepository-1.0/GdkPixbuf-2.0.typelib +lib/libgdk_pixbuf-2.0.a +lib/libgdk_pixbuf-2.0.la +lib/libgdk_pixbuf-2.0.so +lib/libgdk_pixbuf-2.0.so.0 +lib/libgdk_pixbuf_xlib-2.0.a +lib/libgdk_pixbuf_xlib-2.0.la +lib/libgdk_pixbuf_xlib-2.0.so +lib/libgdk_pixbuf_xlib-2.0.so.0 +libdata/pkgconfig/gdk-pixbuf-2.0.pc +libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc +share/gir-1.0/GdkPixbuf-2.0.gir +share/locale/af/LC_MESSAGES/gdk-pixbuf.mo +share/locale/ang/LC_MESSAGES/gdk-pixbuf.mo +share/locale/ar/LC_MESSAGES/gdk-pixbuf.mo +share/locale/as/LC_MESSAGES/gdk-pixbuf.mo +share/locale/ast/LC_MESSAGES/gdk-pixbuf.mo +share/locale/az/LC_MESSAGES/gdk-pixbuf.mo +share/locale/be/LC_MESSAGES/gdk-pixbuf.mo +share/locale/be@latin/LC_MESSAGES/gdk-pixbuf.mo +share/locale/bg/LC_MESSAGES/gdk-pixbuf.mo +share/locale/bn/LC_MESSAGES/gdk-pixbuf.mo +share/locale/bn_IN/LC_MESSAGES/gdk-pixbuf.mo +share/locale/br/LC_MESSAGES/gdk-pixbuf.mo +share/locale/bs/LC_MESSAGES/gdk-pixbuf.mo +share/locale/ca/LC_MESSAGES/gdk-pixbuf.mo +share/locale/ca@valencia/LC_MESSAGES/gdk-pixbuf.mo +share/locale/crh/LC_MESSAGES/gdk-pixbuf.mo +share/locale/cs/LC_MESSAGES/gdk-pixbuf.mo +share/locale/cy/LC_MESSAGES/gdk-pixbuf.mo +share/locale/da/LC_MESSAGES/gdk-pixbuf.mo +share/locale/de/LC_MESSAGES/gdk-pixbuf.mo +share/locale/dz/LC_MESSAGES/gdk-pixbuf.mo +share/locale/el/LC_MESSAGES/gdk-pixbuf.mo +share/locale/en_CA/LC_MESSAGES/gdk-pixbuf.mo +share/locale/en_GB/LC_MESSAGES/gdk-pixbuf.mo +share/locale/eo/LC_MESSAGES/gdk-pixbuf.mo +share/locale/es/LC_MESSAGES/gdk-pixbuf.mo +share/locale/et/LC_MESSAGES/gdk-pixbuf.mo +share/locale/eu/LC_MESSAGES/gdk-pixbuf.mo +share/locale/fa/LC_MESSAGES/gdk-pixbuf.mo +share/locale/fi/LC_MESSAGES/gdk-pixbuf.mo +share/locale/fr/LC_MESSAGES/gdk-pixbuf.mo +share/locale/ga/LC_MESSAGES/gdk-pixbuf.mo +share/locale/gl/LC_MESSAGES/gdk-pixbuf.mo +share/locale/gu/LC_MESSAGES/gdk-pixbuf.mo +share/locale/he/LC_MESSAGES/gdk-pixbuf.mo +share/locale/hi/LC_MESSAGES/gdk-pixbuf.mo +share/locale/hr/LC_MESSAGES/gdk-pixbuf.mo +share/locale/hu/LC_MESSAGES/gdk-pixbuf.mo +share/locale/hy/LC_MESSAGES/gdk-pixbuf.mo +share/locale/ia/LC_MESSAGES/gdk-pixbuf.mo +share/locale/id/LC_MESSAGES/gdk-pixbuf.mo +share/locale/io/LC_MESSAGES/gdk-pixbuf.mo +share/locale/is/LC_MESSAGES/gdk-pixbuf.mo +share/locale/it/LC_MESSAGES/gdk-pixbuf.mo +share/locale/ja/LC_MESSAGES/gdk-pixbuf.mo +share/locale/ka/LC_MESSAGES/gdk-pixbuf.mo +share/locale/kn/LC_MESSAGES/gdk-pixbuf.mo +share/locale/ko/LC_MESSAGES/gdk-pixbuf.mo +share/locale/ku/LC_MESSAGES/gdk-pixbuf.mo +share/locale/li/LC_MESSAGES/gdk-pixbuf.mo +share/locale/lt/LC_MESSAGES/gdk-pixbuf.mo +share/locale/lv/LC_MESSAGES/gdk-pixbuf.mo +share/locale/mai/LC_MESSAGES/gdk-pixbuf.mo +share/locale/mi/LC_MESSAGES/gdk-pixbuf.mo +share/locale/mk/LC_MESSAGES/gdk-pixbuf.mo +share/locale/ml/LC_MESSAGES/gdk-pixbuf.mo +share/locale/mn/LC_MESSAGES/gdk-pixbuf.mo +share/locale/mr/LC_MESSAGES/gdk-pixbuf.mo +share/locale/ms/LC_MESSAGES/gdk-pixbuf.mo +share/locale/my/LC_MESSAGES/gdk-pixbuf.mo +share/locale/nb/LC_MESSAGES/gdk-pixbuf.mo +share/locale/nds/LC_MESSAGES/gdk-pixbuf.mo +share/locale/ne/LC_MESSAGES/gdk-pixbuf.mo +share/locale/nl/LC_MESSAGES/gdk-pixbuf.mo +share/locale/nn/LC_MESSAGES/gdk-pixbuf.mo +share/locale/nso/LC_MESSAGES/gdk-pixbuf.mo +share/locale/oc/LC_MESSAGES/gdk-pixbuf.mo +share/locale/or/LC_MESSAGES/gdk-pixbuf.mo +share/locale/pa/LC_MESSAGES/gdk-pixbuf.mo +share/locale/pl/LC_MESSAGES/gdk-pixbuf.mo +share/locale/ps/LC_MESSAGES/gdk-pixbuf.mo +share/locale/pt/LC_MESSAGES/gdk-pixbuf.mo +share/locale/pt_BR/LC_MESSAGES/gdk-pixbuf.mo +share/locale/ro/LC_MESSAGES/gdk-pixbuf.mo +share/locale/ru/LC_MESSAGES/gdk-pixbuf.mo +share/locale/si/LC_MESSAGES/gdk-pixbuf.mo +share/locale/sk/LC_MESSAGES/gdk-pixbuf.mo +share/locale/sl/LC_MESSAGES/gdk-pixbuf.mo +share/locale/sq/LC_MESSAGES/gdk-pixbuf.mo +share/locale/sr/LC_MESSAGES/gdk-pixbuf.mo +share/locale/sr@ije/LC_MESSAGES/gdk-pixbuf.mo +share/locale/sr@latin/LC_MESSAGES/gdk-pixbuf.mo +share/locale/sv/LC_MESSAGES/gdk-pixbuf.mo +share/locale/ta/LC_MESSAGES/gdk-pixbuf.mo +share/locale/te/LC_MESSAGES/gdk-pixbuf.mo +share/locale/th/LC_MESSAGES/gdk-pixbuf.mo +share/locale/tk/LC_MESSAGES/gdk-pixbuf.mo +share/locale/tr/LC_MESSAGES/gdk-pixbuf.mo +share/locale/tt/LC_MESSAGES/gdk-pixbuf.mo +share/locale/ug/LC_MESSAGES/gdk-pixbuf.mo +share/locale/uk/LC_MESSAGES/gdk-pixbuf.mo +share/locale/uz/LC_MESSAGES/gdk-pixbuf.mo +share/locale/uz@cyrillic/LC_MESSAGES/gdk-pixbuf.mo +share/locale/vi/LC_MESSAGES/gdk-pixbuf.mo +share/locale/wa/LC_MESSAGES/gdk-pixbuf.mo +share/locale/xh/LC_MESSAGES/gdk-pixbuf.mo +share/locale/yi/LC_MESSAGES/gdk-pixbuf.mo +share/locale/zh_CN/LC_MESSAGES/gdk-pixbuf.mo +share/locale/zh_HK/LC_MESSAGES/gdk-pixbuf.mo +share/locale/zh_TW/LC_MESSAGES/gdk-pixbuf.mo +@exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true +@unexec rm %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/yi/LC_MESSAGES +@dirrmtry share/locale/yi +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES +@dirrmtry share/locale/uz@cyrillic +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug +@dirrmtry share/locale/tt/LC_MESSAGES +@dirrmtry share/locale/tt +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin +@dirrmtry share/locale/sr@ije/LC_MESSAGES +@dirrmtry share/locale/sr@ije +@dirrmtry share/locale/si/LC_MESSAGES +@dirrmtry share/locale/si +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc +@dirrmtry share/locale/nso/LC_MESSAGES +@dirrmtry share/locale/nso +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds +@dirrmtry share/locale/my/LC_MESSAGES +@dirrmtry share/locale/my +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/mi/LC_MESSAGES +@dirrmtry share/locale/mi +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/io/LC_MESSAGES +@dirrmtry share/locale/io +@dirrmtry share/locale/ia/LC_MESSAGES +@dirrmtry share/locale/ia +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/crh/LC_MESSAGES +@dirrmtry share/locale/crh +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as +@dirrmtry share/locale/ang/LC_MESSAGES +@dirrmtry share/locale/ang +@dirrm lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/ +@dirrm lib/gdk-pixbuf-2.0/%%GTK2_VERSION%% +@dirrm lib/gdk-pixbuf-2.0 +@dirrm include/gdk-pixbuf-2.0/gdk-pixbuf +@dirrm include/gdk-pixbuf-2.0/gdk-pixbuf-xlib +@dirrm include/gdk-pixbuf-2.0 diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 85a7e7affbdb..03dd02b29b47 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -3,11 +3,11 @@ # Whom: erich@FreeBSD.org # # $FreeBSD$ -# $MCom: ports/graphics/gimp-app/Makefile,v 1.48 2009/09/23 15:44:49 kwm Exp $ +# $MCom: ports/graphics/gimp-app/Makefile,v 1.53 2010/10/08 08:29:33 kwm Exp $ # PORTNAME= gimp-app -DISTVERSION= 2.6.10 +DISTVERSION= 2.6.11 PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES?= graphics gnome @@ -156,7 +156,7 @@ CONFIGURE_ARGS+= --disable-mp .endif .if defined(WITH_POPPLER) -LIB_DEPENDS+= poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk +LIB_DEPENDS+= poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk PLIST_SUB+= POPPLER="" .else CONFIGURE_ARGS+= --without-poppler diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo index f52b3ff05b73..f7fe1e379436 100644 --- a/graphics/gimp-app/distinfo +++ b/graphics/gimp-app/distinfo @@ -1,3 +1,3 @@ -MD5 (gimp-2.6.10.tar.bz2) = b92710ad9f1b52fec98554d765473819 -SHA256 (gimp-2.6.10.tar.bz2) = ef7a3fe73b352d8afeda9a5358431ea64a1d4cf3ebab588167f6335cdb52e032 -SIZE (gimp-2.6.10.tar.bz2) = 16445326 +MD5 (gimp-2.6.11.tar.bz2) = bb2939fe13e54fc7255cef5d097bb5dd +SHA256 (gimp-2.6.11.tar.bz2) = 9b6d08d0803b3912ea596d1b77b9c21ee13778c23388a225c004b8c1587cb0a1 +SIZE (gimp-2.6.11.tar.bz2) = 16473561 diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist index d73be4be7c35..58e1df0ec6c1 100644 --- a/graphics/gimp-app/pkg-plist +++ b/graphics/gimp-app/pkg-plist @@ -2042,6 +2042,8 @@ share/locale/zh_CN/LC_MESSAGES/gimp20-script-fu.mo share/locale/zh_CN/LC_MESSAGES/gimp20-std-plug-ins.mo share/locale/zh_CN/LC_MESSAGES/gimp20-tips.mo share/locale/zh_CN/LC_MESSAGES/gimp20.mo +share/locale/zh_HK/LC_MESSAGES/gimp20-libgimp.mo +share/locale/zh_HK/LC_MESSAGES/gimp20-python.mo share/locale/zh_HK/LC_MESSAGES/gimp20-script-fu.mo share/locale/zh_HK/LC_MESSAGES/gimp20-std-plug-ins.mo share/locale/zh_HK/LC_MESSAGES/gimp20-tips.mo diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 8cd61ba86eb9..179989283c37 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -3,11 +3,11 @@ # Whom: erich@FreeBSD.org # # $FreeBSD$ -# $MCom: ports/graphics/gimp/Makefile,v 1.16 2009/08/25 00:05:58 marcus Exp $ +# $MCom: ports/graphics/gimp/Makefile,v 1.18 2010/10/08 08:29:33 kwm Exp $ # PORTNAME= gimp -DISTVERSION?= 2.6.10 +DISTVERSION?= 2.6.11 PORTREVISION?= 0 PORTEPOCH?= 2 CATEGORIES= graphics gnome diff --git a/graphics/gir-repository-poppler/Makefile b/graphics/gir-repository-poppler/Makefile index 6e5ae914b846..ea7f67415e80 100644 --- a/graphics/gir-repository-poppler/Makefile +++ b/graphics/gir-repository-poppler/Makefile @@ -3,9 +3,10 @@ # Whom: Alexander Logvinov <avl@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/gir-repository-poppler/Makefile,v 1.1 2009/09/16 02:05:11 avl Exp $ +# $MCom: ports/graphics/gir-repository-poppler/Makefile,v 1.4 2010/09/28 15:55:48 kwm Exp $ # +PORTREVISION= 6 CATEGORIES= graphics MASTERDIR= ${.CURDIR}/../../devel/gir-repository diff --git a/graphics/goocanvasmm/Makefile b/graphics/goocanvasmm/Makefile index bf5965e04a70..3cdd9f97c7e6 100644 --- a/graphics/goocanvasmm/Makefile +++ b/graphics/goocanvasmm/Makefile @@ -3,11 +3,10 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/goocanvasmm/Makefile,v 1.2 2009/01/09 11:30:01 kwm Exp $ +# $MCom: ports/graphics/goocanvasmm/Makefile,v 1.4 2010/10/29 10:27:45 kwm Exp $ PORTNAME= goocanvasmm -PORTVERSION= 0.15.0 -PORTREVISION= 2 +PORTVERSION= 0.15.4 CATEGORIES= graphics MASTER_SITES= GNOME @@ -20,6 +19,7 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \ USE_GNOME= gnomehack ltverhack USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes +CONFIGURE_ARGS= --disable-documentation USE_BZIP2= yes USE_GMAKE= yes diff --git a/graphics/goocanvasmm/distinfo b/graphics/goocanvasmm/distinfo index 70c5450a205c..ebee860df7a6 100644 --- a/graphics/goocanvasmm/distinfo +++ b/graphics/goocanvasmm/distinfo @@ -1,3 +1,3 @@ -MD5 (goocanvasmm-0.15.0.tar.bz2) = 14be5630e88a28ef309c2603ecab01ec -SHA256 (goocanvasmm-0.15.0.tar.bz2) = 914d0f3f0220d3d820b2941390e2e6b3888dc9f7f2b9d2ee419203d720df8541 -SIZE (goocanvasmm-0.15.0.tar.bz2) = 387345 +MD5 (goocanvasmm-0.15.4.tar.bz2) = cf462e8d2f36f4e02387eb094773b3e9 +SHA256 (goocanvasmm-0.15.4.tar.bz2) = e70d42f76c5093e929da2be307d97d3631cf71052e8506cfdba592479ef285e3 +SIZE (goocanvasmm-0.15.4.tar.bz2) = 1357399 diff --git a/graphics/goocanvasmm/pkg-plist b/graphics/goocanvasmm/pkg-plist index 48b15e7c3afb..5e45c93de313 100644 --- a/graphics/goocanvasmm/pkg-plist +++ b/graphics/goocanvasmm/pkg-plist @@ -1,77 +1,73 @@ -include/goocanvasmm-0.1/goocanvasmm.h -include/goocanvasmm-0.1/goocanvasmm/bounds.h -include/goocanvasmm-0.1/goocanvasmm/canvas.h -include/goocanvasmm-0.1/goocanvasmm/ellipse.h -include/goocanvasmm-0.1/goocanvasmm/ellipsemodel.h -include/goocanvasmm-0.1/goocanvasmm/enums.h -include/goocanvasmm-0.1/goocanvasmm/grid.h -include/goocanvasmm-0.1/goocanvasmm/gridmodel.h -include/goocanvasmm-0.1/goocanvasmm/group.h -include/goocanvasmm-0.1/goocanvasmm/groupmodel.h -include/goocanvasmm-0.1/goocanvasmm/image.h -include/goocanvasmm-0.1/goocanvasmm/imagemodel.h -include/goocanvasmm-0.1/goocanvasmm/init.h -include/goocanvasmm-0.1/goocanvasmm/item.h -include/goocanvasmm-0.1/goocanvasmm/itemmodel.h -include/goocanvasmm-0.1/goocanvasmm/itemmodelsimple.h -include/goocanvasmm-0.1/goocanvasmm/itemsimple.h -include/goocanvasmm-0.1/goocanvasmm/linedash.h -include/goocanvasmm-0.1/goocanvasmm/path.h -include/goocanvasmm-0.1/goocanvasmm/pathmodel.h -include/goocanvasmm-0.1/goocanvasmm/points.h -include/goocanvasmm-0.1/goocanvasmm/polyline.h -include/goocanvasmm-0.1/goocanvasmm/polylinemodel.h -include/goocanvasmm-0.1/goocanvasmm/private/bounds_p.h -include/goocanvasmm-0.1/goocanvasmm/private/canvas_p.h -include/goocanvasmm-0.1/goocanvasmm/private/ellipse_p.h -include/goocanvasmm-0.1/goocanvasmm/private/ellipsemodel_p.h -include/goocanvasmm-0.1/goocanvasmm/private/enums_p.h -include/goocanvasmm-0.1/goocanvasmm/private/grid_p.h -include/goocanvasmm-0.1/goocanvasmm/private/gridmodel_p.h -include/goocanvasmm-0.1/goocanvasmm/private/group_p.h -include/goocanvasmm-0.1/goocanvasmm/private/groupmodel_p.h -include/goocanvasmm-0.1/goocanvasmm/private/image_p.h -include/goocanvasmm-0.1/goocanvasmm/private/imagemodel_p.h -include/goocanvasmm-0.1/goocanvasmm/private/item_p.h -include/goocanvasmm-0.1/goocanvasmm/private/itemmodel_p.h -include/goocanvasmm-0.1/goocanvasmm/private/itemmodelsimple_p.h -include/goocanvasmm-0.1/goocanvasmm/private/itemsimple_p.h -include/goocanvasmm-0.1/goocanvasmm/private/linedash_p.h -include/goocanvasmm-0.1/goocanvasmm/private/path_p.h -include/goocanvasmm-0.1/goocanvasmm/private/pathmodel_p.h -include/goocanvasmm-0.1/goocanvasmm/private/points_p.h -include/goocanvasmm-0.1/goocanvasmm/private/polyline_p.h -include/goocanvasmm-0.1/goocanvasmm/private/polylinemodel_p.h -include/goocanvasmm-0.1/goocanvasmm/private/rect_p.h -include/goocanvasmm-0.1/goocanvasmm/private/rectmodel_p.h -include/goocanvasmm-0.1/goocanvasmm/private/style_p.h -include/goocanvasmm-0.1/goocanvasmm/private/table_p.h -include/goocanvasmm-0.1/goocanvasmm/private/tablemodel_p.h -include/goocanvasmm-0.1/goocanvasmm/private/text_p.h -include/goocanvasmm-0.1/goocanvasmm/private/textmodel_p.h -include/goocanvasmm-0.1/goocanvasmm/private/widget_p.h -include/goocanvasmm-0.1/goocanvasmm/rect.h -include/goocanvasmm-0.1/goocanvasmm/rectmodel.h -include/goocanvasmm-0.1/goocanvasmm/style.h -include/goocanvasmm-0.1/goocanvasmm/table.h -include/goocanvasmm-0.1/goocanvasmm/tablemodel.h -include/goocanvasmm-0.1/goocanvasmm/text.h -include/goocanvasmm-0.1/goocanvasmm/textmodel.h -include/goocanvasmm-0.1/goocanvasmm/types.h -include/goocanvasmm-0.1/goocanvasmm/widget.h -include/goocanvasmm-0.1/goocanvasmm/wrap_init.h -lib/goocanvasmm-0.1/include/goocanvasmmconfig.h -lib/goocanvasmm-0.1/proc/m4/convert.m4 -lib/goocanvasmm-0.1/proc/m4/convert_libgoocanvasmm.m4 -lib/libgoocanvasmm-0.1.a -lib/libgoocanvasmm-0.1.la -lib/libgoocanvasmm-0.1.so -lib/libgoocanvasmm-0.1.so.5 +include/goocanvasmm-1.0/goocanvasmm.h +include/goocanvasmm-1.0/goocanvasmm/bounds.h +include/goocanvasmm-1.0/goocanvasmm/canvas.h +include/goocanvasmm-1.0/goocanvasmm/ellipse.h +include/goocanvasmm-1.0/goocanvasmm/ellipsemodel.h +include/goocanvasmm-1.0/goocanvasmm/enums.h +include/goocanvasmm-1.0/goocanvasmm/grid.h +include/goocanvasmm-1.0/goocanvasmm/gridmodel.h +include/goocanvasmm-1.0/goocanvasmm/group.h +include/goocanvasmm-1.0/goocanvasmm/groupmodel.h +include/goocanvasmm-1.0/goocanvasmm/image.h +include/goocanvasmm-1.0/goocanvasmm/imagemodel.h +include/goocanvasmm-1.0/goocanvasmm/init.h +include/goocanvasmm-1.0/goocanvasmm/item.h +include/goocanvasmm-1.0/goocanvasmm/itemmodel.h +include/goocanvasmm-1.0/goocanvasmm/itemmodelsimple.h +include/goocanvasmm-1.0/goocanvasmm/itemsimple.h +include/goocanvasmm-1.0/goocanvasmm/linedash.h +include/goocanvasmm-1.0/goocanvasmm/path.h +include/goocanvasmm-1.0/goocanvasmm/pathmodel.h +include/goocanvasmm-1.0/goocanvasmm/points.h +include/goocanvasmm-1.0/goocanvasmm/polyline.h +include/goocanvasmm-1.0/goocanvasmm/polylinemodel.h +include/goocanvasmm-1.0/goocanvasmm/private/bounds_p.h +include/goocanvasmm-1.0/goocanvasmm/private/canvas_p.h +include/goocanvasmm-1.0/goocanvasmm/private/ellipse_p.h +include/goocanvasmm-1.0/goocanvasmm/private/ellipsemodel_p.h +include/goocanvasmm-1.0/goocanvasmm/private/enums_p.h +include/goocanvasmm-1.0/goocanvasmm/private/grid_p.h +include/goocanvasmm-1.0/goocanvasmm/private/gridmodel_p.h +include/goocanvasmm-1.0/goocanvasmm/private/group_p.h +include/goocanvasmm-1.0/goocanvasmm/private/groupmodel_p.h +include/goocanvasmm-1.0/goocanvasmm/private/image_p.h +include/goocanvasmm-1.0/goocanvasmm/private/imagemodel_p.h +include/goocanvasmm-1.0/goocanvasmm/private/item_p.h +include/goocanvasmm-1.0/goocanvasmm/private/itemmodel_p.h +include/goocanvasmm-1.0/goocanvasmm/private/itemmodelsimple_p.h +include/goocanvasmm-1.0/goocanvasmm/private/itemsimple_p.h +include/goocanvasmm-1.0/goocanvasmm/private/linedash_p.h +include/goocanvasmm-1.0/goocanvasmm/private/path_p.h +include/goocanvasmm-1.0/goocanvasmm/private/pathmodel_p.h +include/goocanvasmm-1.0/goocanvasmm/private/points_p.h +include/goocanvasmm-1.0/goocanvasmm/private/polyline_p.h +include/goocanvasmm-1.0/goocanvasmm/private/polylinemodel_p.h +include/goocanvasmm-1.0/goocanvasmm/private/rect_p.h +include/goocanvasmm-1.0/goocanvasmm/private/rectmodel_p.h +include/goocanvasmm-1.0/goocanvasmm/private/style_p.h +include/goocanvasmm-1.0/goocanvasmm/private/table_p.h +include/goocanvasmm-1.0/goocanvasmm/private/tablemodel_p.h +include/goocanvasmm-1.0/goocanvasmm/private/text_p.h +include/goocanvasmm-1.0/goocanvasmm/private/textmodel_p.h +include/goocanvasmm-1.0/goocanvasmm/private/widget_p.h +include/goocanvasmm-1.0/goocanvasmm/rect.h +include/goocanvasmm-1.0/goocanvasmm/rectmodel.h +include/goocanvasmm-1.0/goocanvasmm/style.h +include/goocanvasmm-1.0/goocanvasmm/table.h +include/goocanvasmm-1.0/goocanvasmm/tablemodel.h +include/goocanvasmm-1.0/goocanvasmm/text.h +include/goocanvasmm-1.0/goocanvasmm/textmodel.h +include/goocanvasmm-1.0/goocanvasmm/types.h +include/goocanvasmm-1.0/goocanvasmm/widget.h +include/goocanvasmm-1.0/goocanvasmm/wrap_init.h +lib/goocanvasmm-1.0/include/goocanvasmmconfig.h +lib/libgoocanvasmm-1.0.a +lib/libgoocanvasmm-1.0.la +lib/libgoocanvasmm-1.0.so +lib/libgoocanvasmm-1.0.so.5 libdata/pkgconfig/goocanvasmm-1.0.pc -@dirrm lib/goocanvasmm-0.1/proc/m4 -@dirrm lib/goocanvasmm-0.1/proc -@dirrm lib/goocanvasmm-0.1/include -@dirrm lib/goocanvasmm-0.1 -@dirrm include/goocanvasmm-0.1/goocanvasmm/private -@dirrm include/goocanvasmm-0.1/goocanvasmm -@dirrm include/goocanvasmm-0.1 +@dirrm lib/goocanvasmm-1.0/include +@dirrm lib/goocanvasmm-1.0 +@dirrm include/goocanvasmm-1.0/goocanvasmm/private +@dirrm include/goocanvasmm-1.0/goocanvasmm +@dirrm include/goocanvasmm-1.0 diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile index 28b656a95890..400ce39fed82 100644 --- a/graphics/libchamplain/Makefile +++ b/graphics/libchamplain/Makefile @@ -3,12 +3,11 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/libchamplain/Makefile,v 1.17 2010/03/29 10:55:48 kwm Exp $ +# $MCom: ports/graphics/libchamplain/Makefile,v 1.23 2010/09/27 18:17:23 kwm Exp $ # PORTNAME= libchamplain -PORTVERSION= 0.4.6 -PORTREVISION= 1 +PORTVERSION= 0.8.0 CATEGORIES= graphics MASTER_SITES= GNOME @@ -17,7 +16,7 @@ COMMENT= A C library aimed to provide a Gtk+ widget to display rasterized maps a LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \ clutter-gtk-0.10.0:${PORTSDIR}/graphics/clutter-gtk \ - soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup + soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome USE_BZIP2= yes USE_GNOME= pkgconfig gtk20 gnomehack ltverhack:1 @@ -28,10 +27,10 @@ USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -# clutter-sharp need to get released. -CONFIGURE_ARGS+=--enable-managed=no +PLIST_SUB= VERSION=0.8 -PLIST_SUB= VERSION=${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +# python bindings need to get ported +WITHOUT_PYTHON=yes .if !defined(WITHOUT_PYTHON) USE_PYTHON= yes @@ -50,10 +49,4 @@ PLIST_SUB+= PYTHON="@comment " @${ECHO_CMD} "Specify WITHOUT_PYTHON=yes to disable python bindings" @${ECHO_CMD} "" -post-patch: - @${REINPLACE_CMD} -e 's|pyclutter-gtk-0.9|pyclutter-gtk-0.10|g' \ - ${WRKSRC}/configure - # Fix python bindings, can be safely removed after 0.4.7 release - @${RM} -f ${WRKSRC}/bindings/python/champlain/pychamplain.c - .include <bsd.port.mk> diff --git a/graphics/libchamplain/distinfo b/graphics/libchamplain/distinfo index 8d91140c7ba0..608afa1cce64 100644 --- a/graphics/libchamplain/distinfo +++ b/graphics/libchamplain/distinfo @@ -1,3 +1,3 @@ -MD5 (libchamplain-0.4.6.tar.bz2) = 0ea5f87dba0ce3787a36e5f47b39ae2d -SHA256 (libchamplain-0.4.6.tar.bz2) = 0ffdbd5a067a02c744173174e3f5fa5ae23b444edf0f5dcc6622d295f3059fbc -SIZE (libchamplain-0.4.6.tar.bz2) = 528683 +MD5 (libchamplain-0.8.0.tar.bz2) = 55bf83ce4cd1fa13fdc5d0a5b478e323 +SHA256 (libchamplain-0.8.0.tar.bz2) = 0784b53f488d690ed878b1bbf30cd9bd9b1baafb5b6b0d0b7b2ba0ef240c49cc +SIZE (libchamplain-0.8.0.tar.bz2) = 672862 diff --git a/graphics/libchamplain/pkg-plist b/graphics/libchamplain/pkg-plist index 1ecbf217c6b7..3c7e4bb54a18 100644 --- a/graphics/libchamplain/pkg-plist +++ b/graphics/libchamplain/pkg-plist @@ -1,68 +1,96 @@ -include/libchamplain-%%VERSION%%/champlain/champlain-base-marker.h -include/libchamplain-%%VERSION%%/champlain/champlain-cache.h -include/libchamplain-%%VERSION%%/champlain/champlain-defines.h -include/libchamplain-%%VERSION%%/champlain/champlain-enum-types.h -include/libchamplain-%%VERSION%%/champlain/champlain-layer.h -include/libchamplain-%%VERSION%%/champlain/champlain-map-source-desc.h -include/libchamplain-%%VERSION%%/champlain/champlain-map-source-factory.h -include/libchamplain-%%VERSION%%/champlain/champlain-map-source.h -include/libchamplain-%%VERSION%%/champlain/champlain-marker.h -include/libchamplain-%%VERSION%%/champlain/champlain-network-map-source.h -include/libchamplain-%%VERSION%%/champlain/champlain-point.h -include/libchamplain-%%VERSION%%/champlain/champlain-polygon.h -include/libchamplain-%%VERSION%%/champlain/champlain-selection-layer.h -include/libchamplain-%%VERSION%%/champlain/champlain-tile.h -include/libchamplain-%%VERSION%%/champlain/champlain-version.h -include/libchamplain-%%VERSION%%/champlain/champlain-view.h -include/libchamplain-%%VERSION%%/champlain/champlain-zoom-level.h -include/libchamplain-%%VERSION%%/champlain/champlain.h -include/libchamplain-gtk-%%VERSION%%/champlain-gtk/champlain-gtk.h -include/libchamplain-gtk-%%VERSION%%/champlain-gtk/gtk-champlain-embed.h -lib/girepository-1.0/Champlain-%%VERSION%%.typelib -lib/girepository-1.0/GtkChamplain-%%VERSION%%.typelib -lib/libchamplain-%%VERSION%%.a -lib/libchamplain-%%VERSION%%.la -lib/libchamplain-%%VERSION%%.so -lib/libchamplain-%%VERSION%%.so.1 -lib/libchamplain-gtk-%%VERSION%%.a -lib/libchamplain-gtk-%%VERSION%%.la -lib/libchamplain-gtk-%%VERSION%%.so -lib/libchamplain-gtk-%%VERSION%%.so.1 +include/libchamplain-0.8/champlain/champlain-base-marker.h +include/libchamplain-0.8/champlain/champlain-bounding-box.h +include/libchamplain-0.8/champlain/champlain-defines.h +include/libchamplain-0.8/champlain/champlain-enum-types.h +include/libchamplain-0.8/champlain/champlain-error-tile-renderer.h +include/libchamplain-0.8/champlain/champlain-features.h +include/libchamplain-0.8/champlain/champlain-file-cache.h +include/libchamplain-0.8/champlain/champlain-file-tile-source.h +include/libchamplain-0.8/champlain/champlain-image-renderer.h +include/libchamplain-0.8/champlain/champlain-layer.h +include/libchamplain-0.8/champlain/champlain-map-source-chain.h +include/libchamplain-0.8/champlain/champlain-map-source-desc.h +include/libchamplain-0.8/champlain/champlain-map-source-factory.h +include/libchamplain-0.8/champlain/champlain-map-source.h +include/libchamplain-0.8/champlain/champlain-marker.h +include/libchamplain-0.8/champlain/champlain-marshal.h +include/libchamplain-0.8/champlain/champlain-memory-cache.h +include/libchamplain-0.8/champlain/champlain-network-bbox-tile-source.h +include/libchamplain-0.8/champlain/champlain-network-tile-source.h +include/libchamplain-0.8/champlain/champlain-null-tile-source.h +include/libchamplain-0.8/champlain/champlain-point.h +include/libchamplain-0.8/champlain/champlain-polygon.h +include/libchamplain-0.8/champlain/champlain-renderer.h +include/libchamplain-0.8/champlain/champlain-selection-layer.h +include/libchamplain-0.8/champlain/champlain-tile-cache.h +include/libchamplain-0.8/champlain/champlain-tile-source.h +include/libchamplain-0.8/champlain/champlain-tile.h +include/libchamplain-0.8/champlain/champlain-version.h +include/libchamplain-0.8/champlain/champlain-view.h +include/libchamplain-0.8/champlain/champlain.h +include/libchamplain-gtk-0.8/champlain-gtk/champlain-gtk.h +include/libchamplain-gtk-0.8/champlain-gtk/champlain-gtk-enum-types.h +include/libchamplain-gtk-0.8/champlain-gtk/champlain-gtk-marshal.h +include/libchamplain-gtk-0.8/champlain-gtk/gtk-champlain-embed.h +lib/girepository-1.0/Champlain-0.8.typelib +lib/girepository-1.0/GtkChamplain-0.8.typelib +lib/libchamplain-0.8.a +lib/libchamplain-0.8.la +lib/libchamplain-0.8.so +lib/libchamplain-0.8.so.1 +lib/libchamplain-gtk-0.8.a +lib/libchamplain-gtk-0.8.la +lib/libchamplain-gtk-0.8.so +lib/libchamplain-gtk-0.8.so.1 %%PYTHON%%%%PYTHON_SITELIBDIR%%/champlain.a %%PYTHON%%%%PYTHON_SITELIBDIR%%/champlain.la %%PYTHON%%%%PYTHON_SITELIBDIR%%/champlain.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/champlaingtk.a %%PYTHON%%%%PYTHON_SITELIBDIR%%/champlaingtk.la %%PYTHON%%%%PYTHON_SITELIBDIR%%/champlaingtk.so -libdata/pkgconfig/champlain-%%VERSION%%.pc -libdata/pkgconfig/champlain-gtk-%%VERSION%%.pc -share/gir-1.0/Champlain-%%VERSION%%.gir -share/gir-1.0/GtkChamplain-%%VERSION%%.gir +libdata/pkgconfig/champlain-0.8.pc +libdata/pkgconfig/champlain-gtk-0.8.pc +share/gir-1.0/Champlain-0.8.gir +share/gir-1.0/GtkChamplain-0.8.gir share/gtk-doc/html/libchamplain-gtk/GtkChamplainEmbed.html -share/gtk-doc/html/libchamplain-gtk/ch01.html share/gtk-doc/html/libchamplain-gtk/home.png share/gtk-doc/html/libchamplain-gtk/index.html share/gtk-doc/html/libchamplain-gtk/index.sgml share/gtk-doc/html/libchamplain-gtk/left.png share/gtk-doc/html/libchamplain-gtk/libchamplain-gtk.devhelp share/gtk-doc/html/libchamplain-gtk/libchamplain-gtk.devhelp2 +share/gtk-doc/html/libchamplain-gtk/pt01.html share/gtk-doc/html/libchamplain-gtk/right.png share/gtk-doc/html/libchamplain-gtk/style.css share/gtk-doc/html/libchamplain-gtk/up.png share/gtk-doc/html/libchamplain/ChamplainBaseMarker.html -share/gtk-doc/html/libchamplain/ChamplainCache.html +share/gtk-doc/html/libchamplain/ChamplainErrorTileRenderer.html +share/gtk-doc/html/libchamplain/ChamplainFileCache.html +share/gtk-doc/html/libchamplain/ChamplainFileTileSource.html +share/gtk-doc/html/libchamplain/ChamplainImageRenderer.html share/gtk-doc/html/libchamplain/ChamplainLayer.html share/gtk-doc/html/libchamplain/ChamplainMapSource.html +share/gtk-doc/html/libchamplain/ChamplainMapSourceChain.html share/gtk-doc/html/libchamplain/ChamplainMapSourceFactory.html share/gtk-doc/html/libchamplain/ChamplainMarker.html -share/gtk-doc/html/libchamplain/ChamplainNetworkMapSource.html +share/gtk-doc/html/libchamplain/ChamplainMemoryCache.html +share/gtk-doc/html/libchamplain/ChamplainMemphisRenderer.html +share/gtk-doc/html/libchamplain/ChamplainNetworkBboxTileSource.html +share/gtk-doc/html/libchamplain/ChamplainNetworkTileSource.html +share/gtk-doc/html/libchamplain/ChamplainNullTileSource.html share/gtk-doc/html/libchamplain/ChamplainPolygon.html +share/gtk-doc/html/libchamplain/ChamplainRenderer.html share/gtk-doc/html/libchamplain/ChamplainSelectionLayer.html share/gtk-doc/html/libchamplain/ChamplainTile.html +share/gtk-doc/html/libchamplain/ChamplainTileCache.html +share/gtk-doc/html/libchamplain/ChamplainTileSource.html share/gtk-doc/html/libchamplain/ChamplainView.html share/gtk-doc/html/libchamplain/ch01.html share/gtk-doc/html/libchamplain/ch02.html share/gtk-doc/html/libchamplain/ch03.html +share/gtk-doc/html/libchamplain/ch04.html +share/gtk-doc/html/libchamplain/ch05.html +share/gtk-doc/html/libchamplain/ch06.html share/gtk-doc/html/libchamplain/home.png share/gtk-doc/html/libchamplain/index.html share/gtk-doc/html/libchamplain/index.sgml @@ -73,16 +101,25 @@ share/gtk-doc/html/libchamplain/ix04.html share/gtk-doc/html/libchamplain/ix05.html share/gtk-doc/html/libchamplain/ix06.html share/gtk-doc/html/libchamplain/ix07.html -share/gtk-doc/html/libchamplain/ix08.html share/gtk-doc/html/libchamplain/left.png -share/gtk-doc/html/libchamplain/libchamplain-Champlain.html +share/gtk-doc/html/libchamplain/libchamplain-ChamplainBoundingBox.html +share/gtk-doc/html/libchamplain/libchamplain-ChamplainMapSourceDesc.html share/gtk-doc/html/libchamplain/libchamplain-ChamplainPoint.html share/gtk-doc/html/libchamplain/libchamplain-ChamplainVersion.html share/gtk-doc/html/libchamplain/libchamplain.devhelp share/gtk-doc/html/libchamplain/libchamplain.devhelp2 +share/gtk-doc/html/libchamplain/pt01.html +share/gtk-doc/html/libchamplain/pt02.html +share/gtk-doc/html/libchamplain/pt03.html +share/gtk-doc/html/libchamplain/pt04.html +share/gtk-doc/html/libchamplain/pt05.html share/gtk-doc/html/libchamplain/right.png share/gtk-doc/html/libchamplain/style.css share/gtk-doc/html/libchamplain/up.png +share/vala/vapi/champlain-0.8.deps +share/vala/vapi/champlain-0.8.vapi +share/vala/vapi/champlain-gtk-0.8.deps +share/vala/vapi/champlain-gtk-0.8.vapi @dirrm share/gtk-doc/html/libchamplain @dirrm share/gtk-doc/html/libchamplain-gtk @dirrmtry share/gtk-doc/html diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index c05373a3bd93..dcfd964398c5 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -3,12 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.77 2010/04/02 21:20:26 kwm Exp $ +# $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.79 2010/09/28 07:31:27 kwm Exp $ # PORTNAME= libgnomecanvas -PORTVERSION= 2.30.1 -PORTREVISION?= 1 +PORTVERSION= 2.30.2 +PORTREVISION?= 0 CATEGORIES= graphics gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo index aecc39580155..0b2d196b45b2 100644 --- a/graphics/libgnomecanvas/distinfo +++ b/graphics/libgnomecanvas/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomecanvas-2.30.1.tar.bz2) = 362ab7b81024b3c3b4a712e7df01b169 -SHA256 (gnome2/libgnomecanvas-2.30.1.tar.bz2) = 291a436cba73550fc1cc93a2bc99353daa18c0a9fec4cfcff47d9ec38d643166 -SIZE (gnome2/libgnomecanvas-2.30.1.tar.bz2) = 583190 +MD5 (gnome2/libgnomecanvas-2.30.2.tar.bz2) = 7f7cb2348466616b034bd2265361455d +SHA256 (gnome2/libgnomecanvas-2.30.2.tar.bz2) = a74edb1054cd394ea7514c6abdf7539b0b4c6d62a34c2ab5e30ba231af1f13f9 +SIZE (gnome2/libgnomecanvas-2.30.2.tar.bz2) = 563360 diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index 0d34a51e5127..708f7f4b6460 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -3,15 +3,14 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/librsvg2/Makefile,v 1.131 2010/05/02 10:25:51 kwm Exp $ +# $MCom: ports/graphics/librsvg2/Makefile,v 1.136 2010/11/13 12:59:46 kwm Exp $ # -PORTNAME= librsvg2 -PORTVERSION= 2.26.3 -PORTREVISION= 1 +PORTNAME?= librsvg2 +PORTVERSION= 2.32.1 CATEGORIES= graphics gnome MASTER_SITES= GNOME -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITE_SUBDIR= sources/librsvg/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= librsvg-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,22 +20,48 @@ COMMENT= Library for parsing and rendering SVG vector-graphic files BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ croco-${CROCO_VERSION}.3:${PORTSDIR}/textproc/libcroco -RUN_DEPENDS= gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2 USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:22 -USE_GNOME= gnomehack gnomeprefix libgsf gtk20 ltverhack +USE_GNOME= gnomehack gnomeprefix libgsf ltverhack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-svgz \ --with-croco \ --enable-gtk-theme - CROCO_VERSION= 0.6 +.if defined(SLAVEPORT) +USE_GNOME+= librsvg2 gtk30 +RUN_DEPENDS= gtk-engines3>=2.90.3.1:${PORTSDIR}/x11-themes/gtk-engines3 +.else +USE_GNOME+= gtk20 +RUN_DEPENDS= gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2 MAN1= rsvg.1 +.endif + +.include <bsd.port.pre.mk> + +.if defined(SLAVEPORT) +post-patch: + @${REINPLACE_CMD} -e 's|GTK2_REQUIRED=2.16.0|GTK2_REQUIRED=9.16.0|g' \ + ${WRKSRC}/configure + +do-build: + @cd ${WRKSRC} && gmake rsvg-view-3 + @cd ${WRKSRC}/gtk-engine && gmake + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/rsvg-view-3 ${PREFIX}/bin + @cd ${WRKSRC}/gtk-engine && gmake install + +.else +post-patch: + @${REINPLACE_CMD} -e 's|GTK3_REQUIRED=2.90.0|GTK3_REQUIRED=9.90.0|g' \ + ${WRKSRC}/configure +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo index b81219c6e67e..33e5b4a45477 100644 --- a/graphics/librsvg2/distinfo +++ b/graphics/librsvg2/distinfo @@ -1,3 +1,2 @@ -MD5 (gnome2/librsvg-2.26.3.tar.bz2) = 8df68c2c02cdf2a96a92b43bf737bf9c -SHA256 (gnome2/librsvg-2.26.3.tar.bz2) = c0005f9471b4bd3ba4873d165d8e481ee6b1d124dda4efc6bdc24b7da024b7e5 -SIZE (gnome2/librsvg-2.26.3.tar.bz2) = 511876 +SHA256 (gnome2/librsvg-2.32.1.tar.bz2) = 91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334 +SIZE (gnome2/librsvg-2.32.1.tar.bz2) = 517170 diff --git a/graphics/librsvg2/files/patch-Makefile.in b/graphics/librsvg2/files/patch-Makefile.in new file mode 100644 index 000000000000..d2009b700b95 --- /dev/null +++ b/graphics/librsvg2/files/patch-Makefile.in @@ -0,0 +1,19 @@ +--- Makefile.in.orig 2010-07-07 13:03:21.000000000 +0200 ++++ Makefile.in 2010-07-07 13:04:07.000000000 +0200 +@@ -155,7 +155,6 @@ + am_rsvg_view_3_OBJECTS = rsvg_view_3-test-display.$(OBJEXT) + rsvg_view_3_OBJECTS = $(am_rsvg_view_3_OBJECTS) + rsvg_view_3_DEPENDENCIES = \ +- $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@@ -563,7 +562,7 @@ + + rsvg_view_3_LDFLAGS = + rsvg_view_3_LDADD = \ +- $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \ ++ -lrsvg-2 \ + $(GTK3_LIBS) \ + $(LIBRSVG_LIBS) \ + $(LIBCROCO_LIBS) \ diff --git a/graphics/librsvg2/files/patch-gtk-engines_Makefile.in b/graphics/librsvg2/files/patch-gtk-engines_Makefile.in new file mode 100644 index 000000000000..b1f325203166 --- /dev/null +++ b/graphics/librsvg2/files/patch-gtk-engines_Makefile.in @@ -0,0 +1,20 @@ +--- gtk-engine/Makefile.in.orig 2010-07-07 12:59:02.000000000 +0200 ++++ gtk-engine/Makefile.in 2010-07-07 13:00:27.000000000 +0200 +@@ -72,7 +72,7 @@ + "$(DESTDIR)$(gtk3_enginedir)" + LTLIBRARIES = $(gtk2_engine_LTLIBRARIES) $(gtk3_engine_LTLIBRARIES) + am__DEPENDENCIES_1 = +-@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@libsvg_3_la_DEPENDENCIES = $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \ ++@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@libsvg_3_la_DEPENDENCIES = \ + @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(am__DEPENDENCIES_1) \ + @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(am__DEPENDENCIES_1) \ + @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(am__DEPENDENCIES_1) \ +@@ -405,7 +405,7 @@ + @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ -module $(AM_LDFLAGS) \ + @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(am__append_3) + @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@libsvg_3_la_LIBADD = \ +-@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \ ++@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ -lrsvg-2 \ + @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(GTK3_LIBS) \ + @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(LIBRSVG_LIBS) \ + @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(LIBCROCO_LIBS) \ diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist index 52425f347f26..0992f99834ab 100644 --- a/graphics/librsvg2/pkg-plist +++ b/graphics/librsvg2/pkg-plist @@ -1,41 +1,61 @@ bin/rsvg bin/rsvg-convert bin/rsvg-view -include/librsvg-2/librsvg/librsvg-enum-types.h -include/librsvg-2/librsvg/librsvg-features.h -include/librsvg-2/librsvg/rsvg-cairo.h -include/librsvg-2/librsvg/rsvg.h +include/librsvg-2.0/librsvg/librsvg-enum-types.h +include/librsvg-2.0/librsvg/librsvg-features.h +include/librsvg-2.0/librsvg/rsvg-cairo.h +include/librsvg-2.0/librsvg/rsvg.h +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-svg.a +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-svg.la +lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-svg.so lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.a lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.la lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.so -lib/gtk-2.0/%%GTK2_VERSION%%/loaders/svg_loader.a -lib/gtk-2.0/%%GTK2_VERSION%%/loaders/svg_loader.la -lib/gtk-2.0/%%GTK2_VERSION%%/loaders/svg_loader.so lib/librsvg-2.a lib/librsvg-2.la lib/librsvg-2.so lib/librsvg-2.so.2 libdata/pkgconfig/librsvg-2.0.pc -share/doc/rsvg/home.png -share/doc/rsvg/index.html -share/doc/rsvg/index.sgml -share/doc/rsvg/ix01.html -share/doc/rsvg/left.png -share/doc/rsvg/pt02.html -share/doc/rsvg/pt03.html -share/doc/rsvg/pt04.html -share/doc/rsvg/right.png -share/doc/rsvg/rsvg-Cairo.html -share/doc/rsvg/rsvg-Core-API.html -share/doc/rsvg/rsvg-GdkPixbuf.html -share/doc/rsvg/rsvg.devhelp -share/doc/rsvg/rsvg.devhelp2 -share/doc/rsvg/rsvg.html -share/doc/rsvg/style.css -share/doc/rsvg/up.png +share/doc/rsvg-2.0/RsvgHandle.html +share/doc/rsvg-2.0/annotation-glossary.html +share/doc/rsvg-2.0/api-index-2-14.html +share/doc/rsvg-2.0/api-index-2-22.html +share/doc/rsvg-2.0/api-index-2-32.html +share/doc/rsvg-2.0/api-index-2-4.html +share/doc/rsvg-2.0/api-index-2-8.html +share/doc/rsvg-2.0/api-index-2-9.html +share/doc/rsvg-2.0/api-index-deprecated.html +share/doc/rsvg-2.0/api-index-full.html +share/doc/rsvg-2.0/home.png +share/doc/rsvg-2.0/index.html +share/doc/rsvg-2.0/index.sgml +share/doc/rsvg-2.0/left.png +share/doc/rsvg-2.0/licence.html +share/doc/rsvg-2.0/object-tree.html +share/doc/rsvg-2.0/right.png +share/doc/rsvg-2.0/rsvg-2.0.devhelp +share/doc/rsvg-2.0/rsvg-2.0.devhelp2 +share/doc/rsvg-2.0/rsvg-Using-RSVG-with-GIO.html +share/doc/rsvg-2.0/rsvg-Using-RSVG-with-GdkPixbuf.html +share/doc/rsvg-2.0/rsvg-Using-RSVG-with-cairo.html +share/doc/rsvg-2.0/rsvg-Version-check-and-feature-tests.html +share/doc/rsvg-2.0/rsvg.html +share/doc/rsvg-2.0/style.css +share/doc/rsvg-2.0/up.png share/pixmaps/svg-viewer.svg -@dirrm share/doc/rsvg -@dirrm include/librsvg-2/librsvg -@dirrm include/librsvg-2 -@exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true -@unexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true +share/themes/bubble/gtk-2.0/blue.svg +share/themes/bubble/gtk-2.0/green.svg +share/themes/bubble/gtk-2.0/gtkrc +share/themes/bubble/gtk-2.0/orange.svg +share/themes/bubble/gtk-2.0/purple.svg +share/themes/bubble/gtk-2.0/red.svg +@dirrm share/doc/rsvg-2.0 +@dirrm include/librsvg-2.0/librsvg +@dirrm include/librsvg-2.0 +@dirrmtry lib/gtk-3.0/engines +@dirrmtry lib/gtk-3.0 +@dirrmtry share/themes/bubble/gtk-2.0 +@dirrmtry share/themes/bubble/gtk-3.0 +@dirrmtry share/themes/bubble +@comment @exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true +@comment @unexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile index cd77657135e9..c36fd1fce617 100644 --- a/graphics/nip2/Makefile +++ b/graphics/nip2/Makefile @@ -7,7 +7,7 @@ PORTNAME= nip2 PORTVERSION= 7.14.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/ diff --git a/graphics/nip2/files/patch-src_gtkitementry.c b/graphics/nip2/files/patch-src_gtkitementry.c new file mode 100644 index 000000000000..43b809d653d5 --- /dev/null +++ b/graphics/nip2/files/patch-src_gtkitementry.c @@ -0,0 +1,56 @@ +--- src/gtkitementry.c.orig 2010-10-31 15:58:33.000000000 +0100 ++++ src/gtkitementry.c 2010-10-31 15:59:28.000000000 +0100 +@@ -131,7 +131,7 @@ static void gtk_entry_draw_curso + static PangoLayout *gtk_entry_ensure_layout (GtkEntry *entry, + gboolean include_preedit); + static void gtk_entry_queue_draw (GtkEntry *entry); +-static void gtk_entry_reset_im_context (GtkEntry *entry); ++static void nip_gtk_entry_reset_im_context (GtkEntry *entry); + static void gtk_entry_recompute (GtkEntry *entry); + static void gtk_entry_get_cursor_locations (GtkEntry *entry, + CursorType type, +@@ -657,7 +657,7 @@ gtk_entry_real_set_position (GtkEditable + if (position != entry->current_pos || + position != entry->selection_bound) + { +- gtk_entry_reset_im_context (entry); ++ nip_gtk_entry_reset_im_context (entry); + gtk_entry_set_positions (entry, position, position); + } + } +@@ -823,7 +823,7 @@ gtk_entry_move_cursor (GtkEntry *e + { + gint new_pos = entry->current_pos; + +- gtk_entry_reset_im_context (entry); ++ nip_gtk_entry_reset_im_context (entry); + + if (entry->current_pos != entry->selection_bound && !extend_selection) + { +@@ -917,7 +917,7 @@ gtk_entry_insert_at_cursor (GtkEntry + + if (entry->editable) + { +- gtk_entry_reset_im_context (entry); ++ nip_gtk_entry_reset_im_context (entry); + + gtk_editable_insert_text (editable, str, -1, &pos); + gtk_editable_set_position (editable, pos); +@@ -933,7 +933,7 @@ gtk_entry_delete_from_cursor (GtkEntry + gint start_pos = entry->current_pos; + gint end_pos = entry->current_pos; + +- gtk_entry_reset_im_context (entry); ++ nip_gtk_entry_reset_im_context (entry); + + if (!entry->editable) + return; +@@ -1699,7 +1699,7 @@ gtk_entry_queue_draw (GtkEntry *entry) + } + + static void +-gtk_entry_reset_im_context (GtkEntry *entry) ++nip_gtk_entry_reset_im_context (GtkEntry *entry) + { + if (entry->need_im_reset) + { diff --git a/graphics/poppler-data/Makefile b/graphics/poppler-data/Makefile index b05175647c61..a22fc4dec845 100644 --- a/graphics/poppler-data/Makefile +++ b/graphics/poppler-data/Makefile @@ -3,11 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/graphics/poppler-data/Makefile,v 1.1 2010/07/20 08:17:51 kwm Exp $ +# $MCom: ports/graphics/poppler-data/Makefile,v 1.5 2010/11/17 15:12:27 kwm Exp $ # PORTNAME= poppler-data -PORTVERSION= 0.4.3 +PORTVERSION= 0.4.4 CATEGORIES= graphics MASTER_SITES= http://poppler.freedesktop.org/ diff --git a/graphics/poppler-data/distinfo b/graphics/poppler-data/distinfo index a48d0a2bc6bc..f80a4f6f4a42 100644 --- a/graphics/poppler-data/distinfo +++ b/graphics/poppler-data/distinfo @@ -1,3 +1,2 @@ -MD5 (poppler-data-0.4.3.tar.gz) = 2d648047e5d0b315df1571b460ee6a96 -SHA256 (poppler-data-0.4.3.tar.gz) = 426010488bfb8c923419ca4c5d4916ea0193a140d2246336fdf97f1b632d58a6 -SIZE (poppler-data-0.4.3.tar.gz) = 4175311 +SHA256 (poppler-data-0.4.4.tar.gz) = 7643ada027b99a2ef508ed750b64a89b82c666bd841476b36a2426e69631fe8b +SIZE (poppler-data-0.4.4.tar.gz) = 4175352 diff --git a/graphics/poppler-gtk/Makefile b/graphics/poppler-gtk/Makefile index ae3fb35aed4e..f9fe19076b2f 100644 --- a/graphics/poppler-gtk/Makefile +++ b/graphics/poppler-gtk/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/poppler-gtk/Makefile,v 1.18 2010/03/14 22:08:42 kwm Exp $ +# $MCom: ports/graphics/poppler-gtk/Makefile,v 1.20 2010/07/07 13:03:19 kwm Exp $ # -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -gtk MAINTAINER= gnome@FreeBSD.org diff --git a/graphics/poppler-gtk/pkg-plist b/graphics/poppler-gtk/pkg-plist index 6bb080493e3d..239a7305dc28 100644 --- a/graphics/poppler-gtk/pkg-plist +++ b/graphics/poppler-gtk/pkg-plist @@ -7,12 +7,14 @@ include/poppler/glib/poppler-enums.h include/poppler/glib/poppler-features.h include/poppler/glib/poppler-form-field.h include/poppler/glib/poppler-layer.h +include/poppler/glib/poppler-media.h +include/poppler/glib/poppler-movie.h include/poppler/glib/poppler-page.h include/poppler/glib/poppler.h lib/libpoppler-glib.a lib/libpoppler-glib.la lib/libpoppler-glib.so -lib/libpoppler-glib.so.4 +lib/libpoppler-glib.so.5 libdata/pkgconfig/poppler-glib.pc %%DOCSDIR%%/poppler/ch01.html %%DOCSDIR%%/poppler/home.png @@ -21,7 +23,6 @@ libdata/pkgconfig/poppler-glib.pc %%DOCSDIR%%/poppler/left.png %%DOCSDIR%%/poppler/poppler-poppler-action.html %%DOCSDIR%%/poppler/poppler-poppler-annot.html -%%DOCSDIR%%/poppler/poppler-poppler-attachment.html %%DOCSDIR%%/poppler/poppler-poppler-document.html %%DOCSDIR%%/poppler/poppler-poppler-enums.html %%DOCSDIR%%/poppler/poppler-poppler-features.html diff --git a/graphics/poppler-qt/Makefile b/graphics/poppler-qt/Makefile index 228a5327130b..c946b0bb223b 100644 --- a/graphics/poppler-qt/Makefile +++ b/graphics/poppler-qt/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/poppler-qt/Makefile,v 1.11 2010/03/14 22:08:43 kwm Exp $ +# $MCom: ports/graphics/poppler-qt/Makefile,v 1.13 2010/07/07 13:03:19 kwm Exp $ # PORTREVISION= 0 diff --git a/graphics/poppler-qt4/Makefile b/graphics/poppler-qt4/Makefile index d64da7bb3726..d045b363ca64 100644 --- a/graphics/poppler-qt4/Makefile +++ b/graphics/poppler-qt4/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/poppler-qt4/Makefile,v 1.13 2010/03/14 22:08:43 kwm Exp $ +# $MCom: ports/graphics/poppler-qt4/Makefile,v 1.15 2010/07/07 13:03:19 kwm Exp $ # PORTREVISION= 0 diff --git a/graphics/poppler-qt4/pkg-plist b/graphics/poppler-qt4/pkg-plist index d20d75d3e7c2..d49be20711e6 100644 --- a/graphics/poppler-qt4/pkg-plist +++ b/graphics/poppler-qt4/pkg-plist @@ -4,7 +4,6 @@ include/poppler/qt4/poppler-form.h include/poppler/qt4/poppler-link.h include/poppler/qt4/poppler-optcontent.h include/poppler/qt4/poppler-page-transition.h -include/poppler/qt4/poppler-page-transition-private.h include/poppler/qt4/poppler-qt4.h lib/libpoppler-qt4.a lib/libpoppler-qt4.la diff --git a/graphics/poppler-utils/Makefile b/graphics/poppler-utils/Makefile index 128fa8d63311..263fca70ea32 100644 --- a/graphics/poppler-utils/Makefile +++ b/graphics/poppler-utils/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Nottebrock <lofi@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/poppler-utils/Makefile,v 1.3 2009/08/27 14:48:12 kwm Exp $ +# $MCom: ports/graphics/poppler-utils/Makefile,v 1.5 2010/07/07 13:03:19 kwm Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -utils MAINTAINER= gnome@FreeBSD.org diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index d76bcbb8ab1c..1928a9219b7a 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -3,11 +3,11 @@ # Whom: marcus@FreeBSD.org # # $FreeBSD$ -# $MCom: ports/graphics/poppler/Makefile,v 1.58 2010/03/14 22:08:42 kwm Exp $ +# $MCom: ports/graphics/poppler/Makefile,v 1.66 2010/11/17 15:03:00 kwm Exp $ # PORTNAME= poppler -PORTVERSION= 0.12.4 +PORTVERSION= 0.14.5 PORTREVISION?= 0 CATEGORIES= graphics print MASTER_SITES= http://poppler.freedesktop.org/ @@ -20,9 +20,12 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ lcms.1:${PORTSDIR}/graphics/lcms RUN_DEPENDS= poppler-data>0:${PORTSDIR}/graphics/poppler-data +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING USE_GMAKE= yes USE_GNOME= gnomehack gnometarget libxml2 ltverhack USE_AUTOTOOLS= libtool:22 +MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-zlib \ --enable-xpdf-headers \ @@ -40,7 +43,7 @@ OPTIONS= CAIRO "Enable cairo output backend" on \ .include <bsd.port.pre.mk> .if defined(SLAVEPORT) -LIB_DEPENDS+= poppler.5:${PORTSDIR}/graphics/poppler +LIB_DEPENDS+= poppler.6:${PORTSDIR}/graphics/poppler .if ${SLAVEPORT}=="gtk" CONFIGURE_ARGS+=--enable-poppler-glib @@ -110,11 +113,13 @@ LIB_DEPENDS+= openjpeg.2:${PORTSDIR}/graphics/openjpeg .endif post-patch: + @${REINPLACE_CMD} -e 's|7:0:0|6:0:0|' ${WRKSRC}/poppler/Makefile.in + .if defined(SLAVEPORT) && ${SLAVEPORT}=="qt" @${REINPLACE_CMD} -e 's|/usr/local/qt/include|${LOCALBASE}/include|; \ + s|$$QTDIR|${QT_PREFIX}|; \ s|/usr/local/qt/lib|${LOCALBASE}/lib|' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|$$QTDIR|${QT_PREFIX}|' ${WRKSRC}/configure .endif .if defined(SLAVEPORT) && ${SLAVEPORT}=="qt4" @${REINPLACE_CMD} -e 's|MOCQT4=`.*|MOCQT4="${LOCALBASE}/bin/moc-qt4"|' \ diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo index fe24669ee9cd..d34cf4192e34 100644 --- a/graphics/poppler/distinfo +++ b/graphics/poppler/distinfo @@ -1,3 +1,2 @@ -MD5 (poppler-0.12.4.tar.gz) = 4155346f9369b192569ce9184ff73e43 -SHA256 (poppler-0.12.4.tar.gz) = 2afa2a54bd4ccb09e92f82b64bcafa95d39a404a3b3db9d6a5fcad0e0229857a -SIZE (poppler-0.12.4.tar.gz) = 1674400 +SHA256 (poppler-0.14.5.tar.gz) = c805317c4c1a7080098ae8c7c2a1c1b8e2c784858fc2e04941878eeb8164814c +SIZE (poppler-0.14.5.tar.gz) = 1798194 diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in index 94d7703cd62b..4afb4b2aa878 100644 --- a/graphics/poppler/files/patch-glib_Makefile.in +++ b/graphics/poppler/files/patch-glib_Makefile.in @@ -1,40 +1,42 @@ ---- glib/Makefile.in.orig 2008-03-24 09:03:54.000000000 -0400 -+++ glib/Makefile.in 2008-03-24 09:04:38.000000000 -0400 -@@ -66,7 +66,6 @@ - @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler-cairo.la \ - @BUILD_CAIRO_OUTPUT_TRUE@ $(am__DEPENDENCIES_1) +--- glib/Makefile.in.orig 2010-08-14 16:50:48.000000000 +0200 ++++ glib/Makefile.in 2010-08-14 16:50:48.000000000 +0200 +@@ -82,7 +82,6 @@ + LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = libpoppler_glib_la_DEPENDENCIES = \ -- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \ +- $(top_builddir)/poppler/libpoppler.la \ + $(top_builddir)/poppler/libpoppler-cairo.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) - am__objects_1 = poppler-enums.lo -@@ -80,7 +79,6 @@ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@@ -105,8 +104,7 @@ @BUILD_WITH_GDK_TRUE@ test-poppler-glib.$(OBJEXT) test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS) @BUILD_WITH_GDK_TRUE@test_poppler_glib_DEPENDENCIES = \ -@BUILD_WITH_GDK_TRUE@ $(top_builddir)/poppler/libpoppler.la \ - @BUILD_WITH_GDK_TRUE@ libpoppler-glib.la $(am__DEPENDENCIES_1) \ +-@BUILD_WITH_GDK_TRUE@ libpoppler-glib.la $(am__DEPENDENCIES_1) \ ++@BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) \ @BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) \ - @BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) \ -@@ -295,7 +293,7 @@ - @BUILD_CAIRO_OUTPUT_TRUE@ $(top_builddir)/poppler/libpoppler-cairo.la \ - @BUILD_CAIRO_OUTPUT_TRUE@ $(CAIRO_LIBS) - + @BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler +@@ -386,7 +384,7 @@ + top_srcdir = @top_srcdir@ + win32_libs = @win32_libs@ + AM_LDFLAGS = @auto_import_flags@ -SUBDIRS = . reference demo +SUBDIRS = . reference INCLUDES = \ -DG_LOG_DOMAIN=\"Poppler\" \ -I$(top_srcdir) \ -@@ -336,7 +334,7 @@ +@@ -439,7 +437,7 @@ poppler-private.h libpoppler_glib_la_LIBADD = \ - $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ ++ -lpoppler \ + $(top_builddir)/poppler/libpoppler-cairo.la \ $(POPPLER_GLIB_LIBS) \ $(GDK_LIBS) \ - $(FREETYPE_LIBS) \ -@@ -348,7 +346,7 @@ +@@ -451,7 +449,7 @@ @BUILD_WITH_GDK_TRUE@ test-poppler-glib.cc @BUILD_WITH_GDK_TRUE@test_poppler_glib_LDADD = \ diff --git a/graphics/poppler/files/patch-qt4_src_Makefile.in b/graphics/poppler/files/patch-qt4_src_Makefile.in index e9f0ee2e3749..916eabc22f88 100644 --- a/graphics/poppler/files/patch-qt4_src_Makefile.in +++ b/graphics/poppler/files/patch-qt4_src_Makefile.in @@ -1,19 +1,19 @@ ---- qt4/src/Makefile.in.orig 2008-07-02 14:06:32.000000000 -0500 -+++ qt4/src/Makefile.in 2008-07-02 14:07:35.000000000 -0500 -@@ -62,7 +62,6 @@ +--- qt4/src/Makefile.in.orig 2010-07-07 14:22:29.000000000 +0200 ++++ qt4/src/Makefile.in 2010-07-07 14:23:40.000000000 +0200 +@@ -79,7 +79,6 @@ LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libpoppler_qt4_la_DEPENDENCIES = \ -- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__append_1) +- $(top_builddir)/poppler/libpoppler.la \ + $(top_builddir)/poppler/libpoppler-arthur.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_libpoppler_qt4_la_OBJECTS = poppler-document.lo poppler-page.lo \ - poppler-fontinfo.lo poppler-embeddedfile.lo poppler-textbox.lo \ -@@ -303,7 +302,7 @@ - poppler-export.h \ - poppler-private.h +@@ -384,7 +383,7 @@ + poppler-page-transition-private.h --libpoppler_qt4_la_LIBADD = $(top_builddir)/poppler/libpoppler.la \ -+libpoppler_qt4_la_LIBADD = -lpoppler \ - $(FONTCONFIG_LIBS) $(POPPLER_QT4_LIBS) $(am__append_1) - libpoppler_qt4_la_LDFLAGS = -version-info 3:0:0 - all: all-am + libpoppler_qt4_la_LIBADD = \ +- $(top_builddir)/poppler/libpoppler.la \ ++ -lpoppler \ + $(top_builddir)/poppler/libpoppler-arthur.la \ + $(FONTCONFIG_LIBS) \ + $(POPPLER_QT4_LIBS) diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist index 5ccd2f4ab8da..92af8cb0eaf5 100644 --- a/graphics/poppler/pkg-plist +++ b/graphics/poppler/pkg-plist @@ -3,6 +3,7 @@ include/poppler/Array.h include/poppler/BuiltinFont.h include/poppler/BuiltinFontTables.h include/poppler/CMap.h +include/poppler/CachedFile.h include/poppler/Catalog.h include/poppler/CharCodeToUnicode.h include/poppler/CharTypes.h @@ -26,6 +27,7 @@ include/poppler/JArithmeticDecoder.h include/poppler/JBIG2Stream.h include/poppler/Lexer.h include/poppler/Link.h +include/poppler/LocalPDFDocBuilder.h include/poppler/Movie.h include/poppler/NameToCharCode.h include/poppler/NameToUnicodeTable.h @@ -34,7 +36,9 @@ include/poppler/OptionalContent.h include/poppler/Outline.h include/poppler/OutputDev.h include/poppler/PDFDoc.h +include/poppler/PDFDocBuilder.h include/poppler/PDFDocEncoding.h +include/poppler/PDFDocFactory.h include/poppler/PSOutputDev.h include/poppler/PSTokenizer.h include/poppler/Page.h @@ -43,9 +47,12 @@ include/poppler/Parser.h include/poppler/PopplerCache.h include/poppler/PreScanOutputDev.h include/poppler/ProfileData.h +include/poppler/Rendition.h include/poppler/SecurityHandler.h include/poppler/Sound.h include/poppler/SplashOutputDev.h +include/poppler/StdinCachedFile.h +include/poppler/StdinPDFDocBuilder.h include/poppler/Stream-CCITT.h include/poppler/Stream.h include/poppler/TextOutputDev.h @@ -58,6 +65,15 @@ include/poppler/UnicodeMapTables.h include/poppler/UnicodeTypeTable.h include/poppler/XRef.h include/poppler/XpdfPluginAPI.h +include/poppler/cpp/poppler-document.h +include/poppler/cpp/poppler-embedded-file.h +include/poppler/cpp/poppler-font.h +include/poppler/cpp/poppler-global.h +include/poppler/cpp/poppler-page-transition.h +include/poppler/cpp/poppler-page.h +include/poppler/cpp/poppler-rectangle.h +include/poppler/cpp/poppler-toc.h +include/poppler/cpp/poppler-version.h include/poppler/fofi/FoFiBase.h include/poppler/fofi/FoFiEncodings.h include/poppler/fofi/FoFiTrueType.h @@ -70,6 +86,8 @@ include/poppler/goo/GooMutex.h include/poppler/goo/GooString.h include/poppler/goo/GooTimer.h include/poppler/goo/GooVector.h +include/poppler/goo/ImgWriter.h +include/poppler/goo/JpegWriter.h include/poppler/goo/PNGWriter.h include/poppler/goo/gfile.h include/poppler/goo/gmem.h @@ -99,14 +117,20 @@ include/poppler/splash/SplashT1FontFile.h include/poppler/splash/SplashTypes.h include/poppler/splash/SplashXPath.h include/poppler/splash/SplashXPathScanner.h +lib/libpoppler-cpp.a +lib/libpoppler-cpp.la +lib/libpoppler-cpp.so +lib/libpoppler-cpp.so.0 lib/libpoppler.a lib/libpoppler.la lib/libpoppler.so -lib/libpoppler.so.5 +lib/libpoppler.so.6 %%CAIRO%%libdata/pkgconfig/poppler-cairo.pc +libdata/pkgconfig/poppler-cpp.pc libdata/pkgconfig/poppler-splash.pc libdata/pkgconfig/poppler.pc @dirrm include/poppler/splash @dirrm include/poppler/goo @dirrm include/poppler/fofi +@dirrm include/poppler/cpp @dirrm include/poppler diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile index 0e235accc50a..e5cc5ebd3cf3 100644 --- a/graphics/py-cairo/Makefile +++ b/graphics/py-cairo/Makefile @@ -3,23 +3,23 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/py-cairo/Makefile,v 1.26 2009/01/02 20:13:31 mezz Exp $ +# $MCom: ports/graphics/py-cairo/Makefile,v 1.28 2010/11/15 14:12:13 kwm Exp $ # PORTNAME= cairo -PORTVERSION= 1.8.8 -PORTREVISION= 1 +PORTVERSION= 1.8.10 CATEGORIES= graphics python MASTER_SITES= http://cairographics.org/releases/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= py${PORTNAME}-${PORTVERSION} +DISTNAME= py2${PORTNAME}-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Python bindings for Cairo LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo -USE_PYTHON= 2.6+ +WRKSRC= ${WRKDIR}/py${PORTNAME}-${PORTVERSION} +USE_PYTHON= 2.6-2.7 USE_GMAKE= yes USE_GNOME= gnometarget gnomehack GNU_CONFIGURE= yes diff --git a/graphics/py-cairo/distinfo b/graphics/py-cairo/distinfo index 596dd3cd2b5d..c4bd9a347736 100644 --- a/graphics/py-cairo/distinfo +++ b/graphics/py-cairo/distinfo @@ -1,3 +1,2 @@ -MD5 (pycairo-1.8.8.tar.gz) = 054da6c125cb427a003f5fd6c54f853e -SHA256 (pycairo-1.8.8.tar.gz) = 2f52599943ca03c8ff336a0e84b1c8b74f30e2a3de9cb6a9a42a93a848832860 -SIZE (pycairo-1.8.8.tar.gz) = 475651 +SHA256 (py2cairo-1.8.10.tar.gz) = b15f71019e42e06d86f7e8fe5587f07c3de5a59a6c3a071b25fe100796dbcd56 +SIZE (py2cairo-1.8.10.tar.gz) = 588459 diff --git a/graphics/py-clutter/Makefile b/graphics/py-clutter/Makefile index 365db2649d6b..15f505239d5a 100644 --- a/graphics/py-clutter/Makefile +++ b/graphics/py-clutter/Makefile @@ -3,12 +3,12 @@ # Whom: Martin Wilke <miwi@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/py-clutter/Makefile,v 1.6 2010/05/10 04:21:19 marcus Exp $ +# $MCom: ports/graphics/py-clutter/Makefile,v 1.8 2010/08/26 21:06:34 marcus Exp $ # PORTNAME= clutter PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics python MASTER_SITES= http://www.clutter-project.org/sources/pyclutter/${PORTVERSION:R}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-clutter/files/patch-clutter_cogl-base-types.defs b/graphics/py-clutter/files/patch-clutter_cogl-base-types.defs new file mode 100644 index 000000000000..f30d20b0283e --- /dev/null +++ b/graphics/py-clutter/files/patch-clutter_cogl-base-types.defs @@ -0,0 +1,33 @@ +--- clutter/cogl-base-types.defs.orig 2010-08-28 21:20:41.000000000 -0400 ++++ clutter/cogl-base-types.defs 2010-08-28 21:21:02.000000000 -0400 +@@ -7,30 +7,6 @@ + (gtype-id "COGL_PANGO_TYPE_FONT_MAP") + ) + +-(define-flags DebugFlags +- (in-module "Cogl") +- (c-name "CoglDebugFlags") +- (gtype-id "COGL_TYPE_DEBUG_FLAGS") +- (values +- '("misc" "COGL_DEBUG_MISC") +- '("texture" "COGL_DEBUG_TEXTURE") +- '("material" "COGL_DEBUG_MATERIAL") +- '("shader" "COGL_DEBUG_SHADER") +- '("offscreen" "COGL_DEBUG_OFFSCREEN") +- '("draw" "COGL_DEBUG_DRAW") +- '("pango" "COGL_DEBUG_PANGO") +- '("rectangles" "COGL_DEBUG_RECTANGLES") +- '("handle" "COGL_DEBUG_HANDLE") +- '("blend-strings" "COGL_DEBUG_BLEND_STRINGS") +- '("disable-batching" "COGL_DEBUG_DISABLE_BATCHING") +- '("force-client-side-matrices" "COGL_DEBUG_FORCE_CLIENT_SIDE_MATRICES") +- '("disable-vbos" "COGL_DEBUG_DISABLE_VBOS") +- '("journal" "COGL_DEBUG_JOURNAL") +- '("batching" "COGL_DEBUG_BATCHING") +- '("disable-software-transform" "COGL_DEBUG_DISABLE_SOFTWARE_TRANSFORM") +- ) +-) +- + (define-flags BufferBit + (in-module "Cogl") + (c-name "CoglBufferBit") diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile index 06eb46a85c11..de24a4149ed8 100644 --- a/graphics/shotwell/Makefile +++ b/graphics/shotwell/Makefile @@ -26,6 +26,8 @@ LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 \ webkit:${PORTSDIR}/www/webkit-gtk2 \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique +BROKEN= Doesn't build with vala-0.10 + USE_BZIP2= yes USE_GETTEXT= yes USE_GNOME= gconf2 gtk20 desktopfileutils |