r2721 - in trunk: BOOK/gnome/otherlibs BOOK/introduction/welcome patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Tue Sep 7 09:52:00 PDT 2004


Author: randy
Date: 2004-09-07 10:51:58 -0600 (Tue, 07 Sep 2004)
New Revision: 2721

Added:
   trunk/patches/soup-0.7.11-gcc_3.4-1.patch
Modified:
   trunk/BOOK/gnome/otherlibs/soup.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Added optional dependencies and gcc34 patch to Soup instructions

Modified: trunk/BOOK/gnome/otherlibs/soup.xml
===================================================================
--- trunk/BOOK/gnome/otherlibs/soup.xml	2004-09-07 06:26:50 UTC (rev 2720)
+++ trunk/BOOK/gnome/otherlibs/soup.xml	2004-09-07 16:51:58 UTC (rev 2721)
@@ -9,7 +9,6 @@
 <!ENTITY soup-size "324 KB">
 <!ENTITY soup-buildsize "11.1 MB">
 <!ENTITY soup-time "0.33">
-
 ]>
 
 <sect1 id="soup" xreflabel="Soup-&soup-version;">
@@ -25,7 +24,7 @@
 
 <para>The <application>Soup</application> package contains a
 <acronym>SOAP</acronym> (Simple Object Access Protocol)
-implementation in <application>C</application>.  </para>
+implementation in <application>C</application>.</para>
 
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
@@ -40,15 +39,35 @@
 &soup-time;</para></listitem></itemizedlist>
 </sect3>
 
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required Patch (if compiled with 
+<application><acronym>GCC</acronym></application>-3.4.x): <ulink 
+url="&patch-root;/soup-&soup-version;-gcc_3.4-1.patch"/></para></listitem>
+</itemizedlist>
+</sect3>
+
+<sect3><title><application>Soup</application> dependencies</title>
+<para><xref linkend="openssl"/>, 
+<xref linkend="popt"/>, 
+<xref linkend="libxml2"/>, 
+<xref linkend="GLib"/>, 
+<xref linkend="GLib2"/>, 
+<xref linkend="gnome-libs"/>, 
+<xref linkend="gtk-doc"/> and 
+<xref linkend="docbook-utils"/></para>
+</sect3>
+
 </sect2>
 
 <sect2>
 <title>Installation of <application>Soup</application></title>
 
-<para>Install <application>Soup</application> by running the following commands:
-</para>
+<para>Install <application>Soup</application> by running the following 
+commands:</para>
 
-<screen><userinput><command>./configure --prefix=/opt/gnome &&
+<screen><userinput><command>patch -Np1 -i ../soup-&soup-version;-gcc_3.4-1.patch &&
+./configure --prefix=/opt/gnome &&
 make &&
 make install</command></userinput></screen>
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-09-07 06:26:50 UTC (rev 2720)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-09-07 16:51:58 UTC (rev 2721)
@@ -22,6 +22,9 @@
 
 <itemizedlist>
 
+<listitem><para>September 7th, 2004 [randy]: Added optional dependencies 
+and a gcc34 patch to Soup instructions.</para></listitem>
+
 <listitem><para>September 7th, 2004 [randy]: Added gcc34 patch to Guppi 
 instructions to fix a GCC-3.4.x related build issue.</para></listitem>
 

