* [gentoo-commits] repo/gentoo:master commit in: media-libs/libvisio/, media-libs/libvisio/files/
@ 2016-02-22 17:07 Andreas Hüttel
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Hüttel @ 2016-02-22 17:07 UTC (permalink / raw
To: gentoo-commits
commit: e0e9a97860b81742efd2891f956db03d70950490
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Feb 6 23:13:43 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 17:06:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0e9a978
media-libs/libvisio: Fix tests (bugs 563326, 556922); drop old
All tests passed.
Package-Manager: portage-2.2.27
.../files/libvisio-0.1.3-fix-importtest.patch | 25 ++++++++++
.../files/libvisio-0.1.3-tests-without-tools.patch | 12 +++++
media-libs/libvisio/libvisio-0.1.3-r1.ebuild | 20 +++++---
media-libs/libvisio/libvisio-0.1.3.ebuild | 55 ----------------------
4 files changed, 50 insertions(+), 62 deletions(-)
diff --git a/media-libs/libvisio/files/libvisio-0.1.3-fix-importtest.patch b/media-libs/libvisio/files/libvisio-0.1.3-fix-importtest.patch
new file mode 100644
index 0000000..f7e7035
--- /dev/null
+++ b/media-libs/libvisio/files/libvisio-0.1.3-fix-importtest.patch
@@ -0,0 +1,25 @@
+From a97d30ad693374deab404ec31fe00665882cc949 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Mon, 18 Jan 2016 13:53:19 +0100
+Subject: [PATCH] tdf#92396 test must be run in specific time zone
+
+Change-Id: Idc9d85ae8c5c1a6eccca7e830baa05a867ac4402
+---
+ src/test/Makefile.am | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/test/Makefile.am b/src/test/Makefile.am
+index 59d3419..23049b5 100644
+--- a/src/test/Makefile.am
++++ b/src/test/Makefile.am
+@@ -29,4 +29,7 @@ EXTRA_DIST = \
+ data/dwg.vsdx \
+ $(test_SOURCES)
+
++# ImportTest::testVsdMetadataTitleUtf8 checks formatted date string
++AM_TESTS_ENVIRONMENT = TZ=CET; export TZ;
++
+ TESTS = test
+--
+1.7.9.5
+
diff --git a/media-libs/libvisio/files/libvisio-0.1.3-tests-without-tools.patch b/media-libs/libvisio/files/libvisio-0.1.3-tests-without-tools.patch
new file mode 100644
index 0000000..78eb9fe
--- /dev/null
+++ b/media-libs/libvisio/files/libvisio-0.1.3-tests-without-tools.patch
@@ -0,0 +1,12 @@
+--- a/configure.ac 2015-07-25 09:29:53.000000000 +0200
++++ b/configure.ac 2016-02-07 00:19:30.534383076 +0100
+@@ -317,6 +317,9 @@
+ )
+ AS_IF([test "x$enable_tests" = "xyes"], [
+ PKG_CHECK_MODULES([CPPUNIT], [cppunit])
++ PKG_CHECK_MODULES([REVENGE_STREAM],[
++ librevenge-stream-0.0
++ ])
+ ], [])
+ AC_SUBST([CPPUNIT_CFLAGS])
+ AC_SUBST([CPPUNIT_LIBS])
diff --git a/media-libs/libvisio/libvisio-0.1.3-r1.ebuild b/media-libs/libvisio/libvisio-0.1.3-r1.ebuild
index 0770f0f..8c2449a 100644
--- a/media-libs/libvisio/libvisio-0.1.3-r1.ebuild
+++ b/media-libs/libvisio/libvisio-0.1.3-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libvisio/"
-inherit base eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
+inherit autotools eutils
+[[ ${PV} == 9999 ]] && inherit git-r3
DESCRIPTION="Library parsing the visio documents"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
@@ -33,12 +33,18 @@ DEPEND="${RDEPEND}
test? ( dev-util/cppunit )
"
+PATCHES=(
+ "${FILESDIR}/${P}-fix-tests.patch"
+ "${FILESDIR}/${P}-fix-importtest.patch"
+ "${FILESDIR}/${P}-tests-without-tools.patch"
+ "${FILESDIR}/${P}-boost-1.59.patch"
+)
+
src_prepare() {
- epatch "${FILESDIR}/${P}-fix-tests.patch" \
- "${FILESDIR}/${P}-boost-1.59.patch"
+ epatch "${PATCHES[@]}"
+ epatch_user
[[ -d m4 ]] || mkdir "m4"
- base_src_prepare
- [[ ${PV} == 9999 ]] && eautoreconf
+ eautoreconf
}
src_configure() {
diff --git a/media-libs/libvisio/libvisio-0.1.3.ebuild b/media-libs/libvisio/libvisio-0.1.3.ebuild
deleted file mode 100644
index 591d1b3..0000000
--- a/media-libs/libvisio/libvisio-0.1.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libvisio/"
-inherit base eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="Library parsing the visio documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
-IUSE="doc static-libs test tools"
-
-RDEPEND="
- dev-libs/icu:=
- dev-libs/librevenge
- dev-libs/libxml2
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- >=dev-libs/boost-1.46
- dev-util/gperf
- sys-devel/libtool
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( dev-util/cppunit )
-"
-
-src_prepare() {
- [[ -d m4 ]] || mkdir "m4"
- base_src_prepare
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- $(use_enable static-libs static) \
- --disable-werror \
- $(use_with doc docs) \
- $(use_enable test tests) \
- $(use_enable tools)
-}
-
-src_install() {
- default
- prune_libtool_files --all
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libvisio/, media-libs/libvisio/files/
@ 2017-12-29 23:06 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2017-12-29 23:06 UTC (permalink / raw
To: gentoo-commits
commit: 931d631cc21c2c2585878b721bbfd2b0dd06edee
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 22:40:22 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 23:04:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=931d631c
media-libs/libvisio: Drop 0.1.5
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-libs/libvisio/Manifest | 1 -
.../files/libvisio-0.1.3-tests-without-tools.patch | 12 -----
.../libvisio/files/libvisio-0.1.5-fix-test.patch | 41 ---------------
.../libvisio/files/libvisio-0.1.5-no-zlib.patch | 46 -----------------
media-libs/libvisio/libvisio-0.1.5-r1.ebuild | 59 ----------------------
5 files changed, 159 deletions(-)
diff --git a/media-libs/libvisio/Manifest b/media-libs/libvisio/Manifest
index 758f7f31db9..e4d6b6ef69b 100644
--- a/media-libs/libvisio/Manifest
+++ b/media-libs/libvisio/Manifest
@@ -1,2 +1 @@
-DIST libvisio-0.1.5.tar.xz 504196 BLAKE2B d5b02b9724e17e1a5b48eee750f6e1a50f8d0a5e74ac6cfd90ad5ae6ab4bc79d40718486c6164faa192ac0ce26c13d55918ff1c6f3c03a09b61399754c5920d0 SHA512 094ab546f650840d52fc34c1b105eff139d2f6e4d5cab7c9c99f8387ece0d0c6b02ec1376b3281d56a901bac016c2a024bb708c065b8b5d9404104e6494b5fab
DIST libvisio-0.1.6.tar.xz 676396 BLAKE2B dbd96b64a3789e275a47fe59cd939620787937e31ee11b7af7977575c183ade233afdb952d4c2e362312ae400d23726cbd01e3ccb644c9a413abc84ddbe0f161 SHA512 58cee8cfe4205b2cad2f11dbe17882e57ebf0d10500116ca9d8d120e138f8eb0c65a5fea3bd7d2746bf8140377ee9deb34258597e028f9fdc8d21f270606cce1
diff --git a/media-libs/libvisio/files/libvisio-0.1.3-tests-without-tools.patch b/media-libs/libvisio/files/libvisio-0.1.3-tests-without-tools.patch
deleted file mode 100644
index 78eb9fe66bc..00000000000
--- a/media-libs/libvisio/files/libvisio-0.1.3-tests-without-tools.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac 2015-07-25 09:29:53.000000000 +0200
-+++ b/configure.ac 2016-02-07 00:19:30.534383076 +0100
-@@ -317,6 +317,9 @@
- )
- AS_IF([test "x$enable_tests" = "xyes"], [
- PKG_CHECK_MODULES([CPPUNIT], [cppunit])
-+ PKG_CHECK_MODULES([REVENGE_STREAM],[
-+ librevenge-stream-0.0
-+ ])
- ], [])
- AC_SUBST([CPPUNIT_CFLAGS])
- AC_SUBST([CPPUNIT_LIBS])
diff --git a/media-libs/libvisio/files/libvisio-0.1.5-fix-test.patch b/media-libs/libvisio/files/libvisio-0.1.5-fix-test.patch
deleted file mode 100644
index 801421a689c..00000000000
--- a/media-libs/libvisio/files/libvisio-0.1.5-fix-test.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From a97d30ad693374deab404ec31fe00665882cc949 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Mon, 18 Jan 2016 13:53:19 +0100
-Subject: [PATCH] tdf#92396 test must be run in specific time zone
-
-Change-Id: Idc9d85ae8c5c1a6eccca7e830baa05a867ac4402
-Change-Id: I03b40e2746ad90f2c7cf09560c218aab2a18090d
----
- src/test/Makefile.am | 3 +++
- src/test/importtest.cpp | 4 ++--
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/test/Makefile.am b/src/test/Makefile.am
-index 59d3419..23049b5 100644
---- a/src/test/Makefile.am
-+++ b/src/test/Makefile.am
-@@ -29,4 +29,7 @@ EXTRA_DIST = \
- data/dwg.vsdx \
- $(test_SOURCES)
-
-+# ImportTest::testVsdMetadataTitleUtf8 checks formatted date string
-+AM_TESTS_ENVIRONMENT = TZ=UTC; export TZ;
-+
- TESTS = test
-diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp
-index e05b3c1..32fb185 100644
---- a/src/test/importtest.cpp
-+++ b/src/test/importtest.cpp
-@@ -242,8 +242,8 @@ void ImportTest::testVsdMetadataTitleUtf8()
- // Test the case when the string is UTF-8 encoded already in the file.
- assertXPath(m_doc, "/document/setDocumentMetaData", "title", "mytitle\xC3\xA9\xC3\xA1\xC5\x91\xC5\xB1");
- // Test <dcterms:created> and <dcterms:modified>.
-- assertXPath(m_doc, "/document/setDocumentMetaData", "creation-date", "2014-11-26T09:24:56Z");
-- assertXPath(m_doc, "/document/setDocumentMetaData", "date", "2014-11-26T09:24:56Z");
-+ assertXPath(m_doc, "/document/setDocumentMetaData", "creation-date", "2014-11-26T08:24:56Z");
-+ assertXPath(m_doc, "/document/setDocumentMetaData", "date", "2014-11-26T08:24:56Z");
- }
-
- void ImportTest::testVsdUserDefinedMetadata()
---
-2.1.4
diff --git a/media-libs/libvisio/files/libvisio-0.1.5-no-zlib.patch b/media-libs/libvisio/files/libvisio-0.1.5-no-zlib.patch
deleted file mode 100644
index c119ce619da..00000000000
--- a/media-libs/libvisio/files/libvisio-0.1.5-no-zlib.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 8bfb5e3c19ab4e8aea09132881963facb76cfcda Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Thu, 23 Feb 2017 14:30:15 +0100
-Subject: [PATCH] zlib is not needed since the move to librevenge
-
-Change-Id: Ib83663e9cc7a808db966cd8dfb3fbcd1ee195da6
----
- configure.ac | 12 ------------
- libvisio.pc.in | 2 +-
- 2 files changed, 1 insertion(+), 13 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a11115b..2aa8ece 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,18 +76,6 @@ PKG_CHECK_MODULES([ICU],[icu-i18n],[
- AC_SUBST(ICU_CFLAGS)
- AC_SUBST(ICU_LIBS)
-
--# =========
--# Find zlib
--# =========
--PKG_CHECK_MODULES([ZLIB],[zlib],[],[
-- AC_CHECK_HEADER(zlib.h, [ZLIB_CFLAGS=],
-- [AC_MSG_ERROR(zlib.h not found. install zlib)], [])
-- AC_CHECK_LIB(z, inflate, [ ZLIB_LIBS=-lz ],
-- [AC_MSG_ERROR(zlib not found or functional)], [])
--])
--AC_SUBST(ZLIB_CFLAGS)
--AC_SUBST(ZLIB_LIBS)
--
- # ===========================
- # Find required boost headers
- # ===========================
-diff --git a/libvisio.pc.in b/libvisio.pc.in
-index ce68e6f..638930b 100644
---- a/libvisio.pc.in
-+++ b/libvisio.pc.in
-@@ -10,4 +10,4 @@ Requires: librevenge-0.0
- Libs: -L${libdir} -lvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@
- Cflags: -I${includedir}/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@
-
--Requires.private: icu-i18n libxml-2.0 zlib
-+Requires.private: icu-i18n libxml-2.0
---
-2.1.4
diff --git a/media-libs/libvisio/libvisio-0.1.5-r1.ebuild b/media-libs/libvisio/libvisio-0.1.5-r1.ebuild
deleted file mode 100644
index 549bc409b17..00000000000
--- a/media-libs/libvisio/libvisio-0.1.5-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libvisio.git"
-inherit autotools
-[[ ${PV} == 9999 ]] && inherit git-r3
-
-DESCRIPTION="Library parsing the visio documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
-[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libvisio/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
-IUSE="doc static-libs test tools"
-
-RDEPEND="
- dev-libs/icu:=
- dev-libs/librevenge
- dev-libs/libxml2
-"
-DEPEND="${RDEPEND}
- dev-lang/perl
- dev-libs/boost
- dev-util/gperf
- sys-devel/libtool
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.1.3-tests-without-tools.patch"
- "${FILESDIR}/${P}-fix-test.patch"
- "${FILESDIR}/${P}-no-zlib.patch"
-)
-
-src_prepare() {
- default
- [[ -d m4 ]] || mkdir "m4"
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-werror \
- $(use_with doc docs) \
- $(use_enable static-libs static) \
- $(use_enable test tests) \
- $(use_enable tools)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-12-29 23:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-29 23:06 [gentoo-commits] repo/gentoo:master commit in: media-libs/libvisio/, media-libs/libvisio/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2016-02-22 17:07 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox