Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10668
Modified Files:
linc1.info linc1.patch
Log Message:
bring changes from the unstable package forward to the stable package,
to enable compiling with gcc4
Index: linc1.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome/linc1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- linc1.patch 20 Jan 2006 20:12:53 -0000 1.1
+++ linc1.patch 19 Feb 2006 17:28:35 -0000 1.2
@@ -1,46 +1,32 @@
-diff -Naur linc-1.0.3-old/Makefile.in linc-1.0.3/Makefile.in
---- linc-1.0.3-old/Makefile.in Fri Jun 20 08:27:27 2003
-+++ linc-1.0.3/Makefile.in Tue Oct 14 10:22:38 2003
-@@ -98,7 +98,7 @@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
-
--SUBDIRS = include src test docs
-+SUBDIRS = include src docs
-
- m4datadir = $(datadir)/aclocal
- m4data_DATA = linc.m4
-diff -Naur linc-1.0.3-old/config.h.in linc-1.0.3/config.h.in
---- linc-1.0.3-old/config.h.in Fri Jun 20 08:24:38 2003
-+++ linc-1.0.3/config.h.in Tue Oct 14 10:20:14 2003
-@@ -10,7 +10,9 @@
- * Copyright 2001, Red Hat, Inc., Ximian, Inc.,
- * Sun Microsystems, Inc.
- */
-+#if !defined (__APPLE__)
- #undef socklen_t
-+#endif
- #undef HAVE_SOCKADDR_SA_LEN
- #undef HAVE_INET_PTON
- #undef HAVE_GETADDRINFO
diff -Naur linc-1.0.3-old/include/linc/linc-protocol.h
linc-1.0.3/include/linc/linc-protocol.h
--- linc-1.0.3-old/include/linc/linc-protocol.h Fri Jun 20 07:31:21 2003
+++ linc-1.0.3/include/linc/linc-protocol.h Tue Oct 14 10:20:14 2003
-@@ -14,6 +14,10 @@
+@@ -14,11 +14,11 @@
#include <glib/gmacros.h>
-+#if defined(__APPLE__) && !defined(socklen_t)
-+# define socklen_t int
-+#endif
-+
++#include <sys/socket.h>
G_BEGIN_DECLS
#include <linc/linc-types.h>
+ #include <sys/types.h>
+-#include <sys/socket.h>
+ #include <netdb.h>
+
+ /* socklen_t seems rather un-portable */
+diff -Nurd -x'*~' linc-1.0.3.orig/linc.m4 linc-1.0.3/linc.m4
+--- linc-1.0.3.orig/linc.m4 2001-03-14 00:12:41.000000000 -0500
++++ linc-1.0.3/linc.m4 2005-11-11 01:12:04.000000000 -0500
+@@ -1,4 +1,4 @@
+-AC_DEFUN(AM_PATH_LINC,
++AC_DEFUN([AM_PATH_LINC],
+ [dnl
+ dnl Get the cflags and libs from the linc-config script
+ dnl
diff -Naur linc-1.0.3-old/src/linc-protocols.c linc-1.0.3/src/linc-protocols.c
--- linc-1.0.3-old/src/linc-protocols.c Fri Jun 20 07:31:13 2003
+++ linc-1.0.3/src/linc-protocols.c Tue Oct 14 10:20:14 2003
-@@ -11,12 +11,17 @@
+@@ -11,6 +11,7 @@
*/
#include <config.h>
#include "linc-compat.h"
@@ -48,13 +34,12 @@
#include <dirent.h>
#include <linc/linc-protocol.h>
#include <linc/linc-connection.h>
+@@ -609,7 +610,7 @@
+ /* FIXME: is IN6ADDR_ANY_INIT exported on Mac OS X ? */
+ /* on Mac OS X 10.1 inaddr6_any isn't exported by libc */
+ #ifndef in6addr_any
+- static const struct in6_addr in6addr_any = { { { 0 } } };
++ const struct in6_addr in6addr_any = { { { 0 } } };
+ #endif
- #include "linc-private.h"
- #include "linc-debug.h"
-+
-+#if defined(__APPLE__) && !defined(RES_USE_INET6)
-+# undef AF_INET6
-+#endif
-
- #undef LOCAL_DEBUG
-
+ static gboolean
Index: linc1.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome/linc1.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- linc1.info 23 Jan 2006 06:16:39 -0000 1.3
+++ linc1.info 19 Feb 2006 17:28:35 -0000 1.4
@@ -1,23 +1,28 @@
Package: linc1
+
+# may use poll(), so need different %r 10.3 vs 10.4
Version: 1.0.3
-Revision: 1005
-Architecture: powerpc
-Depends: %N-shlibs (= %v-%r), gettext, glib2 (>= 2.6.6-1111), libiconv,
pkgconfig
-BuildDepends: glib2-dev (>= 2.6.6-1111), pkgconfig, gtk-doc (>= 1.1-1),
gettext-dev, gettext-bin, gettext-tools, libiconv-dev, openjade (>=
1.3.2-1028), gcc3.3
+Revision: 1022
+
+Depends: %N-shlibs (= %v-%r), gettext, glib2 (>= 2.6.6-1111), libiconv
+BuildDepends: glib2-dev (>= 2.6.6-1111), pkgconfig, gtk-doc (>= 1.1-1),
gettext-dev, gettext-bin, gettext-tools, libiconv-dev, openjade (>= 1.3.2-1028)
DescPackaging: <<
Uses pkgconfig.
Any package which BuildDepends on this one must also BuildDepend on:
- glib2-dev (>= 2.6.6-1111)
+ glib2-dev (>= 2.6.6-1111)
<<
-Source: mirror:gnome:sources/linc/1.1/linc-%v.tar.bz2
+Source: mirror:gnome:sources/linc/1.0/linc-%v.tar.bz2
Source-MD5: 29f01b7e3e6045395e369d988573d517
Patch: %n.patch
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
-ConfigureParams: --without-ssl --disable-gtk-doc
+SetLDFLAGS: -lresolv
+ConfigureParams: --without-ssl --disable-gtk-doc --disable-dependency-tracking
CompileScript: <<
- export CC=gcc-3.3; export CXX=g++-3.3; ./configure %c
- make CC=gcc-3.3 CXX=g++-3.3
+ ./configure %c
+#perl -pi -e 's/-flat_namespace//; s/-undefined suppress/-undefined
dynamic_lookup/' libtool
+ perl -pi -e 's/-flat_namespace//; s/-undefined suppress//' libtool
+ make
<<
InstallScript: make install DESTDIR=%d
BuildDependsOnly: True
@@ -37,9 +42,10 @@
transmission/receipt.
<<
DescPort: <<
-- socklen_t was defined as int.
-- Disabled IPv6 support.
+- Make sure to get system's own socklen_t
+- Some .sgml have errors that break gtk-doc generation
- Disabled SSL support.
+- Fix .m4 quoting.
<<
License: LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
