[packages/libcdr] - fix building with boost 1.59 - rel 6

baggins baggins at pld-linux.org
Tue Nov 17 08:52:04 CET 2015


commit c47a61bcca8125b600e0cfd7a919f5c85130de4c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Nov 17 08:51:49 2015 +0100

    - fix building with boost 1.59
    - rel 6

 boost-1.59.patch | 11 +++++++++++
 libcdr.spec      |  9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/libcdr.spec b/libcdr.spec
index f9a78d7..37d9f2d 100644
--- a/libcdr.spec
+++ b/libcdr.spec
@@ -6,11 +6,12 @@ Summary:	A library providing ability to interpret and import Corel Draw drawings
 Summary(pl.UTF-8):	Biblioteka umożliwiająca interpretowanie i importowanie rysunków Corel Draw
 Name:		libcdr
 Version:	0.1.1
-Release:	5
+Release:	6
 License:	MPL v2.0
 Group:		Libraries
 Source0:	http://dev-www.libreoffice.org/src/libcdr/%{name}-%{version}.tar.xz
 # Source0-md5:	72ed4d2f900eac95061207d026d5324c
+Patch0:		boost-1.59.patch
 URL:		http://www.freedesktop.org/wiki/Software/libcdr
 BuildRequires:	doxygen
 BuildRequires:	boost-devel >= 1.41.0
@@ -95,8 +96,14 @@ Aktualnie obsługiwane są XHTML i raw.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
 	--disable-silent-rules \
 	%{?with_static_libs:--enable-static}
diff --git a/boost-1.59.patch b/boost-1.59.patch
new file mode 100644
index 0000000..0ac2923
--- /dev/null
+++ b/boost-1.59.patch
@@ -0,0 +1,11 @@
+--- libcdr-0.1.1/src/lib/Makefile.am~	2014-03-29 11:23:47.000000000 +0100
++++ libcdr-0.1.1/src/lib/Makefile.am	2015-11-17 08:49:44.303756676 +0100
+@@ -14,7 +14,7 @@
+ 
+ AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(LCMS2_CFLAGS) $(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBCDR_BUILD=1
+ 
+-libcdr_ at CDR_MAJOR_VERSION@_ at CDR_MINOR_VERSION@_la_LIBADD  = $(REVENGE_LIBS) $(LCMS2_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBCDR_WIN32_RESOURCE@
++libcdr_ at CDR_MAJOR_VERSION@_ at CDR_MINOR_VERSION@_la_LIBADD  = $(REVENGE_LIBS) $(LCMS2_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) -lboost_system @LIBCDR_WIN32_RESOURCE@
+ libcdr_ at CDR_MAJOR_VERSION@_ at CDR_MINOR_VERSION@_la_DEPENDENCIES = @LIBCDR_WIN32_RESOURCE@
+ libcdr_ at CDR_MAJOR_VERSION@_ at CDR_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined
+ libcdr_ at CDR_MAJOR_VERSION@_ at CDR_MINOR_VERSION@_la_SOURCES = \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libcdr.git/commitdiff/c47a61bcca8125b600e0cfd7a919f5c85130de4c



More information about the pld-cvs-commit mailing list