Attachment #417250 for bug #558794

View | Details | Raw Unified | Return to bug 558794
Collapse All | Expand All

Lines 35-41 Link Here

(-)a/external/libabw/ExternalProject_libabw.mk (-1 / +2 lines)
35	--disable-werror \	35	--disable-werror \
36	$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \	36	$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
37	CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\	37	CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\
38	-I$(call gb_UnpackedTarball_get_dir,boost))" \	38	-I$(call gb_UnpackedTarball_get_dir,boost)) \
		39	-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \
39	$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \	40	$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
40	&& $(MAKE) \	41	&& $(MAKE) \
41	)	42	)

Lines 36-42 Link Here

(-)a/external/libcdr/ExternalProject_libcdr.mk (-1 / +2 lines)
36	--disable-werror \	36	--disable-werror \
37	--disable-weffc \	37	--disable-weffc \
38	$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \	38	$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
39	CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \	39	CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
		40	-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \
40	$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \	41	$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
41	&& $(MAKE) \	42	&& $(MAKE) \
42	)	43	)




))

$(eval $(call gb_ExternalProject_use_externals,libmwaw,\
	boost_headers \
	revenge \
))


			, \
				--enable-shared --disable-static \
			) \
			--with-sharedptr=c++11 \
			--without-docs \
			--disable-tools \
			--disable-zip \
			$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
			--disable-werror \
			CXXFLAGS="$(CXXFLAGS_CXX11)" \
				$(if $(COM_GCC_IS_CLANG),-Qunused-arguments) \
				-I$(call gb_UnpackedTarball_get_dir,boost))" \
			$(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \
				'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
					-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \





$(eval $(call gb_Library_use_externals,mwaw,\
    revenge \
    boost_headers \
))

$(eval $(call gb_Library_set_warnings_not_errors,mwaw))

))

$(eval $(call gb_Library_add_defs,mwaw,\
	-DBOOST_ALL_NO_LIB \
	-DBUILD_MWAW \
	-DNDEBUG \
	-D_WINDLL \
	-DSHAREDPTR_STD \
))

$(eval $(call gb_Library_add_generated_exception_objects,mwaw,\

Lines 16-22 Link Here

(-)a/external/libodfgen/ExternalProject_libodfgen.mk (-2 / +1 lines)
16	))	16	))
17		17
18	$(eval $(call gb_ExternalProject_use_externals,libodfgen,\	18	$(eval $(call gb_ExternalProject_use_externals,libodfgen,\
19	boost_headers \
20	revenge \	19	revenge \
21	))	20	))
22		21
Lines 35-41 Link Here
35	--disable-weffc \	34	--disable-weffc \
36	--without-docs \	35	--without-docs \
37	$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \	36	$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
38	CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) $(if $(SYSTEM_REVENGE),,$(if $(filter-out MSC,$(COM)),-DLIBREVENGE_VISIBILITY))" \	37	CXXFLAGS="$(CXXFLAGS_CXX11) $(if $(SYSTEM_REVENGE),,$(if $(filter-out MSC,$(COM)),-DLIBREVENGE_VISIBILITY))" \
39	$(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \	38	$(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \
40	'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \	39	'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
41	-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \	40	-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \




$(eval $(call gb_Library_use_unpacked,odfgen,libodfgen))

$(eval $(call gb_Library_use_externals,odfgen,\
    boost_headers \
	revenge \
))


))

$(eval $(call gb_Library_add_defs,odfgen,\
	-DBOOST_ALL_NO_LIB \
	-DDLL_EXPORT \
	-DLIBODFGEN_BUILD \
	-DNDEBUG \
	-DSHAREDPTR_STD \
	-DPACKAGE=\"libodfgen\" \
	-DVERSION=\"0.1.$(ODFGEN_VERSION_MICRO)\" \
))

Lines 35-41 Link Here

(-)a/external/libvisio/ExternalProject_libvisio.mk (-1 / +2 lines)
35	$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \	35	$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
36	--disable-werror \	36	--disable-werror \
37	$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \	37	$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
38	CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \	38	CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
		39	-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \
39	$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \	40	$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
40	&& $(MAKE) \	41	&& $(MAKE) \
41	)	42	)




From bc6f0f3a006123a89d1321038edeb75f2fd67c6f Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sun, 30 Aug 2015 11:21:29 +0200
Subject: [PATCH] add missing include

---
 src/lib/WPS8.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/WPS8.cpp b/src/lib/WPS8.cpp
index 04c1e57..8d39fa8 100644
--- a/src/lib/WPS8.cpp
+++ b/src/lib/WPS8.cpp
@@ -19,6 +19,7 @@
  * applicable instead of those above.
  */
 
