diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-03-06 20:48:44 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-03-06 20:48:44 +0000 |
| commit | 9f34304079b57c635b57ddd3f4c5eb97013358b1 (patch) | |
| tree | 0a23411a3a2c61bb43a0d18f04fb45bff67871fd /media-plugins/kipi-plugins | |
| parent | Version bump + move into ~arch. (diff) | |
| download | gentoo-2-9f34304079b57c635b57ddd3f4c5eb97013358b1.tar.gz gentoo-2-9f34304079b57c635b57ddd3f4c5eb97013358b1.tar.bz2 gentoo-2-9f34304079b57c635b57ddd3f4c5eb97013358b1.zip | |
Fix a sub-test where QT has become more tolerant in date/time parsing
(Portage version: 2.1.9.42/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-1.9.0-tests.patch | 21 | ||||
| -rw-r--r-- | media-plugins/kipi-plugins/kipi-plugins-1.9.0.ebuild | 5 |
3 files changed, 29 insertions, 3 deletions
diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog index 0b475eb16064..04782b105b72 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.90 2011/03/01 20:25:02 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.91 2011/03/06 20:48:44 dilfridge Exp $ + + 06 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org> + kipi-plugins-1.9.0.ebuild, +files/kipi-plugins-1.9.0-tests.patch: + Fix a sub-test where QT has become more tolerant in date/time parsing *kipi-plugins-1.9.0 (01 Mar 2011) diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-1.9.0-tests.patch b/media-plugins/kipi-plugins/files/kipi-plugins-1.9.0-tests.patch new file mode 100644 index 000000000000..89b85abdbe9a --- /dev/null +++ b/media-plugins/kipi-plugins/files/kipi-plugins-1.9.0-tests.patch @@ -0,0 +1,21 @@ +diff -ruN kipi-plugins-1.9.0.orig/gpssync/tests/test_gpxparsing.cpp kipi-plugins-1.9.0/gpssync/tests/test_gpxparsing.cpp +--- kipi-plugins-1.9.0.orig/gpssync/tests/test_gpxparsing.cpp 2011-02-28 00:53:44.000000000 +0100 ++++ kipi-plugins-1.9.0/gpssync/tests/test_gpxparsing.cpp 2011-03-06 21:37:23.127817959 +0100 +@@ -48,11 +48,12 @@ + } + + { +- // eCoach in N900: 2010-01-14T09:26:02.287+02:00 +- 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)); ++ // // eCoach in N900: 2010-01-14T09:26:02.287+02:00 ++ // 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)); ++ // seems that the QT classes behave different now + + // when we omit the time zone data, parsing succeeds + // time is interpreted as local time diff --git a/media-plugins/kipi-plugins/kipi-plugins-1.9.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-1.9.0.ebuild index 5a5fd4424aa0..32564092db45 100644 --- a/media-plugins/kipi-plugins/kipi-plugins-1.9.0.ebuild +++ b/media-plugins/kipi-plugins/kipi-plugins-1.9.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-1.9.0.ebuild,v 1.1 2011/03/01 20:25:02 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-1.9.0.ebuild,v 1.2 2011/03/06 20:48:44 dilfridge Exp $ EAPI=3 @@ -52,7 +52,8 @@ RDEPEND="${DEPEND} mjpeg? ( media-video/mjpegtools ) " -PATCHES=( "${FILESDIR}/${PN}-1.7.0-expoblending.patch" ) +PATCHES=( "${FILESDIR}/${PN}-1.7.0-expoblending.patch" + "${FILESDIR}/${PN}-1.9.0-tests.patch" ) src_prepare() { if use handbook; then |