Date: Sat, 21 Aug 2004 18:40:11 +0200 (CEST) From: Jean-Yves Lefort <jylefort@brutele.be> To: FreeBSD-gnats-submit@FreeBSD.org Cc: gnome@FreeBSD.org Subject: ports/70777: Update ports: x11-toolkits/py-gtk2 to 2.3.96 and x11-toolkits/py-gnome2 to 2.5.90 Message-ID: <20040821164011.C8E2F22E1F@jsite.lefort.net> Resent-Message-ID: <200408211640.i7LGeLbs053477@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 70777
>Category: ports
>Synopsis: Update ports: x11-toolkits/py-gtk2 to 2.3.96 and x11-toolkits/py-gnome2 to 2.5.90
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Aug 21 16:40:21 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Jean-Yves Lefort
>Release: FreeBSD 4.10-RELEASE i386
>Organization:
>Environment:
System: FreeBSD jsite.lefort.net 4.10-RELEASE FreeBSD 4.10-RELEASE #0: Thu Jul 1 14:25:43 CEST 2004 jylefort@jsite.lefort.net:/usr/obj/usr/src/sys/JSITE i386
>Description:
Note: the new py-gnome2 does not depend on libzvt anymore, therefore
bsd.gnome.mk should also be modified.
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/x11-toolkits/py-gtk2/Makefile py-gtk2/Makefile
--- /usr/ports/x11-toolkits/py-gtk2/Makefile Mon Jul 26 12:26:40 2004
+++ py-gtk2/Makefile Sat Aug 21 16:53:34 2004
@@ -5,11 +5,10 @@
# $FreeBSD: ports/x11-toolkits/py-gtk2/Makefile,v 1.78 2004/07/25 20:43:12 marcus Exp $
PORTNAME= gtk
-PORTVERSION= 2.2.0
-PORTREVISION= 3
+PORTVERSION= 2.3.96
CATEGORIES= x11-toolkits python
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/pygtk/2.2
+MASTER_SITE_SUBDIR= sources/pygtk/2.3
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pygtk-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -52,7 +51,9 @@
.if !defined(NOPORTDOCS)
post-install:
${MKDIR} ${EG_DST_DIR}
- ${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EG_DST_DIR} -xf -
+.for dir in atk glade gobject gtk ide neil pango pygtk-demo simple
+ ${CP} -R ${EG_SRC_DIR}/${dir} ${EG_DST_DIR}
+.endfor
${CHOWN} -R ${BINOWN}:${BINGRP} ${EG_DST_DIR}
${FIND} ${EG_DST_DIR} -type d -print | ${XARGS} ${CHMOD} 0555
${FIND} ${EG_DST_DIR} -type f -print | ${XARGS} ${CHMOD} 0444
diff -ruN /usr/ports/x11-toolkits/py-gtk2/distinfo py-gtk2/distinfo
--- /usr/ports/x11-toolkits/py-gtk2/distinfo Fri Mar 12 04:35:49 2004
+++ py-gtk2/distinfo Sat Aug 21 16:24:59 2004
@@ -1,2 +1,2 @@
-MD5 (gnome2/pygtk-2.2.0.tar.bz2) = 992122f8a61c266aeb1b7b35be9c4be1
-SIZE (gnome2/pygtk-2.2.0.tar.bz2) = 553761
+MD5 (gnome2/pygtk-2.3.96.tar.bz2) = f5fcace74a398a5fac12f76592c405bb
+SIZE (gnome2/pygtk-2.3.96.tar.bz2) = 630563
diff -ruN /usr/ports/x11-toolkits/py-gtk2/pkg-plist py-gtk2/pkg-plist
--- /usr/ports/x11-toolkits/py-gtk2/pkg-plist Fri Mar 12 04:35:49 2004
+++ py-gtk2/pkg-plist Sat Aug 21 16:45:14 2004
@@ -31,6 +31,9 @@
%%PORTDOCS%%share/examples/py-gtk/glade/test.glade
%%PORTDOCS%%share/examples/py-gtk/gobject/properties.py
%%PORTDOCS%%share/examples/py-gtk/gobject/signal.py
+%%PORTDOCS%%share/examples/py-gtk/gtk/filechooser.py
+%%PORTDOCS%%share/examples/py-gtk/gtk/uimanager.py
+%%PORTDOCS%%share/examples/py-gtk/gtk/widget.py
%%PORTDOCS%%share/examples/py-gtk/ide/README
%%PORTDOCS%%share/examples/py-gtk/ide/break.xpm
%%PORTDOCS%%share/examples/py-gtk/ide/browse.py
@@ -58,6 +61,7 @@
%%PORTDOCS%%share/examples/py-gtk/neil/notebook.py
%%PORTDOCS%%share/examples/py-gtk/neil/question.xpm
%%PORTDOCS%%share/examples/py-gtk/pango/utf8-demo.py
+%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/alphatest.png
%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/__init__.py
%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/appwindow.py
%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/buttonbox.py
@@ -74,6 +78,7 @@
%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/stock_browser.py
%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/toolbar.py
%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/treemodel.py
+%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/floppybuddy.gif
%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/gtk-logo-rgb.gif
%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/pygtk-demo.py
%%PORTDOCS%%share/examples/py-gtk/simple/README
@@ -139,6 +144,7 @@
%%PORTDOCS%%@dirrm share/examples/py-gtk/pango
%%PORTDOCS%%@dirrm share/examples/py-gtk/neil
%%PORTDOCS%%@dirrm share/examples/py-gtk/ide
+%%PORTDOCS%%@dirrm share/examples/py-gtk/gtk
%%PORTDOCS%%@dirrm share/examples/py-gtk/gobject
%%PORTDOCS%%@dirrm share/examples/py-gtk/glade
%%PORTDOCS%%@dirrm share/examples/py-gtk/atk
diff -ruN /usr/ports/x11-toolkits/py-gnome2/Makefile py-gnome2/Makefile
--- /usr/ports/x11-toolkits/py-gnome2/Makefile Sun Aug 8 12:28:37 2004
+++ py-gnome2/Makefile Sat Aug 21 16:58:42 2004
@@ -6,10 +6,10 @@
#
PORTNAME= gnome
-PORTVERSION= 2.0.3
+PORTVERSION= 2.5.90
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-python/2.0
+MASTER_SITE_SUBDIR= sources/gnome-python/2.5
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= gnome-python-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -24,7 +24,7 @@
USE_BZIP2= yes
USE_GMAKE= yes
USE_PYTHON= yes
-USE_GNOME= gnomehack libgnomeprintui libgtkhtml gnomepanel libzvt \
+USE_GNOME= gnomehack libgnomeprintui libgtkhtml gnomepanel \
nautilus2 pygtk2
USE_LIBTOOL_VER=15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -38,7 +38,9 @@
.if !defined(NOPORTDOCS)
post-install:
${MKDIR} ${EG_DST_DIR}
- ${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EG_DST_DIR} -xf -
+.for dir in applet bonobo canvas gconf gnomeprint gtkhtml2 nautilus popt vfs
+ ${CP} -R ${EG_SRC_DIR}/${dir} ${EG_DST_DIR}
+.endfor
${CHOWN} -R ${BINOWN}:${BINGRP} ${EG_DST_DIR}
${FIND} ${EG_DST_DIR} -type d -print | ${XARGS} ${CHMOD} 0555
${FIND} ${EG_DST_DIR} -type f -print | ${XARGS} ${CHMOD} 0444
diff -ruN /usr/ports/x11-toolkits/py-gnome2/distinfo py-gnome2/distinfo
--- /usr/ports/x11-toolkits/py-gnome2/distinfo Sun Aug 8 12:28:37 2004
+++ py-gnome2/distinfo Sat Aug 21 16:59:37 2004
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-python-2.0.3.tar.bz2) = f248cc3a0791c6e1c7c2ba6a49429f48
-SIZE (gnome2/gnome-python-2.0.3.tar.bz2) = 348773
+MD5 (gnome2/gnome-python-2.5.90.tar.bz2) = f1d741b64eb2c6f5ab74dc9357d2f57a
+SIZE (gnome2/gnome-python-2.5.90.tar.bz2) = 361884
diff -ruN /usr/ports/x11-toolkits/py-gnome2/files/patch-bonobo::bonobo.override py-gnome2/files/patch-bonobo::bonobo.override
--- /usr/ports/x11-toolkits/py-gnome2/files/patch-bonobo::bonobo.override Thu Jan 1 01:00:00 1970
+++ py-gnome2/files/patch-bonobo::bonobo.override Sat Aug 21 17:29:15 2004
@@ -0,0 +1,32 @@
+--- bonobo/bonobo.override 4 Aug 2004 22:33:19 -0000 1.29
++++ bonobo/bonobo.override 7 Aug 2004 14:53:04 -0000 1.30
+@@ -186,6 +186,7 @@ _wrap_bonobo_event_source_client_add_lis
+ gchar *opt_mask = NULL;
+ PyObject *params = NULL;
+ CORBA_Environment ev;
++ Bonobo_Listener listener;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+ "O!O|sO:bonobo.event_source_client_add_listener",
+@@ -201,16 +202,14 @@ _wrap_bonobo_event_source_client_add_lis
+
+ CORBA_exception_init(&ev);
+
+- bonobo_event_source_client_add_listener_closure (((PyCORBA_Object *)object)->objref,
+- pyg_closure_new (callback, params, NULL),
+- opt_mask,
+- &ev);
++ listener = bonobo_event_source_client_add_listener_full(
++ ((PyCORBA_Object *)object)->objref,
++ pyg_closure_new (callback, params, NULL), opt_mask, &ev);
+
+ if (pyorbit_check_ex(&ev))
+ return NULL;
+-
+- Py_INCREF(Py_None);
+- return Py_None;
++
++ return pycorba_object_new(listener);
+ }
+ %%
+ override bonobo_item_handler_new_closure kwargs
diff -ruN /usr/ports/x11-toolkits/py-gnome2/pkg-plist py-gnome2/pkg-plist
--- /usr/ports/x11-toolkits/py-gnome2/pkg-plist Wed Apr 7 06:36:45 2004
+++ py-gnome2/pkg-plist Sat Aug 21 17:09:05 2004
@@ -14,7 +14,6 @@
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/nautilus.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/ui.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/vfs.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/zvt.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyo
@@ -51,8 +50,9 @@
%%PORTDOCS%%share/examples/py-gnome/nautilus/Nautilus_View_pysample.server
%%PORTDOCS%%share/examples/py-gnome/nautilus/README
%%PORTDOCS%%share/examples/py-gnome/nautilus/sample.py
+%%PORTDOCS%%share/examples/py-gnome/popt/popt.py
+%%PORTDOCS%%share/examples/py-gnome/vfs/async.py
%%PORTDOCS%%share/examples/py-gnome/vfs/shell.py
-%%PORTDOCS%%share/examples/py-gnome/zvt/zvt-demo.py
share/pygtk/2.0/defs/applet.defs
share/pygtk/2.0/defs/art.defs
share/pygtk/2.0/defs/bonobo-types.defs
@@ -61,15 +61,15 @@
share/pygtk/2.0/defs/bonoboui.defs
share/pygtk/2.0/defs/canvas.defs
share/pygtk/2.0/defs/gconf.defs
+share/pygtk/2.0/defs/gnome-types.defs
share/pygtk/2.0/defs/gnome.defs
share/pygtk/2.0/defs/gtkhtml2.defs
share/pygtk/2.0/defs/nautilus.defs
share/pygtk/2.0/defs/print.defs
share/pygtk/2.0/defs/printui.defs
share/pygtk/2.0/defs/ui.defs
-share/pygtk/2.0/defs/zvt.defs
-%%PORTDOCS%%@dirrm share/examples/py-gnome/zvt
%%PORTDOCS%%@dirrm share/examples/py-gnome/vfs
+%%PORTDOCS%%@dirrm share/examples/py-gnome/popt
%%PORTDOCS%%@dirrm share/examples/py-gnome/nautilus
%%PORTDOCS%%@dirrm share/examples/py-gnome/gtkhtml2
%%PORTDOCS%%@dirrm share/examples/py-gnome/gnomeprint
--- bsd.gnome.mk.orig Sat Aug 21 17:35:47 2004
+++ bsd.gnome.mk Sat Aug 21 17:36:03 2004
@@ -398,7 +398,7 @@
pygnome2_DETECT= ${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py
pygnome2_BUILD_DEPENDS= ${pygnome2_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome2
pygnome2_RUN_DEPENDS= ${pygnome2_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome2
-pygnome2_USE_GNOME_IMPL=libgnomeprintui libgtkhtml gnomepanel libzvt nautilus2 pygtk2
+pygnome2_USE_GNOME_IMPL=libgnomeprintui libgtkhtml gnomepanel nautilus2 pygtk2
gstreamerplugins_LIB_DEPENDS= gstplay-0.8.1:${PORTSDIR}/multimedia/gstreamer-plugins \
gstreamer-0.8:${PORTSDIR}/multimedia/gstreamer
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040821164011.C8E2F22E1F>