From f4ccf68c1c1f13cd512f3411874c34322c56f576 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Mar 25 2008 14:31:14 +0000
Subject: - pinentry failed massrebuild attempt for GCC 4.3 (#434400)


---

diff --git a/pinentry-0.7.4-glib2.patch b/pinentry-0.7.4-glib2.patch
new file mode 100644
index 0000000..2788d73
--- /dev/null
+++ b/pinentry-0.7.4-glib2.patch
@@ -0,0 +1,44 @@
+diff -up pinentry-0.7.4/gtk+-2/gtksecentry.c.glib2 pinentry-0.7.4/gtk+-2/gtksecentry.c
+--- pinentry-0.7.4/gtk+-2/gtksecentry.c.glib2	2007-11-28 16:57:55.000000000 -0600
++++ pinentry-0.7.4/gtk+-2/gtksecentry.c	2008-03-25 09:27:37.000000000 -0500
+@@ -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 %ui 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 %ui bytes", size);
+ 
+     return p;
+ }
+ 
+ gpointer
+-g_realloc(gpointer mem, gulong size)
++g_realloc(gpointer mem, gsize size)
+ {
+     gpointer p;
+ 
diff --git a/pinentry.spec b/pinentry.spec
index fe9313c..8807121 100644
--- a/pinentry.spec
+++ b/pinentry.spec
@@ -1,7 +1,7 @@
 
 Name:    pinentry
 Version: 0.7.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Collection of simple PIN or passphrase entry dialogs
 
 Group:   Applications/System
@@ -11,6 +11,8 @@ Source0: http://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz
 Source1: http://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz.sig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: pinentry-0.7.4-glib2.patch
+
 BuildRequires: gtk2-devel
 BuildRequires: libcap-devel
 BuildRequires: ncurses-devel
@@ -63,6 +65,8 @@ This package contains the Qt GUI based version of the PIN entry dialog.
 %prep
 %setup -q
 
+%patch1 -p1 -b .glib2
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -149,6 +153,9 @@ fi
 
 
 %changelog
+* Tue Mar 25 2008 Rex Dieter <rdieter@fedoraproject.org> - 0.7.4-5
+- pinentry failed massrebuild attempt for GCC 4.3 (#434400)
+
 * Tue Mar 25 2008 Rex Dieter <rdieter@fedoraproject.org> - 0.7.4-4
 - s/qt-devel/qt3-devel/ (f9+)