aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2022-12-05 15:42:23 +0100
committerChristian Grothoff <christian@grothoff.org>2022-12-05 15:42:23 +0100
commit1c7666a87fb2d626145ebc34ba7110afa1089b58 (patch)
treee21ea1b952985d744254034971cdde2bb6d3e7fe
parentd6dfab841de7368dbf6cc124f7504e458f2807f5 (diff)
downloadgnunet-gtk-1c7666a87fb2d626145ebc34ba7110afa1089b58.tar.gz
gnunet-gtk-1c7666a87fb2d626145ebc34ba7110afa1089b58.zip
-fix build issues for dependencies on gnunet-gtk
-rw-r--r--INSTALL6
-rw-r--r--configure.ac2
-rw-r--r--m4/ltsugar.m42
-rw-r--r--src/fs/gnunet-fs-gtk_publish-dialog.c32
-rw-r--r--src/include/gnunet_gtk.h10
-rw-r--r--src/lib/os_installation.c1
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 @@
1Installation Instructions 1Installation Instructions
2************************* 2*************************
3 3
4 Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free 4 Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
5Software Foundation, Inc. 5Foundation, Inc.
6 6
7 Copying and distribution of this file, with or without modification, 7 Copying and distribution of this file, with or without modification,
8are permitted in any medium without royalty provided the copyright 8are permitted in any medium without royalty provided the copyright
@@ -225,7 +225,7 @@ order to use an ANSI C compiler:
225 225
226and if that doesn't work, install pre-built binaries of GCC for HP-UX. 226and if that doesn't work, install pre-built binaries of GCC for HP-UX.
227 227
228 HP-UX 'make' updates targets which have the same timestamps as their 228 HP-UX 'make' updates targets which have the same time stamps as their
229prerequisites, which makes it generally unusable when shipped generated 229prerequisites, which makes it generally unusable when shipped generated
230files such as 'configure' are involved. Use GNU 'make' instead. 230files such as 'configure' are involved. Use GNU 'make' instead.
231 231
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],
360 [test "x$enableval" = "xverbose"], [extra_logging=GNUNET_YES] 360 [test "x$enableval" = "xverbose"], [extra_logging=GNUNET_YES]
361 [test "x$enableval" = "xveryverbose"], [extra_logging=\(GNUNET_YES+1\)]) 361 [test "x$enableval" = "xveryverbose"], [extra_logging=\(GNUNET_YES+1\)])
362 ], []) 362 ], [])
363AC_DEFINE_UNQUOTED([GNUNET_EXTRA_LOGGING],[$extra_logging],[1 if extra logging is enabled, 2 for very verbose extra logging, 0 otherwise]) 363AC_DEFINE_UNQUOTED([GNUNET_GTK_EXTRA_LOGGING],[$extra_logging],[1 if extra logging is enabled, 2 for very verbose extra logging, 0 otherwise])
364 364
365 365
366 366
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 @@
1# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- 1# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
2# 2#
3# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software 3# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
4# Foundation, Inc. 4# Foundation, Inc.
5# Written by Gary V. Vaughan, 2004 5# Written by Gary V. Vaughan, 2004
6# 6#
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 @@
35 * Be very verbose when reporting progress (usually bad as it takes more time 35 * Be very verbose when reporting progress (usually bad as it takes more time
36 * to display this than to make progress). 36 * to display this than to make progress).
37 */ 37 */
38#define VERBOSE_PROGRESS GNUNET_EXTRA_LOGGING 38#define VERBOSE_PROGRESS GNUNET_GTK_EXTRA_LOGGING
39 39
40/** 40/**
41 * Columns in the publish model. 41 * Columns in the publish model.
@@ -591,12 +591,12 @@ create_dir_at_iter (struct MainPublishingDialogContext *ctx,
591 meta = GNUNET_FS_meta_data_create (); 591 meta = GNUNET_FS_meta_data_create ();
592 GNUNET_FS_meta_data_make_directory (meta); 592 GNUNET_FS_meta_data_make_directory (meta);
593 GNUNET_FS_meta_data_insert (meta, 593 GNUNET_FS_meta_data_insert (meta,
594 "<gnunet-gtk>", 594 "<gnunet-gtk>",
595 EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME, 595 EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
596 EXTRACTOR_METAFORMAT_UTF8, 596 EXTRACTOR_METAFORMAT_UTF8,
597 "text/plain", 597 "text/plain",
598 name, 598 name,
599 strlen (name) + 1); 599 strlen (name) + 1);
600 gtk_tree_store_insert_before (GTK_TREE_STORE (ctx->file_info_treemodel), 600 gtk_tree_store_insert_before (GTK_TREE_STORE (ctx->file_info_treemodel),
601 pos, 601 pos,
602 iter, 602 iter,
@@ -1454,9 +1454,9 @@ add_item (struct AddDirClientContext *adcc,
1454 /* update meta data mime type (force to be GNUnet-directory) */ 1454 /* update meta data mime type (force to be GNUnet-directory) */
1455 if (NULL != item->meta) 1455 if (NULL != item->meta)
1456 GNUNET_FS_meta_data_delete (item->meta, 1456 GNUNET_FS_meta_data_delete (item->meta,
1457 EXTRACTOR_METATYPE_MIMETYPE, 1457 EXTRACTOR_METATYPE_MIMETYPE,
1458 NULL, 1458 NULL,
1459 0); 1459 0);
1460 else 1460 else
1461 item->meta = GNUNET_FS_meta_data_create (); 1461 item->meta = GNUNET_FS_meta_data_create ();
1462 GNUNET_FS_meta_data_make_directory (item->meta); 1462 GNUNET_FS_meta_data_make_directory (item->meta);
@@ -2259,12 +2259,12 @@ insert_advertisement (void *cls,
2259 return GNUNET_SYSERR; 2259 return GNUNET_SYSERR;
2260 2260
2261 GNUNET_FS_meta_data_insert (meta, 2261 GNUNET_FS_meta_data_insert (meta,
2262 "<gnunet>", 2262 "<gnunet>",
2263 EXTRACTOR_METATYPE_URI, 2263 EXTRACTOR_METATYPE_URI,
2264 EXTRACTOR_METAFORMAT_UTF8, 2264 EXTRACTOR_METAFORMAT_UTF8,
2265 "text/plain", 2265 "text/plain",
2266 sks_uri_string, 2266 sks_uri_string,
2267 strlen (sks_uri_string) + 1); 2267 strlen (sks_uri_string) + 1);
2268 GNUNET_free (sks_uri_string); 2268 GNUNET_free (sks_uri_string);
2269 return GNUNET_SYSERR; 2269 return GNUNET_SYSERR;
2270} 2270}
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 @@
26#ifndef GNUNET_GTK_H 26#ifndef GNUNET_GTK_H
27#define GNUNET_GTK_H 27#define GNUNET_GTK_H
28 28
29#ifndef HAVE_USED_CONFIG_H
30#define HAVE_USED_CONFIG_H
31#if HAVE_CONFIG_H
32#include "gnunet_gtk_config.h"
33#endif
34#endif
35
36#include <gnunet/gnunet_util_lib.h> 29#include <gnunet/gnunet_util_lib.h>
37#include <gnunet/gnunet_fs_service.h> 30#include <gnunet/gnunet_fs_service.h>
38#include <gtk/gtk.h> 31#include <gtk/gtk.h>
39#include <gladeui/glade.h> 32#include <gladeui/glade.h>
40#include <gdk/gdkkeysyms.h> 33#include <gdk/gdkkeysyms.h>
41#include "gettext.h" 34
42#ifndef GDK_KEY_Return 35#ifndef GDK_KEY_Return
43#define GDK_KEY_Return GDK_Return 36#define GDK_KEY_Return GDK_Return
44#endif 37#endif
@@ -445,6 +438,5 @@ GNUNET_GTK_get_selected_anonymity_combo_level (GtkComboBox *combo,
445 guint *p_level); 438 guint *p_level);
446 439
447 440
448
449#endif 441#endif
450/* end of gnunet_gtk.h */ 442/* 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 @@
24 * @author Christian Grothoff 24 * @author Christian Grothoff
25 */ 25 */
26#include "gnunet_gtk.h" 26#include "gnunet_gtk.h"
27#include "gnunet_gtk_config.h"
27 28
28/** 29/**
29 * Default project data used for installation path detection 30 * Default project data used for installation path detection