[arch-commits] Commit in libvisio/repos (6 files)
Andreas Radke
andyrtr at archlinux.org
Tue Jul 28 17:25:41 UTC 2015
Date: Tuesday, July 28, 2015 @ 19:25:40
Author: andyrtr
Revision: 242580
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libvisio/repos/extra-i686/PKGBUILD
(from rev 242579, libvisio/trunk/PKGBUILD)
libvisio/repos/extra-i686/fix_test.diff
(from rev 242579, libvisio/trunk/fix_test.diff)
libvisio/repos/extra-x86_64/PKGBUILD
(from rev 242579, libvisio/trunk/PKGBUILD)
libvisio/repos/extra-x86_64/fix_test.diff
(from rev 242579, libvisio/trunk/fix_test.diff)
Deleted:
libvisio/repos/extra-i686/PKGBUILD
libvisio/repos/extra-x86_64/PKGBUILD
----------------------------+
/PKGBUILD | 88 +++++++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 33 ----------------
extra-i686/fix_test.diff | 49 +++++++++++++++++++++++
extra-x86_64/PKGBUILD | 33 ----------------
extra-x86_64/fix_test.diff | 49 +++++++++++++++++++++++
5 files changed, 186 insertions(+), 66 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-07-28 17:25:29 UTC (rev 242579)
+++ extra-i686/PKGBUILD 2015-07-28 17:25:40 UTC (rev 242580)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
-# Contributor: philacs
-
-pkgname=libvisio
-pkgver=0.1.1
-pkgrel=2
-pkgdesc='Library providing ability to interpret and import visio diagrams'
-arch=('i686' 'x86_64')
-url='http://www.freedesktop.org/wiki/Software/libvisio'
-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)
-md5sums=('299c02fa08a1b9dc2be8ffa9deb0457a')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- make -k check
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: libvisio/repos/extra-i686/PKGBUILD (from rev 242579, libvisio/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-07-28 17:25:40 UTC (rev 242580)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
+# Contributor: philacs
+
+pkgname=libvisio
+pkgver=0.1.3
+pkgrel=1
+pkgdesc='Library providing ability to interpret and import visio diagrams'
+arch=('i686' 'x86_64')
+url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
+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
+ fix_test.diff)
+md5sums=('fda521a18bbfccc5f034ea02119e7998'
+ 'f7f3d18896d7e76536267238bf85be42')
+
+prepare() {
+ cd $pkgname-$pkgver
+ # https://gerrit.libreoffice.org/gitweb?p=libvisio.git;a=commit;h=75a02c586f6ec49d4316f79004834250ef42b0e0
+ patch -Np1 -i $srcdir/fix_test.diff
+ autoreconf -vfi
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ # Need to set timezone to CET to work around a test failure
+ # https://bugs.documentfoundation.org/show_bug.cgi?id=92396
+ make -k check TZ=CET
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Copied: libvisio/repos/extra-i686/fix_test.diff (from rev 242579, libvisio/trunk/fix_test.diff)
===================================================================
--- extra-i686/fix_test.diff (rev 0)
+++ extra-i686/fix_test.diff 2015-07-28 17:25:40 UTC (rev 242580)
@@ -0,0 +1,49 @@
+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
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-07-28 17:25:29 UTC (rev 242579)
+++ extra-x86_64/PKGBUILD 2015-07-28 17:25:40 UTC (rev 242580)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
-# Contributor: philacs
-
-pkgname=libvisio
-pkgver=0.1.1
-pkgrel=2
-pkgdesc='Library providing ability to interpret and import visio diagrams'
-arch=('i686' 'x86_64')
-url='http://www.freedesktop.org/wiki/Software/libvisio'
-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)
-md5sums=('299c02fa08a1b9dc2be8ffa9deb0457a')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- make -k check
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: libvisio/repos/extra-x86_64/PKGBUILD (from rev 242579, libvisio/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-07-28 17:25:40 UTC (rev 242580)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
+# Contributor: philacs
+
+pkgname=libvisio
+pkgver=0.1.3
+pkgrel=1
+pkgdesc='Library providing ability to interpret and import visio diagrams'
+arch=('i686' 'x86_64')
+url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
+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
+ fix_test.diff)
+md5sums=('fda521a18bbfccc5f034ea02119e7998'
+ 'f7f3d18896d7e76536267238bf85be42')
+
+prepare() {
+ cd $pkgname-$pkgver
+ # https://gerrit.libreoffice.org/gitweb?p=libvisio.git;a=commit;h=75a02c586f6ec49d4316f79004834250ef42b0e0
+ patch -Np1 -i $srcdir/fix_test.diff
+ autoreconf -vfi
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ # Need to set timezone to CET to work around a test failure
+ # https://bugs.documentfoundation.org/show_bug.cgi?id=92396
+ make -k check TZ=CET
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Copied: libvisio/repos/extra-x86_64/fix_test.diff (from rev 242579, libvisio/trunk/fix_test.diff)
===================================================================
--- extra-x86_64/fix_test.diff (rev 0)
+++ extra-x86_64/fix_test.diff 2015-07-28 17:25:40 UTC (rev 242580)
@@ -0,0 +1,49 @@
+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
+
More information about the arch-commits
mailing list