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

[Evangelos Foutras]

    Date: Monday, November 2, 2015 @ 05:40:16
  Author: foutrelis
Revision: 249966

Fix build with Boost 1.59

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

----------------+
 PKGBUILD       |    5 ++++-
 boost159.patch |   22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-02 04:38:12 UTC (rev 249965)
+++ PKGBUILD	2015-11-02 04:40:16 UTC (rev 249966)
@@ -14,14 +14,17 @@
 depends=('libwpd' 'libwpg' 'libxml2' 'icu' 'librevenge')
 makedepends=('boost' 'gperf' 'doxygen' 'cppunit')
 source=(http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz
+        boost159.patch
         fix_test.diff)
 md5sums=('fda521a18bbfccc5f034ea02119e7998'
+         'd197fba862d0a176fd2e68c448c96844'
          'f7f3d18896d7e76536267238bf85be42')
 
 prepare() {
   cd $pkgname-$pkgver
+  patch -Np1 -i ../boost159.patch
   # https://gerrit.libreoffice.org/gitweb?p=libvisio.git;a=commit;h=75a02c586f6ec49d4316f79004834250ef42b0e0
-  patch -Np1 -i $srcdir/fix_test.diff
+  patch -Np1 -i ../fix_test.diff
   autoreconf -vfi
 }
 

Added: boost159.patch
===================================================================
--- boost159.patch	                        (rev 0)
+++ boost159.patch	2015-11-02 04:40:16 UTC (rev 249966)
@@ -0,0 +1,22 @@
+From 2968c3dff8572b4734cb42c7bd5b00222f7fb288 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Sun, 30 Aug 2015 13:59:23 +0200
+Subject: [PATCH] fix build with boost 1.59
+
+Change-Id: I21eebdfa99d379e57949bfe4bf7eb83aec16f916
+---
+ src/lib/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
+index dc0f8fd..6946b0a 100644
+--- a/src/lib/Makefile.am
++++ b/src/lib/Makefile.am
+@@ -22,6 +22,7 @@ generated_files = \
+ 	$(top_builddir)/src/lib/tokens.h \
+ 	$(top_builddir)/src/lib/tokenhash.h
+ 
++libvisio_ at VSD_MAJOR_VERSION@_ at VSD_MINOR_VERSION@_la_CPPFLAGS = -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED
+ libvisio_ at VSD_MAJOR_VERSION@_ at VSD_MINOR_VERSION@_la_LIBADD  = $(LIBVISIO_LIBS) @LIBVISIO_WIN32_RESOURCE@
+ libvisio_ at VSD_MAJOR_VERSION@_ at VSD_MINOR_VERSION@_la_DEPENDENCIES = @LIBVISIO_WIN32_RESOURCE@
+ libvisio_ at VSD_MAJOR_VERSION@_ at VSD_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined