[dia] Resolve various warnings

From: Zander <zbrown src gnome org>
To: commits-list gnome org
Cc:
Subject: [dia] Resolve various warnings
Date: Wed, 8 May 2019 12:25:45 +0000 (UTC)
commit 9d194aa6ddcda98322c8262538bef3aea2e3d4ae
Author: Zander Brown <zbrown gnome org>
Date:   Wed May 8 12:54:53 2019 +0100

    Resolve various warnings

 app/load_save.c             | 2 +-
 app/meson.build             | 5 ++---
 lib/arrows.c                | 2 +-
 lib/boundingbox.c           | 2 +-
 lib/dia_image.c             | 2 +-
 lib/dia_svg.c               | 2 +-
 lib/diacellrendererenum.c   | 3 ++-
 lib/diacontext.c            | 2 +-
 lib/meson.build             | 6 +++++-
 lib/persistence.c           | 2 +-
 lib/standard-path.c         | 2 +-
 lib/widgets.c               | 2 +-
 objects/meson.build         | 5 ++---
 objects/standard/arc.c      | 2 +-
 plug-ins/layout/meson.build | 6 +++---
 plug-ins/meson.build        | 5 ++---
 plug-ins/python/meson.build | 6 +++---
 plug-ins/wmf/meson.build    | 5 ++---
 plug-ins/xslt/meson.build   | 5 ++---
 tests/meson.build           | 5 ++---
 20 files changed, 35 insertions(+), 36 deletions(-)
---
diff --git a/app/load_save.c b/app/load_save.c
index a41e0280..376907af 100644
--- a/app/load_save.c
+++ b/app/load_save.c
@@ -19,7 +19,7 @@
 
 /* so we get fdopen declared even when compiling with -ansi */
 #define _POSIX_C_SOURCE 200809L
-#define _BSD_SOURCE 1 /* to get the prototype for fchmod() */
+#define _DEFAULT_SOURCE 1 /* to get the prototype for fchmod() */
 #include <sys/stat.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/app/meson.build b/app/meson.build
index a4449fcc..936689d8 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -78,11 +78,10 @@ diaapp_inc = include_directories('.')
 
 diaapp = executable('dia',
     dia_sources + [dia_app_icons_h, diamarshal_h, config_h],
-    dependencies: [libgtk_dep, libxml_dep, libm_dep],
-    link_with: [libdia],
+    dependencies: [libgtk_dep, libxml_dep, libm_dep, libdia_dep],
     link_args: dia_link_args,
     export_dynamic: true,  # some plugins require this.
-    include_directories: [configuration_inc, libdia_inc],
+    include_directories: [configuration_inc],
     gui_app: true,
     install: true,
 )
diff --git a/lib/arrows.c b/lib/arrows.c
index 8df15805..663b5929 100644
--- a/lib/arrows.c
+++ b/lib/arrows.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#define _BSD_SOURCE 1 /* to get finite */
+#define _DEFAULT_SOURCE 1 /* to get finite */
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/boundingbox.c b/lib/boundingbox.c
index 83c73501..d10bd21a 100644
--- a/lib/boundingbox.c
+++ b/lib/boundingbox.c
@@ -19,7 +19,7 @@
 
 #include <config.h>
 
-#define _BSD_SOURCE 1
+#define _DEFAULT_SOURCE 1
 #include <math.h>
 #include <string.h> /* memcmp() */
 
diff --git a/lib/dia_image.c b/lib/dia_image.c
index c733e697..9ed95f28 100644
--- a/lib/dia_image.c
+++ b/lib/dia_image.c
@@ -25,7 +25,7 @@
 #include "message.h"
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "dia-lib-icons.h"
+#include "pixmaps/dia-lib-icons.h"
 
 #define SCALING_CACHE
 
