Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv20783/10.3/unstable/main/finkinfo/gnome
Modified Files: orbit2.info orbit2.patch Log Message: Privatize a private function instead of relying on glib2 inline declarations Index: orbit2.patch =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/orbit2.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- orbit2.patch 13 Feb 2007 18:10:30 -0000 1.6 +++ orbit2.patch 13 Nov 2007 01:18:39 -0000 1.7 @@ -1,14 +1,76 @@ -diff -Nurd ORBit2-2.14.4.orig/ltmain.sh ORBit2-2.14.4/ltmain.sh ---- ORBit2-2.14.4.orig/ltmain.sh 2006-07-13 03:12:13.000000000 -0400 -+++ ORBit2-2.14.4/ltmain.sh 2007-01-22 04:14:48.000000000 -0500 -@@ -5739,10 +5739,6 @@ +diff -Nurd -x'*~' ORBit2-2.14.7.orig/include/orbit/GIOP/Makefile.in ORBit2-2.14.7/include/orbit/GIOP/Makefile.in +--- ORBit2-2.14.7.orig/include/orbit/GIOP/Makefile.in 2007-02-26 13:16:03.000000000 -0500 ++++ ORBit2-2.14.7/include/orbit/GIOP/Makefile.in 2007-11-12 19:42:20.000000000 -0500 +@@ -192,9 +192,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + giop_headers = \ +- giop-endian.h \ + giop-connection.h \ +- giop-endian.h \ + giop-recv-buffer.h \ + giop-send-buffer.h \ + giop-server.h \ +diff -Nurd -x'*~' ORBit2-2.14.7.orig/include/orbit/GIOP/giop.h ORBit2-2.14.7/include/orbit/GIOP/giop.h +--- ORBit2-2.14.7.orig/include/orbit/GIOP/giop.h 2007-01-22 08:16:28.000000000 -0500 ++++ ORBit2-2.14.7/include/orbit/GIOP/giop.h 2007-11-12 19:41:51.000000000 -0500 +@@ -9,7 +9,6 @@ + #include <orbit/GIOP/giop-recv-buffer.h> + #include <orbit/GIOP/giop-connection.h> + #include <orbit/GIOP/giop-server.h> +-#include <orbit/GIOP/giop-endian.h> - # Directory that this library needs to be installed in: - libdir='$install_libdir'" -- if test "$installed" = no && test "$need_relink" = yes; then -- $echo >> $output "\ --relink_command=\"$relink_command\"" -- fi - done - fi + G_BEGIN_DECLS + +diff -Nurd -x'*~' ORBit2-2.14.7.orig/src/orb/GIOP/Makefile.in ORBit2-2.14.7/src/orb/GIOP/Makefile.in +--- ORBit2-2.14.7.orig/src/orb/GIOP/Makefile.in 2007-02-26 13:16:06.000000000 -0500 ++++ ORBit2-2.14.7/src/orb/GIOP/Makefile.in 2007-11-12 19:40:28.000000000 -0500 +@@ -44,7 +44,7 @@ + LTLIBRARIES = $(noinst_LTLIBRARIES) + libGIOP_la_LIBADD = + am_libGIOP_la_OBJECTS = giop-connection.lo giop-server.lo giop.lo \ +- giop-send-buffer.lo giop-recv-buffer.lo giop-endian.lo ++ giop-send-buffer.lo giop-recv-buffer.lo + libGIOP_la_OBJECTS = $(am_libGIOP_la_OBJECTS) + DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp +@@ -228,8 +228,7 @@ + giop-debug.h \ + giop-private.h \ + giop-send-buffer.c \ +- giop-recv-buffer.c \ +- giop-endian.c ++ giop-recv-buffer.c + all: all-am + +@@ -283,7 +282,6 @@ + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ [EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ + @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ + @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ + @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ +diff -Nurd -x'*~' ORBit2-2.14.7.orig/src/orb/orb-core/corba-any.c ORBit2-2.14.7/src/orb/orb-core/corba-any.c +--- ORBit2-2.14.7.orig/src/orb/orb-core/corba-any.c 2007-01-01 18:01:32.000000000 -0500 ++++ ORBit2-2.14.7/src/orb/orb-core/corba-any.c 2007-11-12 19:39:40.000000000 -0500 +@@ -6,6 +6,18 @@ + #define SKIP_ALIAS(tc) \ + while ((tc)->kind == CORBA_tk_alias) { (tc) = (tc)->subtypes [0]; } + ++static void ++giop_byteswap (guchar *outdata, ++ const guchar *data, ++ gulong datalen) ++{ ++ const guchar *source_ptr = data; ++ guchar *dest_ptr = (guchar *) outdata + datalen - 1; ++ ++ while (dest_ptr >= outdata) ++ *dest_ptr-- = *source_ptr++; ++} ++ + size_t + ORBit_gather_alloc_info (CORBA_TypeCode tc) + { Index: orbit2.info =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/orbit2.info,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- orbit2.info 28 Feb 2007 05:56:39 -0000 1.23 +++ orbit2.info 13 Nov 2007 01:18:39 -0000 1.24 @@ -1,6 +1,6 @@ Package: orbit2 Version: 2.14.7 -Revision: 1 +Revision: 2 Depends: << %N-shlibs (= %v-%r), glib2-shlibs (>= 2.12.0-1), @@ -9,6 +9,7 @@ libidl2-shlibs (>= 0.8.5-1) << BuildDepends: << + fink (>= 0.24.12-1), glib2-dev (>= 2.12.0-1), gtk-doc (>= 1.2-1), intltool, @@ -26,16 +27,21 @@ %N-dev needs modern pkgconfig because .pc uses *.private popt removed as of 2.14.2 + gtk-doc moved %N -> %N-dev as of 2.14.7-2 << DescPort: << resolv.h problem during ./configure is harmless (for now). See: http://bugzilla.gnome.org/show_bug.cgi?id=309866 + + Make giop_byteswap() less exposed (needed for newer glib2 gcc + inline). See: http://bugzilla.gnome.org/show_bug.cgi?id=495688 << Replaces: %N-bin Conflicts: %N-bin Source: mirror:gnome:sources/ORBit2/2.14/ORBit2-%v.tar.bz2 Source-MD5: 3440c44aaef14dd96e4ccd7ce22a7e6e -Patch: %n.patch +PatchFile: %n.patch +PatchFile-MD5: 733f4ccce20b355111a339f7c0035096 SetCFLAGS: -Os NoSetMAKEFLAGS: true SetMAKEFLAGS: -j1 @@ -56,9 +62,18 @@ SplitOff2: << Package: %N-dev Depends: %N (= %v-%r), pkgconfig (>= 0.20-1) - Replaces: %N (<< 2.3.108-2) + Replaces: %N (<< 2.14.7-2) BuildDependsOnly: True - Files: bin/orbit2-config include lib/libORBit*-2.* lib/lib*.a lib/pkgconfig share/aclocal share/idl + Files: << + bin/orbit2-config + include + lib/libORBit*-2.* + lib/lib*.a + lib/pkgconfig + share/aclocal + share/gtk-doc + share/idl + << DocFiles: AUTHORS COPYING* ChangeLog linc2/ChangeLog:ChangeLog.linc2 MAINTAINERS NEWS README TODO << DocFiles: AUTHORS COPYING* ChangeLog linc2/ChangeLog:ChangeLog.linc2 MAINTAINERS NEWS README TODO ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs