[gthumb] meson files: removed trailing spaces
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb] meson files: removed trailing spaces
- Date: Thu, 10 Jan 2019 18:19:04 +0000 (UTC)
commit 4cf9d645aea3db9d2d6085a5202ce638f00cbb63
Author: Paolo Bacchilega <paobac src gnome org>
Date: Tue Jan 8 17:35:55 2019 +0100
meson files: removed trailing spaces
data/gschemas/meson.build | 2 +-
data/meson.build | 4 +--
extensions/23hq/meson.build | 4 +--
extensions/bookmarks/meson.build | 2 +-
extensions/burn_disc/meson.build | 2 +-
extensions/cairo_io/meson.build | 10 +++----
extensions/catalogs/meson.build | 2 +-
extensions/change_date/meson.build | 2 +-
extensions/comments/meson.build | 2 +-
extensions/contact_sheet/meson.build | 2 +-
extensions/convert_format/meson.build | 2 +-
extensions/desktop_background/meson.build | 2 +-
extensions/edit_metadata/data/meson.build | 2 +-
extensions/edit_metadata/data/ui/meson.build | 2 +-
extensions/edit_metadata/meson.build | 4 +--
extensions/exiv2_tools/meson.build | 4 +--
extensions/export_tools/meson.build | 2 +-
extensions/facebook/meson.build | 10 +++----
extensions/file_manager/meson.build | 2 +-
extensions/file_tools/meson.build | 10 +++----
extensions/file_viewer/meson.build | 2 +-
extensions/find_duplicates/meson.build | 2 +-
extensions/flicker/meson.build | 8 ++---
extensions/flicker_utils/meson.build | 10 +++----
extensions/gstreamer_tools/data/meson.build | 2 +-
extensions/gstreamer_tools/data/ui/meson.build | 2 +-
extensions/gstreamer_tools/meson.build | 2 +-
extensions/gstreamer_utils/meson.build | 2 +-
extensions/image_print/data/ui/meson.build | 2 +-
extensions/image_print/meson.build | 2 +-
extensions/image_rotation/meson.build | 2 +-
extensions/image_viewer/data/meson.build | 2 +-
extensions/image_viewer/gth-image-viewer-page.c | 2 +-
extensions/image_viewer/meson.build | 4 +--
extensions/importer/data/ui/meson.build | 2 +-
extensions/importer/meson.build | 4 +--
extensions/jpeg_utils/meson.build | 8 ++---
extensions/list_tools/meson.build | 2 +-
extensions/map_view/meson.build | 2 +-
extensions/meson.build | 8 ++---
extensions/oauth/meson.build | 4 +--
extensions/photo_importer/meson.build | 12 ++++----
extensions/picasaweb/meson.build | 8 ++---
extensions/raw_files/meson.build | 2 +-
extensions/red_eye_removal/meson.build | 14 ++++-----
extensions/rename_series/meson.build | 2 +-
extensions/resize_images/meson.build | 2 +-
extensions/search/meson.build | 2 +-
extensions/selections/gth-selections-manager.c | 2 ++
extensions/selections/meson.build | 2 +-
extensions/slideshow/data/meson.build | 2 +-
extensions/slideshow/meson.build | 2 +-
extensions/webalbums/meson.build | 4 +--
gthumb/meson.build | 38 +++++++++++------------
meson.build | 40 ++++++++++++-------------
55 files changed, 140 insertions(+), 138 deletions(-)
---
diff --git a/data/gschemas/meson.build b/data/gschemas/meson.build
index 8863d19f..0cf9e5cf 100644
--- a/data/gschemas/meson.build
+++ b/data/gschemas/meson.build
@@ -27,7 +27,7 @@ gschema_files = files(
enums_schema = custom_target('enums_schema',
output : 'org.gnome.gthumb.enums.xml',
- command : [
+ command : [
find_program('make-enums.py'),
join_paths(meson.source_root(), 'gthumb'),
join_paths(meson.source_root(), 'extensions'),
diff --git a/data/meson.build b/data/meson.build
index af6c3c1d..6729b35d 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -4,7 +4,7 @@ install_man('gthumb.1')
# .desktop file
desktop_data = configuration_data()
-desktop_data.set('VERSION', meson.project_version())
+desktop_data.set('VERSION', meson.project_version())
desktop_in_file = configure_file(
input : 'org.gnome.gThumb.desktop.in.in',
output : 'org.gnome.gThumb.desktop.in',
@@ -30,7 +30,7 @@ gthumb_pc = pkg.generate(
subdirs : 'gthumb-@0@'.format(api_version),
requires : [ 'gtk+-3.0' ],
version: meson.project_version(),
- variables : [
+ variables : [
'extensionsdir=${libdir}/gthumb/extensions',
'datarootdir=${prefix}/share',
'datadir=${datarootdir}'
diff --git a/extensions/23hq/meson.build b/extensions/23hq/meson.build
index 92ef7af8..df33ccd8 100644
--- a/extensions/23hq/meson.build
+++ b/extensions/23hq/meson.build
@@ -5,12 +5,12 @@ source_files = files(
'main.c'
)
-shared_module('23hq',
+shared_module('23hq',
sources : source_files,
dependencies : [
extension_common_deps,
libsoup_dep,
- use_libsecret ? libsecret_dep : [],
+ use_libsecret ? libsecret_dep : [],
],
include_directories : [ config_inc, gthumb_inc ],
c_args : c_args,
diff --git a/extensions/bookmarks/meson.build b/extensions/bookmarks/meson.build
index ec78770c..def6601a 100644
--- a/extensions/bookmarks/meson.build
+++ b/extensions/bookmarks/meson.build
@@ -10,7 +10,7 @@ source_files = files(
gresource_files = gnome.compile_resources('bookmarks-resources', 'resources.xml', c_name : 'gth')
-shared_module('bookmarks',
+shared_module('bookmarks',
sources : [ source_files, gresource_files ],
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/burn_disc/meson.build b/extensions/burn_disc/meson.build
index 11425fa5..a3c750c6 100644
--- a/extensions/burn_disc/meson.build
+++ b/extensions/burn_disc/meson.build
@@ -6,7 +6,7 @@ source_files = files(
'main.c'
)
-shared_module('burn_disc',
+shared_module('burn_disc',
sources : source_files,
dependencies : [ extension_common_deps, libbrasero_dep ],
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/cairo_io/meson.build b/extensions/cairo_io/meson.build
index 0c7cd486..90c75e5d 100644
--- a/extensions/cairo_io/meson.build
+++ b/extensions/cairo_io/meson.build
@@ -24,15 +24,15 @@ endif
enum_files = gnome.mkenums_simple('cairo-io-enum-types', sources: [ 'preferences.h' ])
-shared_module('cairo_io',
+shared_module('cairo_io',
sources : [ source_files, enum_files ],
- dependencies : [
- extension_common_deps,
+ dependencies : [
+ extension_common_deps,
jpeg_deps,
use_libtiff ? tiff_deps : [],
use_librsvg ? librsvg_dep : [],
- use_libwebp ? libwebp_dep : []
- ],
+ use_libwebp ? libwebp_dep : []
+ ],
include_directories : [ config_inc, gthumb_inc ],
c_args : c_args,
link_with : jpeg_utils_mod,
diff --git a/extensions/catalogs/meson.build b/extensions/catalogs/meson.build
index ffb4f390..24895f66 100644
--- a/extensions/catalogs/meson.build
+++ b/extensions/catalogs/meson.build
@@ -10,7 +10,7 @@ source_files = files(
'main.c'
)
-catalogs_mod = shared_module('catalogs',
+catalogs_mod = shared_module('catalogs',
sources : source_files,
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/change_date/meson.build b/extensions/change_date/meson.build
index 9d036627..4bc427bd 100644
--- a/extensions/change_date/meson.build
+++ b/extensions/change_date/meson.build
@@ -7,7 +7,7 @@ source_files = files(
'main.c'
)
-shared_module('change_date',
+shared_module('change_date',
sources : source_files,
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/comments/meson.build b/extensions/comments/meson.build
index 8d8cc678..50bb2289 100644
--- a/extensions/comments/meson.build
+++ b/extensions/comments/meson.build
@@ -8,7 +8,7 @@ source_files = files(
'main.c'
)
-shared_module('comments',
+shared_module('comments',
sources : source_files,
dependencies : [ extension_common_deps ],
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/contact_sheet/meson.build b/extensions/contact_sheet/meson.build
index 2fbc7a1f..72f2429b 100644
--- a/extensions/contact_sheet/meson.build
+++ b/extensions/contact_sheet/meson.build
@@ -22,7 +22,7 @@ source_files = files(
'main.c'
)
-shared_module('contact_sheet',
+shared_module('contact_sheet',
sources : [ source_files, enum_files ],
dependencies : [ extension_common_deps, gstreamer_deps ],
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/convert_format/meson.build b/extensions/convert_format/meson.build
index 911d44ab..2cdff42a 100644
--- a/extensions/convert_format/meson.build
+++ b/extensions/convert_format/meson.build
@@ -6,7 +6,7 @@ source_files = files(
'main.c'
)
-shared_module('convert_format',
+shared_module('convert_format',
sources : source_files,
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/desktop_background/meson.build b/extensions/desktop_background/meson.build
index 76d7dd7d..34558873 100644
--- a/extensions/desktop_background/meson.build
+++ b/extensions/desktop_background/meson.build
@@ -4,7 +4,7 @@ source_files = files(
'main.c'
)
-shared_module('desktop_background',
+shared_module('desktop_background',
sources : source_files,
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/edit_metadata/data/meson.build b/extensions/edit_metadata/data/meson.build
index fb796f47..36e5b291 100644
--- a/extensions/edit_metadata/data/meson.build
+++ b/extensions/edit_metadata/data/meson.build
@@ -1 +1 @@
-subdir('ui')
\ No newline at end of file
+subdir('ui')
diff --git a/extensions/edit_metadata/data/ui/meson.build b/extensions/edit_metadata/data/ui/meson.build
index 760e5f00..e5f0bf9a 100644
--- a/extensions/edit_metadata/data/ui/meson.build
+++ b/extensions/edit_metadata/data/ui/meson.build
@@ -1,5 +1,5 @@
ui_files = files(
- 'edit-comment-page.ui',
+ 'edit-comment-page.ui',
'tag-chooser.ui'
)
install_data(ui_files, install_dir : ui_install_dir)
diff --git a/extensions/edit_metadata/meson.build b/extensions/edit_metadata/meson.build
index 0f5879b3..19114a44 100644
--- a/extensions/edit_metadata/meson.build
+++ b/extensions/edit_metadata/meson.build
@@ -12,9 +12,9 @@ source_files = files(
'utils.c'
)
-edit_metadata_mod = shared_module('edit_metadata',
+edit_metadata_mod = shared_module('edit_metadata',
sources : source_files,
- dependencies : extension_common_deps,
+ dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
c_args : c_args,
install : true,
diff --git a/extensions/exiv2_tools/meson.build b/extensions/exiv2_tools/meson.build
index b4cea32b..2056c4d3 100644
--- a/extensions/exiv2_tools/meson.build
+++ b/extensions/exiv2_tools/meson.build
@@ -5,9 +5,9 @@ source_files = files(
'main.c'
)
-exiv2_tools_mod = shared_module('exiv2_tools',
+exiv2_tools_mod = shared_module('exiv2_tools',
sources : source_files,
- dependencies : [ extension_common_deps, exiv2_dep ],
+ dependencies : [ extension_common_deps, exiv2_dep ],
include_directories : [ config_inc, gthumb_inc ],
c_args : c_args,
link_with : [ edit_metadata_mod ],
diff --git a/extensions/export_tools/meson.build b/extensions/export_tools/meson.build
index a897253f..baac456b 100644
--- a/extensions/export_tools/meson.build
+++ b/extensions/export_tools/meson.build
@@ -5,7 +5,7 @@ source_files = files(
gresource_files = gnome.compile_resources('export-tools-resources', 'resources.xml', c_name : 'gth')
-export_tools_mod = shared_module('export_tools',
+export_tools_mod = shared_module('export_tools',
sources : [ source_files, gresource_files ],
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/facebook/meson.build b/extensions/facebook/meson.build
index b34a31df..4d7f698f 100644
--- a/extensions/facebook/meson.build
+++ b/extensions/facebook/meson.build
@@ -10,7 +10,7 @@ source_files = files(
'main.c'
)
-shared_module('facebook',
+shared_module('facebook',
sources : source_files,
dependencies : [
extension_common_deps,
@@ -18,12 +18,12 @@ shared_module('facebook',
libsoup_dep,
libjson_glib_dep,
webkit2_dep,
- use_libsecret ? libsecret_dep : [],
+ use_libsecret ? libsecret_dep : [],
],
- include_directories : [
- config_inc,
+ include_directories : [
+ config_inc,
gthumb_inc,
- importer_inc
+ importer_inc
],
c_args : c_args,
link_with : [
diff --git a/extensions/file_manager/meson.build b/extensions/file_manager/meson.build
index dc454f39..d672162c 100644
--- a/extensions/file_manager/meson.build
+++ b/extensions/file_manager/meson.build
@@ -7,7 +7,7 @@ source_files = files(
'main.c'
)
-shared_module('file_manager',
+shared_module('file_manager',
sources : source_files,
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/file_tools/meson.build b/extensions/file_tools/meson.build
index 580ceee4..463cd007 100644
--- a/extensions/file_tools/meson.build
+++ b/extensions/file_tools/meson.build
@@ -74,12 +74,12 @@ source_files = files(
'main.c'
)
-file_tools_mod = shared_module('file_tools',
+file_tools_mod = shared_module('file_tools',
sources : [ source_files, enum_files ],
- dependencies : extension_common_deps,
- include_directories : [
- config_inc,
- gthumb_inc
+ dependencies : extension_common_deps,
+ include_directories : [
+ config_inc,
+ gthumb_inc
],
c_args : c_args,
link_with : image_viewer_mod,
diff --git a/extensions/file_viewer/meson.build b/extensions/file_viewer/meson.build
index 0d4a2cff..50f7ba77 100644
--- a/extensions/file_viewer/meson.build
+++ b/extensions/file_viewer/meson.build
@@ -3,7 +3,7 @@ source_files = files(
'main.c'
)
-shared_module('file_viewer',
+shared_module('file_viewer',
sources : [ source_files ],
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/find_duplicates/meson.build b/extensions/find_duplicates/meson.build
index 2c1fec7a..01e9fa57 100644
--- a/extensions/find_duplicates/meson.build
+++ b/extensions/find_duplicates/meson.build
@@ -7,7 +7,7 @@ source_files = files(
'main.c'
)
-shared_module('find_duplicates',
+shared_module('find_duplicates',
sources : source_files,
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/flicker/meson.build b/extensions/flicker/meson.build
index aeb17acc..106033c5 100644
--- a/extensions/flicker/meson.build
+++ b/extensions/flicker/meson.build
@@ -5,16 +5,16 @@ source_files = files(
'main.c'
)
-shared_module('flicker',
+shared_module('flicker',
sources : source_files,
dependencies : [
extension_common_deps,
importer_dep,
libsoup_dep,
- use_libsecret ? libsecret_dep : [],
+ use_libsecret ? libsecret_dep : [],
],
- include_directories : [
- config_inc,
+ include_directories : [
+ config_inc,
gthumb_inc,
importer_inc
],
diff --git a/extensions/flicker_utils/meson.build b/extensions/flicker_utils/meson.build
index 776ae033..56c6a916 100644
--- a/extensions/flicker_utils/meson.build
+++ b/extensions/flicker_utils/meson.build
@@ -10,18 +10,18 @@ source_files = files(
'main.c'
)
-flicker_utils_mod = shared_module('flicker_utils',
+flicker_utils_mod = shared_module('flicker_utils',
sources : source_files,
dependencies : [
extension_common_deps,
importer_dep,
libsoup_dep,
- use_libsecret ? libsecret_dep : [],
+ use_libsecret ? libsecret_dep : [],
],
- include_directories : [
- config_inc,
+ include_directories : [
+ config_inc,
gthumb_inc,
- importer_inc
+ importer_inc
],
c_args : c_args,
link_with : [
diff --git a/extensions/gstreamer_tools/data/meson.build b/extensions/gstreamer_tools/data/meson.build
index fb796f47..36e5b291 100644
--- a/extensions/gstreamer_tools/data/meson.build
+++ b/extensions/gstreamer_tools/data/meson.build
@@ -1 +1 @@
-subdir('ui')
\ No newline at end of file
+subdir('ui')
diff --git a/extensions/gstreamer_tools/data/ui/meson.build b/extensions/gstreamer_tools/data/ui/meson.build
index c546ed51..b2084b10 100644
--- a/extensions/gstreamer_tools/data/ui/meson.build
+++ b/extensions/gstreamer_tools/data/ui/meson.build
@@ -1,5 +1,5 @@
ui_files = files(
- 'mediabar.ui',
+ 'mediabar.ui',
'media-viewer-preferences.ui'
)
install_data(ui_files, install_dir : ui_install_dir)
diff --git a/extensions/gstreamer_tools/meson.build b/extensions/gstreamer_tools/meson.build
index 9827faec..94e035c4 100644
--- a/extensions/gstreamer_tools/meson.build
+++ b/extensions/gstreamer_tools/meson.build
@@ -6,7 +6,7 @@ source_files = files(
'main.c'
)
-shared_module('gstreamer_tools',
+shared_module('gstreamer_tools',
sources : source_files,
dependencies : [ extension_common_deps, gstreamer_deps ],
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/gstreamer_utils/meson.build b/extensions/gstreamer_utils/meson.build
index e8f0748d..a1753738 100644
--- a/extensions/gstreamer_utils/meson.build
+++ b/extensions/gstreamer_utils/meson.build
@@ -3,7 +3,7 @@ source_files = files(
'main.c'
)
-gstreamer_utils_mod = shared_module('gstreamer_utils',
+gstreamer_utils_mod = shared_module('gstreamer_utils',
sources : source_files,
dependencies : [ extension_common_deps, gstreamer_deps ],
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/image_print/data/ui/meson.build b/extensions/image_print/data/ui/meson.build
index d8e3103c..56075c01 100644
--- a/extensions/image_print/data/ui/meson.build
+++ b/extensions/image_print/data/ui/meson.build
@@ -1,5 +1,5 @@
ui_files = files(
- 'print-layout.ui',
+ 'print-layout.ui',
'print-preferences.ui'
)
install_data(ui_files, install_dir : ui_install_dir)
diff --git a/extensions/image_print/meson.build b/extensions/image_print/meson.build
index 5ef11efc..320b1a8b 100644
--- a/extensions/image_print/meson.build
+++ b/extensions/image_print/meson.build
@@ -8,7 +8,7 @@ source_files = files(
'main.c'
)
-shared_module('image_print',
+shared_module('image_print',
sources : source_files,
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/image_rotation/meson.build b/extensions/image_rotation/meson.build
index a020d209..9541fc30 100644
--- a/extensions/image_rotation/meson.build
+++ b/extensions/image_rotation/meson.build
@@ -7,7 +7,7 @@ source_files = files(
'rotation-utils.c'
)
-image_rotation_mod = shared_module('image_rotation',
+image_rotation_mod = shared_module('image_rotation',
sources : source_files,
dependencies : [ extension_common_deps, jpeg_deps ],
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/image_viewer/data/meson.build b/extensions/image_viewer/data/meson.build
index fb796f47..36e5b291 100644
--- a/extensions/image_viewer/data/meson.build
+++ b/extensions/image_viewer/data/meson.build
@@ -1 +1 @@
-subdir('ui')
\ No newline at end of file
+subdir('ui')
diff --git a/extensions/image_viewer/gth-image-viewer-page.c b/extensions/image_viewer/gth-image-viewer-page.c
index 0cf6b539..b1509d70 100644
--- a/extensions/image_viewer/gth-image-viewer-page.c
+++ b/extensions/image_viewer/gth-image-viewer-page.c
@@ -167,7 +167,7 @@ _gth_image_preloader_get_requested_size_for_next_images (GthImageViewerPage *sel
requested_size = -1;
break;
default:
- requested_size = get_viewer_size (self);
+ requested_size = (int) floor ((double) get_viewer_size (self) * 0.5);
break;
}
diff --git a/extensions/image_viewer/meson.build b/extensions/image_viewer/meson.build
index 68f48aa4..78565121 100644
--- a/extensions/image_viewer/meson.build
+++ b/extensions/image_viewer/meson.build
@@ -11,9 +11,9 @@ source_files = files(
gresource_files = gnome.compile_resources('image-viewer-resources', 'resources.xml', c_name : 'gth')
-image_viewer_mod = shared_module('image_viewer',
+image_viewer_mod = shared_module('image_viewer',
sources : [ source_files, gresource_files ],
- dependencies : extension_common_deps,
+ dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
c_args : c_args,
link_with : jpeg_utils_mod,
diff --git a/extensions/importer/data/ui/meson.build b/extensions/importer/data/ui/meson.build
index d82e2269..17248f63 100644
--- a/extensions/importer/data/ui/meson.build
+++ b/extensions/importer/data/ui/meson.build
@@ -1,4 +1,4 @@
ui_files = files(
'import-preferences.ui'
)
-install_data(ui_files, install_dir : ui_install_dir)
\ No newline at end of file
+install_data(ui_files, install_dir : ui_install_dir)
diff --git a/extensions/importer/meson.build b/extensions/importer/meson.build
index a5d2a5ef..0f779430 100644
--- a/extensions/importer/meson.build
+++ b/extensions/importer/meson.build
@@ -16,13 +16,13 @@ header_files = [
enum_files = gnome.mkenums_simple('gth-import-enum-types', sources: header_files)
-importer_mod = shared_module('importer',
+importer_mod = shared_module('importer',
sources : [ source_files, enum_files ],
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
c_args : c_args,
link_with : [
- catalogs_mod,
+ catalogs_mod,
image_rotation_mod,
use_exiv2 ? exiv2_tools_mod : []
],
diff --git a/extensions/jpeg_utils/meson.build b/extensions/jpeg_utils/meson.build
index 3a4ffece..77cda188 100644
--- a/extensions/jpeg_utils/meson.build
+++ b/extensions/jpeg_utils/meson.build
@@ -12,11 +12,11 @@ else
source_files += files('transupp-62.c')
endif
-jpeg_utils_mod = shared_module('jpeg_utils',
+jpeg_utils_mod = shared_module('jpeg_utils',
sources : source_files,
- dependencies : [
- extension_common_deps,
- jpeg_deps
+ dependencies : [
+ extension_common_deps,
+ jpeg_deps
],
include_directories : [ config_inc, gthumb_inc ],
c_args : c_args,
diff --git a/extensions/list_tools/meson.build b/extensions/list_tools/meson.build
index 4ab67497..47becbdb 100644
--- a/extensions/list_tools/meson.build
+++ b/extensions/list_tools/meson.build
@@ -11,7 +11,7 @@ source_files = files(
gresource_files = gnome.compile_resources('list-tools-resources', 'resources.xml', c_name : 'gth')
-list_tools_mod = shared_module('list_tools',
+list_tools_mod = shared_module('list_tools',
sources : [ source_files, gresource_files ],
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/map_view/meson.build b/extensions/map_view/meson.build
index a8b06c04..6dacc9a7 100644
--- a/extensions/map_view/meson.build
+++ b/extensions/map_view/meson.build
@@ -3,7 +3,7 @@ source_files = files(
'main.c'
)
-shared_module('map_view',
+shared_module('map_view',
sources : source_files,
dependencies : [ extension_common_deps, libchamplain_deps ],
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/meson.build b/extensions/meson.build
index f40fa4f3..33df1d0f 100644
--- a/extensions/meson.build
+++ b/extensions/meson.build
@@ -1,5 +1,5 @@
extension_data = configuration_data()
-extension_data.set('GTHUMB_VERSION', meson.project_version())
+extension_data.set('GTHUMB_VERSION', meson.project_version())
extension_data.set('GTHUMB_API_VERSION', api_version)
extension_common_deps = [ common_deps, gthumb_h_dep ]
@@ -28,9 +28,9 @@ subdir('convert_format')
subdir('rename_series')
subdir('resize_images')
-# importers
+# importers
subdir('photo_importer')
-
+
# exporters
subdir('export_tools')
if use_libbrasero
@@ -39,7 +39,7 @@ endif
subdir('contact_sheet')
if with_webservices
subdir('oauth')
- subdir('facebook')
+ subdir('facebook')
# flickr exporters
subdir('flicker_utils')
diff --git a/extensions/oauth/meson.build b/extensions/oauth/meson.build
index 1af0d5ad..f6ffc4fb 100644
--- a/extensions/oauth/meson.build
+++ b/extensions/oauth/meson.build
@@ -10,14 +10,14 @@ source_files = files(
'web-service.c'
)
-oauth_mod = shared_module('oauth',
+oauth_mod = shared_module('oauth',
sources : source_files,
dependencies : [
extension_common_deps,
jpeg_deps,
libsoup_dep,
webkit2_dep,
- use_libsecret ? libsecret_dep : [],
+ use_libsecret ? libsecret_dep : [],
],
include_directories : [ config_inc, gthumb_inc ],
c_args : c_args,
diff --git a/extensions/photo_importer/meson.build b/extensions/photo_importer/meson.build
index 97b0dbaf..4da87100 100644
--- a/extensions/photo_importer/meson.build
+++ b/extensions/photo_importer/meson.build
@@ -8,22 +8,22 @@ source_files = files(
gresource_files = gnome.compile_resources('photo-importer-resources', 'resources.xml', c_name : 'gth')
-photo_importer_mod = shared_module('photo_importer',
+photo_importer_mod = shared_module('photo_importer',
sources : [ source_files, gresource_files ],
dependencies : [
extension_common_deps,
importer_dep
],
- include_directories : [
- config_inc,
+ include_directories : [
+ config_inc,
gthumb_inc,
importer_inc
],
c_args : c_args,
- link_with : [
- catalogs_mod,
+ link_with : [
+ catalogs_mod,
importer_mod,
- image_rotation_mod,
+ image_rotation_mod,
],
install : true,
install_dir : extensions_install_dir,
diff --git a/extensions/picasaweb/meson.build b/extensions/picasaweb/meson.build
index 14b6ef7f..8f80d944 100644
--- a/extensions/picasaweb/meson.build
+++ b/extensions/picasaweb/meson.build
@@ -11,17 +11,17 @@ source_files = files(
'picasa-web-service.c'
)
-shared_module('picasaweb',
+shared_module('picasaweb',
sources : source_files,
dependencies : [
extension_common_deps,
importer_dep,
libsoup_dep,
libjson_glib_dep,
- use_libsecret ? libsecret_dep : [],
+ use_libsecret ? libsecret_dep : [],
],
- include_directories : [
- config_inc,
+ include_directories : [
+ config_inc,
gthumb_inc,
importer_inc
],
diff --git a/extensions/raw_files/meson.build b/extensions/raw_files/meson.build
index 1c2e4648..5f3c7d51 100644
--- a/extensions/raw_files/meson.build
+++ b/extensions/raw_files/meson.build
@@ -3,7 +3,7 @@ source_files = files(
'gth-metadata-provider-raw.c'
)
-shared_module('raw_files',
+shared_module('raw_files',
sources : source_files,
dependencies : [ extension_common_deps, libraw_dep ],
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/red_eye_removal/meson.build b/extensions/red_eye_removal/meson.build
index bea4e89f..52b6f7f5 100644
--- a/extensions/red_eye_removal/meson.build
+++ b/extensions/red_eye_removal/meson.build
@@ -3,21 +3,21 @@ source_files = files(
'main.c'
)
-shared_module('red_eye_removal',
+shared_module('red_eye_removal',
sources : source_files,
- dependencies : [
+ dependencies : [
extension_common_deps,
- file_tools_dep
+ file_tools_dep
],
- include_directories : [
- config_inc,
+ include_directories : [
+ config_inc,
gthumb_inc,
file_tools_inc
],
c_args : c_args,
link_with: [
- file_tools_mod,
- image_viewer_mod
+ file_tools_mod,
+ image_viewer_mod
],
install : true,
install_dir : extensions_install_dir,
diff --git a/extensions/rename_series/meson.build b/extensions/rename_series/meson.build
index 667334e6..48d18ab8 100644
--- a/extensions/rename_series/meson.build
+++ b/extensions/rename_series/meson.build
@@ -8,7 +8,7 @@ source_files = files(
'main.c'
)
-shared_module('rename_series',
+shared_module('rename_series',
sources : source_files,
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/resize_images/meson.build b/extensions/resize_images/meson.build
index cc04608f..a75eff04 100644
--- a/extensions/resize_images/meson.build
+++ b/extensions/resize_images/meson.build
@@ -6,7 +6,7 @@ source_files = files(
'main.c'
)
-shared_module('resize_images',
+shared_module('resize_images',
sources : source_files,
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/search/meson.build b/extensions/search/meson.build
index 04a884bc..2e466d5a 100644
--- a/extensions/search/meson.build
+++ b/extensions/search/meson.build
@@ -8,7 +8,7 @@ source_files = files(
'main.c'
)
-shared_module('search',
+shared_module('search',
sources : [ source_files, gresource_files ],
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/selections/gth-selections-manager.c b/extensions/selections/gth-selections-manager.c
index abbc6d48..21423847 100644
--- a/extensions/selections/gth-selections-manager.c
+++ b/extensions/selections/gth-selections-manager.c
@@ -293,6 +293,7 @@ _gth_selections_manager_for_each_selection (gpointer user_data)
}
+G_GNUC_UNUSED
static void
_gth_selections_manager_load_from_node (GthSelectionsManager *self,
DomElement *node)
@@ -580,6 +581,7 @@ gth_selections_manager_get_is_empty (int n_selection)
}
+G_GNUC_UNUSED
static DomElement *
_gth_selections_manager_create_selection_node (GthSelectionsManager *self,
int n_selection,
diff --git a/extensions/selections/meson.build b/extensions/selections/meson.build
index 726b2ea8..338c87dc 100644
--- a/extensions/selections/meson.build
+++ b/extensions/selections/meson.build
@@ -7,7 +7,7 @@ source_files = files(
'main.c'
)
-shared_module('selections',
+shared_module('selections',
sources : source_files,
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/slideshow/data/meson.build b/extensions/slideshow/data/meson.build
index fb796f47..36e5b291 100644
--- a/extensions/slideshow/data/meson.build
+++ b/extensions/slideshow/data/meson.build
@@ -1 +1 @@
-subdir('ui')
\ No newline at end of file
+subdir('ui')
diff --git a/extensions/slideshow/meson.build b/extensions/slideshow/meson.build
index 55d86aca..6f749197 100644
--- a/extensions/slideshow/meson.build
+++ b/extensions/slideshow/meson.build
@@ -8,7 +8,7 @@ source_files = files(
'preferences.c'
)
-shared_module('slideshow',
+shared_module('slideshow',
sources : source_files,
dependencies : [
extension_common_deps,
diff --git a/extensions/webalbums/meson.build b/extensions/webalbums/meson.build
index 9757ff92..2519806d 100644
--- a/extensions/webalbums/meson.build
+++ b/extensions/webalbums/meson.build
@@ -20,8 +20,8 @@ albumtheme_parser = custom_target('albumtheme_parser',
command : [ bison, '@INPUT@', '-pgth_albumtheme_yy', '-o@OUTPUT@' ],
depends : albumtheme_lexer
)
-
-shared_module('webalbums',
+
+shared_module('webalbums',
sources : [ source_files, albumtheme_parser ],
dependencies : extension_common_deps,
include_directories : [ config_inc, gthumb_inc ],
diff --git a/gthumb/meson.build b/gthumb/meson.build
index d0eb5b70..00af83d5 100644
--- a/gthumb/meson.build
+++ b/gthumb/meson.build
@@ -111,18 +111,18 @@ public_header_files = [
]
install_headers(
- public_header_files,
+ public_header_files,
install_dir : pkgincludedir
)
-enum_files = gnome.mkenums_simple('gth-enum-types',
+enum_files = gnome.mkenums_simple('gth-enum-types',
sources: files(public_header_files),
install_header : true,
install_dir : pkgincludedir,
)
-marshal_files = gnome.genmarshal('gth-marshal',
- prefix : 'gth_marshal',
+marshal_files = gnome.genmarshal('gth-marshal',
+ prefix : 'gth_marshal',
sources : 'gth-marshal.list',
install_header : true,
install_dir : pkgincludedir,
@@ -133,7 +133,7 @@ gthumb_h = custom_target('gthumb.h',
output : 'gthumb.h',
command : [ find_program('make-gthumb-h.py'), '@INPUT@', '@OUTPUT@', 'gth-enum-types.h', 'gth-marshal.h',
public_header_files ],
install : true,
- install_dir : pkgincludedir
+ install_dir : pkgincludedir
)
gthumb_h_dep = declare_dependency(sources : [ enum_files, marshal_files, gthumb_h ])
@@ -283,18 +283,18 @@ gthumb_inc = include_directories('.')
# Build targets
-gthumb_exe = executable('gthumb',
- sources : [
- config_file,
+gthumb_exe = executable('gthumb',
+ sources : [
+ config_file,
marshal_files,
enum_files,
- source_files,
+ source_files,
external_files,
gresource_files
],
- dependencies : [
- common_deps,
- jpeg_deps,
+ dependencies : [
+ common_deps,
+ jpeg_deps,
authors_dep,
use_exiv2 ? exiv2_dep : [],
use_clutter ? clutter_deps : [],
@@ -306,11 +306,11 @@ gthumb_exe = executable('gthumb',
use_libwebp ? libwebp_dep : [],
use_libraw ? libraw_dep : [],
use_librsvg ? librsvg_dep : [],
- with_webservices ? webkit2_dep : [],
+ with_webservices ? webkit2_dep : [],
with_webservices ? libsoup_dep : [],
- with_webservices ? libjson_glib_dep : [],
+ with_webservices ? libjson_glib_dep : [],
use_libsecret ? libsecret_dep : [],
- use_libbrasero ? libbrasero_dep : []
+ use_libbrasero ? libbrasero_dep : []
],
include_directories : [ config_inc, gthumb_inc ],
c_args : c_args,
@@ -320,7 +320,7 @@ gthumb_exe = executable('gthumb',
# Tests
-test('dom',
+test('dom',
executable('test-dom',
sources : [ 'test-dom.c', 'dom.c'],
dependencies : common_deps,
@@ -328,7 +328,7 @@ test('dom',
)
)
-test('glib-utils',
+test('glib-utils',
executable('test-glib-utils',
sources : [ 'test-glib-utils.c', 'glib-utils.c' ],
dependencies : common_deps,
@@ -336,7 +336,7 @@ test('glib-utils',
)
)
-test('gsignature',
+test('gsignature',
executable('test-gsignature',
sources : [ 'test-gsignature.c', 'gsignature.c'],
dependencies : common_deps,
@@ -344,7 +344,7 @@ test('gsignature',
)
)
-test('oauth',
+test('oauth',
executable('test-oauth',
sources : [ 'test-oauth.c', 'gsignature.c'],
dependencies : common_deps ,
diff --git a/meson.build b/meson.build
index 174eb71c..2ebdb6cf 100644
--- a/meson.build
+++ b/meson.build
@@ -115,12 +115,12 @@ if not have_tm_gmtoff
int main() { timezone = 1; }'''
have_timezone = c_comp.compiles(code, name : 'timezone variable is defined')
if have_timezone
- code = '''#include <time.h>
+ code = '''#include <time.h>
int main() { altzone = 1; }'''
- have_altzone = c_comp.compiles(code, name : 'altzone variable is defined')
+ have_altzone = c_comp.compiles(code, name : 'altzone variable is defined')
else
error('unable to find a way to determine timezone')
- endif
+ endif
endif
# libjpeg
@@ -147,7 +147,7 @@ have_progressive_jpeg = c_comp.has_function('jpeg_simple_progression', prefix :
if get_option('libtiff')
libtiff_dep = c_comp.find_library('tiff', required : false)
use_libtiff = libtiff_dep.found()
- tiff_deps = [ libm_dep, libz_dep, libtiff_dep ]
+ tiff_deps = [ libm_dep, libz_dep, libtiff_dep ]
else
use_libtiff = false
endif
@@ -182,11 +182,11 @@ if get_option('webservices')
webkit2_dep = dependency('webkit2gtk-3.0', version : webkit2_version, required : false)
endif
with_webservices = libsoup_dep.found() and libjson_glib_dep.found() and webkit2_dep.found()
-
+
if with_webservices and get_option('libsecret')
libsecret_dep = dependency('libsecret-1', version : libsecret_version, required : false)
use_libsecret = libsecret_dep.found()
- endif
+ endif
else
with_webservices = false
endif
@@ -278,8 +278,8 @@ if use_libtiff
config_data.set('HAVE_LIBTIFF', 1)
endif
if use_libwebp
- config_data.set('HAVE_LIBWEBP', 1)
- config_data.set('WEBP_IS_UNKNOWN_TO_GLIB', 1) # Define to 1 if webp images area not recognized by the glib
functions
+ config_data.set('HAVE_LIBWEBP', 1)
+ config_data.set('WEBP_IS_UNKNOWN_TO_GLIB', 1) # Define to 1 if webp images area not recognized by the glib
functions
endif
if use_libraw
config_data.set('HAVE_LIBRAW', 1)
@@ -303,17 +303,17 @@ config_inc = include_directories('.')
c_args = []
if get_option('buildtype').contains('debug')
- test_args = [
- '-Wall',
- '-Wcast-align',
- '-Wtype-limits',
- '-Wclobbered',
- '-Wempty-body',
- '-Wignored-qualifiers',
+ test_args = [
+ '-Wall',
+ '-Wcast-align',
+ '-Wtype-limits',
+ '-Wclobbered',
+ '-Wempty-body',
+ '-Wignored-qualifiers',
'-Wmissing-prototypes',
- '-Wnested-externs',
- '-Wpointer-arith',
- '-Wno-sign-compare',
+ '-Wnested-externs',
+ '-Wpointer-arith',
+ '-Wno-sign-compare',
'-Wformat-security'
]
else
@@ -358,8 +358,8 @@ summary = [
' raw: @0@'.format(use_libraw),
' svg: @0@'.format(use_librsvg),
' web services: @0@'.format(with_webservices),
- ' libsecret: @0@'.format(use_libsecret),
- ' libbrasero: @0@'.format(use_libbrasero),
+ ' libsecret: @0@'.format(use_libsecret),
+ ' libbrasero: @0@'.format(use_libbrasero),
' web albums: @0@'.format(with_webalbums),
' vector ops: @0@'.format(vector_ops),
''
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]