- update py-gnome-extras to 2.25.3

- unbreak after libgksu(ui) removal * disables the gda bindings for now
2009-10-14 17:13:48 +00:00 · 2009-10-14 17:13:48 +00:00 · 93403446d5
commit 93403446d5
parent b2e3b2d66f
7 changed files with 541 additions and 70 deletions
--- a/x11/gnome/py-gnome-extras/Makefile
+++ b/x11/gnome/py-gnome-extras/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.15 2009/08/11 08:39:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2009/10/14 17:13:48 jasper Exp $

 COMMENT=	additional Python bindings for GNOME

 GNOME_PROJECT=	gnome-python-extras
-GNOME_VERSION=	2.19.1
-PKGNAME=	py-gnome-extras-${VERSION}p11
+GNOME_VERSION=	2.25.3
+PKGNAME=	py-gnome-extras-${VERSION}

 HOMEPAGE=	http://www.pygtk.org/

@ -16,36 +16,35 @@ PERMIT_DISTFILES_FTP=	Yes

 WANTLIB += ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite
 WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr
-WANTLIB += Xrender art_lgpl_2 atk-1.0 bonobo-2 bonobo-activation
-WANTLIB += bonoboui-2 cairo crypto dbus-1 dbus-glib-1 enchant
-WANTLIB += expat fam fontconfig freetype gailutil gconf-2 gdk-x11-2.0
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glade-2.0 glib-2.0 glitz gmodule-2.0
-WANTLIB += gnome-2 gnome-keyring gnomecanvas-2 gnomeui-2 gnomevfs-2
-WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 gtop-2.0 kvm m
-WANTLIB += nspr4 pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
-WANTLIB += plc4 plds4 png popt rpcsvc ssl startup-notification-1
-WANTLIB += stdc++ util xml2 z avahi-client avahi-common avahi-glib
-WANTLIB += pthread-stubs xcb pthread-stubs xcb
+WANTLIB += Xrender art_lgpl_2 atk-1.0 avahi-client avahi-common
+WANTLIB += avahi-glib bonobo-2 bonobo-activation bonoboui-2 cairo
+WANTLIB += crypto dbus-1 dbus-glib-1 expat ffi fontconfig freetype
+WANTLIB += gailutil gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 glitz gmodule-2.0 gnome-2 gnome-keyring gnomecanvas-2
+WANTLIB += gnomeui-2 gnomevfs-2 gobject-2.0 gthread-2.0 gtk-x11-2.0
+WANTLIB += m nspr4 pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
+WANTLIB += pixman-1 plc4 plds4 png popt pthread-stubs ssl stdc++
+WANTLIB += util xcb xml2 z

 MODULES=		devel/gettext \
 			lang/python \
 			x11/gnome

 BUILD_DEPENDS=		${RUN_DEPENDS} \
-			:xulrunner-devel->=1.8:devel/xulrunner/1.8,-devel \
-			::sysutils/libgksuui
+			:xulrunner-devel->=1.8:devel/xulrunner/1.8,-devel
 LIB_DEPENDS=		xulrunner/gtkembedmoz,xulrunner/xpcom:xulrunner->=1.8:devel/xulrunner/1.8 \
-			gksu2::sysutils/libgksu \
 			gtkspell::textproc/gtkspell \
+			enchant::textproc/enchant \
 			gdl-1::x11/gnome/gdl \
-			gtkhtml-2::x11/gnome/libgtkhtml \
-			gda-3.0.>=1,gdasql-3.0,gda-report-3.0::x11/gnome/libgda
-RUN_DEPENDS=		:py-gnome->=2.20.0:x11/gnome/py-gnome \
-			::sysutils/libgksuui
+			gtkhtml-2::x11/gnome/libgtkhtml
+#			gda-4.0.>=1,gdasql-4.0,gda-report-4.0::x11/gnome/libgda
+RUN_DEPENDS=		:py-gnome->=2.20.0:x11/gnome/py-gnome
 REGRESS_DEPENDS=	:${PKGNAME}:${BUILD_PKGPATH}

 USE_X11=		Yes
 LIBTOOL_FLAGS=		--tag=disable-static