diff --git a/lib/dia_svg.c b/lib/dia_svg.c
index 44ca103e..4f0b3b3c 100644
--- a/lib/dia_svg.c
+++ b/lib/dia_svg.c
@@ -1223,7 +1223,7 @@ dia_svg_parse_path(GArray *points, const gchar *path_str, gchar **unparsed,
       if (last_type == PATH_CLOSE) {
        g_warning("parse_path: argument given for implicite close path");
        /* consume one number so we don't fall into an infinite loop */
-       while (path != '\0' && strchr("0123456789.+-", path[0])) path++;
+       while (path != NULL && strchr("0123456789.+-", path[0])) path++;
        path_chomp(path);
        *closed = TRUE;
        need_next_element = TRUE;
diff --git a/lib/diacellrendererenum.c b/lib/diacellrendererenum.c
index 7f2ae1ac..de8e62d2 100644
--- a/lib/diacellrendererenum.c
+++ b/lib/diacellrendererenum.c
@@ -78,7 +78,8 @@ _enum_edited (GtkCellRenderer *renderer,
    */
   g_object_set_data (G_OBJECT (store), "modified", GINT_TO_POINTER (1));
 
-  g_print ("edited: %d - %s\n", new_string);
+  // FIXME: What should the number here be?
+  g_print ("edited: %d - %s\n", 42, new_string);
 }
 
 GtkCellRenderer *
diff --git a/lib/diacontext.c b/lib/diacontext.c
index 04dfcf8c..7d807964 100644
--- a/lib/diacontext.c
+++ b/lib/diacontext.c
@@ -98,7 +98,7 @@ dia_context_release (DiaContext *context)
   if (context->messages)
     message_warning ("%s:\n%s", 
                      context->desc ? context->desc : "<no context>",
-                    context->messages->data);
+                     (char *) context->messages->data);
 
   g_object_unref (G_OBJECT (context));
 }
