rpms/libgtk-java/devel libgtk-java-gslice.patch, NONE, 1.1 libgtk-java.spec, 1.76, 1.77
Andrew Cagney (cagney)
fedora-extras-commits at redhat.com
Thu Feb 28 16:33:22 UTC 2008
Author: cagney
Update of /cvs/pkgs/rpms/libgtk-java/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24390
Modified Files:
libgtk-java.spec
Added Files:
libgtk-java-gslice.patch
Log Message:
* Thu Feb 28 2008 Andrew Cagney <cagney at redhat.com> - 2.8.7-7
- Add gslice patch.
- Resolves: #435200
libgtk-java-gslice.patch:
--- NEW FILE libgtk-java-gslice.patch ---
Index: ChangeLog
2008-02-28 Sami Wagiaalla <swagiaal at redhat.com>
* src/jni/org_gnu_gtk_TreeModel.c: Used g_slice_alloc
instead of g_malloc for TreeIters. Fixes bz 516078.
* src/jni/org_gnu_gtk_TreeStore.c: Ditto.
* src/jni/org_gnu_gtk_ListStore.c: Ditto.
* src/jni/org_gnu_gtk_TreeIter.c: Ditto.
Index: src/jni/org_gnu_gtk_TreeModel.c
===================================================================
--- src/jni/org_gnu_gtk_TreeModel.c (revision 1871)
+++ src/jni/org_gnu_gtk_TreeModel.c (working copy)
@@ -71,7 +71,7 @@
{
GtkTreeModel *model_g = (GtkTreeModel*)getPointerFromHandle(env, model);
GtkTreePath *path_g = (GtkTreePath*)getPointerFromHandle(env, path);
- GtkTreeIter* iter = (GtkTreeIter*)g_malloc(sizeof(GtkTreeIter));
+ GtkTreeIter* iter = (GtkTreeIter*)g_slice_alloc(sizeof(GtkTreeIter));
gboolean value = gtk_tree_model_get_iter(model_g, iter, path_g);
if (TRUE == value)
return getTreeIter(env, iter);
@@ -88,7 +88,7 @@
(JNIEnv *env, jclass cls, jobject model, jstring path)
{
GtkTreeModel *model_g = (GtkTreeModel*)getPointerFromHandle(env, model);
- GtkTreeIter* iter = (GtkTreeIter*)g_malloc(sizeof(GtkTreeIter));
+ GtkTreeIter* iter = (GtkTreeIter*)g_slice_alloc(sizeof(GtkTreeIter));
const gchar* p = (*env)->GetStringUTFChars(env, path, NULL);
gboolean value = gtk_tree_model_get_iter_from_string(model_g, iter, p);
(*env)->ReleaseStringUTFChars(env, path, p);
@@ -119,7 +119,7 @@
(JNIEnv *env, jclass cls, jobject model)
{
GtkTreeModel *model_g = (GtkTreeModel*)getPointerFromHandle(env, model);
- GtkTreeIter* iter = (GtkTreeIter*)g_malloc(sizeof(GtkTreeIter));
+ GtkTreeIter* iter = (GtkTreeIter*)g_slice_alloc(sizeof(GtkTreeIter));
gboolean value = gtk_tree_model_get_iter_first(model_g, iter);
if (TRUE == value)
return getTreeIter(env, iter);
@@ -154,7 +154,7 @@
GtkTreeModel *model_g = (GtkTreeModel*)getPointerFromHandle(env, model);
GtkTreeIter *iter_g = (GtkTreeIter*)getPointerFromHandle(env, iter);
gint column_g = (gint)column;
- GValue *value = (GValue*)g_malloc(sizeof(GValue));
+ GValue *value = (GValue*)g_slice_alloc(sizeof(GValue));
value->g_type = 0;
gtk_tree_model_get_value(model_g, iter_g, column_g, value);
return getStructHandle(env, value, NULL, (JGFreeFunc) g_value_unset);
@@ -186,7 +186,7 @@
(JNIEnv *env, jclass cls, jobject model, jobject parent)
{
GtkTreeModel *model_g = (GtkTreeModel*)getPointerFromHandle(env, model);
- GtkTreeIter* iter = (GtkTreeIter*)g_malloc(sizeof(GtkTreeIter));
+ GtkTreeIter* iter = (GtkTreeIter*)g_slice_alloc(sizeof(GtkTreeIter));
GtkTreeIter *parent_g = (GtkTreeIter*)getPointerFromHandle(env, parent);
gboolean value = gtk_tree_model_iter_children(model_g, iter, parent_g);
if (TRUE == value)
@@ -230,7 +230,7 @@
GtkTreeModel *model_g = (GtkTreeModel*)getPointerFromHandle(env, model);
GtkTreeIter *parent_g = (GtkTreeIter*)getPointerFromHandle(env, parent);
gint n_g = (gint)n;
- GtkTreeIter* iter = (GtkTreeIter*)g_malloc(sizeof(GtkTreeIter));
+ GtkTreeIter* iter = (GtkTreeIter*)g_slice_alloc(sizeof(GtkTreeIter));
gboolean value = gtk_tree_model_iter_nth_child(model_g, iter, parent_g, n_g);
if (TRUE == value)
return getTreeIter(env, iter);
@@ -248,7 +248,7 @@
{
GtkTreeModel *model_g = (GtkTreeModel*)getPointerFromHandle(env, model);
GtkTreeIter *child_g = (GtkTreeIter*)getPointerFromHandle(env, child);
- GtkTreeIter* parent = (GtkTreeIter*)g_malloc(sizeof(GtkTreeIter));
+ GtkTreeIter* parent = (GtkTreeIter*)g_slice_alloc(sizeof(GtkTreeIter));
gboolean value = gtk_tree_model_iter_parent(model_g, parent, child_g);
if (TRUE == value)
return getTreeIter(env, parent);
Index: src/jni/org_gnu_gtk_TreeStore.c
===================================================================
--- src/jni/org_gnu_gtk_TreeStore.c (revision 1871)
+++ src/jni/org_gnu_gtk_TreeStore.c (working copy)
@@ -326,7 +326,7 @@
{
GtkTreeStore *treeStore_g =
(GtkTreeStore *)getPointerFromHandle(env, treeStore);
- GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));
+ GtkTreeIter *iter_g = (GtkTreeIter *)g_slice_alloc(sizeof(GtkTreeIter));
GtkTreeIter *parent_g = (GtkTreeIter *)getPointerFromHandle(env, parent);
gint32 position_g = (gint32) position;
@@ -344,7 +344,7 @@
{
GtkTreeStore *treeStore_g =
(GtkTreeStore *)getPointerFromHandle(env, treeStore);
- GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));;
+ GtkTreeIter *iter_g = (GtkTreeIter *)g_slice_alloc(sizeof(GtkTreeIter));;
GtkTreeIter *parent_g = (GtkTreeIter *)getPointerFromHandle(env, parent);
GtkTreeIter *sibling_g = (GtkTreeIter *)getPointerFromHandle(env, sibling);
gtk_tree_store_insert_before (treeStore_g, iter_g, parent_g, sibling_g);
@@ -360,7 +360,7 @@
{
GtkTreeStore *treeStore_g =
(GtkTreeStore *)getPointerFromHandle(env, treeStore);
- GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));;
+ GtkTreeIter *iter_g = (GtkTreeIter *)g_slice_alloc(sizeof(GtkTreeIter));;
GtkTreeIter *parent_g = (GtkTreeIter *)getPointerFromHandle(env, parent);
GtkTreeIter *sibling_g = (GtkTreeIter *)getPointerFromHandle(env, sibling);
gtk_tree_store_insert_after (treeStore_g, iter_g, parent_g, sibling_g);
@@ -377,7 +377,7 @@
{
GtkTreeStore *treeStore_g =
(GtkTreeStore *)getPointerFromHandle(env, treeStore);
- GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));;
+ GtkTreeIter *iter_g = (GtkTreeIter *)g_slice_alloc(sizeof(GtkTreeIter));;
GtkTreeIter *parent_g = (GtkTreeIter *)getPointerFromHandle(env, parent);
gtk_tree_store_prepend (treeStore_g, iter_g, parent_g);
return getTreeIter(env, iter_g);
@@ -393,7 +393,7 @@
{
GtkTreeStore *treeStore_g =
(GtkTreeStore *)getPointerFromHandle(env, treeStore);
- GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));
+ GtkTreeIter *iter_g = (GtkTreeIter *)g_slice_alloc(sizeof(GtkTreeIter));
GtkTreeIter *parent_g = (GtkTreeIter *)getPointerFromHandle(env, parent);
gtk_tree_store_append (treeStore_g, iter_g, parent_g);
return getTreeIter(env, iter_g);
Index: src/jni/org_gnu_gtk_TreeIter.c
===================================================================
--- src/jni/org_gnu_gtk_TreeIter.c (revision 1871)
+++ src/jni/org_gnu_gtk_TreeIter.c (working copy)
@@ -72,7 +72,7 @@
{
GtkTreeModel *model_g = (GtkTreeModel*)getPointerFromHandle(env, model);
GtkTreeIter *child_g = (GtkTreeIter*)getPointerFromHandle(env, child);
- GtkTreeIter *iter_g = (GtkTreeIter*)g_malloc(sizeof(GtkTreeIter));
+ GtkTreeIter *iter_g = (GtkTreeIter*)g_slice_alloc(sizeof(GtkTreeIter));
gboolean value = gtk_tree_model_iter_parent(model_g, iter_g, child_g);
if (TRUE == value)
return getTreeIter(env, iter_g);
@@ -107,7 +107,7 @@
{
GtkTreeModel *model_g = (GtkTreeModel*)getPointerFromHandle(env, model);
GtkTreeIter *parent_g = (GtkTreeIter*)getPointerFromHandle(env, parent);
- GtkTreeIter* iter = (GtkTreeIter*)g_malloc(sizeof(GtkTreeIter));
+ GtkTreeIter* iter = (GtkTreeIter*)g_slice_alloc(sizeof(GtkTreeIter));
gboolean value = gtk_tree_model_iter_children(model_g, iter, parent_g);
if (TRUE == value)
return getTreeIter(env, iter);
@@ -151,7 +151,7 @@
{
GtkTreeModel *model_g = (GtkTreeModel*)getPointerFromHandle(env, model);
GtkTreeIter *parent_g = (GtkTreeIter*)getPointerFromHandle(env, parent);
- GtkTreeIter* iter = (GtkTreeIter*)g_malloc(sizeof(GtkTreeIter));
+ GtkTreeIter* iter = (GtkTreeIter*)g_slice_alloc(sizeof(GtkTreeIter));
gboolean value = gtk_tree_model_iter_nth_child(model_g, iter, parent_g, (gint) n);
if (TRUE == value)
return getTreeIter(env, iter);
@@ -169,7 +169,7 @@
{
GtkTreeModel *model_g = (GtkTreeModel*)getPointerFromHandle(env, model);
GtkTreeIter *child_g = (GtkTreeIter*)getPointerFromHandle(env, child);
- GtkTreeIter* parent = (GtkTreeIter*)g_malloc(sizeof(GtkTreeIter));
+ GtkTreeIter* parent = (GtkTreeIter*)g_slice_alloc(sizeof(GtkTreeIter));
gboolean value = gtk_tree_model_iter_parent(model_g, parent, child_g);
if (TRUE == value)
return getTreeIter(env, parent);
Index: src/jni/org_gnu_gtk_ListStore.c
===================================================================
--- src/jni/org_gnu_gtk_ListStore.c (revision 1871)
+++ src/jni/org_gnu_gtk_ListStore.c (working copy)
@@ -101,7 +101,7 @@
cls, jobject listStore, jint position)
{
GtkListStore *listStore_g = (GtkListStore *)getPointerFromHandle(env, listStore);
- GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));
+ GtkTreeIter *iter_g = (GtkTreeIter *)g_slice_alloc(sizeof(GtkTreeIter));
gint32 position_g = (gint32) position;
gtk_list_store_insert (listStore_g, iter_g, position_g);
return getTreeIter(env, iter_g);
@@ -115,7 +115,7 @@
*env, jclass cls, jobject listStore, jobject sibling)
{
GtkListStore *listStore_g = (GtkListStore *)getPointerFromHandle(env, listStore);
- GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));
+ GtkTreeIter *iter_g = (GtkTreeIter *)g_slice_alloc(sizeof(GtkTreeIter));
GtkTreeIter *sibling_g = (GtkTreeIter *)getPointerFromHandle(env, sibling);
gtk_list_store_insert_before (listStore_g, iter_g, sibling_g);
return getTreeIter(env, iter_g);
@@ -129,7 +129,7 @@
jclass cls, jobject listStore, jobject sibling)
{
GtkListStore *listStore_g = (GtkListStore *)getPointerFromHandle(env, listStore);
- GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));
+ GtkTreeIter *iter_g = (GtkTreeIter *)g_slice_alloc(sizeof(GtkTreeIter));
GtkTreeIter *sibling_g = (GtkTreeIter *)getPointerFromHandle(env, sibling);
gtk_list_store_insert_after (listStore_g, iter_g, sibling_g);
return getTreeIter(env, iter_g);
@@ -143,7 +143,7 @@
jclass cls, jobject listStore)
{
GtkListStore *listStore_g = (GtkListStore *)getPointerFromHandle(env, listStore);
- GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));
+ GtkTreeIter *iter_g = (GtkTreeIter *)g_slice_alloc(sizeof(GtkTreeIter));
gtk_list_store_prepend (listStore_g, iter_g);
return getTreeIter(env, iter_g);
}
@@ -156,7 +156,7 @@
cls, jobject listStore)
{
GtkListStore *listStore_g = (GtkListStore *)getPointerFromHandle(env, listStore);
- GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));
+ GtkTreeIter *iter_g = (GtkTreeIter *)g_slice_alloc(sizeof(GtkTreeIter));
gtk_list_store_append (listStore_g, iter_g);
return getTreeIter(env, iter_g);
}
Index: libgtk-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- libgtk-java.spec 1 Feb 2008 15:21:00 -0000 1.76
+++ libgtk-java.spec 28 Feb 2008 16:32:42 -0000 1.77
@@ -18,13 +18,14 @@
Summary: Java bindings for GTK+
Name: %{java_pkg_prefix}%{name_base}
Version: 2.8.7
-Release: 6%{?dist}
+Release: 7%{?dist}
License: LGPL
Group: Development/Libraries
URL: http://java-gnome.sourceforge.net
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/2.8/%{name_base}-%{version}.tar.bz2
Patch0: libgtk-java-Drawable-region.patch
Patch1: %{name}-gjavah.patch
+Patch2: %{name}-gslice.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires: %{c_pkg_prefix}gtk2 >= 2.8.0
@@ -55,6 +56,7 @@
%setup -q -n %{name_base}-%{version}
%patch0
%patch1
+%patch2
touch aclocal.m4
touch configure Makefile.in
@@ -132,6 +134,10 @@
%changelog
+* Thu Feb 28 2008 Andrew Cagney <cagney at redhat.com> - 2.8.7-7
+- Add gslice patch.
+- Resolves: #435200
+
* Fri Feb 1 2008 Stepan Kasal <skasal at redhat.com> - 2.8.7-6
- remove runExample.sh from exmaple_DATA to prevent collision
- rebuild for new gcc
More information about the fedora-extras-commits
mailing list