GNOME.org
 

Re: [evolution-patches] Please review my patch for bug #43484

Sure, it does work for me when building with forte on Solaris/Sparc.
I think this fix is more appropriate, :P

-Sean.

Chris Toshok wrote:


does:

charset = r->cache->encoding ? (char*)r->cache->encoding : "iso-8859-1";

fix it?

On Thu, 2003-05-22 at 03:41, Antonio Xu wrote:

Hello Chris Toshok
Please see the error log below. It is due to we use Forte to build
evolution on Solaris.

Regards,
Antonio Xu
----------------------------------------------------------------------------------------------------------

/opt/SUNWspro/bin/cc -DHAVE_CONFIG_H -I. -I. -I.. -I.. -I../shell
-I../shell -I../calendar -I../calendar/cal-client
-I../libical/src/libical -I../libical/src/libical
-DEVOLUTION_GLADEDIR=\"/opt/evolution/share/evolution/1.3/glade\"
-DEVOLUTION_DATADIR=\"/opt/evolution/share\"
-DEVOLUTION_IMAGESDIR=\"/opt/evolution/share/evolution/1.3/images\"
-DEVOLUTION_BUTTONSDIR=\"/opt/evolution/share/evolution/1.3/images/buttons\"
-DEVOLUTION_UIDIR=\"/opt/evolution/share/evolution/1.3/ui\"
-DLOCATIONDIR=\"/opt/evolution/share/evolution/1.3\"
-DPREFIX=\"/opt/evolution\"
-DG_LOG_DOMAIN=\"evolution-executive-summary\" -DORBIT2=1 -D_REENTRANT
-I/usr/include/libbonoboui-2.0 -I/usr/include/glib-2.0
-I/usr/lib/glib-2.0/include -I/usr/include/orbit-2.0
-I/usr/include/libbonobo-2.0 -I/usr/include/libgnomecanvas-2.0
-I/usr/include/libgnome-2.0 -I/usr/include/linc-1.0
-I/usr/include/bonobo-activation-2.0 -I/usr/include/libart-2.0
-I/usr/include/pango-1.0 -I/usr/sfw/include -I/usr/sfw/include/freetype2
-I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0
-I/usr/openwin/include -I/usr/include/gconf/2
-I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include
-I/usr/include/libglade-2.0 -I/usr/include/libgnomeui-2.0
-I/opt/evolution/include/libxml2 -I/opt/evolution/include/gal-2.0
-I/opt/evolution/include/libgnomeprint-2.2
-I/opt/evolution/include/libgnomeprintui-2.2
-I/opt/evolution/include/soup-2.0
-I/opt/evolution/include/libgtkhtml-3.0 -D_REENTRANT -mt
-I/opt/evolution/include -I/usr/local/include -D_REENTRANT -mt
-I/usr/openwin/share/include/ -I/opt/evolution/include
-I/usr/local/include -Wp,-MD,.deps/e-summary-rdf.pp -c e-summary-rdf.c
-KPIC -DPIC -o e-summary-rdf.o
"e-summary-rdf.c", line 105: warning: argument #1 is incompatible with
prototype:
prototype: pointer to const char : "/usr/include/string.h", line 70
argument : pointer to const unsigned char
"e-summary-rdf.c", line 107: warning: return value type mismatch
"e-summary-rdf.c", line 197: operands have incompatible types:
pointer to const unsigned char ":" pointer to char
"e-summary-rdf.c", line 197: warning: assignment type mismatch:
pointer to char "=" pointer to const unsigned char
"e-summary-rdf.c", line 225: warning: argument #1 is incompatible with
prototype:
prototype: pointer to const char : "/usr/include/string.h", line 70
argument : pointer to const unsigned char
"e-summary-rdf.c", line 230: warning: argument #1 is incompatible with
prototype:
prototype: pointer to const char : "/usr/include/string.h", line 70
argument : pointer to const unsigned char
"e-summary-rdf.c", line 239: warning: argument #1 is incompatible with
prototype:
prototype: pointer to const char : "/usr/include/string.h", line 70
argument : pointer to const unsigned char
"e-summary-rdf.c", line 243: warning: argument #1 is incompatible with
prototype:
prototype: pointer to const char : "/usr/include/string.h", line 70
argument : pointer to const unsigned char
"e-summary-rdf.c", line 246: warning: argument #1 is incompatible with
prototype:
prototype: pointer to const char : "/usr/include/string.h", line 70
argument : pointer to const unsigned char
"e-summary-rdf.c", line 303: cannot recover from previous errors
cc: acomp failed for e-summary-rdf.c
make[2]: *** [e-summary-rdf.lo] Error 1
make[2]: Leaving directory
`/export/home/sunop/build/buildsrc/evolution/evolution/my-evolution'
make[1]: *** [all-recursive] Error 1


On Thu, 2003-05-22 at 18:20, Chris Toshok wrote:

err, what's the compiler output?  that construct is perfectly valid c.

On Thu, 2003-05-22 at 03:19, Antonio Xu wrote:

Hello All,
             Could you review my patch for bug #43484?
Bug Summary:Build Evolution error in my-evolution directory(May 22 trunk) Bug Description: When building evolution (May 22 trunk) on Solaris 8/9 with Forte, system report errors. It is due to Forte didn't support this kind of assigning value,see the source code below. 
             char *a = is_true? "123":"456";

Thanks
Antonio Xu

______________________________________________________________________
Index: my-evolution/e-summary-rdf.c
===================================================================
RCS file: /cvs/gnome/evolution/my-evolution/e-summary-rdf.c,v
retrieving revision 1.40
diff -u -r1.40 e-summary-rdf.c
--- my-evolution/e-summary-rdf.c	5 May 2003 01:03:56 -0000	1.40
+++ my-evolution/e-summary-rdf.c	22 May 2003 09:07:56 -0000
@@ -194,7 +194,10 @@
		charset = NULL;
	} else {
		/* bad/missing encoding, fallback to latin1 (locale?) */
-		charset = r->cache->encoding ? r->cache->encoding : "iso-8859-1";
+		if (r->cache->encoding)
+			charset = r->cache->encoding;
+ else + charset = "iso-8859-1"; 
	}

	/* FIXME: Need arrows */
Index: my-evolution/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/my-evolution/ChangeLog,v
retrieving revision 1.288
diff -u -r1.288 ChangeLog
--- my-evolution/ChangeLog	19 May 2003 15:24:01 -0000	1.288
+++ my-evolution/ChangeLog	22 May 2003 09:21:39 -0000
@@ -1,3 +1,7 @@
+2003-05-22  Antonio Xu <antonio xu sun com>
+	* e-summary-rdf.c (tree_walk): Change some codes to avoid building
+	error. Fix bug #43484.
+
2003-05-19  Anna Marie Dirks  <anna ximian com>
* e-summary-preferences.c: This patch HIG-ifies the "New News Feed" 
_______________________________________________
Evolution-patches mailing list
Evolution-patches lists ximian com
http://lists.ximian.com/mailman/listinfo/evolution-patches
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]