[packages/libreoffice] - fix building with boost 1.59
baggins
baggins at pld-linux.org
Tue Nov 17 20:26:38 CET 2015
commit d895ef1b4aea132652ae5c5fc1a96eaf9ea0a2e7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Nov 17 20:26:25 2015 +0100
- fix building with boost 1.59
boost-1.59.patch | 11 +++++++++++
libreoffice.spec | 6 ++++--
2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index 7f92f0a..c2c6e0e 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -87,6 +87,7 @@ Source28: http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.b
Patch0: disable-failing-test.patch
Patch1: liborcus-0.9.patch
+Patch2: boost-1.59.patch
URL: http://www.documentfoundation.org/
BuildRequires: /usr/bin/getopt
BuildRequires: Firebird-devel
@@ -2812,6 +2813,7 @@ dialogs.
%setup -q -n %{name}-%{version} -a1 -a2 -a3
%patch0 -p1
%patch1 -p1
+%patch2 -p1
for dir in *-%{version}; do
[ -f $dir/ChangeLog ] && mv $dir/ChangeLog ChangeLog-$dir
@@ -4190,10 +4192,10 @@ fi
%files pdfimport
# -f pdfimport.lang
%defattr(644,root,root,755)
-%{_libdir}/%{name}/program/xpdfimport
+%attr(755,root,root) %{_libdir}/%{name}/program/xpdfimport
%{_datadir}/%{name}/share/registry/pdfimport.xcd
%{_datadir}/%{name}/share/xpdfimport
-%{_libdir}/%{name}/program/libpdfimportlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libpdfimportlo.so
%files wiki-publisher -f wiki-publisher.lang
%defattr(644,root,root,755)
diff --git a/boost-1.59.patch b/boost-1.59.patch
new file mode 100644
index 0000000..fb8a1bc
--- /dev/null
+++ b/boost-1.59.patch
@@ -0,0 +1,11 @@
+--- 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) \
+ ))
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libreoffice.git/commitdiff/d895ef1b4aea132652ae5c5fc1a96eaf9ea0a2e7
More information about the pld-cvs-commit
mailing list