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

Collapse All | Expand All

(-)fprintd-v1.90.5/meson.build.orig (-20 / +20 lines)
Lines 124-148 Link Here
124
polkit_policy_directory = polkit_gobject_dep.get_pkgconfig_variable('policydir')
124
polkit_policy_directory = polkit_gobject_dep.get_pkgconfig_variable('policydir')
125
125
126
# Tests dependencies
126
# Tests dependencies
127
pam_wrapper_dep = dependency('pam_wrapper', required: get_option('pam'))
127
#pam_wrapper_dep = dependency('pam_wrapper', required: get_option('pam'))
128
128
#
129
xmllint = find_program('xmllint', required: false)
129
xmllint = find_program('xmllint', required: false)
130
python3 = find_program('python3') # No meson without it!
130
python3 = find_program('python3') # No meson without it!
131
python3_test_modules = {
131
#python3_test_modules = {
132
    'cairo': true,
132
#    'cairo': true,
133
    'dbus': true,
133
#    'dbus': true,
134
    'dbusmock': true,
134
#    'dbusmock': true,
135
    'gi': true,
135
#    'gi': true,
136
    'gi.repository.FPrint': true,
136
#    'gi.repository.FPrint': true,
137
    'pypamtest': get_option('pam'),
137
#    'pypamtest': get_option('pam'),
138
}
138
#}
139
python3_available_modules = []
139
#python3_available_modules = []
140
140
#
141
foreach module, required : python3_test_modules
141
#foreach module, required : python3_test_modules
142
    if required and run_command(python3, '-c', 'import @0@'.format(module)).returncode() != 0
142
#    if required and run_command(python3, '-c', 'import @0@'.format(module)).returncode() != 0
143
        error('Python3 module \'' + module + '\' required by test suite not found')
143
#        error('Python3 module \'' + module + '\' required by test suite not found')
144
    endif
144
#    endif
145
endforeach
145
#endforeach
146
146
147
cdata = configuration_data()
147
cdata = configuration_data()
148
cdata.set_quoted('GETTEXT_PACKAGE', meson.project_name())
148
cdata.set_quoted('GETTEXT_PACKAGE', meson.project_name())
Lines 166-172 Link Here
166
if get_option('gtk_doc')
166
if get_option('gtk_doc')
167
    subdir('doc')
167
    subdir('doc')
168
endif
168
endif
169
subdir('tests')
169
#subdir('tests')
170
subdir('po')
170
subdir('po')
171
171
172
output = []
172
output = []
Lines 188-194 Link Here
188
output += '  Manuals: ' + get_option('man').to_string()
188
output += '  Manuals: ' + get_option('man').to_string()
189
output += '  GTK Doc: ' + get_option('gtk_doc').to_string()
189
output += '  GTK Doc: ' + get_option('gtk_doc').to_string()
190
output += '  XML Linter ' + xmllint.found().to_string()
190
output += '  XML Linter ' + xmllint.found().to_string()
191
output += '\nTest setup:\n'
191
#output += '\nTest setup:\n'
192
output += '  With address sanitizer: ' + address_sanitizer.to_string()
192
#output += '  With address sanitizer: ' + address_sanitizer.to_string()
193
193
194
message('\n'+'\n'.join(output)+'\n')
194
message('\n'+'\n'.join(output)+'\n')

Return to bug 700282