rpms/reciteword/devel reciteword-0.8.3-fix.patch, 1.1, 1.2 reciteword.spec, 1.1, 1.2
Hu Zheng (zhu)
fedora-extras-commits at redhat.com
Wed Jun 20 08:57:39 UTC 2007
Author: zhu
Update of /cvs/pkgs/rpms/reciteword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11193/devel
Modified Files:
reciteword-0.8.3-fix.patch reciteword.spec
Log Message:
fix x86_64 compile error
reciteword-0.8.3-fix.patch:
Index: reciteword-0.8.3-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/reciteword/devel/reciteword-0.8.3-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- reciteword-0.8.3-fix.patch 20 Jun 2007 07:10:13 -0000 1.1
+++ reciteword-0.8.3-fix.patch 20 Jun 2007 08:57:34 -0000 1.2
@@ -95,7 +95,61 @@
gtk_window_set_resizable(GTK_WINDOW(window),FALSE);
diff -r -u reciteword-0.8.3/src/revise.cpp reciteword-0.8.3.fix/src/revise.cpp
--- reciteword-0.8.3/src/revise.cpp 2006-03-26 16:33:14.000000000 +0800
-+++ reciteword-0.8.3.fix/src/revise.cpp 2007-06-07 14:49:18.000000000 +0800
++++ reciteword-0.8.3.fix/src/revise.cpp 2007-06-20 16:48:32.000000000 +0800
+@@ -240,7 +240,7 @@
+ static void
+ on_revise_group_plane_clicked (gpointer data)
+ {
+- gint index = (gint) data;
++ glong index = (glong) data;
+ gint zu_index = g_pReciteWord->revise_group->revise_zu_index[index];
+
+ gint i, tmpint, last_zu_wordcount = 25, now_wordcount = 0;
+@@ -326,7 +326,7 @@
+ "revise_group", "disorder",
+ &order);
+ order_ckbutton.set_status(order);
+- gint found_group = 0;
++ glong found_group = 0;
+ gint found = TRUE;
+ gint zu_index = 0, revise_times;
+ gchar tmpstr[256];
+@@ -370,7 +370,7 @@
+ if (zu_index > g_pReciteWord->max_zu_index) //the current book is search over....will try old books.
+ found = FALSE;
+ }
+- sprintf(tmpstr,_("found %d groups in total"),found_group);
++ sprintf(tmpstr,_("found %ld groups in total"),found_group);
+ total_groups_label = gtk_label_new(tmpstr);
+ gtk_fixed_put (GTK_FIXED (g_pReciteWord->fixed), total_groups_label,
+ Skin->revise_group.total_groups_label.x[0], Skin->revise_group.total_groups_label.y[0]);
+@@ -378,7 +378,7 @@
+ }
+
+ void
+-CRevise_group::create_plane (gint x, gint y)
++CRevise_group::create_plane (glong x, glong y)
+ {
+ gchar tmpstr[246];
+ sprintf(tmpstr,_("G%d"),revise_zu_index[y]+1);
+@@ -396,7 +396,7 @@
+ Skin->revise_group.plane_button_p.p[1],
+ tmpstr,
+ on_revise_group_plane_clicked,
+- GINT_TO_POINTER (y));
++ (gpointer)y);
+ plane[y] = new tPixButton;
+ plane[y]->create (g_pReciteWord->fixed,
+ Skin->revise_group.plane[x][y].x[0],
+@@ -404,7 +404,7 @@
+ Skin->revise_group.plane[x][y].p[0],
+ Skin->revise_group.plane[x][y].p[1],
+ (GdkPixmap *) NULL, on_revise_group_plane_clicked,
+- GINT_TO_POINTER (y));
++ (gpointer)y);
+ const gchar tooltips[5][3]={"F1","F2","F3","F4","F5"};
+ gtk_tooltips_set_tip (g_pReciteWord->tooltips, plane[y]->event_box,tooltips[y],"");
+ if (Skin->revise_group.plane_h[x][y].w)
@@ -588,7 +588,6 @@
gdk_colormap_alloc_color (parent->cmap, &(parent->color), FALSE,
TRUE);
@@ -138,6 +192,142 @@
else
layout_m=gtk_widget_create_pango_layout (text_area, str2);
if (g_pReciteWord->revise_skim->readword_ckbutton.status)
+diff -r -u reciteword-0.8.3/src/revise.h reciteword-0.8.3.fix/src/revise.h
+--- reciteword-0.8.3/src/revise.h 2003-07-01 17:57:45.000000000 +0800
++++ reciteword-0.8.3.fix/src/revise.h 2007-06-20 16:48:30.000000000 +0800
+@@ -51,7 +51,7 @@
+
+ void init ();
+ void show ();
+- void create_plane (gint x, gint y);
++ void create_plane (glong x, glong y);
+ void close ();
+ };
+
+diff -r -u reciteword-0.8.3/src/shooting.cpp reciteword-0.8.3.fix/src/shooting.cpp
+--- reciteword-0.8.3/src/shooting.cpp 2005-10-06 15:32:10.000000000 +0800
++++ reciteword-0.8.3.fix/src/shooting.cpp 2007-06-20 16:48:40.000000000 +0800
+@@ -93,7 +93,7 @@
+ void
+ tLabelItem::create (GtkWidget * pfixed, gint x, gint y, gint w, gint h,
+ GdkPixmap * pix_1, GdkPixmap * pix_2, gchar * str,
+- void (*func1) (gint), void (*func2) (gint), gint data)
++ void (*func1) (glong), void (*func2) (glong), gint data)
+ {
+ init ();
+
+@@ -512,7 +512,7 @@
+ draw_right_pixmap (gpointer data)
+ {
+ CShooting *parent = g_pReciteWord->shooting;
+- gint index = (gint) data;
++ glong index = (glong) data;
+ GtkWidget *right_pixmap =
+ parent->right_pixmap[parent->
+ tested_wordlist_item[parent->
+@@ -563,7 +563,7 @@
+ draw_shooting (gpointer data)
+ {
+ CShooting *parent = g_pReciteWord->shooting;
+- gint index = (gint) data;
++ glong index = (glong) data;
+ GtkWidget *shoot_pixmap = parent->shoot_pixmap[index];
+ GtkWidget *wordlist_head = parent->wordlist_head[index].event_box;
+
+@@ -620,7 +620,7 @@
+ }
+
+ static void
+-draw_shoot_pixmap (gint type, gint index)
++draw_shoot_pixmap (gint type, glong index)
+ {
+ CShooting *parent = g_pReciteWord->shooting;
+ parent->timer_type = type;
+@@ -664,7 +664,7 @@
+ }
+
+ static void
+-on_shooting_wordlistitem_clicked (gint index)
++on_shooting_wordlistitem_clicked (glong index)
+ {
+ CShooting *parent = g_pReciteWord->shooting;
+
+@@ -697,7 +697,7 @@
+ }
+
+ static void
+-on_shooting_wordlistitem_active (gint index)
++on_shooting_wordlistitem_active (glong index)
+ {
+ if (g_pReciteWord->shooting->wordlist_item[g_pReciteWord->shooting->active_wordlist_item].active)
+ {
+@@ -733,7 +733,7 @@
+ static void
+ on_shooting_wordlisthead_button_press (gpointer data)
+ {
+- on_shooting_wordlistitem_clicked ((gint) data);
++ on_shooting_wordlistitem_clicked ((glong) data);
+ }
+
+
+@@ -743,7 +743,7 @@
+ {
+ if (g_pReciteWord->shooting->shoot_pixmap_timer) //when mouse button press and release,the enter_notify and leave_notift event will happen too.
+ return true;
+- gint index = (gint) func_data;
++ glong index = (glong) func_data;
+ if (!g_pReciteWord->shooting->wordlist_head[index].enable)
+ return true;
+ on_shooting_wordlistitem_active (index);
+@@ -758,7 +758,7 @@
+ {
+ if (g_pReciteWord->shooting->shoot_pixmap_timer)
+ return true;
+- gint index = (gint) func_data;
++ glong index = (glong) func_data;
+ if (!g_pReciteWord->shooting->wordlist_head[index].enable)
+ return true;
+ g_pReciteWord->shooting->wordlist_item[index].active = FALSE;
+@@ -999,7 +999,7 @@
+ Skin->shooting.wordlist_head[3].p[0], NULL, NULL,
+ on_shooting_wordlisthead_button_press,
+ GINT_TO_POINTER (3));
+- int i;
++ glong i;
+ for (i = 0; i < 4; i++)
+ {
+ g_signal_connect (G_OBJECT (wordlist_head[i].event_box),
+@@ -1014,7 +1014,7 @@
+ (void *) i);
+ }
+ /*
+- int i;
++ glong i;
+ GtkWidget *pixmap_widget;
+ for (i=0;i<4;i++)
+ {
+diff -r -u reciteword-0.8.3/src/shooting.h reciteword-0.8.3.fix/src/shooting.h
+--- reciteword-0.8.3/src/shooting.h 2002-12-28 19:42:09.000000000 +0800
++++ reciteword-0.8.3.fix/src/shooting.h 2007-06-20 16:48:38.000000000 +0800
+@@ -16,15 +16,15 @@
+ int mousein;
+ int enable;
+ int active;
+- void (*runfunc1) (gint);
+- void (*runfunc2) (gint);
++ void (*runfunc1) (glong);
++ void (*runfunc2) (glong);
+ gint funcdata;
+
+ tLabelItem ();
+ void init ();
+ void create (GtkWidget * pfixed, gint x, gint y, gint w, gint h,
+ GdkPixmap * pix_1, GdkPixmap * pix_2, gchar * str,
+- void (*func1) (gint), void (*func2) (gint), gint data);
++ void (*func1) (glong), void (*func2) (glong), gint data);
+ void set_label (gchar * str);
+ void set_enable (gint a);
+ void draw ();
diff -r -u reciteword-0.8.3/src/tools/getBdcSound.c reciteword-0.8.3.fix/src/tools/getBdcSound.c
--- reciteword-0.8.3/src/tools/getBdcSound.c 2003-03-06 19:03:19.000000000 +0800
+++ reciteword-0.8.3.fix/src/tools/getBdcSound.c 2007-06-07 14:49:48.000000000 +0800
Index: reciteword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/reciteword/devel/reciteword.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- reciteword.spec 20 Jun 2007 07:10:13 -0000 1.1
+++ reciteword.spec 20 Jun 2007 08:57:34 -0000 1.2
@@ -1,7 +1,7 @@
Name: reciteword
Summary: Recite Word Easily
Version: 0.8.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Applications/Productivity
License: GPL
URL: http://reciteword.cosoft.org.cn
@@ -50,6 +50,9 @@
%changelog
+* Wed Jun 20 2007 Hu Zheng <zhu at redhat.com> - 0.8.3-3
+- Fix x86_64 compile error.
+
* Thu Jun 15 2007 Hu Zheng <zhu at redhat.com> - 0.8.3-2
- Small fixes according to Parag AN's suggestion.
More information about the fedora-extras-commits
mailing list