devel/gai gai-0.5.8-gcc4.patch, NONE, 1.1 gai-0.5.8-multilib.patch, 1.1, 1.2 gai.spec, 1.9, 1.10

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/devel/gai
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14241

Modified Files:
	gai-0.5.8-multilib.patch gai.spec 
Added Files:
	gai-0.5.8-gcc4.patch 
Log Message:
* Sun Mar 20 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-7
- Fix lvalue assignment errors for GCC4.

* Sun Mar 20 2005 Fabrice Colin <fabrice.colin[AT]gmail.com> - 0.5.8-6
- Make gai.pc multilib friendly so that 'pkg-config --exists gai' 
  doesn't fail on x86_64.



gai-0.5.8-gcc4.patch:

--- NEW FILE gai-0.5.8-gcc4.patch ---
diff -Nur gai-0.5.8-orig/gai/gai-pref2.c gai-0.5.8/gai/gai-pref2.c
--- gai-0.5.8-orig/gai/gai-pref2.c	2004-09-12 10:17:58.000000000 +0200
+++ gai-0.5.8/gai/gai-pref2.c	2005-03-20 20:09:30.000000000 +0100
@@ -870,7 +870,7 @@
 
 	    
 	    if(j == g_list_length((GList *)((int *)iw[i].result)[0])){
-		(GList *)((int *)iw[i].result)[0] = g_list_append((GList *)((int *)iw[i].result)[0], 
+		((int *)iw[i].result)[0] = (GList *)g_list_append((GList *)((int *)iw[i].result)[0], 
 								  g_strdup(buff));
 	    } 
 	    ((int *)iw[i].result2)[0] = j;
diff -Nur gai-0.5.8-orig/gai/gai-pref.c gai-0.5.8/gai/gai-pref.c
--- gai-0.5.8-orig/gai/gai-pref.c	2004-03-18 08:56:35.000000000 +0100
+++ gai-0.5.8/gai/gai-pref.c	2005-03-20 20:08:27.000000000 +0100
@@ -967,8 +967,8 @@
 
 	    if((unsigned char*)(((int *)iw[i].result)[0]) != NULL &&
 	       (unsigned char*)(((int *)iw[i].default_val)[0]) != NULL)
-		(unsigned char*)(((int *)iw[i].result)[0]) = 
-		    (unsigned char*)(((int *)iw[i].default_val)[0]) = g_strdup(buff);
+		(((int *)iw[i].result)[0]) = 
+		    (((int *)iw[i].default_val)[0]) = (unsigned char*)g_strdup(buff);
 
 
 	    //printf("%s\n",buff);
@@ -988,7 +988,7 @@
 
 	    
 	    if(j == g_list_length((GList *)((int *)iw[i].result)[0])){
-		(GList *)((int *)iw[i].result)[0] = g_list_append((GList *)((int *)iw[i].result)[0], 
+		((int *)iw[i].result)[0] = (GList *)g_list_append((GList *)((int *)iw[i].result)[0], 
 								  g_strdup(buff));
 		//		printf("%s is a new entry\n",buff);
 	    } 

gai-0.5.8-multilib.patch:

Index: gai-0.5.8-multilib.patch
===================================================================
RCS file: /cvs/extras/devel/gai/gai-0.5.8-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gai-0.5.8-multilib.patch	25 Feb 2005 18:06:58 -0000	1.1
+++ gai-0.5.8-multilib.patch	20 Mar 2005 19:18:40 -0000	1.2
@@ -39,3 +39,13 @@
  clean:
  	rm -f *.o *~ *@LIB_END@
  
+--- gai-0.5.8.old/gai.pc.in     2005-03-20 11:18:30.593311880 +0000
++++ gai-0.5.8/gai.pc.in 2005-03-20 11:18:49.061504288 +0000
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib/gai
++libdir=@libdir@/gai
+ includedir=${prefix}/include
+ gnome=@gnome_installed@
+ gl=@gl_installed@


Index: gai.spec
===================================================================
RCS file: /cvs/extras/devel/gai/gai.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gai.spec	13 Mar 2005 05:25:43 -0000	1.9
+++ gai.spec	20 Mar 2005 19:18:41 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		gai
 Version:	0.5.8
-Release:	5
+Release:	7
 Summary:	Generic Applet Interface
 
 Group:		User Interface/Desktops
@@ -8,6 +8,7 @@
 URL:		http://gai.sourceforge.net
 Source0:	http://download.sf.net/gai/gai-0.5.8.tar.bz2
 Patch0:		gai-0.5.8-multilib.patch
+Patch1:		gai-0.5.8-gcc4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgnomeui-devel, gtk2-devel >= 2.2, gnome-panel-devel
@@ -36,6 +37,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
+%patch1 -p1 -b .gcc4
 
 %build
 %ifarch x86_64
@@ -68,6 +70,13 @@
 %{_libdir}/libgai.so
 
 %changelog
+* Sun Mar 20 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-7
+- Fix lvalue assignment errors for GCC4.
+
+* Sun Mar 20 2005 Fabrice Colin <fabrice.colin[AT]gmail.com> - 0.5.8-6
+- Make gai.pc multilib friendly so that 'pkg-config --exists gai' 
+  doesn't fail on x86_64.
+
 * Sun Mar 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-5
 - Really add gtkglext-devel dependencies (Fabrice Colin).