+AUTOCONF_VERSION=	2.62
+CONFIGURE_STYLE=	autoconf
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS= 	--with-gtkmozembed=xulrunner
--- a/x11/gnome/py-gnome-extras/distinfo
+++ b/x11/gnome/py-gnome-extras/distinfo
@ -1,5 +1,5 @@
-MD5 (gnome/gnome-python-extras-2.19.1.tar.bz2) = CIlsY9cc5E0g+vuvnA7ceA==
-RMD160 (gnome/gnome-python-extras-2.19.1.tar.bz2) = HdVW3vE7bNEO+aOnR+c+o47nDmI=
-SHA1 (gnome/gnome-python-extras-2.19.1.tar.bz2) = +XMDqpLDAAUIGKyKAdC8BleyqeM=
-SHA256 (gnome/gnome-python-extras-2.19.1.tar.bz2) = xfdPTEbbs3nRGdb3TKSkdlOvJRvqF23HoOyszLiDOfA=
-SIZE (gnome/gnome-python-extras-2.19.1.tar.bz2) = 361721
+MD5 (gnome/gnome-python-extras-2.25.3.tar.bz2) = nzt+xcVxMLlgYctIa3nAdg==
+RMD160 (gnome/gnome-python-extras-2.25.3.tar.bz2) = 4JvAFSUS4sqmFian3HiNczbyTkY=
+SHA1 (gnome/gnome-python-extras-2.25.3.tar.bz2) = 5p5SiEZslg7W+YW7EMmWmyHthaQ=
+SHA256 (gnome/gnome-python-extras-2.25.3.tar.bz2) = yjRiZOAOGT8IZsq9iAHTt85w2ue4spbkHls6RcmwJ1w=
+SIZE (gnome/gnome-python-extras-2.25.3.tar.bz2) = 370489
--- a/x11/gnome/py-gnome-extras/patches/patch-configure_ac
+++ b/x11/gnome/py-gnome-extras/patches/patch-configure_ac
@ -0,0 +1,23 @@
+$OpenBSD: patch-configure_ac,v 1.1 2009/10/14 17:13:48 jasper Exp $
+
+Regenerated gdl.defs and updated dependency to gdl 2.27.92
+From upstream git.
+
+--- configure.ac.orig	Wed Oct 14 19:06:44 2009
+++ configure.ac	Wed Oct 14 19:07:20 2009
+@@ -310,14 +310,9 @@ dnl should we build the gdl module?
+ AC_ARG_BINDING([gdl], [ON])
+ if $build_gdl; then
+   have_gdl07=false
+-  PKG_CHECK_MODULES(GDL, [gdl-1.0 >= 0.7.1 gdl-gnome-1.0 >= 0.7.1 pygtk-2.0 >= pygtk_required_version], dnl
+  PKG_CHECK_MODULES(GDL, [gdl-1.0 >= 2.27.92 pygtk-2.0 >= pygtk_required_version], dnl
+                     [build_gdl=true; have_gdl07=true], build_gdl=false)
+ 
+-  dnl try again with no gnome and older version
+-  if ! $build_gdl; then
+-    PKG_CHECK_MODULES(GDL, [gdl-1.0 >= 0.6.1 pygtk-2.0 >= pygtk_required_version], dnl
+-                      build_gdl=true, build_gdl=false)
+-  fi
+ fi
+ 
+ AM_CONDITIONAL(BUILD_GDL, $build_gdl)
--- a/x11/gnome/py-gnome-extras/patches/patch-gdl_gdl_defs
+++ b/x11/gnome/py-gnome-extras/patches/patch-gdl_gdl_defs
@ -0,0 +1,487 @@
+$OpenBSD: patch-gdl_gdl_defs,v 1.1 2009/10/14 17:13:48 jasper Exp $
+
+Regenerated gdl.defs and updated dependency to gdl 2.27.92
+From upstream git.
+
+--- gdl/gdl.defs.orig	Fri Dec 12 02:06:29 2008
+++ gdl/gdl.defs	Wed Oct 14 19:07:53 2009
+@@ -1,23 +1,12 @@
+ ;; -*- scheme -*-
+ ; object definitions ...
+-(ifdef HAVE_GDL_0_7
+-
+-(define-object ComboButton
+(define-object DockItemGrip
+   (in-module "Gdl")
+-  (parent "GtkHBox")
+-  (c-name "GdlComboButton")
+-  (gtype-id "GDL_TYPE_COMBO_BUTTON")
+  (parent "GtkContainer")
+  (c-name "GdlDockItemGrip")
+  (gtype-id "GDL_TYPE_DOCK_ITEM_GRIP")
+ )
+ 
+-) ; ifdef HAVE_GDL_0_7
+-
+-(define-object DockBar
+-  (in-module "Gdl")
+-  (parent "GtkVBox")
+-  (c-name "GdlDockBar")
+-  (gtype-id "GDL_TYPE_DOCK_BAR")
+-)
+-
+ (define-object DockLayout
+   (in-module "Gdl")
+   (parent "GObject")
+@@ -46,13 +35,6 @@
+   (gtype-id "GDL_TYPE_DOCK_ITEM")
+ )
+ 
+-(define-object DockNotebook
+-  (in-module "Gdl")
+-  (parent "GdlDockItem")
+-  (c-name "GdlDockNotebook")
+-  (gtype-id "GDL_TYPE_DOCK_NOTEBOOK")
+-)
+-
+ (define-object Dock
+   (in-module "Gdl")
+   (parent "GdlDockObject")
+@@ -60,13 +42,6 @@
+   (gtype-id "GDL_TYPE_DOCK")
+ )
+ 
+-(define-object DockPaned
+-  (in-module "Gdl")
+-  (parent "GdlDockItem")
+-  (c-name "GdlDockPaned")
+-  (gtype-id "GDL_TYPE_DOCK_PANED")
+-)
+-
+ (define-object DockPlaceholder
+   (in-module "Gdl")
+   (parent "GdlDockObject")
+@@ -74,28 +49,8 @@
+   (gtype-id "GDL_TYPE_DOCK_PLACEHOLDER")
+ )
+ 
+-(define-object DockTablabel
+-  (in-module "Gdl")
+-  (parent "GtkBin")
+-  (c-name "GdlDockTablabel")
+-  (gtype-id "GDL_TYPE_DOCK_TABLABEL")
+-)
+-
+-(ifdef HAVE_GDL_0_7
+-
+-(define-object Icons
+-  (in-module "Gdl")
+-  (parent "GObject")
+-  (c-name "GdlIcons")
+-  (gtype-id "GDL_TYPE_ICONS")
+-)
+-
+-) ; ifdef HAVE_GDL_0_7
+-
+ ;; Enumerations and flags ...
+ 
+-(ifdef HAVE_GDL_0_7
+-
+ (define-enum DockBarStyle
+   (in-module "Gdl")
+   (c-name "GdlDockBarStyle")
+@@ -108,8 +63,6 @@
+   )
+ )
+ 
+-) ; ifdef HAVE_GDL_0_7
+-
+ (define-flags DockItemBehavior
+   (in-module "Gdl")
+   (c-name "GdlDockItemBehavior")
+@@ -127,6 +80,7 @@
+     '("cant-dock-center" "GDL_DOCK_ITEM_BEH_CANT_DOCK_CENTER")
+     '("cant-close" "GDL_DOCK_ITEM_BEH_CANT_CLOSE")
+     '("cant-iconify" "GDL_DOCK_ITEM_BEH_CANT_ICONIFY")
+    '("no-grip" "GDL_DOCK_ITEM_BEH_NO_GRIP")
+   )
+ )
+ 
+@@ -142,6 +96,20 @@
+   )
+ )
+ 
+(define-enum SwitcherStyle
+  (in-module "Gdl")
+  (c-name "GdlSwitcherStyle")
+  (gtype-id "GDL_TYPE_SWITCHER_STYLE")
+  (values
+    '("text" "GDL_SWITCHER_STYLE_TEXT")
+    '("icon" "GDL_SWITCHER_STYLE_ICON")
+    '("both" "GDL_SWITCHER_STYLE_BOTH")
+    '("toolbar" "GDL_SWITCHER_STYLE_TOOLBAR")
+    '("tabs" "GDL_SWITCHER_STYLE_TABS")
+    '("none" "GDL_SWITCHER_STYLE_NONE")
+  )
+)
+
+ (define-flags DockParamFlags
+   (in-module "Gdl")
+   (c-name "GdlDockParamFlags")
+@@ -179,50 +147,7 @@
+   )
+ )
+ 
+-;; From gdl-combo-button.h
+ 
+-(ifdef HAVE_GDL_0_7
+-
+-(define-function gdl_combo_button_get_type
+-  (c-name "gdl_combo_button_get_type")
+-  (return-type "GType")
+-)
+-
+-(define-function gdl_combo_button_new
+-  (c-name "gdl_combo_button_new")
+-  (is-constructor-of "GdlComboButton")
+-  (return-type "GtkWidget*")
+-)
+-
+-(define-method set_icon
+-  (of-object "GdlComboButton")
+-  (c-name "gdl_combo_button_set_icon")
+-  (return-type "none")
+-  (parameters
+-    '("GdkPixbuf*" "pixbuf")
+-  )
+-)
+-
+-(define-method set_label
+-  (of-object "GdlComboButton")
+-  (c-name "gdl_combo_button_set_label")
+-  (return-type "none")
+-  (parameters
+-    '("const-gchar*" "label")
+-  )
+-)
+-
+-(define-method set_menu
+-  (of-object "GdlComboButton")
+-  (c-name "gdl_combo_button_set_menu")
+-  (return-type "none")
+-  (parameters
+-    '("GtkMenu*" "menu")
+-  )
+-)
+-
+-) ; ifdef HAVE_GDL_0_7
+-
+ ;; From gdl-dock-bar.h
+ 
+ (define-function gdl_dock_bar_get_type
+@@ -230,17 +155,12 @@
+   (return-type "GType")
+ )
+ 
+-(define-function gdl_dock_bar_new
+-  (is-constructor-of "GdlDockBar")
+(define-method bar_new
+  (of-object "GdlDock")
+   (c-name "gdl_dock_bar_new")
+   (return-type "GtkWidget*")
+-  (parameters
+-    '("GdlDock*" "dock")
+-  )
+ )
+ 
+-(ifdef HAVE_GDL_0_7
+-
+ (define-method get_orientation
+   (of-object "GdlDockBar")
+   (c-name "gdl_dock_bar_get_orientation")
+@@ -271,15 +191,14 @@
+   (return-type "GdlDockBarStyle")
+ )
+ 
+-) ; ifdef HAVE_GDL_0_7
+ 
+
+ ;; From gdl-dock.h
+ 
+ (define-function gdl_dock_new
+   (c-name "gdl_dock_new")
+   (is-constructor-of "GdlDock")
+   (return-type "GtkWidget*")
+-  (caller-owns-return #f)
+ )
+ 
+ (define-method new_from
+@@ -358,10 +277,49 @@
+   )
+ )
+ 
+
+
+;; From gdl-dock-item-grip.h
+
+(define-function gdl_dock_item_grip_get_type
+  (c-name "gdl_dock_item_grip_get_type")
+  (return-type "GType")
+)
+
+(define-method grip_new
+  (of-object "GdlDockItem")
+  (c-name "gdl_dock_item_grip_new")
+  (return-type "GtkWidget*")
+)
+
+(define-method set_label
+  (of-object "GdlDockItemGrip")
+  (c-name "gdl_dock_item_grip_set_label")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "label")
+  )
+)
+
+(define-method hide_handle
+  (of-object "GdlDockItemGrip")
+  (c-name "gdl_dock_item_grip_hide_handle")
+  (return-type "none")
+)
+
+(define-method show_handle
+  (of-object "GdlDockItemGrip")
+  (c-name "gdl_dock_item_grip_show_handle")
+  (return-type "none")
+)
+
+
+
+ ;; From gdl-dock-item.h
+ 
+ (define-function gdl_dock_item_new
+   (c-name "gdl_dock_item_new")
+  (is-constructor-of "GdlDockItem")
+   (return-type "GtkWidget*")
+   (parameters
+     '("const-gchar*" "name")
+@@ -371,14 +329,13 @@
+ )
+ 
+ (define-function gdl_dock_item_new_with_stock
+-  (is-constructor-of "GdlDockItem")
+   (c-name "gdl_dock_item_new_with_stock")
+   (return-type "GtkWidget*")
+-  (properties
+-    '("name")
+-    '("long_name")
+-    '("stock_id" (optional))
+-    '("behavior" (optional))
+  (parameters
+    '("const-gchar*" "name")
+    '("const-gchar*" "long_name")
+    '("const-gchar*" "stock_id")
+    '("GdlDockItemBehavior" "behavior")
+   )
+ )
+ 
+@@ -392,9 +349,9 @@
+   (c-name "gdl_dock_item_dock_to")
+   (return-type "none")
+   (parameters
+-    '("GdlDockItem*" "target" (null-ok))
+    '("GdlDockItem*" "target")
+     '("GdlDockPlacement" "position")
+-    '("gint" "docking_param" (default "-1"))
+    '("gint" "docking_param")
+   )
+ )
+ 
+@@ -422,6 +379,12 @@
+   )
+ )
+ 
+(define-method get_grip
+  (of-object "GdlDockItem")
+  (c-name "gdl_dock_item_get_grip")
+  (return-type "GtkWidget*")
+)
+
+ (define-method hide_grip
+   (of-object "GdlDockItem")
+   (c-name "gdl_dock_item_hide_grip")
+@@ -506,13 +469,10 @@
+   (return-type "GType")
+ )
+ 
+-(define-function gdl_dock_layout_new
+-  (is-constructor-of "GdlDockLayout")
+(define-method layout_new
+  (of-object "GdlDock")
+   (c-name "gdl_dock_layout_new")
+   (return-type "GdlDockLayout*")
+-  (parameters
+-    '("GdlDock*" "dock")
+-  )
+ )
+ 
+ (define-method attach
+@@ -682,21 +642,6 @@
+ 
+ 
+ 
+-;; From gdl-dock-notebook.h
+-
+-(define-function gdl_dock_notebook_new
+-  (c-name "gdl_dock_notebook_new")
+-  (is-constructor-of "GdlDockNotebook")
+-  (return-type "GtkWidget*")
+-)
+-
+-(define-function gdl_dock_notebook_get_type
+-  (c-name "gdl_dock_notebook_get_type")
+-  (return-type "GType")
+-)
+-
+-
+-
+ ;; From gdl-dock-object.h
+ 
+ (define-function gdl_dock_object_get_type
+@@ -848,24 +793,6 @@
+ 
+ 
+ 
+-;; From gdl-dock-paned.h
+-
+-(define-function gdl_dock_paned_get_type
+-  (c-name "gdl_dock_paned_get_type")
+-  (return-type "GType")
+-)
+-
+-(define-function gdl_dock_paned_new
+-  (c-name "gdl_dock_paned_new")
+-  (is-constructor-of "GdlDockPaned")
+-  (return-type "GtkWidget*")
+-  (properties
+-    '("orientation")
+-  )
+-)
+-
+-
+-
+ ;; From gdl-dock-placeholder.h
+ 
+ (define-function gdl_dock_placeholder_get_type
+@@ -878,7 +805,7 @@
+   (is-constructor-of "GdlDockPlaceholder")
+   (return-type "GtkWidget*")
+   (parameters
+-    '("gchar*" "name")
+    '("const-gchar*" "name")
+     '("GdlDockObject*" "object")
+     '("GdlDockPlacement" "position")
+     '("gboolean" "sticky")
+@@ -896,74 +823,49 @@
+ 
+ 
+ 
+-;; From gdl-dock-tablabel.h
+;; From gdl.h
+ 
+-(define-function gdl_dock_tablabel_new
+-  (c-name "gdl_dock_tablabel_new")
+-  (is-constructor-of "GdlDockTablabel")
+-  (return-type "GtkWidget*")
+-  (properties
+-    '("item")
+-  )
+-)
+ 
+-(define-function gdl_dock_tablabel_get_type
+-  (c-name "gdl_dock_tablabel_get_type")
+
+;; From gdl-tools.h
+
+
+
+;; From libgdltypebuiltins.h
+
+(define-function gdl_dock_param_flags_get_type
+  (c-name "gdl_dock_param_flags_get_type")
+   (return-type "GType")
+ )
+ 
+-(define-method activate
+-  (of-object "GdlDockTablabel")
+-  (c-name "gdl_dock_tablabel_activate")
+-  (return-type "none")
+(define-function gdl_dock_object_flags_get_type
+  (c-name "gdl_dock_object_flags_get_type")
+  (return-type "GType")
+ )
+ 
+-(define-method deactivate
+-  (of-object "GdlDockTablabel")
+-  (c-name "gdl_dock_tablabel_deactivate")
+-  (return-type "none")
+(define-function gdl_dock_placement_get_type
+  (c-name "gdl_dock_placement_get_type")
+  (return-type "GType")
+ )
+ 
+-;; From gdl-icons.h
+-
+-(ifdef HAVE_GDL_0_7
+-
+-(define-function gdl_icons_new
+-  (is-constructor-of "GdlIcons")
+-  (c-name "gdl_icons_new")
+-  (return-type "GdlIcons*")
+-  (parameters
+-    '("int" "icon_size")
+-  )
+(define-function gdl_switcher_style_get_type
+  (c-name "gdl_switcher_style_get_type")
+  (return-type "GType")
+ )
+ 
+-(define-function gdl_icons_get_type
+-  (c-name "gdl_icons_get_type")
+(define-function gdl_dock_item_behavior_get_type
+  (c-name "gdl_dock_item_behavior_get_type")
+   (return-type "GType")
+ )
+ 
+-(define-method get_folder_icon
+-  (of-object "GdlIcons")
+-  (c-name "gdl_icons_get_folder_icon")
+-  (return-type "GdkPixbuf*")
+(define-function gdl_dock_item_flags_get_type
+  (c-name "gdl_dock_item_flags_get_type")
+  (return-type "GType")
+ )
+ 
+-(define-method get_uri_icon
+-  (of-object "GdlIcons")
+-  (c-name "gdl_icons_get_uri_icon")
+-  (return-type "GdkPixbuf*")
+-  (parameters
+-    '("const-char*" "uri")
+-  )
+(define-function gdl_dock_bar_style_get_type
+  (c-name "gdl_dock_bar_style_get_type")
+  (return-type "GType")
+ )
+ 
+-(define-method get_mime_icon
+-  (of-object "GdlIcons")
+-  (c-name "gdl_icons_get_mime_icon")
+-  (return-type "GdkPixbuf*")
+-  (parameters
+-    '("const-char*" "mime_type")
+-  )
+-)
+ 
+-) ; ifdef HAVE_GDL_0_7
--- a/x11/gnome/py-gnome-extras/patches/patch-gdl_gdl_override
+++ b/x11/gnome/py-gnome-extras/patches/patch-gdl_gdl_override
@ -1,11 +0,0 @@
-$OpenBSD: patch-gdl_gdl_override,v 1.1 2008/11/22 23:55:08 ajacoutot Exp $
--- gdl/gdl.override.orig	Sun Nov 23 00:33:41 2008
-+++ gdl/gdl.override	Sun Nov 23 00:33:49 2008
-@@ -6,7 +6,6 @@ headers
- #include <pygtk/pygtk.h>
- #include <gdl/gdl-dock.h>
- #include <gdl/libgdltypebuiltins.h>
-#include <gdl/gdl-icons.h>
- #ifndef HAVE_GDL_0_7
- # include <gdl/gdl-dock-bar.h>
- #endif
--- a/x11/gnome/py-gnome-extras/patches/patch-gtkmozembed_Makefile_in
+++ b/x11/gnome/py-gnome-extras/patches/patch-gtkmozembed_Makefile_in
@ -1,12 +1,12 @@
-$OpenBSD: patch-gtkmozembed_Makefile_in,v 1.1 2008/08/26 18:11:03 martynas Exp $
--- gtkmozembed/Makefile.in.orig	Tue Jun  5 18:03:47 2007
-+++ gtkmozembed/Makefile.in	Mon Aug 25 16:38:27 2008
+$OpenBSD: patch-gtkmozembed_Makefile_in,v 1.2 2009/10/14 17:13:48 jasper Exp $
+--- gtkmozembed/Makefile.in.orig	Tue Oct 13 15:52:29 2009
+++ gtkmozembed/Makefile.in	Tue Oct 13 15:53:07 2009
@@ -259,7 +259,7 @@ defs_DATA = gtkmozembed.defs
 pkgpyexec_LTLIBRARIES = gtkmozembed.la
 gtkmozembed_la_LDFLAGS = -module -avoid-version	\
 	-export-symbols-regex initgtkmozembed	\
-	-R$(MOZILLA_HOME)
-+	-Wl,-rpath,'$(MOZILLA_HOME)'
+-	-R$(MOZILLA_HOME) -L$(MOZILLA_HOME)
+	-Wl,-rpath,'$(MOZILLA_HOME)' -L$(MOZILLA_HOME)
 
 gtkmozembed_la_LIBADD = $(GTKMOZEMBED_LIBS)
 gtkmozembed_la_SOURCES = gtkmozembedmodule.c
--- a/x11/gnome/py-gnome-extras/pkg/PLIST
+++ b/x11/gnome/py-gnome-extras/pkg/PLIST
@ -1,8 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2008/11/22 23:55:08 ajacoutot Exp $
-include/pygda-3.0/
-include/pygda-3.0/pygdavalue_conversions.h
+@comment $OpenBSD: PLIST,v 1.3 2009/10/14 17:13:48 jasper Exp $
 lib/pkgconfig/gnome-python-extras-2.0.pc
-lib/pkgconfig/pygda-3.0.pc
 lib/python${MODPY_VERSION}/site-packages/gtk-2.0/egg/
 lib/python${MODPY_VERSION}/site-packages/gtk-2.0/egg/__init__.py
 lib/python${MODPY_VERSION}/site-packages/gtk-2.0/egg/__init__.pyc
@ -11,16 +8,8 @@ lib/python${MODPY_VERSION}/site-packages/gtk-2.0/egg/recent.la
 lib/python${MODPY_VERSION}/site-packages/gtk-2.0/egg/recent.so
 lib/python${MODPY_VERSION}/site-packages/gtk-2.0/egg/trayicon.la
 lib/python${MODPY_VERSION}/site-packages/gtk-2.0/egg/trayicon.so
-lib/python${MODPY_VERSION}/site-packages/gtk-2.0/gda.la
-lib/python${MODPY_VERSION}/site-packages/gtk-2.0/gda.so
 lib/python${MODPY_VERSION}/site-packages/gtk-2.0/gdl.la
 lib/python${MODPY_VERSION}/site-packages/gtk-2.0/gdl.so
-lib/python${MODPY_VERSION}/site-packages/gtk-2.0/gksu2/
-lib/python${MODPY_VERSION}/site-packages/gtk-2.0/gksu2/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gtk-2.0/gksu2/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/gtk-2.0/gksu2/__init__.pyo
-lib/python${MODPY_VERSION}/site-packages/gtk-2.0/gksu2/_gksu2.la
-lib/python${MODPY_VERSION}/site-packages/gtk-2.0/gksu2/_gksu2.so
 lib/python${MODPY_VERSION}/site-packages/gtk-2.0/gtkhtml2.la
 lib/python${MODPY_VERSION}/site-packages/gtk-2.0/gtkhtml2.so
 lib/python${MODPY_VERSION}/site-packages/gtk-2.0/gtkmozembed.la
@ -44,24 +33,8 @@ share/examples/py-gnome-extras/gksu2/simple.py
 share/examples/py-gnome-extras/gtkhtml2/
 share/examples/py-gnome-extras/gtkhtml2/simple-browser.py
 share/examples/py-gnome-extras/gtkspell/
-share/examples/py-gnome-extras/gtkspell/gtkspell.py
+share/examples/py-gnome-extras/gtkspell/spell.py
 share/examples/py-gnome-extras/gtkspell/test.py
-share/gtk-doc/html/pygtkmozembed/
-share/gtk-doc/html/pygtkmozembed/class-gtkmozembed.html
-share/gtk-doc/html/pygtkmozembed/gtkmozembed-class-reference.html
-share/gtk-doc/html/pygtkmozembed/index.html
-share/gtk-doc/html/pygtkmozembed/index.sgml
-share/gtk-doc/html/pygtkmozembed/pygtkmozembed.devhelp
-share/gtk-doc/html/pygtkspell/
-share/gtk-doc/html/pygtkspell/class-gtkspell.html
-share/gtk-doc/html/pygtkspell/gtkspell-class-reference.html
-share/gtk-doc/html/pygtkspell/index.html
-share/gtk-doc/html/pygtkspell/index.sgml
-share/gtk-doc/html/pygtkspell/pygtkspell.devhelp
-share/pygtk/2.0/argtypes/gda-arg-types.py
-share/pygtk/2.0/argtypes/gda-arg-types.pyc
-share/pygtk/2.0/argtypes/gda-arg-types.pyo
-share/pygtk/2.0/defs/gda.defs
 share/pygtk/2.0/defs/gtkhtml2.defs
 share/pygtk/2.0/defs/gtkmozembed.defs
 share/pygtk/2.0/defs/trayicon.defs