Attachment #172003 for bug #247098




m4_define(mozilla_required_version,           1.0.0)
m4_define(firefox_required_version,           1.0)
m4_define(xulrunner_required_version,         1.8)
m4_define(xulrunner19_required_version,       1.9)
m4_define(libgda_required_version,            2.99.6)
m4_define(gksu_required_version,              1.2.5)
m4_define(gksu2_required_version,             2.0.4)

dnl should we build the gtkmozembed module?
AC_ARG_BINDING([gtkmozembed], [ON], [gtkmozembed])
AC_ARG_WITH(gtkmozembed, AS_HELP_STRING(
                         [--with-gtkmozembed=mozilla|firefox|xulrunner|xulrunner-1.9],
                         [package that provides libgtkmozembed]),
            [mozpackage=$withval], [mozpackage=any])

if "$build_gtkmozembed"; then
if test $mozpackage = any ; then

PKG_CHECK_MODULES(GTKMOZEMBED, [libxul-embedding >= xulrunner19_required_version
				gtk+-2.0         >= gtk_required_version],
  [build_gtkmozembed=true; mozpackage=xulrunner-1.9; mozpkgconfig=libxul-embedding],
  [
PKG_CHECK_MODULES(GTKMOZEMBED, [xulrunner-gtkmozembed >= xulrunner_required_version
                                gtk+-2.0              >= gtk_required_version],
  [build_gtkmozembed=true; mozpackage=xulrunner; mozpkgconfig=$mozpackage-gtkmozembed],
  [
PKG_CHECK_MODULES(GTKMOZEMBED, [firefox-gtkmozembed >= firefox_required_version
                                gtk+-2.0            >= gtk_required_version],
  [build_gtkmozembed=true; mozpackage=firefox; mozpkgconfig=$mozpackage-gtkmozembed],
  [
PKG_CHECK_MODULES(GTKMOZEMBED, [mozilla-gtkmozembed >= mozilla_required_version
                                gtk+-2.0            >= gtk_required_version],
  [build_gtkmozembed=true; mozpackage=mozilla; mozpkgconfig=$mozpackage-gtkmozembed],
  build_gtkmozembed=false)
  ])
  ])
  ])

else

case $mozpackage in
     xulrunner-1.9) mozpackage_required_version=xulrunner19_required_version ; mozpkgconfig=libxul-embedding ;;
     xulrunner) mozpackage_required_version=xulrunner_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
     firefox) mozpackage_required_version=firefox_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
     mozilla) mozpackage_required_version=mozilla_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
     *) AC_MSG_ERROR([--with-gtkmozembed argument must be either 'mozilla', 'firefox', 'xulrunner-1.9' or 'xulrunner'])
esac

PKG_CHECK_MODULES(GTKMOZEMBED, [$mozpkgconfig >= $mozpackage_required_version,
                                gtk+-2.0      >= gtk_required_version],
  build_gtkmozembed=true,
  build_gtkmozembed=false)

fi # if mozpackage = any

if test $mozpackage = xulrunner-1.9; then
GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS $(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding)"
GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS $(pkg-config --libs libxul-embedding)"

