From: Jan Rękorajski <baggins@pld-linux.org>
Date: Fri, 20 Nov 2015 07:58:32 +0000 (+0100)
Subject: - better fix to boost linking problems
X-Git-Tag: auto/th/libreoffice-5.0.2.1-6~2
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=e8482f50dd953070b2766ab21477cc21548b99de;p=packages%2Flibreoffice.git

- better fix to boost linking problems
---

diff --git a/boost-1.59.patch b/boost-1.59.patch
index 8992765..830aa7c 100644
--- a/boost-1.59.patch
+++ b/boost-1.59.patch
@@ -1,61 +1,14 @@
---- libreoffice-5.0.2.1/sdext/Library_pdfimport.mk~	2015-09-05 09:59:15.000000000 +0200
-+++ libreoffice-5.0.2.1/sdext/Library_pdfimport.mk	2015-11-17 20:22:25.619990753 +0100
-@@ -31,7 +31,8 @@
- ))
- 
- $(eval $(call gb_Library_use_externals,pdfimport,\
- 	boost_headers \
-+    boost_system \
-     zlib \
-     $(if $(filter-out WNT MACOSX,$(OS)),fontconfig) \
- ))
---- libreoffice-5.0.2.1/sdext/Executable_pdfunzip.mk~	2015-09-05 09:59:15.000000000 +0200
-+++ libreoffice-5.0.2.1/sdext/Executable_pdfunzip.mk	2015-11-17 23:54:08.725597556 +0100
-@@ -13,6 +13,7 @@
- 
- $(eval $(call gb_Executable_use_externals,pdfunzip,\
-     boost_headers \
-+    boost_system \
-     zlib \
- ))
- 
---- libreoffice-5.0.2.1/sdext/CppunitTest_sdext_pdfimport.mk~	2015-09-05 09:59:15.000000000 +0200
-+++ libreoffice-5.0.2.1/sdext/CppunitTest_sdext_pdfimport.mk	2015-11-17 23:54:30.339491441 +0100
-@@ -21,6 +21,7 @@
- 
- $(eval $(call gb_CppunitTest_use_externals,sdext_pdfimport,\
-     boost_headers \
-+    boost_system \
+--- libreoffice-5.0.2.1/sdext/StaticLibrary_pdfimport_s.mk~	2015-11-18 08:03:28.000000000 +0100
++++ libreoffice-5.0.2.1/sdext/StaticLibrary_pdfimport_s.mk	2015-11-20 08:35:33.833069957 +0100
+@@ -20,6 +20,11 @@
      zlib \
  ))
  
---- libreoffice-5.0.2.1/sdext/Executable_pdf2xml.mk~	2015-09-05 09:59:15.000000000 +0200
-+++ libreoffice-5.0.2.1/sdext/Executable_pdf2xml.mk	2015-11-17 23:54:44.283181837 +0100
-@@ -13,6 +13,7 @@
- 
- $(eval $(call gb_Executable_use_externals,pdf2xml,\
-     boost_headers \
-+    boost_system \
-     cppunit \
-     zlib \
- ))
---- libreoffice-5.0.2.1/sdext/Executable_xpdfimport.mk~	2015-09-05 09:59:15.000000000 +0200
-+++ libreoffice-5.0.2.1/sdext/Executable_xpdfimport.mk	2015-11-17 23:54:54.916785137 +0100
-@@ -11,6 +11,7 @@
- 
- $(eval $(call gb_Executable_use_externals,xpdfimport,\
-     boost_headers \
-+    boost_system \
-     poppler \
-     $(if $(filter-out WNT MACOSX,$(OS)),fontconfig) \
-     zlib \
---- libreoffice-5.0.2.1/sdext/StaticLibrary_pdfimport_s.mk~	2015-09-05 09:59:15.000000000 +0200
-+++ libreoffice-5.0.2.1/sdext/StaticLibrary_pdfimport_s.mk	2015-11-17 23:55:21.907461607 +0100
-@@ -16,6 +16,7 @@
- 
- $(eval $(call gb_StaticLibrary_use_externals,pdfimport_s,\
-     boost_headers \
-+    boost_system \
-     zlib \
- ))
++$(if $(SYSTEM_BOOST), \
++    $(call gb_LinkTarget_add_ldflags,$(1),$(BOOST_LDFLAGS)) \
++    $(call gb_LinkTarget_add_libs,$(1),$(BOOST_SYSTEM_LIB)) \
++)
++
+ $(eval $(call gb_StaticLibrary_use_custom_headers,pdfimport_s,sdext/pdfimport))
  
+ $(eval $(call gb_StaticLibrary_set_include,pdfimport_s,\