Remove, not used by anything in tree and will ease the future gnome3 merge.

ok jasper@
This commit is contained in:
ajacoutot 2011-07-20 06:34:48 +00:00
parent efd4e5b806
commit 9c971dccb2
8 changed files with 0 additions and 863 deletions

View File

@ -1,70 +0,0 @@
# $OpenBSD: Makefile,v 1.36 2011/06/08 17:41:57 rpointel Exp $
COMMENT= additional Python bindings for GNOME
GNOME_PROJECT= gnome-python-extras
GNOME_VERSION= 2.25.3
PKGNAME= py-gnome-extras-${VERSION}
REVISION= 14
HOMEPAGE= http://www.pygtk.org/
# GPLv2/LGPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
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 ogg vorbis vorbisfile
WANTLIB += bonobo-2 bonobo-activation bonoboui-2 cairo xcb-shm
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 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 pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
WANTLIB += pixman-1 png popt pthread-stubs ssl stdc++
WANTLIB += gcrypt gpg-error xcb-render GL Xxf86vm canberra drm ltdl
WANTLIB += util xcb xml2 z gtkspell gdl-1 enchant gda-4.0
WANTLIB += ${MODPY_WANTLIB}
MODULES= devel/gettext \
lang/python \
x11/gnome
BUILD_DEPENDS= ${RUN_DEPENDS}
LIB_DEPENDS= textproc/gtkspell \
textproc/enchant \
x11/gnome/gdl \
x11/gnome/libgda \
${MODPY_LIB_DEPENDS}
# xulrunner-devel needed by gtkmozembed.la
RUN_DEPENDS= x11/gnome/py-gnome>=2.20.0 \
devel/xulrunner/1.9,-devel>=1.9.2.6p3
REGRESS_DEPENDS= ${FULLPKGNAME}:${BUILD_PKGPATH}
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
pre-configure:
@find ${WRKDIST} -name \*.py | \
xargs perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},g'
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-gnome-extras
cd ${WRKSRC}/examples; tar cf - * | tar xf - -C \
${PREFIX}/share/examples/py-gnome-extras
chown -R ${SHAREOWN}:${SHAREGRP} \
${PREFIX}/share/examples/py-gnome-extras
do-regress: fake
cd ${WRKSRC}/tests && env \
PYTHONPATH="${WRKINST}${MODPY_LIBDIR}/site-packages/gtk-2.0" \
${MODPY_BIN} runtests.py
.include <bsd.port.mk>

View File

@ -1,5 +0,0 @@
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

View File

