Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv3221/10.4-pangocairo/unstable/main/finkinfo/gnome
Modified Files:
Tag: pangocairo-branch
orbit2.info orbit2.patch glib2-10.5.info glib2-10.5.patch
glib2.info
Log Message:
some important stuff from 10.4/unstable that seems to work there
Index: glib2-10.5.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glib2-10.5.info,v
retrieving revision 1.3.2.17
retrieving revision 1.3.2.18
diff -u -d -r1.3.2.17 -r1.3.2.18
--- glib2-10.5.info 3 Nov 2007 20:25:24 -0000 1.3.2.17
+++ glib2-10.5.info 15 Nov 2007 15:09:39 -0000 1.3.2.18
@@ -16,7 +16,7 @@
Source: mirror:gnome:sources/glib/2.14/glib-%v.tar.bz2
Source-MD5: 196d7944a8ddc1f7c3d1e9c7146dd560
PatchFile: %n.patch
-PatchFile-MD5: 54ae642747974ba7a73bf67c2c49e70f
+PatchFile-MD5: 71c02c56bda536d751ea83f538524ea1
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetLIBS: -L%p/lib
@@ -124,6 +124,9 @@
(claimed to be fixed in gcc4.0 and wontfix in gcc3.3). See
http://bugzilla.gnome.org/show_bug.cgi?id=173127
+ Patch child-test.c for our location of `true`. See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=495690
+
We need to set LANG=C when doing 'make check', else a previously
installed glib2 will trigger a crash caused by a bug in the old
de.po. See http://bugzilla.gnome.org/show_bug.cgi?id=310731
@@ -140,7 +143,8 @@
Will need to patch gutils.h for inline semantics of newer-gcc. See:
http://bugzilla.gnome.org/show_bug.cgi?id=315437 (patch #96366 does
- not work...not __GNUC_PREREQ)
+ not work...not __GNUC_PREREQ). No idea a portable solution, but
+ msachs says "static inline" is right for this case, so hardcode it.
<<
DescPackaging: <<
Sometimes not all .pc files get created. I suspect this is due to a
@@ -167,6 +171,9 @@
%N-dev installs glib-2.0.m4, which uses PKG_PROG_PKG_CONFIG, which
doesn't exist in pkg.m4 until pkg-config 0.16. See:
http://bugzilla.gnome.org/show_bug.cgi?id=418778
+
+ Builds with included pcre instead of external lib to avoid need to
+ cascade deps on pcre packages
<<
License: LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Index: glib2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glib2.info,v
retrieving revision 1.16.2.25
retrieving revision 1.16.2.26
diff -u -d -r1.16.2.25 -r1.16.2.26
--- glib2.info 7 Oct 2007 20:32:44 -0000 1.16.2.25
+++ glib2.info 15 Nov 2007 15:09:39 -0000 1.16.2.26
@@ -123,6 +123,9 @@
(claimed to be fixed in gcc4.0 and wontfix in gcc3.3). See
http://bugzilla.gnome.org/show_bug.cgi?id=173127
+ Patch child-test.c for our location of `true`. See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=495690
+
We need to set LANG=C when doing 'make check', else a previously
installed glib2 will trigger a crash caused by a bug in the old
de.po. See http://bugzilla.gnome.org/show_bug.cgi?id=310731
Index: glib2-10.5.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glib2-10.5.patch,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- glib2-10.5.patch 3 Nov 2007 20:25:24 -0000 1.2.2.2
+++ glib2-10.5.patch 15 Nov 2007 15:09:39 -0000 1.2.2.3
@@ -72,24 +72,16 @@
diff -Nurd -x'*~' glib-2.12.12.orig/glib/gutils.h glib-2.12.12/glib/gutils.h
--- glib-2.12.12.orig/glib/gutils.h 2007-05-01 19:12:44.000000000 -0400
-+++ glib-2.12.12/glib/gutils.h 2007-11-02 01:23:41.000000000 -0400
-@@ -96,9 +96,13 @@
- #ifdef G_IMPLEMENT_INLINES
++++ glib-2.12.12/glib/gutils.h 2007-11-04 14:12:33.000000000 -0500
+@@ -97,7 +97,7 @@
# define G_INLINE_FUNC
# undef G_CAN_INLINE
--#elif defined (__GNUC__)
+ #elif defined (__GNUC__)
-# define G_INLINE_FUNC extern inline
--#elif defined (G_CAN_INLINE)
-+#elif defined (__GNUC__)
-+# if __GNUC_PREREQ (4,2) && defined (__STDC_VERSION__) && __STDC_VERSION__
>= 199901L
-+# define G_INLINE_FUNC extern __inline __attribute__ ((__gnu_inline__))
-+# else
-+# define G_INLINE_FUNC extern __inline
-+# endif
-+#elif defined (G_CAN_INLINE)
++# define G_INLINE_FUNC static inline
+ #elif defined (G_CAN_INLINE)
# define G_INLINE_FUNC static inline
#else /* can't inline */
- # define G_INLINE_FUNC
diff -Nurd -x'*~' glib-2.12.0.orig/glib/libcharset/Makefile.in
glib-2.12.0/glib/libcharset/Makefile.in
--- glib-2.12.0.orig/glib/libcharset/Makefile.in 2006-07-02
14:48:02.000000000 -0400
+++ glib-2.12.0/glib/libcharset/Makefile.in 2006-07-06 20:56:51.000000000
-0400
Index: orbit2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/orbit2.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- orbit2.patch 13 Feb 2007 15:28:01 -0000 1.1.2.2
+++ orbit2.patch 15 Nov 2007 15:09:39 -0000 1.1.2.3
@@ -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.4/unstable/main/finkinfo/gnome/orbit2.info,v
retrieving revision 1.8.2.19
retrieving revision 1.8.2.20
diff -u -d -r1.8.2.19 -r1.8.2.20
--- orbit2.info 23 Oct 2007 13:36:44 -0000 1.8.2.19
+++ orbit2.info 15 Nov 2007 15:09:39 -0000 1.8.2.20
@@ -27,18 +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.10-1
+ 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: 180f486f07d6db84aca0f71f68e54618
PatchFile: %n.patch
-PatchFile-MD5: d38e410c676cd3283d556704e96bbc6b
+PatchFile-MD5: 733f4ccce20b355111a339f7c0035096
SetCFLAGS: -Os
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
@@ -59,8 +62,7 @@
SplitOff2: <<
Package: %N-dev
Depends: %N (= %v-%r), pkgconfig (>= 0.20-1)
- Replaces: %N (<< 2.14.0-1)
-
+ Replaces: %N (<< 2.14.7-2)
BuildDependsOnly: True
Files: <<
bin/orbit2-config
-------------------------------------------------------------------------
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
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
