[csw-devel] SF.net SVN: gar:[6242] csw/mgar/pkg/orbit2/trunk

[dmichelsen at users.sourceforge.net]

Revision: 6242
          http://gar.svn.sourceforge.net/gar/?rev=6242&view=rev
Author:   dmichelsen
Date:     2009-09-09 13:32:12 +0000 (Wed, 09 Sep 2009)

Log Message:
-----------
orbit2: Add patch and set package name

Modified Paths:
--------------
    csw/mgar/pkg/orbit2/trunk/Makefile
    csw/mgar/pkg/orbit2/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/orbit2/trunk/files/
    csw/mgar/pkg/orbit2/trunk/files/patch-test-foo.diff

Modified: csw/mgar/pkg/orbit2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/orbit2/trunk/Makefile	2009-09-09 13:26:42 UTC (rev 6241)
+++ csw/mgar/pkg/orbit2/trunk/Makefile	2009-09-09 13:32:12 UTC (rev 6242)
@@ -9,10 +9,21 @@
 endef
 
 MASTER_SITES = $(GNOME_MIRROR)
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
 
+PACKAGES = CSWorbit2
+CATALOGNAME = orbit2
+
+REQUIRED_PKGS = CSWggettextrt CSWglib2 CSWlibidl
+
 SPKG_SOURCEURL = http://projects.gnome.org/ORBit2/
 
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
+# Patch from
+#   https://bugzilla.gnome.org/show_bug.cgi?id=563046
+# This also solves
+#   https://bugzilla.gnome.org/show_bug.cgi?id=558796
+PATCHFILES = patch-test-foo.diff
+PATCHDIRLEVEL = 0
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 STRIP_LIBTOOL = 1

Modified: csw/mgar/pkg/orbit2/trunk/checksums
===================================================================
--- csw/mgar/pkg/orbit2/trunk/checksums	2009-09-09 13:26:42 UTC (rev 6241)
+++ csw/mgar/pkg/orbit2/trunk/checksums	2009-09-09 13:32:12 UTC (rev 6242)
@@ -1 +1,2 @@
 10bfb957fa4a8935a0b4afaee7d71df7  download/ORBit2-2.14.17.tar.bz2
+f0854ac5f081775fc2b7c8afbf769843  download/patch-test-foo.diff

Added: csw/mgar/pkg/orbit2/trunk/files/patch-test-foo.diff
===================================================================
--- csw/mgar/pkg/orbit2/trunk/files/patch-test-foo.diff	                        (rev 0)
+++ csw/mgar/pkg/orbit2/trunk/files/patch-test-foo.diff	2009-09-09 13:32:12 UTC (rev 6242)
@@ -0,0 +1,46 @@
+$NetBSD: patch-aa,v 1.7 2009/03/06 14:02:32 wiz Exp $
+
+--- src/idl-compiler/orbit-idl-c-headers.c.orig	2008-08-31 14:04:43.000000000 +0000
++++ src/idl-compiler/orbit-idl-c-headers.c
+@@ -574,21 +574,29 @@ static void
+ ch_output_codefrag(IDL_tree tree, OIDL_Run_Info *rinfo, OIDL_C_Info *ci)
+ {
+   GSList *list;
++  char *ctmp;
+ 
+   for(list = IDL_CODEFRAG(tree).lines; list;
+       list = g_slist_next(list)) {
+-    if(!strncmp(list->data,
+-		"#pragma include_defs",
+-		sizeof("#pragma include_defs")-1)) {
+-	char *ctmp, *cte;
+-	ctmp = ((char *)list->data) + sizeof("#pragma include_defs");
+-	while(*ctmp && (isspace((int)*ctmp) || *ctmp == '"')) ctmp++;
+-	cte = ctmp;
+-	while(*cte && !isspace((int)*cte) && *cte != '"') cte++;
+-	*cte = '\0';
+-      fprintf(ci->fh, "#include <%s>\n", ctmp);
+-    } else
+-      fprintf(ci->fh, "%s\n", (char *)list->data);
++    ctmp = list->data;
++    if(!strncmp(ctmp, "#pragma", sizeof("#pragma")-1)) {
++      ctmp += sizeof("#pragma")-1;
++      if (*ctmp && (isspace((int)*ctmp))) {
++	while(*ctmp && (isspace((int)*ctmp))) ctmp++;
++	if(!strncmp(ctmp, "include_defs", sizeof("include_defs")-1)) {
++	  char *cte;
++
++	  ctmp += sizeof("include_defs")-1;
++	  while(*ctmp && (isspace((int)*ctmp) || *ctmp == '"')) ctmp++;
++	  cte = ctmp;
++	  while(*cte && !isspace((int)*cte) && *cte != '"') cte++;
++	  *cte = '\0';
++	  fprintf(ci->fh, "#include <%s>\n", ctmp);
++	  continue;
++	}
++      }
++    }
++    fprintf(ci->fh, "%s\n", (char *)list->data);
+   }
+ }
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.