@ -1,99 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.2 2010/07/19 14:55:03 landry Exp $
Regenerated gdl.defs and updated dependency to gdl 2.27.92
From upstream git.
add necessary autofoo to make it build against our xulrunner 1.9
inspired from debian patches
--- configure.ac.orig Sun Feb 15 23:20:23 2009
+++ configure.ac Mon Jul 19 16:31:35 2010
@@ -81,6 +81,7 @@ AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
AC_DISABLE_STATIC
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
+AC_PROG_CXX
dnl check for python
AM_PATH_PYTHON(2.3)
@@ -88,7 +89,7 @@ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find
dnl check for pygtk
PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= pygtk_required_version)
-AC_SUBST(PYGTK_CFLAGS)
+AC_SUBST(PYGTK_FLAGS)
AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no)
if test "x$PYGTK_CODEGEN" = xno; then
AC_MSG_ERROR(could not find pygtk-codegen-2.0 script)
@@ -255,7 +256,8 @@ PKG_CHECK_MODULES(GTKMOZEMBED, [mozilla-gtkmozembed >=
else
case $mozpackage in
- xulrunner) mozpackage_required_version=xulrunner_required_version ;;
+ xulrunner) mozpackage_required_version=xulrunner_required_version
+ GTKMOZEMBED_CODEGEN_DEFINES="-DHAVE_XUL19" ;;
firefox) mozpackage_required_version=firefox_required_version ;;
mozilla)
mozpackage_required_version=mozilla_required_version
@@ -269,7 +271,7 @@ case $mozpackage in
esac
AC_SUBST(GTKMOZEMBED_CODEGEN_DEFINES)
-PKG_CHECK_MODULES(GTKMOZEMBED, [$mozpackage-gtkmozembed >= $mozpackage_required_version,
+PKG_CHECK_MODULES(GTKMOZEMBED, [libxul-embedding >= $mozpackage_required_version,
gtk+-2.0 >= gtk_required_version],
build_gtkmozembed=true,
build_gtkmozembed=false)
@@ -280,14 +282,33 @@ AM_CONDITIONAL(BUILD_GTKMOZEMBED, $build_gtkmozembed)
if test -n "$export_dynamic"; then
GTKMOZEMBED_LIBS=`echo $GTKMOZEMBED_LIBS | sed -e "s/$export_dynamic//"`
fi
-MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
-if test -z "$MOZILLA_HOME"; then
- MOZILLA_HOME="`$PKG_CONFIG --variable=sdkdir $mozpackage-gtkmozembed`/lib"
-fi
+MOZILLA_HOME="`$PKG_CONFIG --variable=sdkdir libxul-embedding`"
AC_SUBST(MOZILLA_HOME)
fi # if build_gtkmozembed
+GTKMOZEMBED_CFLAGS="$(pkg-config --cflags libxul-embedding gtk+-2.0 nspr)"
+AC_LANG_PUSH(C++)
+_SAVE_CPPFLAGS=$CPPFLAGS
+_SAVE_CXXFLAGS=$CXXFLAGS
+CXXFLAGS=$GTKMOZEMBED_CFLAGS
+CPPFLAGS=
+AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+[[#ifndef XPCOM_GLUE
+#error "no xpcom glue"
+#endif]])],
+[have_xpcom_glue=yes], [have_xpcom_glue=yes]
+)
+CPPFLAGS=$_SAVE_CPPFLAGS
+CXXFLAGS=$_SAVE_CXXFLAGS
+AC_LANG_POP(C++)
+
+AM_CONDITIONAL(HAVE_XPCOM_GLUE, [test $have_xpcom_glue=yes])
+if test "$have_xpcom_glue" = "yes"; then
+ AC_DEFINE(HAVE_XPCOM_GLUE, 1,
+ [Define to 1 if libxpcomglue is being used.])
+fi
+
AM_CONDITIONAL(BUILD_GTKMOZEMBED, $build_gtkmozembed)
if test -n "$export_dynamic"; then
GTKMOZEMBED_LIBS=`echo $GTKMOZEMBED_LIBS | sed -e "s/$export_dynamic//"`
@@ -310,14 +331,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)

View File

@ -1,487 +0,0 @@
$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

View File

@ -1,57 +0,0 @@
$OpenBSD: patch-gtkmozembed_Makefile_in,v 1.3 2010/07/19 14:55:03 landry Exp $
Needed generated Makefile goo to link/build gtkmozembedmodule.cpp with c++
--- gtkmozembed/Makefile.in.orig Sun Feb 15 23:21:02 2009
+++ gtkmozembed/Makefile.in Thu Jul 15 22:33:14 2010
@@ -73,6 +73,15 @@ CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(gtkmozembed_la_SOURCES) $(nodist_gtkmozembed_la_SOURCES)
DIST_SOURCES = $(gtkmozembed_la_SOURCES)
defsDATA_INSTALL = $(INSTALL_DATA)
@@ -259,17 +268,17 @@ defs_DATA = gtkmozembed.defs
pkgpyexec_LTLIBRARIES = gtkmozembed.la
gtkmozembed_la_LDFLAGS = -module -avoid-version \
-export-symbols-regex initgtkmozembed \
- -R$(MOZILLA_HOME) -L$(MOZILLA_HOME)
+ -Wl,-rpath,$(MOZILLA_HOME) -Wl,-export-dynamic -L$(MOZILLA_HOME)
gtkmozembed_la_LIBADD = $(GTKMOZEMBED_LIBS)
-gtkmozembed_la_SOURCES = gtkmozembedmodule.c
+gtkmozembed_la_SOURCES = gtkmozembedmodule.cpp
nodist_gtkmozembed_la_SOURCES = gtkmozembed.c
CLEANFILES = gtkmozembed.c
EXTRA_DIST = gtkmozembed.override gtkmozembed.defs
all: all-am
.SUFFIXES:
-.SUFFIXES: .c .defs .lo .o .obj
+.SUFFIXES: .c .cpp .defs .lo .o .obj
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -358,6 +367,14 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+.cpp.o:
+ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+
+.cpp.lo:
+ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
mostlyclean-libtool:
-rm -f *.lo

View File

@ -1,85 +0,0 @@
$OpenBSD: patch-gtkmozembed_gtkmozembedmodule_cpp,v 1.1 2010/07/19 14:55:03 landry Exp $
Patch from ubuntu/debian/gentoo
See http://patch-tracker.debian.org/patch/series/view/gnome-python-extras/2.25.3-5/01_xul19.patch
--- gtkmozembed/gtkmozembedmodule.cpp.orig Sun Jul 11 09:32:15 2010
+++ gtkmozembed/gtkmozembedmodule.cpp Sun Jul 11 09:32:15 2010
@@ -0,0 +1,78 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+/* include this first, before NO_IMPORT_PYGOBJECT is defined */
+#include <pygobject.h>
+#include <pygtk/pygtk.h>
+
+#ifdef XPCOM_GLUE
+#include "gtkmozembed_glue.cpp"
+#endif
+
+G_BEGIN_DECLS
+void initgtkmozembed(void);
+void pygtkmozembed_add_constants(PyObject *module, const gchar *strip_prefix);
+void pygtkmozembed_register_classes (PyObject *d);
+G_END_DECLS
+
+extern PyMethodDef pygtkmozembed_functions[];
+
+void
+initgtkmozembed(void)
+{
+ PyObject *m, *d;
+ int argc = 0;
+
+ init_pygobject ();
+
+#ifdef XPCOM_GLUE
+ static const GREVersionRange greVersion = {
+ "1.9.1", PR_TRUE,
+ "1.9.3", PR_FALSE
+ };
+ char xpcomLocation[4096];
+ nsresult rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
+ if (NS_FAILED(rv)) {
+ printf("GRE_GetGREPathWithProperties failed\n");
+ return;
+ }
+
+ // Startup the XPCOM Glue that links us up with XPCOM.
+ XPCOMGlueStartup(xpcomLocation);
+ if (NS_FAILED(rv)) {
+ printf("XPCOMGlueStartup failed\n");
+ return;
+ }
+
+ rv = GTKEmbedGlueStartup();
+ if (NS_FAILED(rv)) {printf("location: %s \n", xpcomLocation);
+ printf("GTKEmbedGlueStartup failed\n");
+ return;
+ }
+
+ rv = GTKEmbedGlueStartupInternal();
+ if (NS_FAILED (rv)) {
+ printf ("GTKEmbedGlueStartupInternal failed\n");
+ return;
+ }
+
+ //gtk_moz_embed_set_comp_path(xpcomLocation);
+
+ char *lastSlash = strrchr(xpcomLocation, '/');
+ if (lastSlash)
+ *lastSlash = '\0';
+
+ gtk_moz_embed_set_path(xpcomLocation);
+#endif
+
+ m = Py_InitModule ("gtkmozembed", pygtkmozembed_functions);
+ d = PyModule_GetDict (m);
+
+ pygtkmozembed_add_constants(m, "GTK_MOZ_EMBED_");
+ pygtkmozembed_register_classes (d);
+
+ if (PyErr_Occurred ()) {
+ Py_FatalError ("can't initialise module gtkmozembed");
+ }
+}

View File

@ -1,14 +0,0 @@
py-gnome-extras (also known as gnome-python-extras) is a set of bindings
for the GNOME platform libraries. It extends py-gnome with bindings for
several libraries.
Currently covered parts are:
- gtkhtml2
- egg.trayicon
- egg.recent
- gtkmozembed
- gtkspell
- gdl
- gda
- gksu2
- gksu.ui

View File

@ -1,46 +0,0 @@
@comment $OpenBSD: PLIST,v 1.6 2010/04/21 07:36:59 jasper Exp $
include/pygda-4.0/
include/pygda-4.0/pygdavalue_conversions.h
lib/pkgconfig/gnome-python-extras-2.0.pc
lib/pkgconfig/pygda-4.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
lib/python${MODPY_VERSION}/site-packages/gtk-2.0/egg/__init__.pyo
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/gtkmozembed.la
lib/python${MODPY_VERSION}/site-packages/gtk-2.0/gtkmozembed.so
lib/python${MODPY_VERSION}/site-packages/gtk-2.0/gtkspell.la
lib/python${MODPY_VERSION}/site-packages/gtk-2.0/gtkspell.so
share/examples/py-gnome-extras/
share/examples/py-gnome-extras/egg/
share/examples/py-gnome-extras/egg/recent/
share/examples/py-gnome-extras/egg/recent/Bonobo_Sample_Hello.xml
share/examples/py-gnome-extras/egg/recent/bonobo-view.py
share/examples/py-gnome-extras/egg/recent/gtk-view.py
share/examples/py-gnome-extras/egg/recent/populate-recent.py
share/examples/py-gnome-extras/egg/trayicon.py
share/examples/py-gnome-extras/gdl/
share/examples/py-gnome-extras/gdl/gdl_combo_button.py
share/examples/py-gnome-extras/gdl/gdl_dock.py
share/examples/py-gnome-extras/gdl/gdl_test.py
@comment share/examples/py-gnome-extras/gksu2/
@comment 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/spell.py
share/examples/py-gnome-extras/gtkspell/test.py
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/gtkmozembed.defs
share/pygtk/2.0/defs/trayicon.defs