meson: added some extensions

.gitignore

+*~
+.cproject
+.project
+.settings/
+build/
+_build/
+po/gthumb.pot

extensions/23hq/23hq.extension.in.in

@@ -9,6 +9,5 @@ Category=Exporter
 
 [Loader]
 Type=module
-File=%LIBRARY%
 API=%GTHUMB_API_VERSION%
 Requires=importer;export_tools;flicker_utils

extensions/bookmarks/bookmarks.extension.in.in

 [Extension]
-_Name=Bookmarks
-_Description=Add bookmarks support.
-_Authors=gthumb development team
+Name=Bookmarks
+Comment=Add bookmarks support.
+Authors=gthumb development team
 Copyright=Copyright © 2008-2013 The Free Software Foundation, Inc.
-Version=%VERSION%
-URL=http://live.gnome.org/Apps/gthumb
+Version=@GTHUMB_VERSION@
 Category=Browser
 
 [Loader]
 Type=module
-File=%LIBRARY%
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@

extensions/bookmarks/meson.build

+source_files = files(
+  'actions.c',
+  'actions.h',
+  'callbacks.c',
+  'callbacks.h',
+  'dlg-bookmarks.c',
+  'dlg-bookmarks.h',
+  'main.c'
+)
+
+gresource_files = gnome.compile_resources('bookmarks-resources', 'resources.xml', c_name : 'gth')
+
+shared_module('bookmarks', 
+  sources : [ source_files, gresource_files ],
+  dependencies : extension_common_deps,
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'bookmarks.extension.in.in',
+  output : 'bookmarks.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'bookmarks.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)

extensions/burn_disc/burn_disc.extension.in.in

@@ -9,6 +9,5 @@ Category=Exporter
 
 [Loader]
 Type=module
-File=%LIBRARY%
 API=%GTHUMB_API_VERSION%
 Requires=export_tools

extensions/cairo_io/cairo_io.extension.in.in

@@ -3,6 +3,5 @@ Mandatory=true
 
 [Loader]
 Type=module
-File=%LIBRARY%
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@
 After=jpeg_utils

extensions/cairo_io/data/meson.build

+subdir('ui')

extensions/cairo_io/data/ui/meson.build

+ui_files = files(
+  'jpeg-options.ui',
+  'png-options.ui',
+  'save-options-preferences.ui',
+  'tga-options.ui',
+  'tiff-options.ui',
+  'webp-options.ui'
+)
+install_data(ui_files, install_dir : ui_install_dir)

extensions/cairo_io/gth-image-saver-tiff.c

@@ -25,7 +25,7 @@
 #endif /* HAVE_LIBTIFF */
 #include <glib/gi18n.h>
 #include <gthumb.h>
-#include "enum-types.h"
+#include "cairo-io-enum-types.h"
 #include "gth-image-saver-tiff.h"
 #include "preferences.h"
 

extensions/cairo_io/meson.build

