[arch-commits] Commit in libcdr/trunk (PKGBUILD boost159.patch)

[Evangelos Foutras]

    Date: Monday, November 2, 2015 @ 05:36:50
  Author: foutrelis
Revision: 249963

Fix build with Boost 1.59

Added:
  libcdr/trunk/boost159.patch
Modified:
  libcdr/trunk/PKGBUILD

----------------+
 PKGBUILD       |   12 ++++++++++--
 boost159.patch |   11 +++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2015-11-02 04:23:15 UTC (rev 249962)
+++ PKGBUILD    2015-11-02 04:36:50 UTC (rev 249963)
@@ -12,9 +12,17 @@
 license=('GPL2' 'LGPL2.1' 'MPL')
 depends=('libwpd' 'lcms2' 'icu' 'librevenge')
 makedepends=('libwpg' 'boost' 'doxygen')
-source=(http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('72ed4d2f900eac95061207d026d5324c')
+source=(http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz
+        boost159.patch)
+md5sums=('72ed4d2f900eac95061207d026d5324c'
+         'dd38f0c2324920b577b9b5725a8fa3f2')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../boost159.patch
+  autoreconf -vi
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr

Added: boost159.patch
===================================================================
--- boost159.patch                              (rev 0)
+++ boost159.patch      2015-11-02 04:36:50 UTC (rev 249963)
@@ -0,0 +1,11 @@
+diff -upr libcdr-0.1.1.orig/src/lib/Makefile.am 
libcdr-0.1.1/src/lib/Makefile.am
+--- libcdr-0.1.1.orig/src/lib/Makefile.am      2014-03-29 12:23:47.000000000 
+0200
++++ libcdr-0.1.1/src/lib/Makefile.am   2015-11-02 06:35:12.633076664 +0200
+@@ -14,6 +14,7 @@ libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VE
+ 
+ AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(LCMS2_CFLAGS) 
$(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBCDR_BUILD=1
+ 
++libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_CPPFLAGS = 
-DBOOST_ERROR_CODE_HEADER_ONLY
+ libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LIBADD  = $(REVENGE_LIBS) 
$(LCMS2_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBCDR_WIN32_RESOURCE@
+ libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_DEPENDENCIES = 
@LIBCDR_WIN32_RESOURCE@
+ libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LDFLAGS = $(version_info) 
-export-dynamic -no-undefined