GNOME.org
 

[gnome-todo/gnome-3-26] project: fix build

commit 9de8dcf014a5b07807faafcc5f28710b56ac8616
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Tue Sep 19 23:59:39 2017 -0300

    project: fix build

 doc/reference/meson.build           |   27 ++++++++++++---------------
 meson.build                         |    2 +-
 plugins/today-panel/meson.build     |   11 ++++++-----
 plugins/todo-txt/meson.build        |    8 ++++----
 plugins/todoist/meson.build         |   10 +++++-----
 src/engine/gtd-plugin-manager.c     |    4 +---
 src/gtd-task-list-view.c            |    5 +++++
 src/gtd-window.c                    |    2 ++
 src/meson.build                     |   12 +++++++++++-
 src/provider/gtd-provider-popover.c |    2 ++
 src/views/gtd-list-selector-panel.c |   22 +++++++++-------------
 11 files changed, 58 insertions(+), 47 deletions(-)
---
diff --git a/doc/reference/meson.build b/doc/reference/meson.build
index 2db0bf5..1e59f14 100644
--- a/doc/reference/meson.build
+++ b/doc/reference/meson.build
@@ -37,8 +37,8 @@ version_conf.set('VERSION', gnome_todo_version)
 version_xml = 'version.xml'
 
 configure_file(
-  input: version_xml + '.in',
-  output: version_xml,
+          input: version_xml + '.in',
+         output: version_xml,
   configuration: version_conf
 )
 
