Package: tea
Version: 7.0-1
Severity: normal
Tags: patch
When building 'tea' on amd64/unstable with gcc-4.0,
I get the following error:
if x86_64-linux-gcc -DHAVE_CONFIG_H -I. -I. -I..
-DPACKAGE_DATA_DIR=\""/usr/share"\"
-DPACKAGE_LOCALE_DIR=\""/usr/share/locale"\" -DXTHREADS -I/usr/include/gtk-2.0
-I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0
-I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0
-I/usr/lib/glib-2.0/include -Wall -g -O2 -w -s -pipe -MT callbacks.o -MD
-MP -MF ".deps/callbacks.Tpo" \
-c -o callbacks.o `test -f 'callbacks.c' || echo './'`callbacks.c; \
then mv -f ".deps/callbacks.Tpo" ".deps/callbacks.Po"; \
else rm -f ".deps/callbacks.Tpo"; exit 1; \
fi
callbacks.c:2227: error: static declaration of 'lookup_widget2' follows
non-static declaration
callbacks.h:133: error: previous declaration of 'lookup_widget2' was here
make[3]: *** [callbacks.o] Error 1
make[3]: Leaving directory `/tea-7.0/src'
With the attached patch 'tea' can be compiled
on amd64 using gcc-4.0.
Regards
Andreas Jochens
diff -urN ../tmp-orig/tea-7.0/src/callbacks.c ./src/callbacks.c
--- ../tmp-orig/tea-7.0/src/callbacks.c 2005-01-24 22:58:27.000000000 +0100
+++ ./src/callbacks.c 2005-04-06 16:51:17.257116704 +0200
@@ -46,6 +46,7 @@
#include "undo.h"
#include "tea_gtk_utils.h"
+static GtkWidget* lookup_widget2 (GtkContainer *widget, const gchar
*widget_name);
//n.p. Depeche Mode - Enjoy The Silence
void set_fam_text (gchar *def)
diff -urN ../tmp-orig/tea-7.0/src/callbacks.h ./src/callbacks.h
--- ../tmp-orig/tea-7.0/src/callbacks.h 2005-01-21 11:52:12.000000000 +0100
+++ ./src/callbacks.h 2005-04-06 16:51:02.762834307 +0200
@@ -130,7 +130,6 @@
void on_mni_func_strings_sort_by_q (GtkMenuItem* menuitem, gpointer user_data);
void on_mni_tabs_menuitem_click (GtkMenuItem *menuitem, gpointer user_data);
void on_mni_show_images_in_text (GtkMenuItem *menuitem, gpointer user_data);
-GtkWidget* lookup_widget2 (GtkContainer *widget, const gchar *widget_name);
void on_mni_nav_goto_recent_tab (GtkMenuItem* menuitem, gpointer user_data);
void on_mni_nav_goto_next_tab (GtkMenuItem* menuitem, gpointer user_data);
void on_mni_view_hide_highlighting (GtkMenuItem* menuitem, gpointer user_data);
diff -urN ../tmp-orig/tea-7.0/src/rox_strings.c ./src/rox_strings.c
--- ../tmp-orig/tea-7.0/src/rox_strings.c 2005-01-20 21:59:45.000000000
+0100
+++ ./src/rox_strings.c 2005-04-06 16:51:39.017036830 +0200
@@ -379,7 +379,7 @@
t = g_strconcat ((gchar*) p->data, b, NULL);
g_free (p->data);
- (gchar*) p->data = t;
+ p->data = t;
p = g_list_next (p);
}
diff -urN ../tmp-orig/tea-7.0/src/tea_config.c ./src/tea_config.c
--- ../tmp-orig/tea-7.0/src/tea_config.c 2005-01-20 20:01:10.000000000
+0100
+++ ./src/tea_config.c 2005-04-06 16:52:12.725716626 +0200
@@ -41,6 +41,8 @@
static GHashTable *ht_tea_hotkeys = NULL;
static GHashTable *tea_options = NULL;
+static GtkWidget* lookup_widget (GtkContainer *widget, gchar *widget_name);
+
void ui_init (void)
{
gl_enc_choosed = NULL;
@@ -1089,4 +1091,4 @@
//glist_print (gl_enc_choosed);
}
*/
-
\ No newline at end of file
+
diff -urN ../tmp-orig/tea-7.0/src/tea_config.h ./src/tea_config.h
--- ../tmp-orig/tea-7.0/src/tea_config.h 2005-01-18 23:27:33.000000000
+0100
+++ ./src/tea_config.h 2005-04-06 16:52:01.488823486 +0200
@@ -252,7 +252,6 @@
void update_enc_menu (void);
void reload_snippets (void);
-GtkWidget* lookup_widget (GtkContainer *widget, gchar *widget_name);
void hash_remove_cb (gpointer data);
gchar* get_tmp_file_string (void);
@@ -260,4 +259,4 @@
void reload_sessions (void);
void reload_autoreplace (void);
void reload_autosave (void);
-//void reload_choosed_charsets (void);
\ No newline at end of file
+//void reload_choosed_charsets (void);
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
