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.5/platform/gtk-x11/setup.py (-13 / +5 lines)
Lines 145-154 Link Here
145
145
146
    if options_dict is None:
146
    if options_dict is None:
147
        options_dict = {
147
        options_dict = {
148
            'include_dirs' : [],
148
            'include_dirs' : ['/usr/lib/mozilla-firefox/include/webbrwsr',
149
                              '/usr/lib/mozilla-firefox/include/dom',
150
                              '/usr/lib/mozilla-firefox/include/uriloader'],
149
            'library_dirs' : [],
151
            'library_dirs' : [],
150
            'libraries' : [],
152
            'libraries' : [],
151
            'extra_compile_args' : []
152
        }
153
        }
153
    commandLine = "%s --cflags --libs %s" % (command, components)
154
    commandLine = "%s --cflags --libs %s" % (command, components)
154
    output = getCommandOutput(commandLine).strip()
155
    output = getCommandOutput(commandLine).strip()
Lines 160-167 Link Here
160
            options_dict['library_dirs'].append(rest)
161
            options_dict['library_dirs'].append(rest)
161
        elif prefix == '-l':
162
        elif prefix == '-l':
162
            options_dict['libraries'].append(rest)
163
            options_dict['libraries'].append(rest)
163
        else:
164
            options_dict['extra_compile_args'].append(comp)
165
    return options_dict
164
    return options_dict
166
165
167
#### The fasttypes extension ####
166
#### The fasttypes extension ####
Lines 172-186 Link Here
172
    )
171
    )
173
172
174
#### MozillaBrowser Extension ####
173
#### MozillaBrowser Extension ####
175
packages = getCommandOutput("pkg-config --list-all")
174
xpcom = 'firefox-xpcom'
176
if re.search("^xulrunner-xpcom", packages, re.MULTILINE):
175
gtkmozembed = 'firefox-gtkmozembed'
177
    xpcom = 'xulrunner-xpcom'
178
    gtkmozembed = 'xulrunner-gtkmozembed'
179
elif re.search("^mozilla-xpcom", packages, re.MULTILINE):
180
    xpcom = 'mozilla-xpcom'
181
    gtkmozembed = 'mozilla-gtkmozembed'
182
else:
183
    raise RuntimeError("Can't find xulrunner-xpcom or mozilla-xpcom")
184
mozilla_browser_options = parsePkgConfig("pkg-config" , 
176
mozilla_browser_options = parsePkgConfig("pkg-config" , 
185
        "gtk+-2.0 glib-2.0 pygtk-2.0 %s %s" % (gtkmozembed, xpcom))
177
        "gtk+-2.0 glib-2.0 pygtk-2.0 %s %s" % (gtkmozembed, xpcom))
186
mozilla_lib_path = parsePkgConfig('pkg-config', 
178
mozilla_lib_path = parsePkgConfig('pkg-config', 

Return to bug 131527