File liborcus-0.5.1-windows.patch of Package mingw32-liborcus

Overview Repositories Revisions Requests Users Attributes Meta

File liborcus-0.5.1-windows.patch of Package mingw32-liborcus (Revision f30c5cba2910e85bfb65c4c6453463c7)

Currently displaying revision f30c5cba2910e85bfb65c4c6453463c7 , Show latest

--- liborcus-0.5.1/configure.ac	2013-04-13 03:56:10.000000000 +0200
+++ liborcus-0.5.1/configure.ac	2013-05-14 17:22:26.990685810 +0200
@@ -22,7 +22,7 @@
 # =============
 AC_INIT([liborcus],[orcus_version])
 AC_CONFIG_MACRO_DIR([m4])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2 dist-xz])
 AM_SILENT_RULES([yes])
 AC_LANG([C++])
--- liborcus-0.5.1/include/orcus/env.hpp	2012-09-01 23:10:55.000000000 +0200
+++ liborcus-0.5.1/include/orcus/env.hpp	2013-05-14 17:21:53.924461512 +0200
@@ -29,7 +29,10 @@
 #define __ORCUS_ENV_HPP__
 
 #if defined _WIN32 || defined __CYGWIN__
-  #ifdef __ORCUS_BUILDING_DLL
+  #if defined __MINGW32__
+    #define ORCUS_DLLPUBLIC
+    #define ORCUS_DLLLOCAL
+  #elif defined __ORCUS_BUILDING_DLL
     #ifdef __GNUC__
       #define ORCUS_DLLPUBLIC __attribute__ ((dllexport))
     #else
--- liborcus-0.5.1/src/liborcus/Makefile.am	2013-04-12 16:24:50.000000000 +0200
+++ liborcus-0.5.1/src/liborcus/Makefile.am	2013-05-14 17:21:53.931461397 +0200
@@ -97,6 +97,7 @@
 	mock_spreadsheet.cpp
 
 orcus_xlsx_sheet_context_test_LDADD = \
+	liborcus-@ORCUS_API_VERSION@.la \
 	../parser/liborcus-parser-@ORCUS_API_VERSION@.la
 
 orcus_xlsx_sheet_context_test_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(COMMON_CPPFLAGS) -DNO_XML_EXPECTED
@@ -163,7 +164,7 @@
 	mock_spreadsheet.cpp
 
 gnumeric_cell_context_test_LDADD = \
-	../parser/liborcus-parser-@ORCUS_API_VERSION@.la
+	liborcus-@ORCUS_API_VERSION@.la
 
 orcus_gnumeric_cell_context_test_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(COMMON_CPPFLAGS)
 
@@ -175,6 +176,7 @@
 	$(BOOST_SYSTEM_CFLAGS) $(ZLIB_CFLAGS)
 liborcus_@ORCUS_API_VERSION@_la_LDFLAGS = -no-undefined
 liborcus_@ORCUS_API_VERSION@_la_LIBADD = \
+	../parser/liborcus-parser-@ORCUS_API_VERSION@.la \
 	 $(BOOST_SYSTEM_LIBS) $(BOOST_SYSTEM_LIB) $(ZLIB_LIBS)
 
 # liborcus-test-xml-map-tree
@@ -185,7 +187,6 @@
 	xml_map_tree_test.cpp
 
 liborcus_test_xml_map_tree_LDADD = \
-	../parser/liborcus-parser-@ORCUS_API_VERSION@.la \
 	liborcus-@ORCUS_API_VERSION@.la
 
 # liborcus-test-xml-structure-tree
@@ -195,7 +196,6 @@
 	xml_structure_tree_test.cpp
 
 liborcus_test_xml_structure_tree_LDADD = \
-	../parser/liborcus-parser-@ORCUS_API_VERSION@.la \
 	liborcus-@ORCUS_API_VERSION@.la
 
 # liborcus-test-common
@@ -206,7 +206,6 @@
 	common_test.cpp
 
 liborcus_test_common_LDADD = \
-	../parser/liborcus-parser-@ORCUS_API_VERSION@.la \
 	liborcus-@ORCUS_API_VERSION@.la
 
 TESTS += \
--- liborcus-0.5.1/src/parser/Makefile.am	2013-04-12 16:25:03.000000000 +0200
+++ liborcus-0.5.1/src/parser/Makefile.am	2013-05-27 18:22:44.103354661 +0200
@@ -20,7 +20,7 @@
 
 liborcus_parser_@ORCUS_API_VERSION@_la_LDFLAGS = -no-undefined
 liborcus_parser_@ORCUS_API_VERSION@_la_LIBADD = \
-	 $(ZLIB_LIBS)
+	 $(ZLIB_LIBS) $(BOOST_SYSTEM_LIB)
 
 EXTRA_PROGRAMS = \
 	parser-test-string-pool \
--- liborcus-0.5.1/src/spreadsheet/Makefile.am	2013-04-11 03:43:48.000000000 +0200
+++ liborcus-0.5.1/src/spreadsheet/Makefile.am	2013-05-14 17:27:27.180643045 +0200
@@ -19,6 +19,6 @@
 
 liborcus_spreadsheet_model_@ORCUS_API_VERSION@_la_CXXFLAGS = $(LIBIXION_CFLAGS)
 liborcus_spreadsheet_model_@ORCUS_API_VERSION@_la_LDFLAGS = -no-undefined
-liborcus_spreadsheet_model_@ORCUS_API_VERSION@_la_LIBADD = $(LIBIXION_LIBS)
+liborcus_spreadsheet_model_@ORCUS_API_VERSION@_la_LIBADD = ../liborcus/liborcus-@ORCUS_API_VERSION@.la $(LIBIXION_LIBS)
 
 endif

Places

File liborcus-0.5.1-windows.patch of Package mingw32-liborcus (Revision f30c5cba2910e85bfb65c4c6453463c7)

Places