update to goocanvas-2.0.2

This commit is contained in:
jasper 2013-11-03 20:00:43 +00:00
parent fcb8d8dbc2
commit 7e16062a79
7 changed files with 15 additions and 106 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.14 2013/09/28 08:50:42 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.15 2013/11/03 20:00:43 jasper Exp $
COMMENT= canvas widget for GTK+ based on Cairo
GNOME_PROJECT= goocanvas
GNOME_VERSION= 2.0.1
GNOME_VERSION= 2.0.2
PKGNAME= goocanvas2-${GNOME_VERSION}
REVISION= 3
SHARED_LIBS += goocanvas-2.0 0.0 # 11.0
CATEGORIES= graphics
@ -13,13 +12,14 @@ CATEGORIES= graphics
# LGPLv2
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo cairo-gobject
WANTLIB += expat fontconfig freetype gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB += gtk-3 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
WANTLIB += pixman-1 png pthread-stubs xcb xcb-render xcb-shm z
WANTLIB += ffi
WANTLIB += ffi ICE SM atk-bridge-2.0 atspi dbus-1 graphite2
WANTLIB += harfbuzz pthread
MODULES= devel/gettext \
lang/python \
@ -29,8 +29,7 @@ BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= devel/py-gobject3
LIB_DEPENDS= x11/gtk+3
AUTOCONF_VERSION=2.68
CONFIGURE_STYLE=autoconf
CONFIGURE_STYLE=gnu
MODGNOME_TOOLS= gi

View File

@ -1,5 +1,4 @@
MD5 (goocanvas-2.0.1.tar.xz) = eKmPpSbOc6d6RUcRyW8Hog==
RMD160 (goocanvas-2.0.1.tar.xz) = VP1lbKyNfdZDT09wH6pcIVP4XE4=
SHA1 (goocanvas-2.0.1.tar.xz) = f0lrF9VkZ+1p2W5yH4evdJd0cgQ=
SHA256 (goocanvas-2.0.1.tar.xz) = DDpZWm0qT+DxoaUkNjfmaqG/uvZJJFW/0LUeDeybFVM=
SIZE (goocanvas-2.0.1.tar.xz) = 486788
MD5 (goocanvas-2.0.2.tar.xz) = JnQJlM+l5X37cNQMTsVSAA==
RMD160 (goocanvas-2.0.2.tar.xz) = REFEFlKkB71JNQTAULmJwJkLBBM=
SHA256 (goocanvas-2.0.2.tar.xz) = 8g5fvvjRomMwM+29iG3RMUahuUjRgTqcNTqAopKV0dA=
SIZE (goocanvas-2.0.2.tar.xz) = 502732

View File

