1 |
commit: 931d631cc21c2c2585878b721bbfd2b0dd06edee |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 29 22:40:22 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 29 23:04:56 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=931d631c |
7 |
|
8 |
media-libs/libvisio: Drop 0.1.5 |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
media-libs/libvisio/Manifest | 1 - |
13 |
.../files/libvisio-0.1.3-tests-without-tools.patch | 12 ----- |
14 |
.../libvisio/files/libvisio-0.1.5-fix-test.patch | 41 --------------- |
15 |
.../libvisio/files/libvisio-0.1.5-no-zlib.patch | 46 ----------------- |
16 |
media-libs/libvisio/libvisio-0.1.5-r1.ebuild | 59 ---------------------- |
17 |
5 files changed, 159 deletions(-) |
18 |
|
19 |
diff --git a/media-libs/libvisio/Manifest b/media-libs/libvisio/Manifest |
20 |
index 758f7f31db9..e4d6b6ef69b 100644 |
21 |
--- a/media-libs/libvisio/Manifest |
22 |
+++ b/media-libs/libvisio/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST libvisio-0.1.5.tar.xz 504196 BLAKE2B d5b02b9724e17e1a5b48eee750f6e1a50f8d0a5e74ac6cfd90ad5ae6ab4bc79d40718486c6164faa192ac0ce26c13d55918ff1c6f3c03a09b61399754c5920d0 SHA512 094ab546f650840d52fc34c1b105eff139d2f6e4d5cab7c9c99f8387ece0d0c6b02ec1376b3281d56a901bac016c2a024bb708c065b8b5d9404104e6494b5fab |
25 |
DIST libvisio-0.1.6.tar.xz 676396 BLAKE2B dbd96b64a3789e275a47fe59cd939620787937e31ee11b7af7977575c183ade233afdb952d4c2e362312ae400d23726cbd01e3ccb644c9a413abc84ddbe0f161 SHA512 58cee8cfe4205b2cad2f11dbe17882e57ebf0d10500116ca9d8d120e138f8eb0c65a5fea3bd7d2746bf8140377ee9deb34258597e028f9fdc8d21f270606cce1 |
26 |
|
27 |
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 |
28 |
deleted file mode 100644 |
29 |
index 78eb9fe66bc..00000000000 |
30 |
--- a/media-libs/libvisio/files/libvisio-0.1.3-tests-without-tools.patch |
31 |
+++ /dev/null |
32 |
@@ -1,12 +0,0 @@ |
33 |
---- a/configure.ac 2015-07-25 09:29:53.000000000 +0200 |
34 |
-+++ b/configure.ac 2016-02-07 00:19:30.534383076 +0100 |
35 |
-@@ -317,6 +317,9 @@ |
36 |
- ) |
37 |
- AS_IF([test "x$enable_tests" = "xyes"], [ |
38 |
- PKG_CHECK_MODULES([CPPUNIT], [cppunit]) |
39 |
-+ PKG_CHECK_MODULES([REVENGE_STREAM],[ |
40 |
-+ librevenge-stream-0.0 |
41 |
-+ ]) |
42 |
- ], []) |
43 |
- AC_SUBST([CPPUNIT_CFLAGS]) |
44 |
- AC_SUBST([CPPUNIT_LIBS]) |
45 |
|
46 |
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 |
47 |
deleted file mode 100644 |
48 |
index 801421a689c..00000000000 |
49 |
--- a/media-libs/libvisio/files/libvisio-0.1.5-fix-test.patch |
50 |
+++ /dev/null |
51 |
@@ -1,41 +0,0 @@ |
52 |
-From a97d30ad693374deab404ec31fe00665882cc949 Mon Sep 17 00:00:00 2001 |
53 |
-From: David Tardon <dtardon@××××××.com> |
54 |
-Date: Mon, 18 Jan 2016 13:53:19 +0100 |
55 |
-Subject: [PATCH] tdf#92396 test must be run in specific time zone |
56 |
- |
57 |
-Change-Id: Idc9d85ae8c5c1a6eccca7e830baa05a867ac4402 |
58 |
-Change-Id: I03b40e2746ad90f2c7cf09560c218aab2a18090d |
59 |
---- |
60 |
- src/test/Makefile.am | 3 +++ |
61 |
- src/test/importtest.cpp | 4 ++-- |
62 |
- 2 files changed, 5 insertions(+), 2 deletions(-) |
63 |
- |
64 |
-diff --git a/src/test/Makefile.am b/src/test/Makefile.am |
65 |
-index 59d3419..23049b5 100644 |
66 |
---- a/src/test/Makefile.am |
67 |
-+++ b/src/test/Makefile.am |
68 |
-@@ -29,4 +29,7 @@ EXTRA_DIST = \ |
69 |
- data/dwg.vsdx \ |
70 |
- $(test_SOURCES) |
71 |
- |
72 |
-+# ImportTest::testVsdMetadataTitleUtf8 checks formatted date string |
73 |
-+AM_TESTS_ENVIRONMENT = TZ=UTC; export TZ; |
74 |
-+ |
75 |
- TESTS = test |
76 |
-diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp |
77 |
-index e05b3c1..32fb185 100644 |
78 |
---- a/src/test/importtest.cpp |
79 |
-+++ b/src/test/importtest.cpp |
80 |
-@@ -242,8 +242,8 @@ void ImportTest::testVsdMetadataTitleUtf8() |
81 |
- // Test the case when the string is UTF-8 encoded already in the file. |
82 |
- assertXPath(m_doc, "/document/setDocumentMetaData", "title", "mytitle\xC3\xA9\xC3\xA1\xC5\x91\xC5\xB1"); |
83 |
- // Test <dcterms:created> and <dcterms:modified>. |
84 |
-- assertXPath(m_doc, "/document/setDocumentMetaData", "creation-date", "2014-11-26T09:24:56Z"); |
85 |
-- assertXPath(m_doc, "/document/setDocumentMetaData", "date", "2014-11-26T09:24:56Z"); |
86 |
-+ assertXPath(m_doc, "/document/setDocumentMetaData", "creation-date", "2014-11-26T08:24:56Z"); |
87 |
-+ assertXPath(m_doc, "/document/setDocumentMetaData", "date", "2014-11-26T08:24:56Z"); |
88 |
- } |
89 |
- |
90 |
- void ImportTest::testVsdUserDefinedMetadata() |
91 |
--- |
92 |
-2.1.4 |
93 |
|
94 |
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 |
95 |
deleted file mode 100644 |
96 |
index c119ce619da..00000000000 |
97 |
--- a/media-libs/libvisio/files/libvisio-0.1.5-no-zlib.patch |
98 |
+++ /dev/null |
99 |
@@ -1,46 +0,0 @@ |
100 |
-From 8bfb5e3c19ab4e8aea09132881963facb76cfcda Mon Sep 17 00:00:00 2001 |
101 |
-From: David Tardon <dtardon@××××××.com> |
102 |
-Date: Thu, 23 Feb 2017 14:30:15 +0100 |
103 |
-Subject: [PATCH] zlib is not needed since the move to librevenge |
104 |
- |
105 |
-Change-Id: Ib83663e9cc7a808db966cd8dfb3fbcd1ee195da6 |
106 |
---- |
107 |
- configure.ac | 12 ------------ |
108 |
- libvisio.pc.in | 2 +- |
109 |
- 2 files changed, 1 insertion(+), 13 deletions(-) |
110 |
- |
111 |
-diff --git a/configure.ac b/configure.ac |
112 |
-index a11115b..2aa8ece 100644 |
113 |
---- a/configure.ac |
114 |
-+++ b/configure.ac |
115 |
-@@ -76,18 +76,6 @@ PKG_CHECK_MODULES([ICU],[icu-i18n],[ |
116 |
- AC_SUBST(ICU_CFLAGS) |
117 |
- AC_SUBST(ICU_LIBS) |
118 |
- |
119 |
--# ========= |
120 |
--# Find zlib |
121 |
--# ========= |
122 |
--PKG_CHECK_MODULES([ZLIB],[zlib],[],[ |
123 |
-- AC_CHECK_HEADER(zlib.h, [ZLIB_CFLAGS=], |
124 |
-- [AC_MSG_ERROR(zlib.h not found. install zlib)], []) |
125 |
-- AC_CHECK_LIB(z, inflate, [ ZLIB_LIBS=-lz ], |
126 |
-- [AC_MSG_ERROR(zlib not found or functional)], []) |
127 |
--]) |
128 |
--AC_SUBST(ZLIB_CFLAGS) |
129 |
--AC_SUBST(ZLIB_LIBS) |
130 |
-- |
131 |
- # =========================== |
132 |
- # Find required boost headers |
133 |
- # =========================== |
134 |
-diff --git a/libvisio.pc.in b/libvisio.pc.in |
135 |
-index ce68e6f..638930b 100644 |
136 |
---- a/libvisio.pc.in |
137 |
-+++ b/libvisio.pc.in |
138 |
-@@ -10,4 +10,4 @@ Requires: librevenge-0.0 |
139 |
- Libs: -L${libdir} -lvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@ |
140 |
- Cflags: -I${includedir}/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@ |
141 |
- |
142 |
--Requires.private: icu-i18n libxml-2.0 zlib |
143 |
-+Requires.private: icu-i18n libxml-2.0 |
144 |
--- |
145 |
-2.1.4 |
146 |
|
147 |
diff --git a/media-libs/libvisio/libvisio-0.1.5-r1.ebuild b/media-libs/libvisio/libvisio-0.1.5-r1.ebuild |
148 |
deleted file mode 100644 |
149 |
index 549bc409b17..00000000000 |
150 |
--- a/media-libs/libvisio/libvisio-0.1.5-r1.ebuild |
151 |
+++ /dev/null |
152 |
@@ -1,59 +0,0 @@ |
153 |
-# Copyright 1999-2017 Gentoo Foundation |
154 |
-# Distributed under the terms of the GNU General Public License v2 |
155 |
- |
156 |
-EAPI=6 |
157 |
- |
158 |
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libvisio.git" |
159 |
-inherit autotools |
160 |
-[[ ${PV} == 9999 ]] && inherit git-r3 |
161 |
- |
162 |
-DESCRIPTION="Library parsing the visio documents" |
163 |
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio" |
164 |
-[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libvisio/${P}.tar.xz" |
165 |
- |
166 |
-LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )" |
167 |
-SLOT="0" |
168 |
-[[ ${PV} == 9999 ]] || \ |
169 |
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86" |
170 |
-IUSE="doc static-libs test tools" |
171 |
- |
172 |
-RDEPEND=" |
173 |
- dev-libs/icu:= |
174 |
- dev-libs/librevenge |
175 |
- dev-libs/libxml2 |
176 |
-" |
177 |
-DEPEND="${RDEPEND} |
178 |
- dev-lang/perl |
179 |
- dev-libs/boost |
180 |
- dev-util/gperf |
181 |
- sys-devel/libtool |
182 |
- virtual/pkgconfig |
183 |
- doc? ( app-doc/doxygen ) |
184 |
- test? ( dev-util/cppunit ) |
185 |
-" |
186 |
- |
187 |
-PATCHES=( |
188 |
- "${FILESDIR}/${PN}-0.1.3-tests-without-tools.patch" |
189 |
- "${FILESDIR}/${P}-fix-test.patch" |
190 |
- "${FILESDIR}/${P}-no-zlib.patch" |
191 |
-) |
192 |
- |
193 |
-src_prepare() { |
194 |
- default |
195 |
- [[ -d m4 ]] || mkdir "m4" |
196 |
- eautoreconf |
197 |
-} |
198 |
- |
199 |
-src_configure() { |
200 |
- econf \ |
201 |
- --disable-werror \ |
202 |
- $(use_with doc docs) \ |
203 |
- $(use_enable static-libs static) \ |
204 |
- $(use_enable test tests) \ |
205 |
- $(use_enable tools) |
206 |
-} |
207 |
- |
208 |
-src_install() { |
209 |
- default |
210 |
- find "${D}" -name '*.la' -delete || die |
211 |
-} |