|
Line
Link Here
|
| 0 |
-- Democracy-0.8.4.1/platform/gtk-x11/frontend_implementation/MozillaBrowserXPCOM.h 2006-06-23 01:27:16.000000000 +0930 |
0 |
++ Democracy-0.8.4.1-patched/platform/gtk-x11/frontend_implementation/MozillaBrowserXPCOM.h 2006-07-02 12:31:41.000000000 +0930 |
|
Lines 1-6
Link Here
|
| 1 |
#ifndef MOZILLA_BROWSER_XPCOM_H |
1 |
#ifndef MOZILLA_BROWSER_XPCOM_H |
| 2 |
#define MOZILLA_BROWSER_XPCOM_H |
2 |
#define MOZILLA_BROWSER_XPCOM_H |
|
|
3 |
#ifndef MOZILLA_INTERNAL_API |
| 4 |
#define MOZILLA_INTERNAL_API |
| 5 |
|
| 3 |
#include <gtkmozembed.h> |
6 |
#include <gtkmozembed.h> |
| 4 |
#include <nscore.h> |
7 |
#include <nscore.h> |
|
Lines 25-28
Link Here
|
| 25 |
} |
28 |
} |
| 26 |
#endif |
29 |
#endif |
|
|
30 |
#endif /* MOZILLA_INTERNAL_API */ |
| 31 |
|
| 27 |
#endif /* MOZILLA_BROWSER_XPCOM_H */ |
32 |
#endif /* MOZILLA_BROWSER_XPCOM_H */ |
| 28 |
-- Democracy-0.8.4.1/platform/gtk-x11/setup.py 2006-06-23 01:27:16.000000000 +0930 |
33 |
++ Democracy-0.8.4.1-patched/platform/gtk-x11/setup.py 2006-07-02 12:33:09.000000000 +0930 |
|
Lines 129-138
Link Here
|
| 129 |
if options_dict is None: |
129 |
if options_dict is None: |
| 130 |
options_dict = { |
130 |
options_dict = { |
| 131 |
'include_dirs' : [], |
131 |
'include_dirs' : ['/usr/lib/mozilla-firefox/include/webbrwsr', |
|
|
132 |
'/usr/lib/mozilla-firefox/include/dom', |
| 133 |
'/usr/lib/mozilla-firefox/include/uriloader'], |
| 132 |
'library_dirs' : [], |
134 |
'library_dirs' : [], |
| 133 |
'libraries' : [], |
135 |
'libraries' : [], |
| 134 |
'extra_compile_args' : [] |
|
|
| 135 |
} |
136 |
} |
| 136 |
commandLine = "%s --cflags --libs %s" % (command, components) |
137 |
commandLine = "%s --cflags --libs %s" % (command, components) |
| 137 |
output = getCommandOutput(commandLine).strip() |
138 |
output = getCommandOutput(commandLine).strip() |
|
Lines 144-151
Link Here
|
| 144 |
options_dict['library_dirs'].append(rest) |
145 |
options_dict['library_dirs'].append(rest) |
| 145 |
elif prefix == '-l': |
146 |
elif prefix == '-l': |
| 146 |
options_dict['libraries'].append(rest) |
147 |
options_dict['libraries'].append(rest) |
| 147 |
else: |
|
|
| 148 |
options_dict['extra_compile_args'].append(comp) |
| 149 |
return options_dict |
148 |
return options_dict |
| 150 |
#### The fasttypes extension #### |
149 |
#### The fasttypes extension #### |
|
Lines 157-164
Link Here
|
| 157 |
#### MozillaBrowser Extension #### |
156 |
#### MozillaBrowser Extension #### |
| 158 |
mozilla_browser_options = parsePkgConfig("pkg-config" , |
157 |
mozilla_browser_options = parsePkgConfig("pkg-config" , |
| 159 |
"gtk+-2.0 glib-2.0 pygtk-2.0 mozilla-gtkmozembed mozilla-xpcom") |
158 |
"gtk+-2.0 glib-2.0 pygtk-2.0 firefox-gtkmozembed firefox-xpcom") |
| 160 |
mozilla_lib_path = parsePkgConfig('pkg-config', 'mozilla-gtkmozembed')['library_dirs'] |
159 |
mozilla_lib_path = parsePkgConfig('pkg-config', 'firefox-gtkmozembed')['library_dirs'] |
| 161 |
mozilla_browser_ext = Extension("democracy.MozillaBrowser", |
160 |
mozilla_browser_ext = Extension("democracy.MozillaBrowser", |
| 162 |
[ os.path.join(frontend_implementation_dir,'MozillaBrowser.pyx'), |
161 |
[ os.path.join(frontend_implementation_dir,'MozillaBrowser.pyx'), |
| 163 |
os.path.join(frontend_implementation_dir,'MozillaBrowserXPCOM.cc'), |
162 |
os.path.join(frontend_implementation_dir,'MozillaBrowserXPCOM.cc'), |