+#include <algorithm>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-- 
2.4.3





))

$(eval $(call gb_ExternalProject_use_externals,libwps,\
	boost_headers \
	revenge \
))


			, \
				--enable-shared --disable-static \
			) \
			--with-sharedptr=c++11 \
			--without-docs \
			--disable-tools \
			--disable-debug \
			--disable-werror \
			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
			CXXFLAGS="$(CXXFLAGS_CXX11) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \
			$(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \
				'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
					-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \




$(eval $(call gb_Library_use_unpacked,wps,libwps))

$(eval $(call gb_Library_use_externals,wps,\
    boost_headers \
	revenge \
))


))

$(eval $(call gb_Library_add_defs,wps,\
	-DBOOST_ALL_NO_LIB \
	-DBUILD_WPS\
	-DDLL_EXPORT \
	-DNDEBUG \
	-DSHAREDPTR_STD \
))

$(eval $(call gb_Library_set_generated_cxx_suffix,wps,cpp))

Lines 14-19 Link Here

(-)a/external/libwps/UnpackedTarball_libwps.mk (+1 lines)
14	$(eval $(call gb_UnpackedTarball_set_patchlevel,libwps,1))	14	$(eval $(call gb_UnpackedTarball_set_patchlevel,libwps,1))
15		15
16	$(eval $(call gb_UnpackedTarball_add_patches,libwps,\	16	$(eval $(call gb_UnpackedTarball_add_patches,libwps,\
		17	external/libwps/0001-add-missing-include.patch \
17	external/libwps/0001-QuattroPro-parser-correct-a-mistake-when-reading-neg.patch \	18	external/libwps/0001-QuattroPro-parser-correct-a-mistake-when-reading-neg.patch \
18	external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch \	19	external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch \
19	$(if $(SYSTEM_REVENGE),,external/libwps/rpath.patch.0) \	20	$(if $(SYSTEM_REVENGE),,external/libwps/rpath.patch.0) \

Return to bug 558794

Lines 16-22 Link Here

(-)a/external/libmwaw/ExternalProject_libmwaw.mk (-4 / +2 lines)
16	))	16	))
17		17
18	$(eval $(call gb_ExternalProject_use_externals,libmwaw,\	18	$(eval $(call gb_ExternalProject_use_externals,libmwaw,\
19	boost_headers \
20	revenge \	19	revenge \
21	))	20	))
22		21
Lines 30-44 Link Here
30	, \	29	, \
31	--enable-shared --disable-static \	30	--enable-shared --disable-static \
32	) \	31	) \
		32	--with-sharedptr=c++11 \
33	--without-docs \	33	--without-docs \
34	--disable-tools \	34	--disable-tools \
35	--disable-zip \	35	--disable-zip \
36	$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \	36	$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
37	$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \	37	$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
38	--disable-werror \	38	--disable-werror \
39	CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\	39	CXXFLAGS="$(CXXFLAGS_CXX11)" \
40	$(if $(COM_GCC_IS_CLANG),-Qunused-arguments) \
41	-I$(call gb_UnpackedTarball_get_dir,boost))" \
42	$(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \	40	$(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \
43	'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \	41	'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
44	-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \	42	-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \

Lines 13-19 Link Here

