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

Collapse All | Expand All

(-)Democracy-0.8.4.1/platform/gtk-x11/frontend_implementation/MozillaBrowserXPCOM.h (+5 lines)
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
3
4
#ifndef MOZILLA_INTERNAL_API
5
#define MOZILLA_INTERNAL_API
6
4
#include <gtkmozembed.h>
7
#include <gtkmozembed.h>
5
#include <nscore.h>
8
#include <nscore.h>
6
9
Lines 25-28 Link Here
25
}
28
}
26
#endif
29
#endif
27
30
31
#endif /* MOZILLA_INTERNAL_API */
32
28
#endif /* MOZILLA_BROWSER_XPCOM_H */
33
#endif /* MOZILLA_BROWSER_XPCOM_H */
(-)Democracy-0.8.4.1/platform/gtk-x11/setup.py (-6 / +5 lines)
Lines 129-138 Link Here
129
129
130
    if options_dict is None:
130
    if options_dict is None:
131
        options_dict = {
131
        options_dict = {
132
            'include_dirs' : [],
132
            'include_dirs' : ['/usr/lib/mozilla-firefox/include/webbrwsr',
133
                              '/usr/lib/mozilla-firefox/include/dom',
134
                              '/usr/lib/mozilla-firefox/include/uriloader'],
133
            'library_dirs' : [],
135
            'library_dirs' : [],
134
            'libraries' : [],
136
            'libraries' : [],
135
            'extra_compile_args' : []
136
        }
137
        }
137
    commandLine = "%s --cflags --libs %s" % (command, components)
138
    commandLine = "%s --cflags --libs %s" % (command, components)
138
    output = getCommandOutput(commandLine).strip()
139
    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
149
151
#### The fasttypes extension ####
150
#### The fasttypes extension ####
Lines 157-164 Link Here
157
156
158
#### MozillaBrowser Extension ####
157
#### MozillaBrowser Extension ####
159
mozilla_browser_options = parsePkgConfig("pkg-config" , 
158
mozilla_browser_options = parsePkgConfig("pkg-config" , 
160
        "gtk+-2.0 glib-2.0 pygtk-2.0 mozilla-gtkmozembed mozilla-xpcom")
159
        "gtk+-2.0 glib-2.0 pygtk-2.0 firefox-gtkmozembed firefox-xpcom")
161
mozilla_lib_path = parsePkgConfig('pkg-config', 'mozilla-gtkmozembed')['library_dirs']
160
mozilla_lib_path = parsePkgConfig('pkg-config', 'firefox-gtkmozembed')['library_dirs']
162
mozilla_browser_ext = Extension("democracy.MozillaBrowser",
161
mozilla_browser_ext = Extension("democracy.MozillaBrowser",
163
        [ os.path.join(frontend_implementation_dir,'MozillaBrowser.pyx'),
162
        [ os.path.join(frontend_implementation_dir,'MozillaBrowser.pyx'),
164
          os.path.join(frontend_implementation_dir,'MozillaBrowserXPCOM.cc'),
163
          os.path.join(frontend_implementation_dir,'MozillaBrowserXPCOM.cc'),

Return to bug 131527