1 |
commit: e0e9a97860b81742efd2891f956db03d70950490 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Feb 6 23:13:43 2016 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 22 17:06:15 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0e9a978 |
7 |
|
8 |
media-libs/libvisio: Fix tests (bugs 563326, 556922); drop old |
9 |
|
10 |
All tests passed. |
11 |
|
12 |
Package-Manager: portage-2.2.27 |
13 |
|
14 |
.../files/libvisio-0.1.3-fix-importtest.patch | 25 ++++++++++ |
15 |
.../files/libvisio-0.1.3-tests-without-tools.patch | 12 +++++ |
16 |
media-libs/libvisio/libvisio-0.1.3-r1.ebuild | 20 +++++--- |
17 |
media-libs/libvisio/libvisio-0.1.3.ebuild | 55 ---------------------- |
18 |
4 files changed, 50 insertions(+), 62 deletions(-) |
19 |
|
20 |
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 |
21 |
new file mode 100644 |
22 |
index 0000000..f7e7035 |
23 |
--- /dev/null |
24 |
+++ b/media-libs/libvisio/files/libvisio-0.1.3-fix-importtest.patch |
25 |
@@ -0,0 +1,25 @@ |
26 |
+From a97d30ad693374deab404ec31fe00665882cc949 Mon Sep 17 00:00:00 2001 |
27 |
+From: David Tardon <dtardon@××××××.com> |
28 |
+Date: Mon, 18 Jan 2016 13:53:19 +0100 |
29 |
+Subject: [PATCH] tdf#92396 test must be run in specific time zone |
30 |
+ |
31 |
+Change-Id: Idc9d85ae8c5c1a6eccca7e830baa05a867ac4402 |
32 |
+--- |
33 |
+ src/test/Makefile.am | 3 +++ |
34 |
+ 1 file changed, 3 insertions(+) |
35 |
+ |
36 |
+diff --git a/src/test/Makefile.am b/src/test/Makefile.am |
37 |
+index 59d3419..23049b5 100644 |
38 |
+--- a/src/test/Makefile.am |
39 |
++++ b/src/test/Makefile.am |
40 |
+@@ -29,4 +29,7 @@ EXTRA_DIST = \ |
41 |
+ data/dwg.vsdx \ |
42 |
+ $(test_SOURCES) |
43 |
+ |
44 |
++# ImportTest::testVsdMetadataTitleUtf8 checks formatted date string |
45 |
++AM_TESTS_ENVIRONMENT = TZ=CET; export TZ; |
46 |
++ |
47 |
+ TESTS = test |
48 |
+-- |
49 |
+1.7.9.5 |
50 |
+ |
51 |
|
52 |
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 |
53 |
new file mode 100644 |
54 |
index 0000000..78eb9fe |
55 |
--- /dev/null |
56 |
+++ b/media-libs/libvisio/files/libvisio-0.1.3-tests-without-tools.patch |
57 |
@@ -0,0 +1,12 @@ |
58 |
+--- a/configure.ac 2015-07-25 09:29:53.000000000 +0200 |
59 |
++++ b/configure.ac 2016-02-07 00:19:30.534383076 +0100 |
60 |
+@@ -317,6 +317,9 @@ |
61 |
+ ) |
62 |
+ AS_IF([test "x$enable_tests" = "xyes"], [ |
63 |
+ PKG_CHECK_MODULES([CPPUNIT], [cppunit]) |
64 |
++ PKG_CHECK_MODULES([REVENGE_STREAM],[ |
65 |
++ librevenge-stream-0.0 |
66 |
++ ]) |
67 |
+ ], []) |
68 |
+ AC_SUBST([CPPUNIT_CFLAGS]) |
69 |
+ AC_SUBST([CPPUNIT_LIBS]) |
70 |
|
71 |
diff --git a/media-libs/libvisio/libvisio-0.1.3-r1.ebuild b/media-libs/libvisio/libvisio-0.1.3-r1.ebuild |
72 |
index 0770f0f..8c2449a 100644 |
73 |
--- a/media-libs/libvisio/libvisio-0.1.3-r1.ebuild |
74 |
+++ b/media-libs/libvisio/libvisio-0.1.3-r1.ebuild |
75 |
@@ -1,12 +1,12 @@ |
76 |
-# Copyright 1999-2015 Gentoo Foundation |
77 |
+# Copyright 1999-2016 Gentoo Foundation |
78 |
# Distributed under the terms of the GNU General Public License v2 |
79 |
# $Id$ |
80 |
|
81 |
EAPI=5 |
82 |
|
83 |
EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libvisio/" |
84 |
-inherit base eutils |
85 |
-[[ ${PV} == 9999 ]] && inherit autotools git-r3 |
86 |
+inherit autotools eutils |
87 |
+[[ ${PV} == 9999 ]] && inherit git-r3 |
88 |
|
89 |
DESCRIPTION="Library parsing the visio documents" |
90 |
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio" |
91 |
@@ -33,12 +33,18 @@ DEPEND="${RDEPEND} |
92 |
test? ( dev-util/cppunit ) |
93 |
" |
94 |
|
95 |
+PATCHES=( |
96 |
+ "${FILESDIR}/${P}-fix-tests.patch" |
97 |
+ "${FILESDIR}/${P}-fix-importtest.patch" |
98 |
+ "${FILESDIR}/${P}-tests-without-tools.patch" |
99 |
+ "${FILESDIR}/${P}-boost-1.59.patch" |
100 |
+) |
101 |
+ |
102 |
src_prepare() { |
103 |
- epatch "${FILESDIR}/${P}-fix-tests.patch" \ |
104 |
- "${FILESDIR}/${P}-boost-1.59.patch" |
105 |
+ epatch "${PATCHES[@]}" |
106 |
+ epatch_user |
107 |
[[ -d m4 ]] || mkdir "m4" |
108 |
- base_src_prepare |
109 |
- [[ ${PV} == 9999 ]] && eautoreconf |
110 |
+ eautoreconf |
111 |
} |
112 |
|
113 |
src_configure() { |
114 |
|
115 |
diff --git a/media-libs/libvisio/libvisio-0.1.3.ebuild b/media-libs/libvisio/libvisio-0.1.3.ebuild |
116 |
deleted file mode 100644 |
117 |
index 591d1b3..0000000 |
118 |
--- a/media-libs/libvisio/libvisio-0.1.3.ebuild |
119 |
+++ /dev/null |
120 |
@@ -1,55 +0,0 @@ |
121 |
-# Copyright 1999-2015 Gentoo Foundation |
122 |
-# Distributed under the terms of the GNU General Public License v2 |
123 |
-# $Id$ |
124 |
- |
125 |
-EAPI=5 |
126 |
- |
127 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libvisio/" |
128 |
-inherit base eutils |
129 |
-[[ ${PV} == 9999 ]] && inherit autotools git-r3 |
130 |
- |
131 |
-DESCRIPTION="Library parsing the visio documents" |
132 |
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio" |
133 |
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz" |
134 |
- |
135 |
-LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )" |
136 |
-SLOT="0" |
137 |
-[[ ${PV} == 9999 ]] || \ |
138 |
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" |
139 |
-IUSE="doc static-libs test tools" |
140 |
- |
141 |
-RDEPEND=" |
142 |
- dev-libs/icu:= |
143 |
- dev-libs/librevenge |
144 |
- dev-libs/libxml2 |
145 |
- sys-libs/zlib |
146 |
-" |
147 |
-DEPEND="${RDEPEND} |
148 |
- >=dev-libs/boost-1.46 |
149 |
- dev-util/gperf |
150 |
- sys-devel/libtool |
151 |
- virtual/pkgconfig |
152 |
- doc? ( app-doc/doxygen ) |
153 |
- test? ( dev-util/cppunit ) |
154 |
-" |
155 |
- |
156 |
-src_prepare() { |
157 |
- [[ -d m4 ]] || mkdir "m4" |
158 |
- base_src_prepare |
159 |
- [[ ${PV} == 9999 ]] && eautoreconf |
160 |
-} |
161 |
- |
162 |
-src_configure() { |
163 |
- econf \ |
164 |
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
165 |
- $(use_enable static-libs static) \ |
166 |
- --disable-werror \ |
167 |
- $(use_with doc docs) \ |
168 |
- $(use_enable test tests) \ |
169 |
- $(use_enable tools) |
170 |
-} |
171 |
- |
172 |
-src_install() { |
173 |
- default |
174 |
- prune_libtool_files --all |
175 |
-} |