@@ -52,19 +52,19 @@ doc_path = join_paths(gnome_todo_datadir, 'gtk-doc', 'html', meson.project_name(
 
 gnome.gtkdoc(
   meson.project_name(),
-  main_sgml: meson.project_name() + '-docs.sgml',
-  src_dir: src_inc,
-  dependencies: libgtd_dep,
-  scan_args: [
+          main_sgml: meson.project_name() + '-docs.sgml',
+            src_dir: src_inc,
+       dependencies: libgtd_dep,
+          mkdb_args: [ '--sgml-mode', '--output-format=xml' ],
+        html_assets: html_images,
+            install: true,
+        install_dir: doc_path
+  gobject_typesfile: meson.project_name() + '.types',
+          scan_args: [
     '--rebuild-types',
     '--ignore-headers=' + ' '.join(private_headers)
   ],
-  mkdb_args: [
-    '--sgml-mode',
-    '--output-format=xml'
-  ],
-  gobject_typesfile: meson.project_name() + '.types',
-  fixxref_args: [
+       fixxref_args: [
     '--extra-dir=@0@'.format(join_paths(glib_doc_path, 'glib')),
     '--extra-dir=@0@'.format(join_paths(glib_doc_path, 'gmodule')),
     '--extra-dir=@0@'.format(join_paths(glib_doc_path, 'gobject')),
@@ -73,7 +73,4 @@ gnome.gtkdoc(
     '--extra-dir=@0@'.format(join_paths(gtk_doc_path, 'gtk')),
     '--extra-dir=@0@'.format(join_paths(gtk_doc_path, 'gtksourceview-3.0'))
   ],
-  html_assets: html_images,
-  install: true,
-  install_dir: doc_path
 )
diff --git a/meson.build b/meson.build
index 58d41b7..076f552 100644
--- a/meson.build
+++ b/meson.build
@@ -134,7 +134,7 @@ if gnome_todo_debug
     '-Wswitch-enum',
     '-Wundef',
     '-Wunused-but-set-variable',
-    '-Wwrite-strings'
+    '-Wwrite-strings',
   ]
 
   foreach cflag: test_cflags
diff --git a/plugins/today-panel/meson.build b/plugins/today-panel/meson.build
index da1a0bd..8e8aebc 100644
--- a/plugins/today-panel/meson.build
+++ b/plugins/today-panel/meson.build
@@ -8,16 +8,17 @@ sources = files(
 )
 
 plugins_libs += static_library(
-  'todaypanel',
-  sources: sources,
+         'todaypanel',
+              sources: sources,
   include_directories: plugins_incs,
-  dependencies: gnome_todo_deps
+         dependencies: gnome_todo_deps,
+                  pic: true,
 )
 
 plugin_data = plugin_name + '.plugin'
 
 plugins_confs += configure_file(
-  input: plugin_data + '.in',
-  output: plugin_data,
+          input: plugin_data + '.in',
+         output: plugin_data,
   configuration: plugins_conf
 )
diff --git a/plugins/todo-txt/meson.build b/plugins/todo-txt/meson.build
index 45f9bdf..ddaba56 100644
--- a/plugins/todo-txt/meson.build
+++ b/plugins/todo-txt/meson.build
@@ -10,9 +10,9 @@ sources = files(
 
 plugins_libs += static_library(
   'todotxt',
-  sources: sources,
+              sources: sources,
   include_directories: plugins_incs,
-  dependencies: gnome_todo_deps
+         dependencies: gnome_todo_deps
 )
 
 install_data(
@@ -23,7 +23,7 @@ install_data(
 plugin_data = plugin_name + '.plugin'
 
 plugins_confs += configure_file(
-  input: plugin_data + '.in',
-  output: plugin_data,
+          input: plugin_data + '.in',
+         output: plugin_data,
   configuration: plugins_conf
 )
diff --git a/plugins/todoist/meson.build b/plugins/todoist/meson.build
index 84d0d45..6587165 100644
--- a/plugins/todoist/meson.build
+++ b/plugins/todoist/meson.build
@@ -14,16 +14,16 @@ todoist_deps = gnome_todo_deps + [
 ]
 
 plugins_libs += static_library(
-  plugin_name,
-  sources: sources,
+          plugin_name,
+              sources: sources,
   include_directories: plugins_incs,
-  dependencies: todoist_deps
+         dependencies: todoist_deps
 )
 
 plugin_data = plugin_name + '.plugin'
 
 plugins_confs += configure_file(
-  input: plugin_data + '.in',
-  output: plugin_data,
+          input: plugin_data + '.in',
+         output: plugin_data,
   configuration: plugins_conf
 )
diff --git a/src/engine/gtd-plugin-manager.c b/src/engine/gtd-plugin-manager.c
index 5a01160..71601e9 100644
--- a/src/engine/gtd-plugin-manager.c
+++ b/src/engine/gtd-plugin-manager.c
@@ -319,9 +319,7 @@ setup_engine (GtdPluginManager *self)
                                  "plugins",
                                  NULL);
 
-  peas_engine_add_search_path (engine,
-                               plugin_dir,
-                               NULL);
+  peas_engine_add_search_path (engine, plugin_dir, NULL);
   peas_engine_prepend_search_path (engine,
                                    "resource:///org/gnome/todo/plugins",
                                    "resource:///org/gnome/todo/plugins");
diff --git a/src/gtd-task-list-view.c b/src/gtd-task-list-view.c
index 1ba77ef..a0fdd39 100644
--- a/src/gtd-task-list-view.c
+++ b/src/gtd-task-list-view.c
@@ -1584,7 +1584,12 @@ gtd_task_list_view_class_init (GtdTaskListViewClass *klass)
 
   widget_class->map = gtd_task_list_view_map;
 
+  g_type_ensure (GTD_TYPE_ARROW_FRAME);
+  g_type_ensure (GTD_TYPE_EDIT_PANE);
+  g_type_ensure (GTD_TYPE_NEW_TASK_ROW);
   g_type_ensure (GTD_TYPE_TASK_ROW);
+  g_type_ensure (GTD_TYPE_DND_ROW);
+  g_type_ensure (GTD_TYPE_EMPTY_LIST_WIDGET);
 
   /**
    * GtdTaskListView::color:
diff --git a/src/gtd-window.c b/src/gtd-window.c
index 0c730b9..1489a6d 100644
--- a/src/gtd-window.c
+++ b/src/gtd-window.c
@@ -790,6 +790,8 @@ gtd_window_class_init (GtdWindowClass *klass)
                            GTD_WINDOW_MODE_NORMAL,
                            G_PARAM_READWRITE));
 
+  g_type_ensure (GTD_TYPE_NOTIFICATION_WIDGET);
+
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/window.ui");
 
   gtk_widget_class_bind_template_child_private (widget_class, GtdWindow, cancel_selection_button);
diff --git a/src/meson.build b/src/meson.build
index 8f1684a..f108dfe 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -98,7 +98,7 @@ cflags = [
   '-DUI_DATA_DIR="@0@"'.format(join_paths(gnome_todo_pkgdatadir, 'style'))
 ]
 
-ldflags = []
+ldflags = [ '-Wl,--export-dynamic' ]
 
 if host_machine.system().contains('linux')
   foreach ldflag: plugins_ldflags
@@ -108,6 +108,11 @@ if host_machine.system().contains('linux')
   endforeach
 endif
 
+
+##############
+# gnome-todo #
+##############
+
 gnome_todo = executable(
   meson.project_name(),
                sources,
@@ -120,6 +125,11 @@ gnome_todo = executable(
           install_dir: gnome_todo_bindir
 )
 
+
+###################
+# Private library #
+###################
+
 libgtd = shared_library(
                 'gtd',
               sources: sources,
diff --git a/src/provider/gtd-provider-popover.c b/src/provider/gtd-provider-popover.c
index b9e033f..9eb3dbf 100644
--- a/src/provider/gtd-provider-popover.c
+++ b/src/provider/gtd-provider-popover.c
@@ -196,6 +196,8 @@ gtd_provider_popover_class_init (GtdProviderPopoverClass *klass)
   object_class->finalize = gtd_provider_popover_finalize;
   object_class->constructed = gtd_provider_popover_constructed;
 
+  g_type_ensure (GTD_TYPE_PROVIDER_SELECTOR);
+
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/provider-popover.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GtdProviderPopover, change_location_button);
diff --git a/src/views/gtd-list-selector-panel.c b/src/views/gtd-list-selector-panel.c
index 80b5ab2..dfb16fb 100644
--- a/src/views/gtd-list-selector-panel.c
+++ b/src/views/gtd-list-selector-panel.c
@@ -16,8 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "interfaces/gtd-panel.h"
-#include "interfaces/gtd-provider.h"
 #include "gtd-enum-types.h"
 #include "gtd-list-selector.h"
 #include "gtd-list-selector-grid.h"
@@ -25,6 +23,9 @@
 #include "gtd-list-selector-list.h"
 #include "gtd-list-selector-panel.h"
 #include "gtd-manager.h"
+#include "gtd-panel.h"
+#include "gtd-provider.h"
+#include "gtd-provider-popover.h"
 #include "gtd-task-list.h"
 #include "gtd-task-list-view.h"
 #include "gtd-window.h"
@@ -579,17 +580,9 @@ gtd_list_selector_panel_class_init (GtdListSelectorPanelClass *klass)
   object_class->set_property = gtd_list_selector_panel_set_property;
   object_class->finalize = gtd_list_selector_panel_finalize;
 
-  g_object_class_override_property (object_class,
-                                    PROP_MENU,
-                                    "menu");
-
-  g_object_class_override_property (object_class,
-                                    PROP_NAME,
-                                    "name");
-
-  g_object_class_override_property (object_class,
-                                    PROP_TITLE,
-                                    "title");
+  g_object_class_override_property (object_class, PROP_MENU, "menu");
+  g_object_class_override_property (object_class, PROP_NAME, "name");
+  g_object_class_override_property (object_class, PROP_TITLE, "title");
 
   /**
    * GtdListSelectorPanel::mode:
@@ -621,6 +614,9 @@ gtd_list_selector_panel_class_init (GtdListSelectorPanelClass *klass)
                                                       GTD_LIST_SELECTOR_VIEW_GRID,
                                                       G_PARAM_READWRITE));
 
+  g_type_ensure (GTD_TYPE_TASK_LIST_VIEW);
+  g_type_ensure (GTD_TYPE_PROVIDER_POPOVER);
+
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/list-selector-panel.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GtdListSelectorPanel, actionbar);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]