rpms/pinentry/devel pinentry-0.7.4-glib2.patch, NONE, 1.1 pinentry.spec, 1.20, 1.21

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Tue Mar 25 14:31:59 UTC 2008


Author: rdieter

Update of /cvs/pkgs/rpms/pinentry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3705

Modified Files:
	pinentry.spec 
Added Files:
	pinentry-0.7.4-glib2.patch 
Log Message:
* Tue Mar 25 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.7.4-5
- pinentry failed massrebuild attempt for GCC 4.3 (#434400)


pinentry-0.7.4-glib2.patch:

--- NEW FILE pinentry-0.7.4-glib2.patch ---
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;
 


Index: pinentry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinentry/devel/pinentry.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pinentry.spec	25 Mar 2008 13:33:37 -0000	1.20
+++ pinentry.spec	25 Mar 2008 14:31:14 -0000	1.21
@@ -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 @@
 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 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .glib2
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -149,6 +153,9 @@
 
 
 %changelog
+* Tue Mar 25 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.7.4-5
+- pinentry failed massrebuild attempt for GCC 4.3 (#434400)
+
 * Tue Mar 25 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.7.4-4
 - s/qt-devel/qt3-devel/ (f9+)
 




More information about the fedora-extras-commits mailing list