From 84fc393e9f13495e4421a5bdc05f2301887cb158 Mon Sep 17 00:00:00 2001 From: lofi Date: Sat, 5 Apr 2008 17:36:26 +0000 Subject: Fix build. Submitted by: Andrew W. Nosenko --- security/pinentry/files/patch-glib.2.16 | 58 +++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 security/pinentry/files/patch-glib.2.16 (limited to 'security') diff --git a/security/pinentry/files/patch-glib.2.16 b/security/pinentry/files/patch-glib.2.16 new file mode 100644 index 000000000000..ac7b6489b59e --- /dev/null +++ b/security/pinentry/files/patch-glib.2.16 @@ -0,0 +1,58 @@ +--- gtk+-2/gtksecentry.c- 2008-03-26 17:28:13.000000000 +0200 ++++ gtk+-2/gtksecentry.c 2008-03-26 17:32:51.000000000 +0200 +@@ -270,7 +270,7 @@ gboolean g_use_secure_mem = FALSE; + + + gpointer +-g_malloc(gulong size) ++g_malloc(gsize size) + { + gpointer p; + +@@ -282,13 +282,13 @@ g_malloc(gulong size) + else + p = (gpointer) malloc(size); + if (!p) +- g_error("could not allocate %ld bytes", size); ++ g_error("could not allocate %zd bytes", size); + + return p; + } + + gpointer +-g_malloc0(gulong size) ++g_malloc0(gsize size) + { + gpointer p; + +@@ -302,13 +302,13 @@ g_malloc0(gulong size) + } else + p = (gpointer) calloc(size, 1); + if (!p) +- g_error("could not allocate %ld bytes", size); ++ g_error("could not allocate %zd bytes", size); + + return p; + } + + gpointer +-g_realloc(gpointer mem, gulong size) ++g_realloc(gpointer mem, gsize size) + { + gpointer p; + +@@ -3210,11 +3210,11 @@ static gint + get_cursor_time(GtkSecureEntry * entry) + { + GtkSettings *settings = gtk_widget_get_settings(GTK_WIDGET(entry)); +- gint time; ++ gint _time; + +- g_object_get(settings, "gtk-cursor-blink-time", &time, NULL); ++ g_object_get(settings, "gtk-cursor-blink-time", &_time, NULL); + +- return time; ++ return _time; + } + + static void -- cgit