commit 495d321cdddf9d82b0120c937fc8a704f26f609a parent 7684aae08a55ed9f395e21fb0c8076ed6e220efb Author: Colin Leroy <colin@colino.net> Date: Wed, 20 Feb 2013 16:40:46 +0000 2013-02-20 [colin] 3.9.0cvs95 * src/prefs_common.h * src/plugins/address_keeper/claws.def * src/plugins/att_remover/Makefile.am * src/plugins/att_remover/claws.def * src/plugins/att_remover/plugin.def * src/plugins/att_remover/version.rc * src/plugins/clamd/libclamd/Makefile.am * src/plugins/fetchinfo/Makefile.am * src/plugins/fetchinfo/claws.def * src/plugins/fetchinfo/plugin.def * src/plugins/fetchinfo/version.rc * src/plugins/mailmbox/Makefile.am * src/plugins/mailmbox/claws.def * src/plugins/mailmbox/plugin.def * src/plugins/mailmbox/version.rc * src/plugins/notification/gtkhotkey/Makefile.am * src/plugins/spam_report/Makefile.am * src/plugins/spam_report/claws.def * src/plugins/spam_report/plugin.def * src/plugins/spam_report/spam_report.c * src/plugins/spam_report/version.rc Win32 build fixes (and add of address_keeper, att_remover, fetchinfo and spam_report) Diffstat:
24 files changed, 400 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog @@ -1,3 +1,29 @@ +2013-02-20 [colin] 3.9.0cvs95 + + * src/prefs_common.h + * src/plugins/address_keeper/claws.def + * src/plugins/att_remover/Makefile.am + * src/plugins/att_remover/claws.def + * src/plugins/att_remover/plugin.def + * src/plugins/att_remover/version.rc + * src/plugins/clamd/libclamd/Makefile.am + * src/plugins/fetchinfo/Makefile.am + * src/plugins/fetchinfo/claws.def + * src/plugins/fetchinfo/plugin.def + * src/plugins/fetchinfo/version.rc + * src/plugins/mailmbox/Makefile.am + * src/plugins/mailmbox/claws.def + * src/plugins/mailmbox/plugin.def + * src/plugins/mailmbox/version.rc + * src/plugins/notification/gtkhotkey/Makefile.am + * src/plugins/spam_report/Makefile.am + * src/plugins/spam_report/claws.def + * src/plugins/spam_report/plugin.def + * src/plugins/spam_report/spam_report.c + * src/plugins/spam_report/version.rc + Win32 build fixes (and add of address_keeper, att_remover, + fetchinfo and spam_report) + 2013-02-20 [paul] 3.9.0cvs94 * configure.ac diff --git a/PATCHSETS b/PATCHSETS @@ -4592,3 +4592,4 @@ ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/gdata/Makefile.am; ) > 3.9.0cvs92.patchset ( cvs diff -u -r 1.13.2.48 -r 1.13.2.49 src/common/plugin.c; ) > 3.9.0cvs93.patchset ( cvs diff -u -r 1.654.2.4670 -r 1.654.2.4671 configure.ac; ) > 3.9.0cvs94.patchset +( cvs diff -u -r 1.103.2.144 -r 1.103.2.145 src/prefs_common.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/address_keeper/claws.def; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/att_remover/Makefile.am; diff -u /dev/null src/plugins/att_remover/claws.def; diff -u /dev/null src/plugins/att_remover/plugin.def; diff -u /dev/null src/plugins/att_remover/version.rc; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/clamd/libclamd/Makefile.am; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/fetchinfo/Makefile.am; diff -u /dev/null src/plugins/fetchinfo/claws.def; diff -u /dev/null src/plugins/fetchinfo/plugin.def; diff -u /dev/null src/plugins/fetchinfo/version.rc; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/mailmbox/Makefile.am; diff -u /dev/null src/plugins/mailmbox/claws.def; diff -u /dev/null src/plugins/mailmbox/plugin.def; diff -u /dev/null src/plugins/mailmbox/version.rc; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/gtkhotkey/Makefile.am; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/spam_report/Makefile.am; diff -u /dev/null src/plugins/spam_report/claws.def; diff -u /dev/null src/plugins/spam_report/plugin.def; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/spam_report/spam_report.c; diff -u /dev/null src/plugins/spam_report/version.rc; ) > 3.9.0cvs95.patchset diff --git a/configure.ac b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=9 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=94 +EXTRA_VERSION=95 EXTRA_RELEASE= EXTRA_GTK2_VERSION= @@ -1456,7 +1456,9 @@ if test x"$enable_notification_plugin" != xno; then AC_DEFINE(NOTIFICATION_BANNER, 1, Activate notification banner) AC_DEFINE(NOTIFICATION_COMMAND, 1, Activate notification shell command) AC_DEFINE(NOTIFICATION_TRAYICON, 1, Activate notification trayicon) - AC_DEFINE(NOTIFICATION_LCDPROC, 1, Activate lcdproc support) + if test x"$platform_win32" = xno; then + AC_DEFINE(NOTIFICATION_LCDPROC, 1, Activate lcdproc support) + fi notification_features="banner command" notification_missing_dependencies="" diff --git a/src/plugins/address_keeper/claws.def b/src/plugins/address_keeper/claws.def @@ -28,3 +28,12 @@ prefs_set_default prefs_write_open prefs_write_param prefs_common_get_prefs +extract_address +start_address_completion +complete_matches_found +addrbook_add_contact +addressbook_refresh +end_address_completion +addressbook_peek_folder_exists +prefs_common_translated_header_name +addressbook_folder_selection diff --git a/src/plugins/att_remover/Makefile.am b/src/plugins/att_remover/Makefile.am @@ -1,3 +1,46 @@ +EXTRA_DIST = claws.def plugin.def version.rc + +if OS_WIN32 + +LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \ + `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \ + sed -e 's/-I/--include-dir /g;s/-D/--define /g'` + +%.lo : %.rc + $(LTRCCOMPILE) -i $< -o $@ + +plugin_res = version.lo +plugin_res_ldflag = -Wl,.libs/version.o + +export_symbols = -export-symbols $(srcdir)/plugin.def + +plugin_deps = libclaws.a $(plugin_res) plugin.def + +libclaws.a: claws.def + $(DLLTOOL) --output-lib $@ --def $< + +plugin_ldadd = -L. -lclaws + +else +plugin_res = +plugin_res_ldflag = +export_symbols = +plugin_deps = +plugin_ldadd = +endif + +if PLATFORM_WIN32 +no_undefined = -no-undefined +else +no_undefined = +endif + +if CYGWIN +cygwin_export_lib = -L$(top_builddir)/src -lclaws-mail +else +cygwin_export_lib = +endif + plugindir = $(pkglibdir)/plugins if BUILD_ATT_REMOVER_PLUGIN diff --git a/src/plugins/address_keeper/claws.def b/src/plugins/att_remover/claws.def diff --git a/src/plugins/att_remover/plugin.def b/src/plugins/att_remover/plugin.def @@ -0,0 +1,10 @@ +EXPORTS + plugin_desc + plugin_done + plugin_init + plugin_licence + plugin_name + plugin_type + plugin_provides + plugin_version + diff --git a/src/plugins/att_remover/version.rc b/src/plugins/att_remover/version.rc @@ -0,0 +1,36 @@ +1 VERSIONINFO + FILEVERSION 0, 0, 0, 0 + PRODUCTVERSION 0, 0, 0, 0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "FileDescription", "AtatchWarner Plugin\0" + VALUE "FileVersion", "0.0.0.0\0" + VALUE "ProductVersion", "0.0.0.0 Win32\0" + VALUE "LegalCopyright", "GPL / © 1999-2008 Hiroyuki Yamamoto & The Claws Mail Team\0" + VALUE "CompanyName", "GNU / Free Software Foundation\0" + VALUE "ProductName", "Claws Mail\0" +// VALUE "Comments", "\0" +// VALUE "InternalName", "\0" +// VALUE "LegalTrademarks", "\0" +// VALUE "OriginalFilename", "\0" +// VALUE "PrivateBuild", "\0" +// VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END diff --git a/src/plugins/clamd/libclamd/Makefile.am b/src/plugins/clamd/libclamd/Makefile.am @@ -7,7 +7,9 @@ INCLUDES = @GLIB_CFLAGS@ \ -I$(top_srcdir)/src/common \ -I$(top_srcdir)/src/gtk +if BUILD_CLAMD_PLUGIN noinst_LTLIBRARIES = libclamd-plugin.la +endif libclamd_plugin_la_SOURCES = \ clamd-plugin.h \ diff --git a/src/plugins/fetchinfo/Makefile.am b/src/plugins/fetchinfo/Makefile.am @@ -1,3 +1,44 @@ +if OS_WIN32 + +LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \ + `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \ + sed -e 's/-I/--include-dir /g;s/-D/--define /g'` + +%.lo : %.rc + $(LTRCCOMPILE) -i $< -o $@ + +plugin_res = version.lo +plugin_res_ldflag = -Wl,.libs/version.o + +export_symbols = -export-symbols $(srcdir)/plugin.def + +plugin_deps = libclaws.a $(plugin_res) plugin.def + +libclaws.a: claws.def + $(DLLTOOL) --output-lib $@ --def $< + +plugin_ldadd = -L. -lclaws + +else +plugin_res = +plugin_res_ldflag = +export_symbols = +plugin_deps = +plugin_ldadd = +endif + +if PLATFORM_WIN32 +no_undefined = -no-undefined +else +no_undefined = +endif + +if CYGWIN +cygwin_export_lib = -L$(top_builddir)/src -lclaws-mail +else +cygwin_export_lib = +endif + plugindir = $(pkglibdir)/plugins if BUILD_FETCHINFO_PLUGIN @@ -23,4 +64,4 @@ INCLUDES = \ -I$(top_builddir)/src/common \ -I$(top_srcdir)/src/gtk -EXTRA_DIST= +EXTRA_DIST = claws.def plugin.def version.rc diff --git a/src/plugins/address_keeper/claws.def b/src/plugins/fetchinfo/claws.def diff --git a/src/plugins/fetchinfo/plugin.def b/src/plugins/fetchinfo/plugin.def @@ -0,0 +1,10 @@ +EXPORTS + plugin_desc + plugin_done + plugin_init + plugin_licence + plugin_name + plugin_type + plugin_provides + plugin_version + diff --git a/src/plugins/fetchinfo/version.rc b/src/plugins/fetchinfo/version.rc @@ -0,0 +1,36 @@ +1 VERSIONINFO + FILEVERSION 0, 0, 0, 0 + PRODUCTVERSION 0, 0, 0, 0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "FileDescription", "Address Keeper Plugin\0" + VALUE "FileVersion", "0.0.0.0\0" + VALUE "ProductVersion", "0.0.0.0 Win32\0" + VALUE "LegalCopyright", "GPL / © 1999-2009 Hiroyuki Yamamoto & The Claws Mail Team\0" + VALUE "CompanyName", "GNU / Free Software Foundation\0" + VALUE "ProductName", "Claws Mail\0" +// VALUE "Comments", "\0" +// VALUE "InternalName", "\0" +// VALUE "LegalTrademarks", "\0" +// VALUE "OriginalFilename", "\0" +// VALUE "PrivateBuild", "\0" +// VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END diff --git a/src/plugins/mailmbox/Makefile.am b/src/plugins/mailmbox/Makefile.am @@ -1,3 +1,46 @@ +EXTRA_DIST = claws.def plugin.def version.rc + +if OS_WIN32 + +LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \ + `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \ + sed -e 's/-I/--include-dir /g;s/-D/--define /g'` + +%.lo : %.rc + $(LTRCCOMPILE) -i $< -o $@ + +plugin_res = version.lo +plugin_res_ldflag = -Wl,.libs/version.o + +export_symbols = -export-symbols $(srcdir)/plugin.def + +plugin_deps = libclaws.a $(plugin_res) plugin.def + +libclaws.a: claws.def + $(DLLTOOL) --output-lib $@ --def $< + +plugin_ldadd = -L. -lclaws + +else +plugin_res = +plugin_res_ldflag = +export_symbols = +plugin_deps = +plugin_ldadd = +endif + +if PLATFORM_WIN32 +no_undefined = -no-undefined +else +no_undefined = +endif + +if CYGWIN +cygwin_export_lib = -L$(top_builddir)/src -lclaws-mail +else +cygwin_export_lib = +endif + plugindir = $(pkglibdir)/plugins if BUILD_MAILMBOX_PLUGIN diff --git a/src/plugins/address_keeper/claws.def b/src/plugins/mailmbox/claws.def diff --git a/src/plugins/mailmbox/plugin.def b/src/plugins/mailmbox/plugin.def @@ -0,0 +1,10 @@ +EXPORTS + plugin_desc + plugin_done + plugin_init + plugin_licence + plugin_name + plugin_type + plugin_provides + plugin_version + diff --git a/src/plugins/mailmbox/version.rc b/src/plugins/mailmbox/version.rc @@ -0,0 +1,36 @@ +1 VERSIONINFO + FILEVERSION 0, 0, 0, 0 + PRODUCTVERSION 0, 0, 0, 0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "FileDescription", "Address Keeper Plugin\0" + VALUE "FileVersion", "0.0.0.0\0" + VALUE "ProductVersion", "0.0.0.0 Win32\0" + VALUE "LegalCopyright", "GPL / © 1999-2009 Hiroyuki Yamamoto & The Claws Mail Team\0" + VALUE "CompanyName", "GNU / Free Software Foundation\0" + VALUE "ProductName", "Claws Mail\0" +// VALUE "Comments", "\0" +// VALUE "InternalName", "\0" +// VALUE "LegalTrademarks", "\0" +// VALUE "OriginalFilename", "\0" +// VALUE "PrivateBuild", "\0" +// VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END diff --git a/src/plugins/notification/gtkhotkey/Makefile.am b/src/plugins/notification/gtkhotkey/Makefile.am @@ -1,4 +1,6 @@ +if BUILD_HOTKEYS noinst_LTLIBRARIES = libcmnpgtkhotkey.la +endif libcmnpgtkhotkey_la_SOURCES = \ gtk-hotkey-info.c \ diff --git a/src/plugins/spam_report/Makefile.am b/src/plugins/spam_report/Makefile.am @@ -1,3 +1,46 @@ +EXTRA_DIST = claws.def plugin.def version.rc + +if OS_WIN32 + +LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \ + `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \ + sed -e 's/-I/--include-dir /g;s/-D/--define /g'` + +%.lo : %.rc + $(LTRCCOMPILE) -i $< -o $@ + +plugin_res = version.lo +plugin_res_ldflag = -Wl,.libs/version.o + +export_symbols = -export-symbols $(srcdir)/plugin.def + +plugin_deps = libclaws.a $(plugin_res) plugin.def + +libclaws.a: claws.def + $(DLLTOOL) --output-lib $@ --def $< + +plugin_ldadd = -L. -lclaws + +else +plugin_res = +plugin_res_ldflag = +export_symbols = +plugin_deps = +plugin_ldadd = +endif + +if PLATFORM_WIN32 +no_undefined = -no-undefined +else +no_undefined = +endif + +if CYGWIN +cygwin_export_lib = -L$(top_builddir)/src -lclaws-mail +else +cygwin_export_lib = +endif + plugindir = $(pkglibdir)/plugins if BUILD_SPAM_REPORT_PLUGIN diff --git a/src/plugins/address_keeper/claws.def b/src/plugins/spam_report/claws.def diff --git a/src/plugins/spam_report/plugin.def b/src/plugins/spam_report/plugin.def @@ -0,0 +1,10 @@ +EXPORTS + plugin_desc + plugin_done + plugin_init + plugin_licence + plugin_name + plugin_type + plugin_provides + plugin_version + diff --git a/src/plugins/spam_report/spam_report.c b/src/plugins/spam_report/spam_report.c @@ -29,7 +29,6 @@ #include <glib.h> #include <glib/gi18n.h> #include <gtk/gtk.h> -#include <gdk/gdkx.h> #include "common/claws.h" #include "common/version.h" #include "main.h" diff --git a/src/plugins/spam_report/version.rc b/src/plugins/spam_report/version.rc @@ -0,0 +1,36 @@ +1 VERSIONINFO + FILEVERSION 0, 0, 0, 0 + PRODUCTVERSION 0, 0, 0, 0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "FileDescription", "Address Keeper Plugin\0" + VALUE "FileVersion", "0.0.0.0\0" + VALUE "ProductVersion", "0.0.0.0 Win32\0" + VALUE "LegalCopyright", "GPL / © 1999-2009 Hiroyuki Yamamoto & The Claws Mail Team\0" + VALUE "CompanyName", "GNU / Free Software Foundation\0" + VALUE "ProductName", "Claws Mail\0" +// VALUE "Comments", "\0" +// VALUE "InternalName", "\0" +// VALUE "LegalTrademarks", "\0" +// VALUE "OriginalFilename", "\0" +// VALUE "PrivateBuild", "\0" +// VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END diff --git a/src/prefs_common.h b/src/prefs_common.h @@ -378,6 +378,7 @@ struct _PrefsCommon /* Other */ #ifndef G_OS_WIN32 gchar *uri_cmd; +#else gchar *gtk_theme; #endif gchar *ext_editor_cmd;