Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1cd21216b230c35b31db1038d0c279195d66aa9c
commit 1cd21216b230c35b31db1038d0c279195d66aa9c Author: crazy <[email protected]> Date: Thu Jan 28 09:41:56 2016 +0100 libabw-0.1.1-4-x86_64 * rebuild with boost * added patch to fix the build diff --git a/source/xoffice/libabw/FrugalBuild b/source/xoffice/libabw/FrugalBuild index 19224d8..5b8c62b 100644 --- a/source/xoffice/libabw/FrugalBuild +++ b/source/xoffice/libabw/FrugalBuild @@ -3,16 +3,17 @@ pkgname=libabw pkgver=0.1.1 -pkgrel=3 +pkgrel=4 pkgdesc="A library to import of AbiWord files" url="http://wiki.documentfoundation.org/DLP/Libraries/libabw"; -depends=('libwpd>=0.10.0' 'libboost>=1.58.0') -makedepends=('boost>=1.58.0' 'cppunit' 'gperf') +depends=('libwpd>=0.10.1-4' 'libboost>=1.60.0') +makedepends=('boost>=1.60.0' 'cppunit' 'gperf') groups=('xoffice') archs=('i686' 'x86_64') up2date="Flasttar http://dev-www.libreoffice.org/src/libabw"; -source=(http://dev-www.libreoffice.org/src/libabw/libabw-$pkgver.tar.xz) -sha1sums=('b4ce343738228e235c9d378dc31b016462e7d984') +source=(http://dev-www.libreoffice.org/src/libabw/libabw-$pkgver.tar.xz boost.patch) +sha1sums=('b4ce343738228e235c9d378dc31b016462e7d984' \ + 'd20ee0fca65a1bb4b3b6f935ed2e4872d82bec18') Fconfopts="$Fconfopts --disable-werror" # optimization OK diff --git a/source/xoffice/libabw/boost.patch b/source/xoffice/libabw/boost.patch new file mode 100644 index 0000000..8f85c39 --- /dev/null +++ b/source/xoffice/libabw/boost.patch @@ -0,0 +1,24 @@ +diff -Naur libabw-0.1.1/src/lib/Makefile.am libabw-0.1.1-boost/src/lib/Makefile.am +--- libabw-0.1.1/src/lib/Makefile.am 2014-12-20 08:44:20.000000000 +0100 ++++ libabw-0.1.1-boost/src/lib/Makefile.am 2016-01-28 09:35:30.586836257 +0100 +@@ -26,7 +26,7 @@ + $(top_builddir)/src/lib/tokens.h \ + $(top_builddir)/src/lib/tokenhash.h + +-libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) $(LIBXML_LIBS) $(ZLIB_LIBS) @LIBABW_WIN32_RESOURCE@ ++libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) $(LIBXML_LIBS) $(ZLIB_LIBS) -lboost_system @LIBABW_WIN32_RESOURCE@ + libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_DEPENDENCIES = @LIBABW_WIN32_RESOURCE@ + libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) + libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_SOURCES = \ +diff -Naur libabw-0.1.1/src/lib/Makefile.in libabw-0.1.1-boost/src/lib/Makefile.in +--- libabw-0.1.1/src/lib/Makefile.in 2014-12-20 14:23:18.000000000 +0100 ++++ libabw-0.1.1-boost/src/lib/Makefile.in 2016-01-28 09:36:54.901045501 +0100 +@@ -369,7 +369,7 @@ + $(top_builddir)/src/lib/tokens.h \ + $(top_builddir)/src/lib/tokenhash.h + +-libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) $(LIBXML_LIBS) $(ZLIB_LIBS) @LIBABW_WIN32_RESOURCE@ ++libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) $(LIBXML_LIBS) $(ZLIB_LIBS) -lboost_system @LIBABW_WIN32_RESOURCE@ + libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_DEPENDENCIES = @LIBABW_WIN32_RESOURCE@ + libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) + libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_SOURCES = \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
