Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 223265 | Differences between
and this patch

Collapse All | Expand All

(-)gnome-python-extras-2.19.1.orig/configure.ac (-11 / +46 lines)
Lines 19-24 m4_define(gtkhtml2_required_version, Link Here
19
m4_define(mozilla_required_version,           1.2b)
19
m4_define(mozilla_required_version,           1.2b)
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 136-185 fi Link Here
136
dnl should we build the gtkmozembed module?
137
dnl should we build the gtkmozembed module?
137
build_gtkmozembed=false
138
build_gtkmozembed=false
138
AC_ARG_WITH(gtkmozembed, AS_HELP_STRING(
139
AC_ARG_WITH(gtkmozembed, AS_HELP_STRING(
139
                         [--with-gtkmozembed=mozilla|firefox|xulrunner],
140
                         [--with-gtkmozembed=mozilla|firefox|xulrunner|xulrunner-1.9],
140
                         [package that provides libgtkmozembed]),
141
                         [package that provides libgtkmozembed]),
141
            [mozpackage=$withval], [mozpackage=any])
142
            [mozpackage=$withval], [mozpackage=any])
142
143
143
if test $mozpackage = any ; then
144
if test $mozpackage = any ; then
144
145
146
PKG_CHECK_MODULES(GTKMOZEMBED, [libxul-embedding >= xulrunner19_required_version
147
				gtk+-2.0         >= gtk_required_version],
148
  [build_gtkmozembed=true; mozpackage=xulrunner-1.9; mozpkgconfig=libxul-embedding],
149
  [
145
PKG_CHECK_MODULES(GTKMOZEMBED, [xulrunner-gtkmozembed >= xulrunner_required_version
150
PKG_CHECK_MODULES(GTKMOZEMBED, [xulrunner-gtkmozembed >= xulrunner_required_version
146
                                gtk+-2.0              >= gtk_required_version],
151
                                gtk+-2.0              >= gtk_required_version],
147
  [build_gtkmozembed=true; mozpackage=xulrunner],
152
  [build_gtkmozembed=true; mozpackage=xulrunner; mozpkgconfig=$mozpackage-gtkmozembed],
148
  [
153
  [
149
PKG_CHECK_MODULES(GTKMOZEMBED, [firefox-gtkmozembed >= firefox_required_version
154
PKG_CHECK_MODULES(GTKMOZEMBED, [firefox-gtkmozembed >= firefox_required_version
150
                                gtk+-2.0            >= gtk_required_version],
155
                                gtk+-2.0            >= gtk_required_version],
151
  [build_gtkmozembed=true; mozpackage=firefox],
156
  [build_gtkmozembed=true; mozpackage=firefox; mozpkgconfig=$mozpackage-gtkmozembed],
152
  [
157
  [
153
PKG_CHECK_MODULES(GTKMOZEMBED, [mozilla-gtkmozembed >= mozilla_required_version
158
PKG_CHECK_MODULES(GTKMOZEMBED, [mozilla-gtkmozembed >= mozilla_required_version
154
                                gtk+-2.0            >= gtk_required_version],
159
                                gtk+-2.0            >= gtk_required_version],
155
  [build_gtkmozembed=true; mozpackage=mozilla],
160
  [build_gtkmozembed=true; mozpackage=mozilla; mozpkgconfig=$mozpackage-gtkmozembed],
156
  build_gtkmozembed=false)
161
  build_gtkmozembed=false)
157
  ])
162
  ])
158
  ])
163
  ])
164
  ])
159
165
160
else
166
else
161
167
162
case $mozpackage in
168
case $mozpackage in
163
     xulrunner) mozpackage_required_version=xulrunner_required_version ;;
169
     xulrunner-1.9) mozpackage_required_version=xulrunner19_required_version ; mozpkgconfig=libxul-embedding ;;
164
     firefox) mozpackage_required_version=firefox_required_version ;;
170
     xulrunner) mozpackage_required_version=xulrunner_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
165
     mozilla) mozpackage_required_version=mozilla_required_version ;;
171
     firefox) mozpackage_required_version=firefox_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
166
     *) AC_MSG_ERROR([--with-gtkmozembed argument must be either 'mozilla', 'firefox', or 'xulrunner'])
172
     mozilla) mozpackage_required_version=mozilla_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
173
     *) AC_MSG_ERROR([--with-gtkmozembed argument must be either 'mozilla', 'firefox', 'xulrunner-1.9' or 'xulrunner'])
167
esac
174
esac
168
175
169
PKG_CHECK_MODULES(GTKMOZEMBED, [$mozpackage-gtkmozembed >= $mozpackage_required_version,
176
PKG_CHECK_MODULES(GTKMOZEMBED, [$mozpkgconfig >= $mozpackage_required_version,
170
                                gtk+-2.0                >= gtk_required_version],
177
                                gtk+-2.0      >= gtk_required_version],
171
  build_gtkmozembed=true,
178
  build_gtkmozembed=true,
172
  build_gtkmozembed=false)
179
  build_gtkmozembed=false)
173
180
174
fi
181
fi
175
182
176
AM_CONDITIONAL(BUILD_GTKMOZEMBED, $build_gtkmozembed)
183
if test $mozpackage = xulrunner-1.9; then
184
GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS $(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding)"
185
GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS $(pkg-config --libs libxul-embedding)"
186
187
else
188
177
if test -n "$export_dynamic"; then
189
if test -n "$export_dynamic"; then
178
  GTKMOZEMBED_LIBS=`echo $GTKMOZEMBED_LIBS | sed -e "s/$export_dynamic//"`
190
  GTKMOZEMBED_LIBS=`echo $GTKMOZEMBED_LIBS | sed -e "s/$export_dynamic//"`
179
fi
191
fi
180
MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
192
MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
181
AC_SUBST(MOZILLA_HOME)
193
AC_SUBST(MOZILLA_HOME)
182
194
195
fi
196
AM_CONDITIONAL(BUILD_GTKMOZEMBED, $build_gtkmozembed)
197
198
AC_LANG_PUSH(C++)
199
_SAVE_CPPFLAGS=$CPPFLAGS
200
_SAVE_CXXFLAGS=$CXXFLAGS
201
CXXFLAGS=$GTKMOZEMBED_CFLAGS
202
CPPFLAGS=
203
AC_COMPILE_IFELSE([AC_LANG_SOURCE(
204
[[#ifndef XPCOM_GLUE
205
#error "no xpcom glue"
206
#endif]])],
207
[have_xpcom_glue=yes], [have_xpcom_glue=yes]
208
)
209
CPPFLAGS=$_SAVE_CPPFLAGS
210
CXXFLAGS=$_SAVE_CXXFLAGS
211
AC_LANG_POP(C++)
212
213
AM_CONDITIONAL(HAVE_XPCOM_GLUE, [test $have_xpcom_glue=yes])
214
if test "$have_xpcom_glue" = "yes"; then
215
  AC_DEFINE(HAVE_XPCOM_GLUE, 1,
216
    [Define to 1 if libxpcomglue is being used.])
217
fi
183
218
184
dnl should we build the gtkspell module?
219
dnl should we build the gtkspell module?
185
build_gtkspell=false
220
build_gtkspell=false
(-)gnome-python-extras-2.19.1.orig/gtkmozembed/Makefile.am (-2 / +8 lines)
Lines 13-21 pkgpyexecdir = $(pyexecdir)/gtk-2.0 Link Here
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
(-)gnome-python-extras-2.19.1/gtkmozembed/gtkmozembedmodule.cpp (+73 lines)
Added Link Here
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
}

Return to bug 223265