[Midnightbsd-cvs] mports: security/pinentry: fix for recent glib

[laffer1 at midnightbsd.org]

Log Message:
-----------
fix for recent glib

Modified Files:
--------------
    mports/security/pinentry:
        Makefile (r1.3 -> r1.4)

Added Files:
-----------
    mports/security/pinentry/files:
        patch-glib.2.16 (r1.1)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/security/pinentry/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L security/pinentry/Makefile -L security/pinentry/Makefile -u -r1.3 -r1.4
--- security/pinentry/Makefile
+++ security/pinentry/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pinentry
 PORTVERSION=	0.7.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	pinentry
--- /dev/null
+++ 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