Added: trunk/patches/soup-0.7.11-gcc_3.4-1.patch
===================================================================
--- trunk/patches/soup-0.7.11-gcc_3.4-1.patch	2004-09-07 06:26:50 UTC (rev 2720)
+++ trunk/patches/soup-0.7.11-gcc_3.4-1.patch	2004-09-07 16:51:58 UTC (rev 2721)
@@ -0,0 +1,106 @@
+Submitted By: Jeremy Utley (jeremy at linuxfromscratch.org)
+Date: 2004-04-11
+Initial Package Version: 0.7.11
+Upstream Status: Not Submitted
+Origin: Self Created
+Description: Fixes syntax issues with GCC 3.4
+
+$LastChangedBy$
+$Date$
+
+diff -ur soup-0.7.11/src/libwsdl/wsdl-soap-memory.c 
+soup-0.7.11.jbit/src/libwsdl/wsdl-soap-memory.c
+--- soup-0.7.11/src/libwsdl/wsdl-soap-memory.c	2001-08-26 18:38:53.000000000 -0700
++++ soup-0.7.11.jbit/src/libwsdl/wsdl-soap-memory.c	2004-04-13 14:37:17.271344628 -0700
+@@ -33,14 +33,14 @@
+ 
+ 	while (param->name != NULL) {
+ 		if (param->typecode == NULL) {
+-			g_warning (G_GNUC_FUNCTION
+-				   ": Parameter %s has no typecode!",
+-				   param->name);
++			g_warning (
++				   "%s: Parameter %s has no typecode!",
++				   G_GNUC_FUNCTION, param->name);
+ 		} else {
+ 			if (param->param == NULL) {
+-				g_warning (G_GNUC_FUNCTION
+-					   ": Parameter %s has no "
+-					   "memory location!",
++				g_warning (
++					   "%s: Parameter %s has no "
++					   "memory location!", G_GNUC_FUNCTION,
+ 					   param->name);
+ 			} else {
+ 				memset (param->param, 
+@@ -71,8 +71,8 @@
+ 
+ 	while (param->name != NULL) {
+ 		if (param->typecode == NULL) {
+-			g_warning (G_GNUC_FUNCTION
+-				   ": Parameter %s has no typecode!",
++			g_warning (
++				   "%s: Parameter %s has no typecode!", G_GNUC_FUNCTION,
+ 				   param->name);
+ 		} else {
+ 			if (param->param != NULL &&
+diff -ur soup-0.7.11/src/libwsdl/wsdl-soap-parse.c soup-0.7.11.jbit/src/libwsdl/wsdl-soap-parse.c
+--- soup-0.7.11/src/libwsdl/wsdl-soap-parse.c	2002-05-03 13:14:27.000000000 -0700
++++ soup-0.7.11.jbit/src/libwsdl/wsdl-soap-parse.c	2004-04-13 14:35:51.883142637 -0700
+@@ -37,7 +37,7 @@
+ 
+ 	switch (wsdl_typecode_kind (typecode)) {
+ 	case WSDL_TK_GLIB_NULL:
+-		g_warning ("Invalid typecode NULL in " G_GNUC_FUNCTION);
++		g_warning ("Invalid typecode NULL in %s", G_GNUC_FUNCTION);
+ 		break;
+ 
+ 	case WSDL_TK_GLIB_VOID:
+@@ -203,7 +203,7 @@
+ 		/* Handled elsewhere */
+ 		break;
+ 	case WSDL_TK_GLIB_MAX:
+-		g_warning ("Invalid typecode MAX in " G_GNUC_FUNCTION);
++		g_warning ("Invalid typecode MAX in %s", G_GNUC_FUNCTION);
+ 		break;
+ 	}
+ }
+diff -ur soup-0.7.11/src/libwsdl/wsdl-typecodes.c soup-0.7.11.jbit/src/libwsdl/wsdl-typecodes.c
+--- soup-0.7.11/src/libwsdl/wsdl-typecodes.c	2002-04-05 12:46:30.000000000 -0800
++++ soup-0.7.11.jbit/src/libwsdl/wsdl-typecodes.c	2004-04-13 14:35:06.786126919 -0700
+@@ -977,7 +977,7 @@
+ {
+ 	switch (tc->kind) {
+ 	case WSDL_TK_GLIB_NULL:
+-		g_warning ("Invalid typecode NULL in " G_GNUC_FUNCTION);
++		g_warning ("Invalid typecode NULL in %s", G_GNUC_FUNCTION);
+ 		return (0);
+ 		break;
+ 
+@@ -1082,7 +1082,7 @@
+ 		break;
+ 
+ 	case WSDL_TK_GLIB_MAX:
+-		g_warning ("Invalid typecode MAX in " G_GNUC_FUNCTION);
++		g_warning ("Invalid typecode MAX in %s", G_GNUC_FUNCTION);
+ 		return (0);
+ 		break;
+ 	}
+@@ -1106,7 +1106,7 @@
+ {
+ 	switch (tc->kind) {
+ 	case WSDL_TK_GLIB_NULL:
+-		g_warning ("Invalid typecode NULL in " G_GNUC_FUNCTION);
++		g_warning ("Invalid typecode NULL in %s", G_GNUC_FUNCTION);
+ 		return (0);
+ 		break;
+ 
+@@ -1218,7 +1218,7 @@
+ 		break;
+ 
+ 	case WSDL_TK_GLIB_MAX:
+-		g_warning ("Invalid typecode MAX in " G_GNUC_FUNCTION);
++		g_warning ("Invalid typecode MAX in %s", G_GNUC_FUNCTION);
+ 		return (0);
+ 		break;
+ 	}


Property changes on: trunk/patches/soup-0.7.11-gcc_3.4-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list