File planner-0.14.5-windows.patch of Package mingw32-planner
--- planner-0.14.5/eds-backend/planner-source/Makefile.am 2010-01-21 11:10:37.000000000 +0100
+++ planner-0.14.5/eds-backend/planner-source/Makefile.am 2011-10-18 14:49:38.295877416 +0200
@@ -11,7 +11,7 @@
liborg_gnome_planner_source_la_SOURCES = planner-source.c
-liborg_gnome_planner_source_la_LDFLAGS = -module -avoid-version
+liborg_gnome_planner_source_la_LDFLAGS = -module -avoid-version -no-undefined
liborg_gnome_planner_source_la_LIBADD = $(EDS_BACKEND_LIBS)
EXTRA_DIST = org-gnome-planner-source.eplug.in
--- planner-0.14.5/libplanner/Makefile.am 2010-06-05 16:41:51.000000000 +0200
+++ planner-0.14.5/libplanner/Makefile.am 2011-10-18 16:50:49.789909068 +0200
@@ -58,6 +58,8 @@
libplanner_1_la_LIBADD = $(LIBPLANNER_LIBS) -lm
+libplanner_1_la_LDFLAGS = -no-undefined
+
libplannerincludedir = $(includedir)/planner-1.0/libplanner
@@ -80,7 +82,7 @@
mrp-parser.c \
mrp-parser.h
-libstorage_mrproject_1_la_LDFLAGS = -avoid-version -module
+libstorage_mrproject_1_la_LDFLAGS = -avoid-version -module -no-undefined
libstorage_mrproject_1_la_LIBADD = libplanner-1.la
if HAVE_GDA
@@ -110,12 +112,12 @@
mrp-old-xml.h
libmrp_xml_la_CFLAGS = -DDTDDIR=\""$(datadir)/planner/dtd"\"
-libmrp_xml_la_LDFLAGS = -avoid-version -module
+libmrp_xml_la_LDFLAGS = -avoid-version -module -no-undefined
libmrp_xml_la_LIBADD = libplanner-1.la
libmrp_xsl_la_SOURCES = mrp-xsl.c
libmrp_xsl_la_CFLAGS = $(XSLT_CFLAGS) -DSTYLESHEETDIR=\""$(datadir)/planner/stylesheets"\"
-libmrp_xsl_la_LDFLAGS = -avoid-version -module
+libmrp_xsl_la_LDFLAGS = -avoid-version -module -no-undefined
libmrp_xsl_la_LIBADD = $(XSLT_LIBS) libplanner-1.la
mrp-marshal.h: Makefile.am mrp-marshal.list
--- planner-0.14.5/libplanner/mrp-time.c 2011-07-04 17:33:24.000000000 +0200
+++ planner-0.14.5/libplanner/mrp-time.c 2011-10-18 14:49:38.297877649 +0200
@@ -29,6 +29,9 @@
#ifndef WIN32
#include <langinfo.h>
#else
+#ifdef DATADIR
+#undef DATADIR
+#endif
#include <windows.h>
#endif
#include "mrp-time.h"
--- planner-0.14.5/src/Makefile.am 2011-07-04 19:06:12.000000000 +0200
+++ planner-0.14.5/src/Makefile.am 2011-10-18 14:51:37.906796714 +0200
@@ -17,15 +17,18 @@
bin_PROGRAMS = planner
planner_SOURCES = \
planner-main.c
-planner_LDFLAGS = -export-dynamic
planner_LDADD = \
- libplannerapp.la \
- $(top_builddir)/libplanner/libplanner-1.la \
- $(PLANNER_LIBS)
+ libplannerapp.la
# Create a convenience library to link our tests against
-noinst_LTLIBRARIES = libplannerapp.la
+lib_LTLIBRARIES = libplannerapp.la
+
+libplannerapp_la_LIBADD = \
+ $(top_builddir)/libplanner/libplanner-1.la \
+ $(PLANNER_LIBS) -lws2_32
+
+libplannerapp_la_LDFLAGS = -avoid-version -export-dynamic -no-undefined
libplannerapp_la_SOURCES = \
$(built_sources) \
@@ -177,13 +180,13 @@
libsql_plugin_la_SOURCES = planner-sql-plugin.c
libsql_plugin_la_LIBADD = $(GDA_LIBS)
libsql_plugin_la_CFLAGS = $(GDA_CFLAGS) -DGDA_VERSION=@GDA_VER@
-libsql_plugin_la_LDFLAGS = -avoid-version -module
+libsql_plugin_la_LDFLAGS = -avoid-version -module -no-undefined
endif
if HAVE_PYTHON_PLUGIN
python_plugin = libpython-plugin.la
libpython_plugin_la_SOURCES = planner-python-plugin.c
-libpython_plugin_la_LDFLAGS = -avoid-version -module
+libpython_plugin_la_LDFLAGS = -avoid-version -module -no-undefined
libpython_plugin_la_LIBADD = $(PYTHON_LDFLAGS)
libpython_plugin_la_CFLAGS = $(PYGTK_CFLAGS)
endif
@@ -191,9 +194,9 @@
if HAVE_EDS_PLUGIN
eds_plugin = libeds-plugin.la
libeds_plugin_la_SOURCES = planner-eds-plugin.c
-libeds_plugin_la_LDFLAGS = -avoid-version -module
-libeds_plugin_la_LIBADD = $(EDS_LIBS)
-libeds_plugin_la_CFLAGS = $(EDS_CFLAGS)
+libeds_plugin_la_LDFLAGS = -avoid-version -module -no-undefined
+libeds_plugin_la_LIBADD = libplannerapp.la $(EDS_LIBS) $(PLANNER_LIBS)
+libeds_plugin_la_CFLAGS = $(EDS_CFLAGS) $(PLANNER_CFLAGS)
endif
plugin_LTLIBRARIES = \
@@ -205,13 +208,16 @@
$(eds_plugin)
libhtml_plugin_la_SOURCES = planner-html-plugin.c
-libhtml_plugin_la_LDFLAGS = -avoid-version -module
+libhtml_plugin_la_LDFLAGS = -avoid-version -module -no-undefined
+libhtml_plugin_la_LIBADD = libplannerapp.la $(PLANNER_LIBS)
libxmlplanner_plugin_la_SOURCES = planner-xml-planner-plugin.c
-libxmlplanner_plugin_la_LDFLAGS = -avoid-version -module
+libxmlplanner_plugin_la_LDFLAGS = -avoid-version -module -no-undefined
+libxmlplanner_plugin_la_LIBADD = libplannerapp.la $(PLANNER_LIBS)
libmsp_plugin_la_SOURCES = planner-msp-plugin.c
-libmsp_plugin_la_LDFLAGS = -avoid-version -module
+libmsp_plugin_la_LDFLAGS = -avoid-version -module -no-undefined
+libmsp_plugin_la_LIBADD = libplannerapp.la $(XSLT_LIBS) $(PLANNER_LIBS)
planner-marshal.h: Makefile.am planner-marshal.list
$(GLIB_GENMARSHAL) --prefix=planner_marshal $(srcdir)/planner-marshal.list --header > xgen-gmh \