+source_files = files(
+  'cairo-image-surface-jpeg.c',
+  'cairo-image-surface-png.c',
+  'cairo-image-surface-xcf.c',
+  'gth-image-saver-jpeg.c',
+  'gth-image-saver-png.c',
+  'gth-image-saver-tga.c',
+  'gth-image-saver-tiff.c',
+  'preferences.c',
+  'main.c'
+)
+
+if use_librsvg
+  source_files += files('cairo-image-surface-svg.c')
+endif
+
+if use_libwebp
+  source_files += files('cairo-image-surface-webp.c', 'gth-image-saver-webp.c')
+endif
+
+if use_libtiff
+  source_files += files('cairo-image-surface-tiff.c')
+endif
+
+enum_files = gnome.mkenums_simple('cairo-io-enum-types', sources: [ 'preferences.h' ])
+
+shared_module('cairo_io', 
+  sources : [ source_files, enum_files ],
+  dependencies : [ 
+    extension_common_deps, 
+    jpeg_deps,
+    use_libtiff ? tiff_deps : [],
+    use_librsvg ? librsvg_dep : [],
+    use_libwebp ? libwebp_dep : []    
+  ],  
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  link_with : jpeg_utils_mod,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'cairo_io.extension.in.in',
+  output : 'cairo_io.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'cairo_io.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# Subdirectories
+
+subdir('data')

extensions/catalogs/catalogs.extension.in.in

 [Extension]
-_Name=Catalogs
-_Description=Create file collections.
-_Authors=gthumb development team
+Name=Catalogs
+Comment=Create file collections.
+Authors=gthumb development team
 Copyright=Copyright © 2008-2013 The Free Software Foundation, Inc.
-Version=%VERSION%
-URL=http://live.gnome.org/Apps/gthumb
-Icon=file-catalog
+Version=@GTHUMB_VERSION@
+Icon=file-catalog-symbolic
 Category=Browser
 
 [Loader]
 Type=module
-File=%LIBRARY%
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@

extensions/catalogs/data/meson.build

+subdir('ui')

extensions/catalogs/data/ui/meson.build

+ui_files = files(
+  'add-to-catalog.ui',
+  'catalog-properties.ui',
+  'organize-files.ui',
+  'organize-files-task.ui'
+)
+install_data(ui_files, install_dir : ui_install_dir)

extensions/catalogs/meson.build

+source_files = files(
+  'actions.c',
+  'callbacks.c',
+  'dlg-add-to-catalog.c',
+  'dlg-catalog-properties.c',
+  'dlg-organize-files.c',
+  'gth-catalog.c',
+  'gth-file-source-catalogs.c',
+  'gth-organize-task.c',
+  'main.c'
+)
+
+catalogs_mod = shared_module('catalogs', 
+  sources : source_files,
+  dependencies : extension_common_deps,
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'catalogs.extension.in.in',
+  output : 'catalogs.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'catalogs.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# Subdirectories
+
+subdir('data')

extensions/change_date/change_date.extension.in.in

@@ -8,6 +8,5 @@ Category=List-Tool
 
 [Loader]
 Type=module
-File=%LIBRARY%
 API=%GTHUMB_API_VERSION%
 Requires=list_tools

extensions/comments/comments.extension.in.in

 [Extension]
-_Name=Comments and tags
-_Description=Add comments and tags to any file type.
-_Authors=gthumb development team
+Name=Comments and tags
+Comment=Add comments and tags to any file type.
+Authors=gthumb development team
 Copyright=Copyright © 2009-2013 The Free Software Foundation, Inc.
-Version=%VERSION%
+Version=@GTHUMB_VERSION@
 Category=Metadata
 
 [Loader]
 Type=module
-File=%LIBRARY%
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@

extensions/comments/data/meson.build

+subdir('ui')

extensions/comments/data/ui/meson.build

+ui_files = files(
+  'comments-preferences.ui'
+)
+install_data(ui_files, install_dir : ui_install_dir)

extensions/comments/meson.build

+source_files = files(
+  'actions.c',
+  'callbacks.c',
+  'dlg-comments-preferences.c',
+  'gth-comment.c',
+  'gth-import-metadata-task.c',
+  'gth-metadata-provider-comment.c',
+  'main.c'
+)
+
+shared_module('comments', 
+  sources : source_files,
+  dependencies : [ extension_common_deps ],
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  link_with : use_exiv2 ? exiv2_tools_mod : [],
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'comments.extension.in.in',
+  output : 'comments.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'comments.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# Subdirectories
+
+subdir('data')

extensions/contact_sheet/contact_sheet.extension.in.in

@@ -8,6 +8,5 @@ Category=Exporter
 
 [Loader]
 Type=module
-File=%LIBRARY%
 API=%GTHUMB_API_VERSION%
 Requires=export_tools

extensions/convert_format/convert_format.extension.in.in

@@ -8,6 +8,5 @@ Category=List-Tool
 
 [Loader]
 Type=module
-File=%LIBRARY%
 API=%GTHUMB_API_VERSION%
 Requires=list_tools

extensions/desktop_background/desktop_background.extension.in.in

 [Extension]
-_Name=Desktop background
-_Description=Set the image as desktop background
-_Authors=gthumb development team
+Name=Desktop background
+Comment=Set the image as desktop background
+Authors=gthumb development team
 Copyright=Copyright © 2009-2013 The Free Software Foundation, Inc.
-Version=%VERSION%
+Version=@GTHUMB_VERSION@
 Icon=desktop
 Category=List-Tool
 
 [Loader]
 Type=module
-File=%LIBRARY%
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@
 After=image_viewer

extensions/desktop_background/meson.build

+source_files = files(
+  'actions.c',
+  'callbacks.c',
+  'main.c'
+)
+
+shared_module('desktop_background', 
+  sources : source_files,
+  dependencies : extension_common_deps,
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  link_with : image_viewer_mod,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'desktop_background.extension.in.in',
+  output : 'desktop_background.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'desktop_background.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)

extensions/edit_metadata/data/meson.build

+subdir('ui')
\ No newline at end of file

extensions/edit_metadata/data/ui/meson.build

+ui_files = files(
+  'edit-comment-page.ui', 
+  'tag-chooser.ui'
+)
+install_data(ui_files, install_dir : ui_install_dir)

extensions/edit_metadata/edit_metadata.extension.in.in

 [Extension]
-_Name=Edit metadata
-_Description=Allow to edit files metadata.
-_Authors=gthumb development team
+Name=Edit metadata
+Comment=Allow to edit files metadata.
+Authors=gthumb development team
 Copyright=Copyright © 2009-2013 The Free Software Foundation, Inc.
-Version=%VERSION%
-URL=http://live.gnome.org/Apps/gthumb
+Version=@GTHUMB_VERSION@
 Category=Metadata
 
 [Loader]
 Type=module
-File=%LIBRARY%
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@
 After=list_tools

extensions/edit_metadata/meson.build

+source_files = files(
+  'actions.c',
+  'callbacks.c',
+  'dlg-edit-metadata.c',
+  'gth-delete-metadata-task.c',
+  'gth-edit-comment-dialog.c',
+  'gth-edit-general-page.c',
+  'gth-edit-metadata-dialog.c',
+  'gth-edit-tags-dialog.c',
+  'gth-tag-task.c',
+  'main.c',
+  'utils.c'
+)
+
+edit_metadata_mod = shared_module('edit_metadata', 
+  sources : source_files,
+  dependencies : extension_common_deps,  
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'edit_metadata.extension.in.in',
+  output : 'edit_metadata.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'edit_metadata.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# Subdirectories
+
+subdir('data')

extensions/example/src/example.extension.in.in

@@ -5,8 +5,8 @@ Authors=gthumb development team
 Copyright=Copyright © 2010 The Free Software Foundation, Inc.
 Version=1.0
 Category=Browser
+URL=https://www.example.com
 
 [Loader]
 Type=module
-File=%LIBRARY%
 API=3.0

extensions/exiv2_tools/exiv2-utils.cpp

@@ -1167,7 +1167,7 @@ exiv2_write_metadata_private (Exiv2::Image::AutoPtr  image,
 
 	if (g_file_info_get_attribute_boolean (info, "gth::file::image-changed")) {
 		if (software_name == NULL)
-			software_name = g_strconcat (g_get_application_name (), " ", VERSION, NULL);
+			software_name = g_strconcat (g_get_application_name (), " ", PACKAGE_VERSION, NULL);
 		ed["Exif.Image.ProcessingSoftware"] = software_name;
 	}
 

extensions/exiv2_tools/exiv2_tools.extension.in.in

 [Extension]
-_Name=EXIF, IPTC, XMP support
-_Description=Read and write exif, iptc and xmp metadata.
-_Authors=gthumb development team
+Name=EXIF, IPTC, XMP support
+Comment=Read and write exif, iptc and xmp metadata.
+Authors=gthumb development team
 Copyright=Copyright © 2009-2013 The Free Software Foundation, Inc.
-Version=%VERSION%
+Version=@GTHUMB_VERSION@
 Category=Metadata
 
 [Loader]
 Type=module
-File=%LIBRARY%
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@
 After=image_rotation;comments;edit_metadata

extensions/exiv2_tools/meson.build

+source_files = files(
+  'exiv2-utils.cpp',
+  'gth-edit-iptc-page.c',
+  'gth-metadata-provider-exiv2.c',
+  'main.c'
+)
+
+exiv2_tools_mod = shared_module('exiv2_tools', 
+  sources : source_files,
+  dependencies : [ extension_common_deps, exiv2_dep ],  
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  link_with : [ edit_metadata_mod ],
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'exiv2_tools.extension.in.in',
+  output : 'exiv2_tools.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'exiv2_tools.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)

extensions/export_tools/export_tools.extension.in.in

@@ -3,5 +3,4 @@ Hidden=true
 
 [Loader]
 Type=module
-File=%LIBRARY%
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@

extensions/export_tools/meson.build

+source_files = files(
+  'callbacks.c',
+  'main.c'
+)
+
+gresource_files = gnome.compile_resources('export-tools-resources', 'resources.xml', c_name : 'gth')
+
+export_tools_mod = shared_module('export_tools', 
+  sources : [ source_files, gresource_files ],
+  dependencies : extension_common_deps,
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'export_tools.extension.in.in',
+  output : 'export_tools.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'export_tools.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)

extensions/facebook/facebook.extension.in.in

@@ -9,6 +9,5 @@ Category=Exporter
 
 [Loader]
 Type=module
-File=%LIBRARY%
 API=%GTHUMB_API_VERSION%
 Requires=photo_importer;export_tools;oauth

extensions/file_manager/file_manager.extension.in.in

 [Extension]
-_Name=File manager
-_Description=File manager operations.
-_Authors=gthumb development team
+Name=File manager
+Comment=File manager operations.
+Authors=gthumb development team
 Copyright=Copyright © 2009-2013 The Free Software Foundation, Inc.
-Version=%VERSION%
+Version=@GTHUMB_VERSION@
 Icon=system-file-manager
 Category=Browser