Attachment #88944 for bug #125801

Lines 1-3 Link Here

(-)google-gadgets/distinfo 2008-07-20 14:57:47.000000000 +0530 (-3 / +3 lines)
1	MD5 (google-gadgets-for-linux-0.9.3.tar.gz) = 590b6fefbf9cbbbfe5dc34f99c0932f4	1	MD5 (google-gadgets-for-linux-0.10.0.tar.gz) = 315406fe83ab05d31e48200e07344496
2	SHA256 (google-gadgets-for-linux-0.9.3.tar.gz) = 6b93b3d39719c10063e143e919e9ee65956dacc51bbc5aa1cafef76c71abcff6	2	SHA256 (google-gadgets-for-linux-0.10.0.tar.gz) = 5367a44d47d60e31fc17dc43b7b1e1d393147bd901cb8c24f7975781e4abed5a
3	SIZE (google-gadgets-for-linux-0.9.3.tar.gz) = 2338243	3	SIZE (google-gadgets-for-linux-0.10.0.tar.gz) = 2499027





$FreeBSD: ports/deskutils/google-gadgets/files/patch-ggadget_module.cc,v 1.1 2008/06/13 14:01:28 pav Exp $

--- ggadget/module.cc.orig
+++ ggadget/module.cc
@@ -34,6 +34,12 @@
 // #define DEBUG_MODULES
 #endif

