Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/crypto
In directory vz-cvs-3.sog:/tmp/cvs-serv17905/10.7/stable/main/finkinfo/crypto
Modified Files:
libinfinity-0.5.0.info
Added Files:
libinfinity-0.5.0.patch
Log Message:
Clang fix via Jack Howarth.
--- NEW FILE: libinfinity-0.5.0.patch ---
diff --git a/libinfinity/communication/inf-communication-method.c
b/libinfinity/communication/inf-communication-method.c
index 8526ab8..37e2db7 100644
--- a/libinfinity/communication/inf-communication-method.c
+++ b/libinfinity/communication/inf-communication-method.c
@@ -299,13 +299,13 @@ inf_communication_method_received(InfCommunicationMethod*
method,
{
InfCommunicationMethodIface* iface;
- g_return_if_fail(INF_COMMUNICATION_IS_METHOD(method));
- g_return_if_fail(INF_IS_XML_CONNECTION(connection));
- g_return_if_fail(inf_communication_method_is_member(method, connection));
- g_return_if_fail(xml != NULL);
+ g_return_val_if_fail(INF_COMMUNICATION_IS_METHOD(method), 0);
+ g_return_val_if_fail(INF_IS_XML_CONNECTION(connection), 0);
+ g_return_val_if_fail(inf_communication_method_is_member(method, connection),
0);
+ g_return_val_if_fail(xml != NULL, 0);
iface = INF_COMMUNICATION_METHOD_GET_IFACE(method);
- g_return_if_fail(iface->received != NULL);
+ g_return_val_if_fail(iface->received != NULL, 0);
return iface->received(method, connection, xml);
}
Index: libinfinity-0.5.0.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/crypto/libinfinity-0.5.0.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libinfinity-0.5.0.info 9 Aug 2012 18:32:03 -0000 1.3
+++ libinfinity-0.5.0.info 12 Aug 2012 21:45:53 -0000 1.4
@@ -2,7 +2,7 @@
Package: libinfinity-0.5.0
Type: base (libinfinity)
Version: 0.5.2
-Revision: 1
+Revision: 2
Depends: %N-shlibs (= %v-%r)
BuildDepends: <<
pkgconfig (>= 0.9.0-1),
@@ -39,6 +39,8 @@
Source: http://releases.0x539.de/%type_pkg[base]/%type_pkg[base]-%v.tar.gz
Source-MD5: 1b2eee8150654baa7bba5900b96ffdc3
+PatchFile: %n.patch
+PatchFile-MD5: 6d4a3eaca374127d04dabab8d2a15dac
PatchScript: <<
#!/bin/sh -ev
@@ -46,11 +48,10 @@
if [ $osversion -ge 10 ] ; then
perl -pi -e 's,pam(/pam_appl\.h),security\1,'
infinoted/infinoted-pam.c
fi
+ patch -p1 < %{PatchFile}
<<
SetCFLAGS: -Os
-SetCXX: llvm-g++-4.2
-SetCC: llvm-gcc-4.2
ConfigureParams: --mandir=%p/share/man --enable-gtk-doc
CompileScript: <<
%{default_script}
@@ -122,7 +123,15 @@
DescPort: <<
For 10.6 and later, pam_appl.h is in /usr/include/security rather than
/usr/include/pam,
so patch that conditionally.
-For 10.7 and later, use llvm-gcc|g++ due to the following error:
+For 10.7 and later, apply
+
+2012-06-09 Philipp Kern <p...@0x539.de>
+
+ * libinfinity/communication/inf-communication-method.c
+ (inf_communication_method_received): Do not return without a value
+ from a non-void function.
+
+to avoid the following error:
inf-communication-method.c:302:3: error: non-void function
'inf_communication_method_received' should return a value [-Wreturn-type]
g_return_if_fail(INF_COMMUNICATION_IS_METHOD(method));
@@ -131,4 +140,4 @@
return; \
<<
-<<
\ No newline at end of file
+<<
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
