Skip to content

Commit

Permalink
meson: remove libxml2 dependency from PDF backend
Browse files Browse the repository at this point in the history
There's nothing in the PDF backend making use of it. It is only used
in libdocument/ev-xmp.c, which is unconditionally added as part of
libdocument, so add the dependency as global instead
  • Loading branch information
pabloyoyoista authored and gpoo committed Jun 18, 2023
1 parent 732fef0 commit dbd3329
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
1 change: 0 additions & 1 deletion backend/pdf/meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
backend_deps = backends_common_deps + [
cairo_pdf_dep,
cairo_ps_dep,
libxml_dep,
poppler_glib_dep,
]

Expand Down
9 changes: 4 additions & 5 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ top_inc = include_directories('.')
glib_req_version = '>= 2.44.0'
gtk_req_version = '>= 3.22.0'
hdy_req_version = '>= 1.5.0'
libxml_req_version = '>= 2.5.0'

gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', version: '>= 2.40.0')
config_h.set_quoted('EXTRA_GDK_PIXBUF_LOADERS_DIR',
Expand All @@ -160,6 +161,7 @@ gmodule_no_export_dep = dependency('gmodule-no-export-2.0', version: glib_req_ve
gtk_dep = dependency('gtk+-3.0', version: gtk_req_version)
gthread_dep = dependency('gthread-2.0', version: glib_req_version)
hdy_dep = dependency('libhandy-1', version: hdy_req_version)
libxml_dep = dependency('libxml-2.0', version: libxml_req_version)

m_dep = cc.find_library('m')

Expand Down Expand Up @@ -394,18 +396,15 @@ endif
poppler_req_version = '>= 22.02.0'
poppler_glib_dep = dependency('poppler-glib', version: poppler_req_version, required: get_option('pdf'))

libxml_req_version = '>= 2.5.0'
libxml_dep = dependency('libxml-2.0', version: libxml_req_version, required: get_option('pdf'))

enable_pdf = poppler_glib_dep.found() and libxml_dep.found()
enable_pdf = poppler_glib_dep.found()
if enable_pdf
cairo_pdf_dep = dependency('cairo-pdf', required: false)
cairo_ps_dep = dependency('cairo-ps', required: false)

backends += {'pdf': mime_types_list.get('pdf')}
evince_mime_types += mime_types_list.get('pdf')
elif get_option('pdf').auto()
warning('PDF support is disabled since poppler-glib version ' + poppler_req_version + ' or libxml-2.0 version ' + libxml_req_version + ' not found')
warning('PDF support is disabled since poppler-glib version ' + poppler_req_version + ' not found')
endif

# *** PostScript ***
Expand Down

0 comments on commit dbd3329

Please sign in to comment.