rpms/frysk/FC-4 libglade-java-20060125-fix-64bit-miscompilation.patch, NONE, 1.1 frysk.spec, 1.2, 1.3 update.sh, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: cagney

Update of /cvs/dist/rpms/frysk/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv29555

Modified Files:
	frysk.spec update.sh 
Added Files:
	libglade-java-20060125-fix-64bit-miscompilation.patch 
Log Message:
* Fri Jan 27 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.EL4.9

- For pango and gtk, store the config file in a path containing _host
  but canonicalized using config.sub.

* Fri Jan 27 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.EL4.8

- Put pango.modules pack in the -host directory.
- Delete conditional definition of frysk_gcc_prefix, and
  frysk_gcc_suffix.  Doesn't work with older RPMs.

* Fri Jan 27 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.EL4.7

- Conditionally define frysk_gcc_prefix and frysk_gcc_suffix.


libglade-java-20060125-fix-64bit-miscompilation.patch:
 org_gnu_glade_LibGlade.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE libglade-java-20060125-fix-64bit-miscompilation.patch ---
--- ./src/jni/org_gnu_glade_LibGlade.c.dist	2006-01-26 12:00:14.000000000 -0500
+++ ./src/jni/org_gnu_glade_LibGlade.c	2006-01-26 12:01:42.000000000 -0500
@@ -18,6 +18,7 @@
 #include <glade/glade.h>
 #include <gtk/gtk.h>
 #include <jg_jnu.h>
+#include <gtk_java.h>
 
 #define LIBGLADE_DOMAIN "libglade"
 
@@ -148,7 +149,7 @@
     len = (*env)->GetArrayLength(env, buffer);
     buf = (*env)->GetByteArrayElements(env, buffer, NULL);
     if (buf == NULL)
-	return;
+	return NULL;
 
     rootname = root ? (char *)(*env)->GetStringUTFChars(env, root, 0) : NULL;
 
@@ -159,7 +160,7 @@
     (*env)->ReleaseByteArrayElements(env, buffer, buf, 0);
 
     if ((*env)->ExceptionCheck(env))
-	return;
+	return NULL;
 	
     //(*env)->SetObjectField(env, o, gladeFID, getHandleFromPointer(env, xml));
     return getGObjectHandle(env, (GObject *) xml);
@@ -190,7 +191,7 @@
     remove_log_handler(handler_id);
 
     if ((*env)->ExceptionCheck(env))
-       return;
+       return NULL;
        
     //(*env)->SetObjectField(env, o, gladeFID, getHandleFromPointer(env, xml));
     return getGObjectHandle(env, (GObject *) xml);


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-4/frysk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- frysk.spec	27 Jan 2006 21:10:44 -0000	1.2
+++ frysk.spec	28 Jan 2006 03:22:19 -0000	1.3
@@ -22,7 +22,7 @@
 %define build_libvte_java	1
 %define build_antlr		1
 %define build_jdom		1
-%define build_frysk 0
+%define build_frysk		1
 
 #---- cairo/fontconfig/pango defines
 %define freetype_version 2.1.5
@@ -37,7 +37,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
 Version:	0.0.1.2006.01.22
-Release:	0.FC4.6
+Release:	0.FC4.9
 License:	GPL + EXPLICIT EXCEPTION
 Group:		Development/System
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
@@ -687,7 +687,10 @@
 	%{__frysk_libs_configure}
 BUILD %{pango} %{?_smp_mflags} %{pango_makeflags}
 if INSTALL_P ; then
-	MKUPDATE frysk-update-pango-modules frysk-pango-querymodules pango/%{_target_platform}/pango.modules
+	# The pango code uses _host, not _target_platform.
+	pango_host=`${RPM_BUILD_DIR}/%{pango}/config.sub %{_host}`
+	MKUPDATE frysk-update-pango-modules frysk-pango-querymodules \
+		pango/${pango_host}/pango.modules
 	INSTALL %{pango} %{pango_makeflags}
 fi
 
@@ -725,7 +728,9 @@
 	# instead of /usr/lib/frysk, this generates paths that point
 	# to the existing / installed immodules. XXX: Per rant with
 	# pango's MKUPDATE call, _host should be _target_platform.
-	MKUPDATE frysk-update-gtk-immodules frysk-gtk-query-immodules-2.0 gtk-2.0/%{_host}/gtk.immodules
+	gtk2_host=`${RPM_BUILD_DIR}/%{gtk2}/config.sub %{_host}`
+	MKUPDATE frysk-update-gtk-immodules frysk-gtk-query-immodules-2.0 \
+		gtk-2.0/${gtk2_host}/gtk.immodules
 	INSTALL %{gtk2} %{gtk2_makeflags}
 fi
 
@@ -936,6 +941,18 @@
 %endif
 
 %changelog
+* Fri Jan 27 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.EL4.9
+- For pango and gtk, store the config file in a path containing _host
+  but canonicalized using config.sub.
+
+* Fri Jan 27 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.EL4.8
+- Put pango.modules pack in the -host directory.
+- Delete conditional definition of frysk_gcc_prefix, and
+  frysk_gcc_suffix.  Doesn't work with older RPMs.
+
+* Fri Jan 27 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.EL4.7
+- Conditionally define frysk_gcc_prefix and frysk_gcc_suffix.
+
 * Fri Jan 27 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.EL4.6
 - Add the macros build_glib2, build_glib_java, build_fontconfig,
   build_atk, build_cairo, build_cairo_java, build_pango, build_gtk2,


Index: update.sh
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-4/update.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- update.sh	24 Jan 2006 00:33:58 -0000	1.1
+++ update.sh	28 Jan 2006 03:22:19 -0000	1.2
@@ -22,6 +22,5 @@
 # Drag over the mashed frysk.spec file.
 
 sed < ../RHEL-4/frysk.spec > frysk.spec \
-    -e 's,^\(%define build_frysk\).*$,\1 0,' \
     -e 's,^\(Release:.*\).EL4.\(.*\)$,\1.FC4.\2,' \
     -e 's,^\(%define frysk_gcc_suffix\).*,\1 %{nil},'