diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-08-14 18:14:03 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-08-14 18:14:03 +0000 |
| commit | 99df99150b2b87bcadf63e32d45d1890933d9587 (patch) | |
| tree | 4ddf04e06ce29d8025714a648f73930c42d875ac /media-plugins/kipi-plugins | |
| parent | arm stable, bug #355085 (diff) | |
| download | gentoo-2-99df99150b2b87bcadf63e32d45d1890933d9587.tar.gz gentoo-2-99df99150b2b87bcadf63e32d45d1890933d9587.tar.bz2 gentoo-2-99df99150b2b87bcadf63e32d45d1890933d9587.zip | |
Fix tests, bug 379183
(Portage version: 2.1.10.10/cvs/Linux x86_64)
Diffstat (limited to 'media-plugins/kipi-plugins')
| -rw-r--r-- | media-plugins/kipi-plugins/ChangeLog | 6 | ||||
| -rw-r--r-- | media-plugins/kipi-plugins/files/kipi-plugins-2.0.0-tests.patch | 13 | ||||
| -rw-r--r-- | media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild | 7 |
3 files changed, 23 insertions, 3 deletions
diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog index 3baad362e2e3..b5bc1091a2e6 100644 --- a/media-plugins/kipi-plugins/ChangeLog +++ b/media-plugins/kipi-plugins/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/kipi-plugins # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.98 2011/07/30 12:14:02 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.99 2011/08/14 18:14:02 dilfridge Exp $ + + 14 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> + kipi-plugins-2.0.0.ebuild, +files/kipi-plugins-2.0.0-tests.patch: + Fix tests, bug 379183 30 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org> kipi-plugins-2.0.0.ebuild, metadata.xml: diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-2.0.0-tests.patch b/media-plugins/kipi-plugins/files/kipi-plugins-2.0.0-tests.patch new file mode 100644 index 000000000000..41f5cdf23647 --- /dev/null +++ b/media-plugins/kipi-plugins/files/kipi-plugins-2.0.0-tests.patch @@ -0,0 +1,13 @@ +diff -ruN digikam-2.0.0.orig/extra/kipi-plugins/kmlexport/tests/test_kmlexport_gpxparsing.cpp digikam-2.0.0/extra/kipi-plugins/kmlexport/tests/test_kmlexport_gpxparsing.cpp +--- digikam-2.0.0.orig/extra/kipi-plugins/kmlexport/tests/test_kmlexport_gpxparsing.cpp 2011-07-28 01:27:35.000000000 +0200 ++++ digikam-2.0.0/extra/kipi-plugins/kmlexport/tests/test_kmlexport_gpxparsing.cpp 2011-08-14 20:09:37.000000000 +0200 +@@ -53,7 +53,8 @@ + QDateTime time1 = QDateTime::fromString("2010-01-14T09:26:02.287+02:00", Qt::ISODate); + // the date is parsed fine, but the time fails: + QCOMPARE(time1.date(), QDate(2010, 01, 14)); +- QCOMPARE(time1.time(), QTime(0, 0, 0)); ++ // QCOMPARE(time1.time(), QTime(0, 0, 0)); ++ // it seems like the library has become more permissive in the meantime + + // when we omit the time zone data, parsing succeeds + // time is interpreted as local time diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild index b7d98dcb1f0b..011f405e325c 100644 --- a/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild +++ b/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild,v 1.2 2011/07/30 12:14:01 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild,v 1.3 2011/08/14 18:14:02 dilfridge Exp $ EAPI=4 @@ -61,7 +61,10 @@ RDEPEND="${DEPEND} S=${WORKDIR}/${MY_P}/extra/${PN} -PATCHES=( "${FILESDIR}/${PN}-1.7.0-expoblending.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-1.7.0-expoblending.patch" + "${FILESDIR}/${PN}-2.0.0-tests.patch" +) src_prepare() { # prepare the handbook |