From 1c7666a87fb2d626145ebc34ba7110afa1089b58 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 5 Dec 2022 15:42:23 +0100 Subject: -fix build issues for dependencies on gnunet-gtk --- INSTALL | 6 +++--- configure.ac | 2 +- m4/ltsugar.m4 | 2 +- src/fs/gnunet-fs-gtk_publish-dialog.c | 32 ++++++++++++++++---------------- src/include/gnunet_gtk.h | 10 +--------- src/lib/os_installation.c | 1 + 6 files changed, 23 insertions(+), 30 deletions(-) diff --git a/INSTALL b/INSTALL index e82fd21d..8865734f 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ Installation Instructions ************************* - Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free -Software Foundation, Inc. + Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software +Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -225,7 +225,7 @@ order to use an ANSI C compiler: and if that doesn't work, install pre-built binaries of GCC for HP-UX. - HP-UX 'make' updates targets which have the same timestamps as their + HP-UX 'make' updates targets which have the same time stamps as their prerequisites, which makes it generally unusable when shipped generated files such as 'configure' are involved. Use GNU 'make' instead. diff --git a/configure.ac b/configure.ac index 83203a8a..9a05a0fe 100644 --- a/configure.ac +++ b/configure.ac @@ -360,7 +360,7 @@ AC_ARG_ENABLE([logging], [test "x$enableval" = "xverbose"], [extra_logging=GNUNET_YES] [test "x$enableval" = "xveryverbose"], [extra_logging=\(GNUNET_YES+1\)]) ], []) -AC_DEFINE_UNQUOTED([GNUNET_EXTRA_LOGGING],[$extra_logging],[1 if extra logging is enabled, 2 for very verbose extra logging, 0 otherwise]) +AC_DEFINE_UNQUOTED([GNUNET_GTK_EXTRA_LOGGING],[$extra_logging],[1 if extra logging is enabled, 2 for very verbose extra logging, 0 otherwise]) diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4 index 902508bd..48bc9344 100644 --- a/m4/ltsugar.m4 +++ b/m4/ltsugar.m4 @@ -1,6 +1,6 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software # Foundation, Inc. # Written by Gary V. Vaughan, 2004 # diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c index e42cbb7d..1a8e31fb 100644 --- a/src/fs/gnunet-fs-gtk_publish-dialog.c +++ b/src/fs/gnunet-fs-gtk_publish-dialog.c @@ -35,7 +35,7 @@ * Be very verbose when reporting progress (usually bad as it takes more time * to display this than to make progress). */ -#define VERBOSE_PROGRESS GNUNET_EXTRA_LOGGING +#define VERBOSE_PROGRESS GNUNET_GTK_EXTRA_LOGGING /** * Columns in the publish model. @@ -591,12 +591,12 @@ create_dir_at_iter (struct MainPublishingDialogContext *ctx, meta = GNUNET_FS_meta_data_create (); GNUNET_FS_meta_data_make_directory (meta); GNUNET_FS_meta_data_insert (meta, - "", - EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME, - EXTRACTOR_METAFORMAT_UTF8, - "text/plain", - name, - strlen (name) + 1); + "", + EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME, + EXTRACTOR_METAFORMAT_UTF8, + "text/plain", + name, + strlen (name) + 1); gtk_tree_store_insert_before (GTK_TREE_STORE (ctx->file_info_treemodel), pos, iter, @@ -1454,9 +1454,9 @@ add_item (struct AddDirClientContext *adcc, /* update meta data mime type (force to be GNUnet-directory) */ if (NULL != item->meta) GNUNET_FS_meta_data_delete (item->meta, - EXTRACTOR_METATYPE_MIMETYPE, - NULL, - 0); + EXTRACTOR_METATYPE_MIMETYPE, + NULL, + 0); else item->meta = GNUNET_FS_meta_data_create (); GNUNET_FS_meta_data_make_directory (item->meta); @@ -2259,12 +2259,12 @@ insert_advertisement (void *cls, return GNUNET_SYSERR; GNUNET_FS_meta_data_insert (meta, - "", - EXTRACTOR_METATYPE_URI, - EXTRACTOR_METAFORMAT_UTF8, - "text/plain", - sks_uri_string, - strlen (sks_uri_string) + 1); + "", + EXTRACTOR_METATYPE_URI, + EXTRACTOR_METAFORMAT_UTF8, + "text/plain", + sks_uri_string, + strlen (sks_uri_string) + 1); GNUNET_free (sks_uri_string); return GNUNET_SYSERR; } diff --git a/src/include/gnunet_gtk.h b/src/include/gnunet_gtk.h index 3c3a1f33..e615114f 100644 --- a/src/include/gnunet_gtk.h +++ b/src/include/gnunet_gtk.h @@ -26,19 +26,12 @@ #ifndef GNUNET_GTK_H #define GNUNET_GTK_H -#ifndef HAVE_USED_CONFIG_H -#define HAVE_USED_CONFIG_H -#if HAVE_CONFIG_H -#include "gnunet_gtk_config.h" -#endif -#endif - #include #include #include #include #include -#include "gettext.h" + #ifndef GDK_KEY_Return #define GDK_KEY_Return GDK_Return #endif @@ -445,6 +438,5 @@ GNUNET_GTK_get_selected_anonymity_combo_level (GtkComboBox *combo, guint *p_level); - #endif /* end of gnunet_gtk.h */ diff --git a/src/lib/os_installation.c b/src/lib/os_installation.c index 7fc8d627..3c358d03 100644 --- a/src/lib/os_installation.c +++ b/src/lib/os_installation.c @@ -24,6 +24,7 @@ * @author Christian Grothoff */ #include "gnunet_gtk.h" +#include "gnunet_gtk_config.h" /** * Default project data used for installation path detection -- cgit v1.2.3