[evince/gpoo/wip/use-only-c] Remove c++ dependency, and use only C
- From: Germán Poo-Caamaño <gpoo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evince/gpoo/wip/use-only-c] Remove c++ dependency, and use only C
- Date: Sun, 27 Jun 2021 16:44:14 +0000 (UTC)
commit 0e328f336eed49967ac623336296d434cb0d978f
Author: Germán Poo-Caamaño <gpoo gnome org>
Date: Sun Jun 27 12:41:49 2021 -0400
Remove c++ dependency, and use only C
ev-poppler.cc was the remaining file depending on C++, but it is
C code. If in the future we need C++ to access Poppler, it can
be changed back.
backend/meson.build | 2 +-
backend/pdf/{ev-poppler.cc => ev-poppler.c} | 3 +++
backend/pdf/meson.build | 4 ++--
meson.build | 3 +--
4 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/backend/meson.build b/backend/meson.build
index d1f6fe07..14629f2f 100644
--- a/backend/meson.build
+++ b/backend/meson.build
@@ -12,7 +12,7 @@ backends_cflags = [
]
backends_symbol_map = join_paths(meson.current_source_dir(), 'backend-symbol.map')
-backends_ldflags = cpp.get_supported_link_arguments('-Wl,--version-script,' + backends_symbol_map)
+backends_ldflags = cc.get_supported_link_arguments('-Wl,--version-script,' + backends_symbol_map)
foreach backend, backend_mime_types: backends
backend_name = backend + 'document'
diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.c
similarity index 99%
rename from backend/pdf/ev-poppler.cc
rename to backend/pdf/ev-poppler.c
index 91cc2a29..ae164b45 100644
--- a/backend/pdf/ev-poppler.cc
+++ b/backend/pdf/ev-poppler.c
@@ -798,6 +798,8 @@ pdf_document_get_localized_object_from_metadata (xmlXPathContextPtr xpathCtx,
language_string = pango_language_to_string (gtk_get_default_language ());
tags = g_strsplit (language_string, "-", -1);
i = g_strv_length (tags);
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wformat-nonliteral"
while (i-- && !loc_object) {
tag = g_strdup (tags[0]);
for (j = 1; j <= i; j++) {
@@ -818,6 +820,7 @@ pdf_document_get_localized_object_from_metadata (xmlXPathContextPtr xpathCtx,
loc_object = (gchar *)pdf_document_get_xmptag_from_path (xpathCtx, aux);
g_free (aux);
}
+ #pragma GCC diagnostic pop
return loc_object;
}
diff --git a/backend/pdf/meson.build b/backend/pdf/meson.build
index f89fce2b..32020319 100644
--- a/backend/pdf/meson.build
+++ b/backend/pdf/meson.build
@@ -7,10 +7,10 @@ deps = backends_deps + [
shared_module(
backend_name,
- sources: 'ev-poppler.cc',
+ sources: 'ev-poppler.c',
include_directories: backends_incs,
dependencies: deps,
- cpp_args: backends_cflags,
+ c_args: backends_cflags,
link_args: backends_ldflags,
link_depends: backends_symbol_map,
install: true,
diff --git a/meson.build b/meson.build
index e5c401b2..124552a7 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project(
- 'evince', ['c', 'cpp'],
+ 'evince', ['c'],
version: '41.alpha',
license: 'GPL2+',
default_options: 'buildtype=debugoptimized',
@@ -72,7 +72,6 @@ ev_code_prefix = 'Ev'
ev_debug = get_option('buildtype').contains('debug')
cc = meson.get_compiler('c')
-cpp = meson.get_compiler('cpp')
config_h = configuration_data()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]