rpms/libgtk-java/devel GdkCairoFix.patch, NONE, 1.1 libgtk-java.spec, 1.44, 1.45

[fedora-cvs-commits at redhat.com]

Author: ajocksch

Update of /cvs/dist/rpms/libgtk-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12939

Modified Files:
	libgtk-java.spec 
Added Files:
	GdkCairoFix.patch 
Log Message:
* Tue Mar 14 2006 Adam Jocksch <ajocksch at redhat.com> - 2.8.3.0.20060301.rh1-1
- Added GdkCairoFix.patch to address bug in GdkCairo class.


GdkCairoFix.patch:
 org_gnu_gdk_GdkCairo.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE GdkCairoFix.patch ---
Index: src/jni/org_gnu_gdk_GdkCairo.c
===================================================================
RCS file: /cvs/gnome/libgtk-java/src/jni/org_gnu_gdk_GdkCairo.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- src/jni/org_gnu_gdk_GdkCairo.c	28 Feb 2006 02:43:32 -0000	1.5
+++ src/jni/org_gnu_gdk_GdkCairo.c	8 Mar 2006 15:51:05 -0000	1.6
@@ -30,8 +30,8 @@
 	drawable_g = (GdkDrawable*)getPointerFromHandle(env, drawable);
 	
 	cr = gdk_cairo_create(drawable_g);
-	
-	return getStructHandle(env, cr, NULL, (JGFreeFunc) cairo_destroy);
+
+	return getHandleFromPointer(env, cr);
 }
 
 /*


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- libgtk-java.spec	1 Mar 2006 21:36:23 -0000	1.44
+++ libgtk-java.spec	14 Mar 2006 22:13:53 -0000	1.45
@@ -13,7 +13,7 @@
 
 %define	name_base 	libgtk-java
 %define	version		2.8.3.0.20060301.rh1
-%define release 	0
+%define release 	1
 
 
 Summary:	Java bindings for GTK+
@@ -35,6 +35,9 @@
 BuildRequires:  %{c_pkg_prefix}gtk2-devel >= 2.8.0
 BuildRequires:  java-devel >= 1.4.2, gcc-java >= 3.3.3, docbook-utils
 
+# patch that fixes occaision NPE in GdkCairo
+Patch0: GdkCairoFix.patch
+
 ExcludeArch: s390x
 
 %description
@@ -53,6 +56,7 @@
 %prep
 
 %setup -q -n %{name_base}-%{version}
+%patch0
 
 %build 
 # if either the C or Java packages has a prefix declared, then we will
@@ -123,6 +127,9 @@
 
 
 %changelog
+* Tue Mar 14 2006 Adam Jocksch <ajocksch at redhat.com> - 2.8.3.0.20060301.rh1-1
+- Added GdkCairoFix.patch to address bug in GdkCairo class.
+
 * Wed Mar 01 2006 Adam Jocksch <ajocksch at redhat.com> - 2.8.3.0.20060301.rh1-0
 - Imported new tarball to address bg #183538, updated dependancies.