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

[Andreas Radke]

    Date: Thursday, December 24, 2015 @ 10:07:01
  Author: andyrtr
Revision: 257243

upgpkg: libvisio 0.1.4-1

upstream update 0.1.4

Modified:
  libvisio/trunk/PKGBUILD
Deleted:
  libvisio/trunk/boost159.patch
  libvisio/trunk/fix_test.diff

----------------+
 PKGBUILD       |   20 ++++----------------
 boost159.patch |   22 ----------------------
 fix_test.diff  |   49 -------------------------------------------------
 3 files changed, 4 insertions(+), 87 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-24 08:39:44 UTC (rev 257242)
+++ PKGBUILD	2015-12-24 09:07:01 UTC (rev 257243)
@@ -5,8 +5,8 @@
 # Contributor: philacs
 
 pkgname=libvisio
-pkgver=0.1.3
-pkgrel=3
+pkgver=0.1.4
+pkgrel=1
 pkgdesc='Library providing ability to interpret and import visio diagrams'
 arch=('i686' 'x86_64')
 url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
@@ -13,21 +13,9 @@
 license=('LGPL')
 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')
+source=(http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz)
+md5sums=('bf5f66ef14b789cd5824de8b31841867')
 
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../boost159.patch
-  # https://gerrit.libreoffice.org/gitweb?p=libvisio.git;a=commit;h=75a02c586f6ec49d4316f79004834250ef42b0e0
-  patch -Np1 -i ../fix_test.diff
-  autoreconf -vfi
-}
-
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr

Deleted: boost159.patch
===================================================================
--- boost159.patch	2015-12-24 08:39:44 UTC (rev 257242)
+++ boost159.patch	2015-12-24 09:07:01 UTC (rev 257243)
@@ -1,22 +0,0 @@
-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

Deleted: fix_test.diff
===================================================================
--- fix_test.diff	2015-12-24 08:39:44 UTC (rev 257242)
+++ fix_test.diff	2015-12-24 09:07:01 UTC (rev 257243)
@@ -1,49 +0,0 @@
-From 75a02c586f6ec49d4316f79004834250ef42b0e0 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Sat, 25 Jul 2015 15:11:19 +0200
-Subject: [PATCH 1/1] fix test
-
-The previous version only worked with libxml2 < 2.9.2, because of a bug
-in handling nested elements of the same name.
-
-Change-Id: I1368cedf5845895154806d4ecf427bfbed19165f
----
- configure.ac            |    4 ++++
- src/test/importtest.cpp |    6 +++---
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1611dcb..a075e73 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -128,6 +128,10 @@ AS_IF([test "x$enable_tools" = "xyes"], [
- 	PKG_CHECK_MODULES([REVENGE_STREAM],[
- 		librevenge-stream-0.0
- 	])
-+        PKG_CHECK_EXISTS([libxml-2.0 >= 2.9.2],
-+                [],
-+                [AC_MSG_ERROR([libxml2 >= 2.9.2 is needed to run tests])]
-+        )
- ])
- AC_SUBST([REVENGE_GENERATORS_CFLAGS])
- AC_SUBST([REVENGE_GENERATORS_LIBS])
-diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp
-index 8554309..0296380 100644
---- a/src/test/importtest.cpp
-+++ b/src/test/importtest.cpp
-@@ -272,9 +272,9 @@ void ImportTest::testVsdxImportBgColorFromTheme()
- void ImportTest::testVsdxCharBgColor()
- {
-   m_doc = parse("bgcolor.vsdx", m_buffer);
--  assertXPathNoAttribute(m_doc, "/document/page/layer/textObject/paragraph/span", "background-color");
--  assertXPath(m_doc, "/document/page/layer/layer[2]/textObject/paragraph/span", "background-color", "#9dbb61");
--  assertXPath(m_doc, "/document/page/layer/layer[2]/layer[2]/textObject/paragraph/span", "background-color", "#9dbb61");
-+  assertXPathNoAttribute(m_doc, "/document/page/layer[1]/textObject/paragraph/span", "background-color");
-+  assertXPath(m_doc, "/document/page/layer[2]/textObject/paragraph/span", "background-color", "#9dbb61");
-+  assertXPath(m_doc, "/document/page/layer[3]/textObject/paragraph/span", "background-color", "#9dbb61");
- }
- 
- CPPUNIT_TEST_SUITE_REGISTRATION(ImportTest);
--- 
-1.7.9.5
-