@ -1,36 +0,0 @@
$OpenBSD: patch-configure_in,v 1.1 2011/10/21 20:19:03 jasper Exp $
From 88164ce28d4aea3da4357bf48a60dbf4219843b0 Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Tue, 11 Oct 2011 19:52:42 +0000
Subject: Bump pygobject dependency to 2.90.4
--- configure.in.orig Tue Oct 11 21:43:57 2011
+++ configure.in Tue Oct 11 21:44:47 2011
@@ -28,7 +28,7 @@ AM_PROG_LIBTOOL
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-PYGOBJECT_REQUIRED=2.28
+PYGOBJECT_REQUIRED=2.90.4
pkg_modules="gtk+-3.0 >= 3.0.0 glib-2.0 >= 2.28.0 cairo >= 1.10.0"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
@@ -87,14 +87,14 @@ AC_ARG_ENABLE([python],
[enable_python="auto"])
if test "x$enable_python" = "xauto"; then
- PKG_CHECK_EXISTS([pygobject-2.0 >= $PYGOBJECT_REQUIRED],
+ PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED],
[enable_python=yes],[enable_python=no])
fi
if test "x$enable_python" = "xyes"; then
- PKG_CHECK_MODULES(PYTHON, [pygobject-2.0 >= $PYGOBJECT_REQUIRED])
+ PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED])
- pyoverridesdir=`$PKG_CONFIG --variable=overridesdir pygobject-2.0`
+ pyoverridesdir=`$PYTHON -c "import gi;print gi._overridesdir"`
AC_SUBST(pyoverridesdir)
fi

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-src_goocanvasitem_c,v 1.1 2013/03/28 13:08:58 jasper Exp $
From 2088843efb50f05b8965340eddbf7c0103c6eef1 Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Thu, 28 Mar 2013 10:22:08 +0000
Subject: Use GObject.Object instead of GLib.Object in introspection annotations
--- src/goocanvasitem.c.orig Thu Mar 28 11:19:56 2013
+++ src/goocanvasitem.c Thu Mar 28 11:20:44 2013
@@ -397,7 +397,7 @@ goo_canvas_item_base_init (gpointer g_iface)
/**
* GooCanvasItem::child-notify
* @item: the item that received the signal.
- * @pspec: (type GLib.ParamSpec): the #GParamSpec of the changed child property.
+ * @pspec: (type GObject.ParamSpec): the #GParamSpec of the changed child property.
*
* Emitted for each child property that has changed.
* The signal's detail holds the property name.

View File

@ -1,36 +0,0 @@
$OpenBSD: patch-src_goocanvasitemmodel_c,v 1.1 2013/03/28 13:08:58 jasper Exp $
From 2088843efb50f05b8965340eddbf7c0103c6eef1 Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Thu, 28 Mar 2013 10:22:08 +0000
Subject: Use GObject.Object instead of GLib.Object in introspection annotations
--- src/goocanvasitemmodel.c.orig Thu Mar 28 11:20:01 2013
+++ src/goocanvasitemmodel.c Thu Mar 28 11:20:31 2013
@@ -186,7 +186,7 @@ goo_canvas_item_model_base_init (gpointer g_iface)
/**
* GooCanvasItemModel::child-notify
* @item: the item model that received the signal.
- * @pspec: (type GLib.ParamSpec): the #GParamSpec of the changed child property.
+ * @pspec: (type GObject.ParamSpec): the #GParamSpec of the changed child property.
*
* Emitted for each child property that has changed.
* The signal's detail holds the property name.
@@ -1126,7 +1126,7 @@ goo_canvas_item_model_class_install_child_property (GO
*
* It finds a child property of a canvas item class by name.
*
- * Returns: (type GLib.ParamSpec) (transfer none): The #GParamSpec of the child
+ * Returns: (type GObject.ParamSpec) (transfer none): The #GParamSpec of the child
* property or %NULL if @class has no child property with that name.
*/
GParamSpec*
@@ -1152,7 +1152,7 @@ goo_canvas_item_model_class_find_child_property (GObje
*
* It returns all child properties of a canvas item class.
*
- * Returns: (array length=n_properties) (element-type GLib.ParamSpec) (transfer container):
+ * Returns: (array length=n_properties) (element-type GObject.ParamSpec) (transfer container):
* a newly allocated array of #GParamSpec*. The array must be freed with g_free().
*/
GParamSpec**

View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2011/09/12 14:07:11 ajacoutot Exp $
@lib lib/libgoocanvas-2.0.so.${LIBgoocanvas-2.0_VERSION}

View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2011/10/10 08:14:46 jasper Exp $
%%SHARED%%
@comment $OpenBSD: PLIST,v 1.3 2013/11/03 20:00:43 jasper Exp $
include/goocanvas-2.0/
include/goocanvas-2.0/goocanvas.h
include/goocanvas-2.0/goocanvasellipse.h
@ -22,6 +21,7 @@ include/goocanvas-2.0/goocanvaswidget.h
lib/girepository-1.0/GooCanvas-2.0.typelib
lib/libgoocanvas-2.0.a
lib/libgoocanvas-2.0.la
@lib lib/libgoocanvas-2.0.so.${LIBgoocanvas-2.0_VERSION}
lib/pkgconfig/goocanvas-2.0.pc
lib/python${MODPY_VERSION}/site-packages/gi/overrides/GooCanvas.py
lib/python${MODPY_VERSION}/site-packages/gi/overrides/GooCanvas.pyc
@ -70,9 +70,12 @@ share/gtk-doc/html/goocanvas2/goocanvas2.devhelp2
share/gtk-doc/html/goocanvas2/home.png
share/gtk-doc/html/goocanvas2/index.html
share/gtk-doc/html/goocanvas2/index.sgml
share/gtk-doc/html/goocanvas2/left-insensitive.png
share/gtk-doc/html/goocanvas2/left.png
share/gtk-doc/html/goocanvas2/right-insensitive.png
share/gtk-doc/html/goocanvas2/right.png
share/gtk-doc/html/goocanvas2/style.css
share/gtk-doc/html/goocanvas2/up-insensitive.png
share/gtk-doc/html/goocanvas2/up.png
share/locale/en_GB/LC_MESSAGES/goocanvas2.mo
share/locale/es/LC_MESSAGES/goocanvas2.mo