Fix LP64 build.

3 files changed, 73 insertions, 1 deletions

diff --git a/x11/ede/distinfo b/x11/ede/distinfo
index e13221d62e8..c992b0b48c1 100644
--- a/x11/ede/distinfo
+++ b/x11/ede/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.2 2011/05/21 08:35:25 obache Exp $
+$NetBSD: distinfo,v 1.3 2011/10/09 06:52:46 dholland Exp $
 
 SHA1 (ede-1.0.4.tar.bz2) = 22dfcb972ceef00fa4c79b971708b317095c612c
 RMD160 (ede-1.0.4.tar.bz2) = 1165f448a4ee0d385cc0372c9b18d0f18ec669fe
 Size (ede-1.0.4.tar.bz2) = 1372589 bytes
 SHA1 (patch-aa) = 53580cfa4d25730fb7cc8cd417c293978e130c95
+SHA1 (patch-esvrconf_escreensaver_cpp) = 7f63df9d0e8f5a0997704e00df7058950233262e
+SHA1 (patch-eworkpanel_workpanel_cpp) = 1c918020ed748398f6e3b41792f560bee40df271
 SHA1 (patch-makeinclude.in) = 88dd36a2aee3069a99245fd77a2fcf87f816c6b1
diff --git a/x11/ede/patches/patch-esvrconf_escreensaver_cpp b/x11/ede/patches/patch-esvrconf_escreensaver_cpp
new file mode 100644
index 00000000000..1bbd4b72b5b
--- /dev/null
+++ b/x11/ede/patches/patch-esvrconf_escreensaver_cpp
@@ -0,0 +1,46 @@
+$NetBSD: patch-esvrconf_escreensaver_cpp,v 1.1 2011/10/09 06:52:46 dholland Exp $
+
+Fix LP64 build.
+
+--- esvrconf/escreensaver.cpp~	2005-03-04 15:45:43.000000000 +0000
++++ esvrconf/escreensaver.cpp
+@@ -320,7 +320,7 @@ void writeConfiguration()
+     config.create_section("Saver");
+     config.set_section("Saver");
+     
+-    config.write("Active", saversList->item() ? (int)saversList->item()->user_data() : default_saver);
++    config.write("Active", saversList->item() ? (intptr_t)saversList->item()->user_data() : default_saver);
+ 
+     config.write("Timeout", timeoutSlider->value());
+     config.create_section("DPMS");
+@@ -357,10 +357,10 @@ void writeConfigurationSaver()
+     fprintf(config, "selected:		%d\n", 0);    
+     
+     fprintf(config, "programs:	\"%s\"	%s\n", saversList->item() ?
+-        (char*)p.screenhacks[(int)saversList->item()->user_data()]->name :
++        (char*)p.screenhacks[(intptr_t)saversList->item()->user_data()]->name :
+ 	    (char*)p.screenhacks[default_saver]->name,
+ 	saversList->item() ?    
+-	(char*)p.screenhacks[(int)saversList->item()->user_data()]->command :
++	(char*)p.screenhacks[(intptr_t)saversList->item()->user_data()]->command :
+ 	    (char*)p.screenhacks[default_saver]->command
+     );    
+     
+@@ -436,7 +436,7 @@ void fillSaversList(Fl_Input_Browser *br
+         }
+         else item = new Fl_Item(p.screenhacks[i]->name);
+ 
+-        item->user_data((void*) i);
++        item->user_data((void*)(intptr_t) i);
+ 	item->activate(p.screenhacks[i]->enabled_p);
+         browser->end();
+     }
+@@ -473,7 +473,7 @@ void startSaverPreview()
+ 
+     char cmd[4096] = {0};
+     snprintf(cmd, 4096, "%s%s -window-id 0x%X", location, 
+-	saversList->item() ? (char*)p.screenhacks[(int)saversList->item()
++	saversList->item() ? (char*)p.screenhacks[(intptr_t)saversList->item()
+ 	->user_data()]->command : 
+ 	(char*)p.screenhacks[default_saver]->command, (int)id);
+     launchPreviewSubprocess(cmd);
diff --git a/x11/ede/patches/patch-eworkpanel_workpanel_cpp b/x11/ede/patches/patch-eworkpanel_workpanel_cpp
new file mode 100644
index 00000000000..c9d5ebd2524
--- /dev/null
+++ b/x11/ede/patches/patch-eworkpanel_workpanel_cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-eworkpanel_workpanel_cpp,v 1.1 2011/10/09 06:52:46 dholland Exp $
+
+Fix LP64 build.
+
+--- eworkpanel/workpanel.cpp~	2005-08-29 23:20:59.000000000 +0000
++++ eworkpanel/workpanel.cpp
+@@ -113,7 +113,7 @@ int Fl_Update_Window::handle(int event) 
+ 
+ void setWorkspace(Fl_Button *, void *w)
+ {
+-	Fl_WM::set_current_workspace((int) w);
++	Fl_WM::set_current_workspace((int)(intptr_t) w);
+ }
+ 
+ void restoreRunBrowser() {
+@@ -334,7 +334,7 @@ void updateWorkspaces(Fl_Widget*,void*)
+ 
+ 	for(int n=0; n<count; n++) {
+ 		Fl_Item *i = new Fl_Item();
+-		i->callback( (Fl_Callback *) setWorkspace, (void*)n);
++		i->callback( (Fl_Callback *) setWorkspace, (void*)(intptr_t)n);
+ 		i->type(Fl_Item::RADIO);
+ 		if(n<names_count && names[n]) {
+ 			i->label(names[n]);