(-)a/external/libmwaw/Library_mwaw.mk (-2 / +1 lines)
13		13
14	$(eval $(call gb_Library_use_externals,mwaw,\	14	$(eval $(call gb_Library_use_externals,mwaw,\
15	revenge \	15	revenge \
16	boost_headers \
17	))	16	))
18		17
19	$(eval $(call gb_Library_set_warnings_not_errors,mwaw))	18	$(eval $(call gb_Library_set_warnings_not_errors,mwaw))
Lines 24-33 Link Here
24	))	23	))
25		24
26	$(eval $(call gb_Library_add_defs,mwaw,\	25	$(eval $(call gb_Library_add_defs,mwaw,\
27	-DBOOST_ALL_NO_LIB \
28	-DBUILD_MWAW \	26	-DBUILD_MWAW \
29	-DNDEBUG \	27	-DNDEBUG \
30	-D_WINDLL \	28	-D_WINDLL \
		29	-DSHAREDPTR_STD \
31	))	30	))
32		31
33	$(eval $(call gb_Library_add_generated_exception_objects,mwaw,\	32	$(eval $(call gb_Library_add_generated_exception_objects,mwaw,\

Lines 12-18 Link Here

(-)a/external/libodfgen/Library_odfgen.mk (-2 / +1 lines)
12	$(eval $(call gb_Library_use_unpacked,odfgen,libodfgen))	12	$(eval $(call gb_Library_use_unpacked,odfgen,libodfgen))
13		13
14	$(eval $(call gb_Library_use_externals,odfgen,\	14	$(eval $(call gb_Library_use_externals,odfgen,\
15	boost_headers \
16	revenge \	15	revenge \
17	))	16	))
18		17
Lines 24-33 Link Here
24	))	23	))
25		24
26	$(eval $(call gb_Library_add_defs,odfgen,\	25	$(eval $(call gb_Library_add_defs,odfgen,\
27	-DBOOST_ALL_NO_LIB \
28	-DDLL_EXPORT \	26	-DDLL_EXPORT \
29	-DLIBODFGEN_BUILD \	27	-DLIBODFGEN_BUILD \
30	-DNDEBUG \	28	-DNDEBUG \
		29	-DSHAREDPTR_STD \
31	-DPACKAGE=\"libodfgen\" \	30	-DPACKAGE=\"libodfgen\" \
32	-DVERSION=\"0.1.$(ODFGEN_VERSION_MICRO)\" \	31	-DVERSION=\"0.1.$(ODFGEN_VERSION_MICRO)\" \
33	))	32	))

Line 0 Link Here

(-)a/external/libwps/0001-add-missing-include.patch (+24 lines)
	1	From bc6f0f3a006123a89d1321038edeb75f2fd67c6f Mon Sep 17 00:00:00 2001
	2	From: David Tardon <dtardon@redhat.com>
	3	Date: Sun, 30 Aug 2015 11:21:29 +0200
	4	Subject: [PATCH] add missing include
	5
	6	---
	7	src/lib/WPS8.cpp \| 1 +
	8	1 file changed, 1 insertion(+)
	9
	10	diff --git a/src/lib/WPS8.cpp b/src/lib/WPS8.cpp
	11	index 04c1e57..8d39fa8 100644
	12	--- a/src/lib/WPS8.cpp
	13	+++ b/src/lib/WPS8.cpp
	14	@@ -19,6 +19,7 @@
	15	* applicable instead of those above.
	16	*/
	17
	18	+#include <algorithm>
	19	#include <stdlib.h>
	20	#include <stdio.h>
	21	#include <string.h>
	22	--
	23	2.4.3
	24

Lines 16-22 Link Here

(-)a/external/libwps/ExternalProject_libwps.mk (-2 / +2 lines)
16	))	16	))
17		17
18	$(eval $(call gb_ExternalProject_use_externals,libwps,\	18	$(eval $(call gb_ExternalProject_use_externals,libwps,\
19	boost_headers \
20	revenge \	19	revenge \
21	))	20	))
22		21
Lines 30-41 Link Here
30	, \	29	, \
31	--enable-shared --disable-static \	30	--enable-shared --disable-static \
32	) \	31	) \
		32	--with-sharedptr=c++11 \
33	--without-docs \	33	--without-docs \
34	--disable-tools \	34	--disable-tools \
35	--disable-debug \	35	--disable-debug \
36	--disable-werror \	36	--disable-werror \
37	$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \	37	$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
38	CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \	38	CXXFLAGS="$(CXXFLAGS_CXX11) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \
39	$(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \	39	$(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \
40	'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \	40	'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
41	-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \	41	-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \

Lines 12-18 Link Here

(-)a/external/libwps/Library_wps.mk (-2 / +1 lines)
12	$(eval $(call gb_Library_use_unpacked,wps,libwps))	12	$(eval $(call gb_Library_use_unpacked,wps,libwps))
13		13
14	$(eval $(call gb_Library_use_externals,wps,\	14	$(eval $(call gb_Library_use_externals,wps,\
15	boost_headers \
16	revenge \	15	revenge \
17	))	16	))
18		17
Lines 24-33 Link Here
24	))	23	))
25		24
26	$(eval $(call gb_Library_add_defs,wps,\	25	$(eval $(call gb_Library_add_defs,wps,\
27	-DBOOST_ALL_NO_LIB \
28	-DBUILD_WPS\	26	-DBUILD_WPS\
29	-DDLL_EXPORT \	27	-DDLL_EXPORT \
30	-DNDEBUG \	28	-DNDEBUG \
		29	-DSHAREDPTR_STD \
31	))	30	))
32		31
33	$(eval $(call gb_Library_set_generated_cxx_suffix,wps,cpp))	32	$(eval $(call gb_Library_set_generated_cxx_suffix,wps,cpp))