Fix broken 64-bit build.
This commit is contained in:
dholland
parent
891852c7a5
commit
2dcbcbceb3
3 changed files with 167 additions and 1 deletions
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: distinfo,v 1.6 2006/08/03 18:35:43 wiz Exp $
|
||||
$NetBSD: distinfo,v 1.7 2008/08/17 04:01:37 dholland Exp $
|
||||
|
||||
SHA1 (gcvs-1.0.tar.gz) = 42b2469d0a9acc0e69a127b44000cd1b11bb895e
|
||||
RMD160 (gcvs-1.0.tar.gz) = 195698283848cd1f22d00eb37df7dd0f6b52cffc
|
||||
|
|
@ -24,3 +24,5 @@ SHA1 (patch-ao) = 0c34855297bd4c8aa32d5f6ef14695c58f6d3e8c
|
|||
SHA1 (patch-ap) = c14228e74fc433b06cf25b23aece71dfe74587aa
|
||||
SHA1 (patch-aq) = 544d6b2d44cba7ab31fea66c13ff391d0cd81932
|
||||
SHA1 (patch-ar) = 05244267342a031e5470e4c2641ac359985c6334
|
||||
SHA1 (patch-as) = db6412aee518e989cca0d3b288513a718d6eee8c
|
||||
SHA1 (patch-at) = 02343059426fabe3ef50bfe7bc61bb6214b10a47
|
||||
|
|
|
|||
16
devel/gcvs/patches/patch-as
Normal file
16
devel/gcvs/patches/patch-as
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
$NetBSD: patch-as,v 1.1 2008/08/17 04:01:37 dholland Exp $
|
||||
|
||||
This may or may not work, but appears to be the best possible
|
||||
approach; the code is doing gross marshalling/closure stuff.
|
||||
|
||||
--- rf/uevent.cpp~ 2001-09-19 01:13:09.000000000 -0400
|
||||
+++ rf/uevent.cpp 2008-08-16 23:50:15.000000000 -0400
|
||||
@@ -375,7 +375,7 @@ dispatch:
|
||||
(this->*mmf.pfnV_ii)(ULOWORD(arg1), UHIWORD(arg1));
|
||||
break;
|
||||
case epV_iii:
|
||||
- (this->*mmf.pfnV_iii)(ULOWORD(arg1), UHIWORD(arg1), (int)arg2);
|
||||
+ (this->*mmf.pfnV_iii)(ULOWORD(arg1), UHIWORD(arg1), (int)(intptr_t)arg2);
|
||||
break;
|
||||
case epV_iiVP:
|
||||
(this->*mmf.pfnV_iiVP)(ULOWORD(arg1), UHIWORD(arg1), arg2);
|
||||
148
devel/gcvs/patches/patch-at
Normal file
148
devel/gcvs/patches/patch-at
Normal file
|
|
@ -0,0 +1,148 @@
|
|||
$NetBSD: patch-at,v 1.1 2008/08/17 04:01:37 dholland Exp $
|
||||
|
||||
--- rf/uwidget.cpp~ 2003-01-14 13:07:42.000000000 -0500
|
||||
+++ rf/uwidget.cpp 2008-08-16 23:58:08.000000000 -0400
|
||||
@@ -231,23 +231,23 @@ extern "C"
|
||||
|
||||
static void gtkclicked(GtkButton *button, gpointer user_data)
|
||||
{
|
||||
- int widid = ULOWORD((int)user_data);
|
||||
- int cmdid = UHIWORD((int)user_data);
|
||||
+ int widid = ULOWORD((int)(intptr_t)user_data);
|
||||
+ int cmdid = UHIWORD((int)(intptr_t)user_data);
|
||||
UEventSendMessage(widid, EV_CMD, cmdid, 0L);
|
||||
}
|
||||
|
||||
static void gtkmenuitemactivate(GtkMenuItem *menuitem, gpointer user_data)
|
||||
{
|
||||
- int widid = ULOWORD((int)user_data);
|
||||
- int cmdid = UHIWORD((int)user_data);
|
||||
+ int widid = ULOWORD((int)(intptr_t)user_data);
|
||||
+ int cmdid = UHIWORD((int)(intptr_t)user_data);
|
||||
UEventSendMessage(widid, EV_CMD, cmdid, 0L);
|
||||
}
|
||||
|
||||
static void gtkselectclist(GtkWidget *clist, gint row, gint column,
|
||||
GdkEventButton *event, gpointer user_data)
|
||||
{
|
||||
- int widid = ULOWORD((int)user_data);
|
||||
- int cmdid = UHIWORD((int)user_data);
|
||||
+ int widid = ULOWORD((int)(intptr_t)user_data);
|
||||
+ int cmdid = UHIWORD((int)(intptr_t)user_data);
|
||||
gchar *text;
|
||||
gtk_clist_get_text(GTK_CLIST(clist), row, column, &text);
|
||||
UEventSendMessage(widid, EV_LIST_SELECTING, UMAKEINT(cmdid, row), text);
|
||||
@@ -255,15 +255,15 @@ extern "C"
|
||||
|
||||
static void gtkselectclistcolumn(GtkCList *clist, gint column, gpointer user_data)
|
||||
{
|
||||
- int widid = ULOWORD((int)user_data);
|
||||
- int cmdid = UHIWORD((int)user_data);
|
||||
+ int widid = ULOWORD((int)(intptr_t)user_data);
|
||||
+ int cmdid = UHIWORD((int)(intptr_t)user_data);
|
||||
UEventSendMessage(widid, EV_LIST_SELCOLUMN, UMAKEINT(cmdid, column), 0L);
|
||||
}
|
||||
|
||||
static gint gtkclistdblclick(GtkWidget *widget, GdkEventButton *event, gpointer data)
|
||||
{
|
||||
- int widid = ULOWORD((int)data);
|
||||
- int cmdid = UHIWORD((int)data);
|
||||
+ int widid = ULOWORD((int)(intptr_t)data);
|
||||
+ int cmdid = UHIWORD((int)(intptr_t)data);
|
||||
if (event->type == GDK_2BUTTON_PRESS)
|
||||
{
|
||||
UEventSendMessage(widid, EV_LIST_DBLCLICK, cmdid, 0L);
|
||||
@@ -274,8 +274,8 @@ extern "C"
|
||||
|
||||
static void gtkcomboclicked(GtkWidget *widget, gpointer user_data)
|
||||
{
|
||||
- int widid = ULOWORD((int)user_data);
|
||||
- int cmdid = UHIWORD((int)user_data);
|
||||
+ int widid = ULOWORD((int)(intptr_t)user_data);
|
||||
+ int cmdid = UHIWORD((int)(intptr_t)user_data);
|
||||
|
||||
GtkList *list = GTK_LIST(widget->parent);
|
||||
GList *selection = list->selection;
|
||||
@@ -320,8 +320,8 @@ extern "C"
|
||||
|
||||
static void gtkmenuactivated(GtkWidget *widget, gpointer user_data)
|
||||
{
|
||||
- int widid = ULOWORD((int)user_data);
|
||||
- int cmdid = UHIWORD((int)user_data);
|
||||
+ int widid = ULOWORD((int)(intptr_t)user_data);
|
||||
+ int cmdid = UHIWORD((int)(intptr_t)user_data);
|
||||
|
||||
UStr selTxt;
|
||||
|
||||
@@ -392,7 +392,7 @@ extern "C"
|
||||
static void dataForeach(GQuark key_id, gpointer data, gpointer user_data)
|
||||
{
|
||||
const char *str = g_quark_to_string(key_id);
|
||||
- int id = (int)user_data;
|
||||
+ int id = (int)(intptr_t)user_data;
|
||||
int cmd;
|
||||
if(matchToken(str, cmd))
|
||||
{
|
||||
@@ -514,32 +514,32 @@ extern "C"
|
||||
|
||||
static void gtktreeexpand(GtkWidget *item, gpointer user_data)
|
||||
{
|
||||
- int widid = ULOWORD((int)user_data);
|
||||
- int cmdid = UHIWORD((int)user_data);
|
||||
+ int widid = ULOWORD((int)(intptr_t)user_data);
|
||||
+ int cmdid = UHIWORD((int)(intptr_t)user_data);
|
||||
g_assert(GTK_IS_TREE_ITEM(item));
|
||||
UEventSendMessage(widid, EV_TREE_EXPANDING, UMAKEINT(cmdid, 0), item);
|
||||
}
|
||||
|
||||
static void gtktreecollapse(GtkWidget *item, gpointer user_data)
|
||||
{
|
||||
- int widid = ULOWORD((int)user_data);
|
||||
- int cmdid = UHIWORD((int)user_data);
|
||||
+ int widid = ULOWORD((int)(intptr_t)user_data);
|
||||
+ int cmdid = UHIWORD((int)(intptr_t)user_data);
|
||||
g_assert(GTK_IS_TREE_ITEM(item));
|
||||
UEventSendMessage(widid, EV_TREE_EXPANDING, UMAKEINT(cmdid, 1), item);
|
||||
}
|
||||
|
||||
static void gtktreeselect(GtkWidget *item, gpointer user_data)
|
||||
{
|
||||
- int widid = ULOWORD((int)user_data);
|
||||
- int cmdid = UHIWORD((int)user_data);
|
||||
+ int widid = ULOWORD((int)(intptr_t)user_data);
|
||||
+ int cmdid = UHIWORD((int)(intptr_t)user_data);
|
||||
g_assert(GTK_IS_TREE_ITEM(item));
|
||||
UEventSendMessage(widid, EV_TREE_SELECTING, UMAKEINT(cmdid, 0), item);
|
||||
}
|
||||
|
||||
static void gtktreedeselect(GtkWidget *item, gpointer user_data)
|
||||
{
|
||||
- int widid = ULOWORD((int)user_data);
|
||||
- int cmdid = UHIWORD((int)user_data);
|
||||
+ int widid = ULOWORD((int)(intptr_t)user_data);
|
||||
+ int cmdid = UHIWORD((int)(intptr_t)user_data);
|
||||
g_assert(GTK_IS_TREE_ITEM(item));
|
||||
UEventSendMessage(widid, EV_TREE_SELECTING, UMAKEINT(cmdid, 1), item);
|
||||
}
|
||||
@@ -661,8 +661,8 @@ extern "C"
|
||||
gint page_num,
|
||||
gpointer data)
|
||||
{
|
||||
- int widid = ULOWORD((int)data);
|
||||
- int cmdid = UHIWORD((int)data);
|
||||
+ int widid = ULOWORD((int)(intptr_t)data);
|
||||
+ int cmdid = UHIWORD((int)(intptr_t)data);
|
||||
|
||||
UEventSendMessage(widid, EV_PAGE_CHANGED, UMAKEINT(cmdid, page_num), 0L);
|
||||
}
|
||||
@@ -682,8 +682,8 @@ extern "C"
|
||||
|
||||
static gint gtkexposeevent(GtkWidget *widget, GdkEvent *event, gpointer user_data)
|
||||
{
|
||||
- int widid = ULOWORD((int)user_data);
|
||||
- int cmdid = UHIWORD((int)user_data);
|
||||
+ int widid = ULOWORD((int)(intptr_t)user_data);
|
||||
+ int cmdid = UHIWORD((int)(intptr_t)user_data);
|
||||
|
||||
UEventSendMessage(widid, EV_CUSTOM_DRAW, cmdid, event);
|
||||
return TRUE;
|
||||
Loading…
Reference in a new issue