Sat, 21 May 2011 22:05:42 +0200
Correct diverse buildconf of upstream release and reconcile packaging somewhat.
These changes stem from the obvious changes in the latest vendor release, but
from discussions with trolls Daniel and Oswald as well regarding build config.
This commital follows conclusion of buildconf adjustments to allow the new
vendor version to build on Linux AMD64, but is incomplete as many packaging
comments show. The next series of changes focus on Solaris IA32 and reduction
of buildconf adjustments testing old problems comprehensively in anticipation
of discussion at the upcoming Nokia Contributor Summit in Berlin.
1 Index: gtk+-2/gtksecentry.c
2 --- gtk+-2/gtksecentry.c.orig 2004-09-02 03:47:13 +0200
3 +++ gtk+-2/gtksecentry.c 2006-11-15 21:27:51 +0100
4 @@ -39,6 +39,16 @@
5 #include <gdk/gdkkeysyms.h>
6 #include <gtk/gtk.h>
8 +#define g_malloc my_g_malloc
9 +#define g_malloc0 my_g_malloc0
10 +#define g_realloc my_g_realloc
11 +#define g_free my_g_free
12 +
13 +gpointer g_malloc(gulong size);
14 +gpointer g_malloc0(gulong size);
15 +gpointer g_realloc(gpointer mem, gulong size);
16 +void g_free(gpointer mem);
17 +
18 #include "gtksecentry.h"
19 #include "memory.h"