diff --git a/lib/meson.build b/lib/meson.build
index eab9b4c0..3a2f089e 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -120,7 +120,7 @@ libdia_deps = [
 
 libdia_inc = include_directories('.')
 
-libdia = library('dia',
+libdia_lib = library('dia',
     libdia_sources + [diamarshal, dia_lib_icons_h, config_h],
     dependencies: libdia_deps,
     include_directories: configuration_inc,
@@ -128,3 +128,7 @@ libdia = library('dia',
     vs_module_defs: 'libdia.def',
     install: true,
 )
+
+libdia_dep = declare_dependency (include_directories: libdia_inc,
+                                 link_with: libdia_lib,
+                                 dependencies: libdia_deps)
\ No newline at end of file
diff --git a/lib/persistence.c b/lib/persistence.c
index 2cba2cb4..ee16bdc9 100644
--- a/lib/persistence.c
+++ b/lib/persistence.c
@@ -1116,7 +1116,7 @@ persistence_register_boolean(const gchar *role, gboolean defaultvalue)
   if (booleanval == NULL) {
     booleanval = g_new(gboolean, 1);
     *booleanval = defaultvalue;
-    g_hash_table_insert(persistent_booleans, role, booleanval);
+    g_hash_table_insert (persistent_booleans, (gpointer) role, booleanval);
   }
   return *booleanval;
 }
diff --git a/lib/standard-path.c b/lib/standard-path.c
index f44a7528..e7e466b4 100644
--- a/lib/standard-path.c
+++ b/lib/standard-path.c
@@ -44,7 +44,7 @@
 #include "bezier-common.h"
 #include "pattern.h"
 
-#include "dia-lib-icons.h"
+#include "pixmaps/dia-lib-icons.h"
 
 #define NUM_HANDLES 8
 
diff --git a/lib/widgets.c b/lib/widgets.c
index d1467630..43f87453 100644
--- a/lib/widgets.c
+++ b/lib/widgets.c
@@ -25,7 +25,7 @@
 #include "dia_dirs.h"
 #include "diadynamicmenu.h"
 #include "diaoptionmenu.h"
-#include "dia-lib-icons.h"
+#include "pixmaps/dia-lib-icons.h"
 
 #include <stdlib.h>
 #include <glib.h>
diff --git a/objects/meson.build b/objects/meson.build
index 99ad63f5..ec167e01 100644
--- a/objects/meson.build
+++ b/objects/meson.build
@@ -22,9 +22,8 @@ subdir('UML')
 foreach o : dia_object_desc
     library(o.get('name'),
         o.get('sources') + [config_h],
-        dependencies: [libc_dep, libgtk_dep, libxml_dep, libm_dep] + o.get('extra_deps', []),
-        link_with: libdia,
-        include_directories: [configuration_inc, libdia_inc],
+        dependencies: [libc_dep, libgtk_dep, libxml_dep, libm_dep, libdia_dep] + o.get('extra_deps', []),
+        include_directories: [configuration_inc],
         install: true,
         install_dir: dialibdir
     )
diff --git a/objects/standard/arc.c b/objects/standard/arc.c
index 425a1d6e..8d04581d 100644
--- a/objects/standard/arc.c
+++ b/objects/standard/arc.c
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#define _BSD_SOURCE 1 /* to get finite */
+#define _DEFAULT_SOURCE 1 /* to get finite */
 #include <math.h>
 #include <assert.h>
 
diff --git a/plug-ins/layout/meson.build b/plug-ins/layout/meson.build
index a41ebbf8..91d5c5f9 100644
--- a/plug-ins/layout/meson.build
+++ b/plug-ins/layout/meson.build
@@ -16,9 +16,9 @@ endif
 shared_module(
     'layout_filter',
     sources + [config_h],
-    dependencies: deps,
-    include_directories: [libdia_inc, configuration_inc, diaapp_inc],
-    link_with: [libdia, diaapp],
+    dependencies: [deps, libdia_dep],
+    include_directories: [configuration_inc, diaapp_inc],
+    link_with: [diaapp],
     install: true,
     install_dir: dialibdir
 )
diff --git a/plug-ins/meson.build b/plug-ins/meson.build
index 27808d31..5935cb81 100644
--- a/plug-ins/meson.build
+++ b/plug-ins/meson.build
@@ -39,9 +39,8 @@ foreach p : install_plugins_desc
     library(
         p.get('name'),
         p.get('sources') + [config_h],
-        dependencies: [libc_dep, libgtk_dep, libm_dep, libxml_dep] + p.get('extra_deps', []),
-        include_directories: [libdia_inc, configuration_inc],
-        link_with: [libdia],
+        dependencies: [libc_dep, libgtk_dep, libm_dep, libxml_dep, libdia_dep] + p.get('extra_deps', []),
+        include_directories: [configuration_inc],
         install: p.get('install', true),
         install_dir: dialibdir
     )
diff --git a/plug-ins/python/meson.build b/plug-ins/python/meson.build
index f08bdfcf..998d7912 100644
--- a/plug-ins/python/meson.build
+++ b/plug-ins/python/meson.build
@@ -50,9 +50,9 @@ if py_dep.found()
     shared_module(
         'python_plugin',
         sources + [config_h],
-        dependencies: [libc_dep, libxml_dep, libgtk_dep, py_dep],
-        include_directories: [libdia_inc, configuration_inc, diaapp_inc],
-        link_with: [libdia, diaapp],
+        dependencies: [libc_dep, libxml_dep, libgtk_dep, py_dep, libdia_dep],
+        include_directories: [configuration_inc, diaapp_inc],
+        link_with: [diaapp],
         install: true,
         install_dir: dialibdir
     )
diff --git a/plug-ins/wmf/meson.build b/plug-ins/wmf/meson.build
index fa0e1a0d..12203b08 100644
--- a/plug-ins/wmf/meson.build
+++ b/plug-ins/wmf/meson.build
@@ -15,9 +15,8 @@ endif
 library(
     'wmf_filter',
     sources,
-    dependencies: [libc_dep, libgtk_dep, libm_dep, libxml_dep] + deps,
-    include_directories: [libdia_inc, configuration_inc],
-    link_with: [libdia],
+    dependencies: [libc_dep, libgtk_dep, libm_dep, libxml_dep, libdia_dep] + deps,
+    include_directories: [configuration_inc],
     install: libemf_dep.found(),
     install_dir: dialibdir
 )
diff --git a/plug-ins/xslt/meson.build b/plug-ins/xslt/meson.build
index f0fa51f9..cba1f056 100644
--- a/plug-ins/xslt/meson.build
+++ b/plug-ins/xslt/meson.build
@@ -22,9 +22,8 @@ if libxslt_dep.found()
     library(
         'xslt_filter',
         sources,
-        dependencies: [libc_dep, libgtk_dep, libm_dep, libxml_dep, libxslt_dep],
-        include_directories: [libdia_inc, configuration_inc],
-        link_with: [libdia],
+        dependencies: [libc_dep, libgtk_dep, libm_dep, libxml_dep, libdia_dep, libxslt_dep],
+        include_directories: [configuration_inc],
         install: true,
         install_dir: dialibdir
     )
diff --git a/tests/meson.build b/tests/meson.build
index c4524484..5d889018 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -25,10 +25,9 @@ foreach t : ['boundingbox', 'objects', 'svg', 'sizeof']
         executable(
             'test-' + t,
             ['test-' + t + '.c', config_h],
-            dependencies: [libgtk_dep, libxml_dep, libm_dep],
-            link_with: [libdia],
+            dependencies: [libgtk_dep, libxml_dep, libm_dep, libdia_dep],
             link_args: dia_link_args,
-            include_directories: [configuration_inc, libdia_inc],
+            include_directories: [configuration_inc],
         )
     ]
 endforeach
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]