else

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`"
AC_SUBST(MOZILLA_HOME)

fi
fi # if build_gtkmozembed

AM_CONDITIONAL(BUILD_GTKMOZEMBED, $build_gtkmozembed)

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

dnl should we build the gtkspell module?

Lines 13-21 Link Here

(-)gnome-python-extras-2.19.1.orig/gtkmozembed/Makefile.am (-2 / +8 lines)
13	pkgpyexec_LTLIBRARIES = gtkmozembed.la	13	pkgpyexec_LTLIBRARIES = gtkmozembed.la
14	gtkmozembed_la_LDFLAGS = -module -avoid-version \	14	gtkmozembed_la_LDFLAGS = -module -avoid-version \
15	-export-symbols-regex initgtkmozembed \	15	-export-symbols-regex initgtkmozembed \
16	-R$(MOZILLA_HOME)	16	$(NULL)
		17
		18	# only use rpath for non-glue builds
		19	if !HAVE_XPCOM_GLUE
		20	gtkmozembed_la_LDFLAGS + = -R$(MOZILLA_HOME)
		21	endif
		22
17	gtkmozembed_la_LIBADD = $(GTKMOZEMBED_LIBS)	23	gtkmozembed_la_LIBADD = $(GTKMOZEMBED_LIBS)
18	gtkmozembed_la_SOURCES = gtkmozembedmodule.c	24	gtkmozembed_la_SOURCES = gtkmozembedmodule.cpp
19	nodist_gtkmozembed_la_SOURCES = gtkmozembed.c	25	nodist_gtkmozembed_la_SOURCES = gtkmozembed.c
20	gtkmozembed.c: gtkmozembed.defs gtkmozembed.override	26	gtkmozembed.c: gtkmozembed.defs gtkmozembed.override
21	CLEANFILES = gtkmozembed.c	27	CLEANFILES = gtkmozembed.c




#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.9b", PR_TRUE,
    "1.9.*", PR_TRUE
    };
    char xpcomLocation[4096];
    nsresult rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
    if (NS_FAILED(rv)) {
	printf("failed 1\n");
	return;
    } else printf("location: %s \n", xpcomLocation);

    // Startup the XPCOM Glue that links us up with XPCOM.
    XPCOMGlueStartup(xpcomLocation);
    if (NS_FAILED(rv)) {
        printf("failed 2\n");
        return;
    }
    printf("before 3\n");

    rv = GTKEmbedGlueStartup();
    if (NS_FAILED(rv)) {printf("location: %s \n", xpcomLocation);
        printf("failed 3\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");
    }
}

Return to bug 247098

Lines 19-24 Link Here

(-)gnome-python-extras-2.19.1.orig/configure.ac (-13 / +47 lines)
19	m4_define(mozilla_required_version, 1.0.0)	19	m4_define(mozilla_required_version, 1.0.0)
20	m4_define(firefox_required_version, 1.0)	20	m4_define(firefox_required_version, 1.0)
21	m4_define(xulrunner_required_version, 1.8)	21	m4_define(xulrunner_required_version, 1.8)
		22	m4_define(xulrunner19_required_version, 1.9)
22	m4_define(libgda_required_version, 2.99.6)	23	m4_define(libgda_required_version, 2.99.6)
23	m4_define(gksu_required_version, 1.2.5)	24	m4_define(gksu_required_version, 1.2.5)
24	m4_define(gksu2_required_version, 2.0.4)	25	m4_define(gksu2_required_version, 2.0.4)
Lines 185-236 Link Here
185	dnl should we build the gtkmozembed module?	186	dnl should we build the gtkmozembed module?
186	AC_ARG_BINDING([gtkmozembed], [ON], [gtkmozembed])	187	AC_ARG_BINDING([gtkmozembed], [ON], [gtkmozembed])
187	AC_ARG_WITH(gtkmozembed, AS_HELP_STRING(	188	AC_ARG_WITH(gtkmozembed, AS_HELP_STRING(
188	[--with-gtkmozembed=mozilla\|firefox\|xulrunner],	189	[--with-gtkmozembed=mozilla\|firefox\|xulrunner\|xulrunner-1.9],
189	[package that provides libgtkmozembed]),	190	[package that provides libgtkmozembed]),
190	[mozpackage=$withval], [mozpackage=any])	191	[mozpackage=$withval], [mozpackage=any])
191		192
192	if "$build_gtkmozembed"; then	193	if "$build_gtkmozembed"; then
193	if test $mozpackage = any ; then	194	if test $mozpackage = any ; then
194		195
		196	PKG_CHECK_MODULES(GTKMOZEMBED, [libxul-embedding >= xulrunner19_required_version
		197	gtk+-2.0 >= gtk_required_version],
		198	[build_gtkmozembed=true; mozpackage=xulrunner-1.9; mozpkgconfig=libxul-embedding],
		199	[
195	PKG_CHECK_MODULES(GTKMOZEMBED, [xulrunner-gtkmozembed >= xulrunner_required_version	200	PKG_CHECK_MODULES(GTKMOZEMBED, [xulrunner-gtkmozembed >= xulrunner_required_version
196	gtk+-2.0 >= gtk_required_version],	201	gtk+-2.0 >= gtk_required_version],
197	[build_gtkmozembed=true; mozpackage=xulrunner],	202	[build_gtkmozembed=true; mozpackage=xulrunner; mozpkgconfig=$mozpackage-gtkmozembed],
198	[	203	[
199	PKG_CHECK_MODULES(GTKMOZEMBED, [firefox-gtkmozembed >= firefox_required_version	204	PKG_CHECK_MODULES(GTKMOZEMBED, [firefox-gtkmozembed >= firefox_required_version
200	gtk+-2.0 >= gtk_required_version],	205	gtk+-2.0 >= gtk_required_version],
201	[build_gtkmozembed=true; mozpackage=firefox],	206	[build_gtkmozembed=true; mozpackage=firefox; mozpkgconfig=$mozpackage-gtkmozembed],
202	[	207	[
203	PKG_CHECK_MODULES(GTKMOZEMBED, [mozilla-gtkmozembed >= mozilla_required_version	208	PKG_CHECK_MODULES(GTKMOZEMBED, [mozilla-gtkmozembed >= mozilla_required_version
204	gtk+-2.0 >= gtk_required_version],	209	gtk+-2.0 >= gtk_required_version],
205	[build_gtkmozembed=true; mozpackage=mozilla],	210	[build_gtkmozembed=true; mozpackage=mozilla; mozpkgconfig=$mozpackage-gtkmozembed],
206	build_gtkmozembed=false)	211	build_gtkmozembed=false)
207	])	212	])
208	])	213	])
		214	])
209		215
210	else	216	else
211		217
212	case $mozpackage in	218	case $mozpackage in
213	xulrunner) mozpackage_required_version=xulrunner_required_version ;;	219	xulrunner-1.9) mozpackage_required_version=xulrunner19_required_version ; mozpkgconfig=libxul-embedding ;;
214	firefox) mozpackage_required_version=firefox_required_version ;;	220	xulrunner) mozpackage_required_version=xulrunner_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
215	seamonkey) mozpackage_required_version=mozilla_required_version ;;	221	firefox) mozpackage_required_version=firefox_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
216	*) AC_MSG_ERROR([--with-gtkmozembed argument must be either 'mozilla', 'firefox', or 'xulrunner'])	222	mozilla) mozpackage_required_version=mozilla_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
		223	*) AC_MSG_ERROR([--with-gtkmozembed argument must be either 'mozilla', 'firefox', 'xulrunner-1.9' or 'xulrunner'])
217	esac	224	esac
218		225
219	PKG_CHECK_MODULES(GTKMOZEMBED, [$mozpackage-gtkmozembed >= $mozpackage_required_version,	226	PKG_CHECK_MODULES(GTKMOZEMBED, [$mozpkgconfig >= $mozpackage_required_version,
220	gtk+-2.0 >= gtk_required_version],	227	gtk+-2.0 >= gtk_required_version],
221	build_gtkmozembed=true,	228	build_gtkmozembed=true,
222	build_gtkmozembed=false)	229	build_gtkmozembed=false)
223		230
224	fi # if mozpackage = any	231	fi # if mozpackage = any
225		232
		233	if test $mozpackage = xulrunner-1.9; then
		234	GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS $(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding)"
		235	GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS $(pkg-config --libs libxul-embedding)"
		236
		237	else
		238
		239	if test -n "$export_dynamic"; then
		240	GTKMOZEMBED_LIBS=`echo $GTKMOZEMBED_LIBS \| sed -e "s/$export_dynamic//"`
		241	fi
226	MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"	242	MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
227	AC_SUBST(MOZILLA_HOME)	243	AC_SUBST(MOZILLA_HOME)
228		244
		245	fi
229	fi # if build_gtkmozembed	246	fi # if build_gtkmozembed
230
231	AM_CONDITIONAL(BUILD_GTKMOZEMBED, $build_gtkmozembed)	247	AM_CONDITIONAL(BUILD_GTKMOZEMBED, $build_gtkmozembed)
232	if test -n "$export_dynamic"; then	248
233	GTKMOZEMBED_LIBS=`echo $GTKMOZEMBED_LIBS \| sed -e "s/$export_dynamic//"`	249	AC_LANG_PUSH(C++)
		250	_SAVE_CPPFLAGS=$CPPFLAGS
		251	_SAVE_CXXFLAGS=$CXXFLAGS
		252	CXXFLAGS=$GTKMOZEMBED_CFLAGS
		253	CPPFLAGS=
		254	AC_COMPILE_IFELSE([AC_LANG_SOURCE(
		255	[[#ifndef XPCOM_GLUE
		256	#error "no xpcom glue"
		257	#endif]])],
		258	[have_xpcom_glue=yes], [have_xpcom_glue=yes]
		259	)
		260	CPPFLAGS=$_SAVE_CPPFLAGS
		261	CXXFLAGS=$_SAVE_CXXFLAGS
		262	AC_LANG_POP(C++)
		263
		264	AM_CONDITIONAL(HAVE_XPCOM_GLUE, [test $have_xpcom_glue=yes])
		265	if test "$have_xpcom_glue" = "yes"; then
		266	AC_DEFINE(HAVE_XPCOM_GLUE, 1,
		267	[Define to 1 if libxpcomglue is being used.])
234	fi	268	fi
235		269
236	dnl should we build the gtkspell module?	270	dnl should we build the gtkspell module?

Added Link Here

(-) (+73 lines)
1	#ifdef HAVE_CONFIG_H
2	#include "config.h"
3	#endif
4
5	/* include this first, before NO_IMPORT_PYGOBJECT is defined */
6	#include <pygobject.h>
7	#include <pygtk/pygtk.h>
8
9	#ifdef XPCOM_GLUE
10	#include "gtkmozembed_glue.cpp"
11	#endif
12
13	G_BEGIN_DECLS
14	void initgtkmozembed(void);
15	void pygtkmozembed_add_constants(PyObject module, const gchar strip_prefix);
16	void pygtkmozembed_register_classes (PyObject *d);
17	G_END_DECLS
18
19	extern PyMethodDef pygtkmozembed_functions[];
20
21	void
22	initgtkmozembed(void)
23	{
24	PyObject m, d;
25	int argc = 0;
26
27	init_pygobject ();
28
29	#ifdef XPCOM_GLUE
30	static const GREVersionRange greVersion = {
31	"1.9b", PR_TRUE,
32	"1.9.*", PR_TRUE
33	};
34	char xpcomLocation[4096];
35	nsresult rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
36	if (NS_FAILED(rv)) {
37	printf("failed 1\n");
38	return;
39	} else printf("location: %s \n", xpcomLocation);
40
41	// Startup the XPCOM Glue that links us up with XPCOM.
42	XPCOMGlueStartup(xpcomLocation);
43	if (NS_FAILED(rv)) {
44	printf("failed 2\n");
45	return;
46	}
47	printf("before 3\n");
48
49	rv = GTKEmbedGlueStartup();
50	if (NS_FAILED(rv)) {printf("location: %s \n", xpcomLocation);
51	printf("failed 3\n");
52	return;
53	}
54
55	//gtk_moz_embed_set_comp_path(xpcomLocation);
56
57	char *lastSlash = strrchr(xpcomLocation, '/');
58	if (lastSlash)
59	*lastSlash = '\0';
60
61	gtk_moz_embed_set_path(xpcomLocation);
62	#endif
63
64	m = Py_InitModule ("gtkmozembed", pygtkmozembed_functions);
65	d = PyModule_GetDict (m);
66
67	pygtkmozembed_add_constants(m, "GTK_MOZ_EMBED_");
68	pygtkmozembed_register_classes (d);
69
70	if (PyErr_Occurred ()) {
71	Py_FatalError ("can't initialise module gtkmozembed");
72	}
73	}