+#if __GNUC__ < 4
+#define CAST_HACK(x) (x)
+#else
+#define CAST_HACK(x) reinterpret_cast<x>
+#endif
+
 namespace ggadget {

 static const char *kModulePathEnv = "GGL_MODULE_PATH";
@@ -117,10 +123,10 @@

     NormalizeNameString(&module_name);

-    InitializeFunction new_initialize = reinterpret_cast<InitializeFunction>(
+    InitializeFunction new_initialize = CAST_HACK(InitializeFunction)(
         GetModuleSymbol(new_handle, module_name.c_str(),
                         kModuleInitializeSymbol));
-    FinalizeFunction new_finalize = reinterpret_cast<FinalizeFunction>(
+    FinalizeFunction new_finalize = CAST_HACK(FinalizeFunction)(
         GetModuleSymbol(new_handle, module_name.c_str(),
                         kModuleFinalizeSymbol));


Lines 39-44 Link Here

(-)google-gadgets/pkg-plist 2008-07-20 15:27:54.000000000 +0530 (+30 lines)
39	include/google-gadgets/ggadget/gadget_manager_interface.h	39	include/google-gadgets/ggadget/gadget_manager_interface.h
40	include/google-gadgets/ggadget/graphics_interface.h	40	include/google-gadgets/ggadget/graphics_interface.h
41	include/google-gadgets/ggadget/gtk/cairo_graphics.h	41	include/google-gadgets/ggadget/gtk/cairo_graphics.h
		42	include/google-gadgets/ggadget/gtk/hotkey.h
42	include/google-gadgets/ggadget/gtk/key_convert.h	43	include/google-gadgets/ggadget/gtk/key_convert.h
43	include/google-gadgets/ggadget/gtk/main_loop.h	44	include/google-gadgets/ggadget/gtk/main_loop.h
44	include/google-gadgets/ggadget/gtk/menu_builder.h	45	include/google-gadgets/ggadget/gtk/menu_builder.h
Lines 51-56 Link Here
51	include/google-gadgets/ggadget/image_interface.h	52	include/google-gadgets/ggadget/image_interface.h
52	include/google-gadgets/ggadget/img_element.h	53	include/google-gadgets/ggadget/img_element.h
53	include/google-gadgets/ggadget/item_element.h	54	include/google-gadgets/ggadget/item_element.h
		55	include/google-gadgets/ggadget/js/js_utils.h
		56	include/google-gadgets/ggadget/js/jscript_massager.h
54	include/google-gadgets/ggadget/label_element.h	57	include/google-gadgets/ggadget/label_element.h
55	include/google-gadgets/ggadget/listbox_element.h	58	include/google-gadgets/ggadget/listbox_element.h
56	include/google-gadgets/ggadget/locales.h	59	include/google-gadgets/ggadget/locales.h
Lines 67-72 Link Here
67	include/google-gadgets/ggadget/options_interface.h	70	include/google-gadgets/ggadget/options_interface.h
68	include/google-gadgets/ggadget/progressbar_element.h	71	include/google-gadgets/ggadget/progressbar_element.h
69	include/google-gadgets/ggadget/registerable_interface.h	72	include/google-gadgets/ggadget/registerable_interface.h
		73	include/google-gadgets/ggadget/run_once.h
70	include/google-gadgets/ggadget/scoped_ptr.h	74	include/google-gadgets/ggadget/scoped_ptr.h
71	include/google-gadgets/ggadget/script_context_interface.h	75	include/google-gadgets/ggadget/script_context_interface.h
72	include/google-gadgets/ggadget/script_runtime_interface.h	76	include/google-gadgets/ggadget/script_runtime_interface.h
Lines 156-173 Link Here
156	lib/libggadget-gtk-1.0.la	160	lib/libggadget-gtk-1.0.la
157	lib/libggadget-gtk-1.0.so	161	lib/libggadget-gtk-1.0.so
158	lib/libggadget-gtk-1.0.so.0	162	lib/libggadget-gtk-1.0.so.0
		163	lib/libggadget-js-1.0.a
		164	lib/libggadget-js-1.0.la
		165	lib/libggadget-js-1.0.so
		166	lib/libggadget-js-1.0.so.0
159	libdata/pkgconfig/libggadget-1.0.pc	167	libdata/pkgconfig/libggadget-1.0.pc
160	libdata/pkgconfig/libggadget-dbus-1.0.pc	168	libdata/pkgconfig/libggadget-dbus-1.0.pc
161	libdata/pkgconfig/libggadget-gtk-1.0.pc	169	libdata/pkgconfig/libggadget-gtk-1.0.pc
		170	libdata/pkgconfig/libggadget-js-1.0.pc
		171	share/applications/ggl-gtk.desktop
		172	share/applications/mimeinfo.cache
		173	%%DATADIR%%/analog_clock.gg
		174	%%DATADIR%%/digital_alarm_clock.gg
162	%%DATADIR%%/google-gadget-browser.gg	175	%%DATADIR%%/google-gadget-browser.gg
163	%%DATADIR%%/igoogle.gg	176	%%DATADIR%%/igoogle.gg
164	%%DATADIR%%/resources.gg	177	%%DATADIR%%/resources.gg
165	%%DATADIR%%/rss.gg	178	%%DATADIR%%/rss.gg
		179	share/mime/XMLnamespaces
		180	share/mime/aliases
		181	share/mime/application/x-google-gadgets.xml
		182	share/mime/generic-icons
		183	share/mime/globs
		184	share/mime/globs2
		185	share/mime/icons
		186	share/mime/magic
		187	share/mime/mime.cache
		188	share/mime/packages/00-google-gadgets.xml
		189	share/mime/subclasses
		190	share/pixmaps/google-gadgets.png
		191	@dirrm share/mime/packages
		192	@dirrm share/mime/application
		193	@dirrm share/mime
166	@dirrm %%DATADIR%%	194	@dirrm %%DATADIR%%
		195	@dirrm share/applications
167	@dirrm lib/google-gadgets/modules	196	@dirrm lib/google-gadgets/modules
168	@dirrm lib/google-gadgets/include/ggadget	197	@dirrm lib/google-gadgets/include/ggadget
169	@dirrm lib/google-gadgets/include	198	@dirrm lib/google-gadgets/include
170	@dirrm lib/google-gadgets	199	@dirrm lib/google-gadgets
		200	@dirrm include/google-gadgets/ggadget/js
171	@dirrm include/google-gadgets/ggadget/gtk	201	@dirrm include/google-gadgets/ggadget/gtk
172	@dirrm include/google-gadgets/ggadget/dbus	202	@dirrm include/google-gadgets/ggadget/dbus
173	@dirrm include/google-gadgets/ggadget	203	@dirrm include/google-gadgets/ggadget

Return to bug 125801

Lines 1-31 Link Here

(-)google-gadgets/files/patch-ggadget_module.cc 1970-01-01 05:30:00.000000000 +0530 (-31 lines)
1
2	$FreeBSD: ports/deskutils/google-gadgets/files/patch-ggadget_module.cc,v 1.1 2008/06/13 14:01:28 pav Exp $
3
4	--- ggadget/module.cc.orig
5	+++ ggadget/module.cc
6	@@ -34,6 +34,12 @@
7	// #define DEBUG_MODULES
8	#endif
9
10	+#if __GNUC__ < 4
11	+#define CAST_HACK(x) (x)
12	+#else
13	+#define CAST_HACK(x) reinterpret_cast<x>
14	+#endif
15	+
16	namespace ggadget {
17
18	static const char *kModulePathEnv = "GGL_MODULE_PATH";
19	@@ -117,10 +123,10 @@
20
21	NormalizeNameString(&module_name);
22
23	- InitializeFunction new_initialize = reinterpret_cast<InitializeFunction>(
24	+ InitializeFunction new_initialize = CAST_HACK(InitializeFunction)(
25	GetModuleSymbol(new_handle, module_name.c_str(),
26	kModuleInitializeSymbol));
27	- FinalizeFunction new_finalize = reinterpret_cast<FinalizeFunction>(
28	+ FinalizeFunction new_finalize = CAST_HACK(FinalizeFunction)(
29	GetModuleSymbol(new_handle, module_name.c_str(),
30	kModuleFinalizeSymbol));
31