Hi ports@, here's an update that brings x11/tellico-kde4 up to the stable latest version. All patches from upstream are not more necessary. All regression tests passed on amd64.
Kind regards, Rafael Sadowski Index: Makefile =================================================================== RCS file: /cvs/ports/x11/tellico-kde4/Makefile,v retrieving revision 1.9 diff -u -p -u -p -r1.9 Makefile --- Makefile 8 Nov 2016 14:23:59 -0000 1.9 +++ Makefile 15 Nov 2016 18:13:57 -0000 @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.9 2016/11/08 14:23:59 sthen Exp $ COMMENT = organizer for book/music/video collections for KDE4 -DISTNAME = tellico-2.3.10 -REVISION = 2 +DISTNAME = tellico-2.3.11 CATEGORIES = productivity x11 HOMEPAGE = http://tellico-project.org/ @@ -26,7 +25,7 @@ MASTER_SITES = http://tellico-project.or EXTRACT_SUFX = .tar.bz2 MODULES = devel/gettext x11/kde4 multimedia/phonon lang/python -MODKDE4_USE = pim +MODKDE4_USE = pim BUILD_DEPENDS = ${MODKDE4_DEP_DIR}/libkcompactdisc Index: distinfo =================================================================== RCS file: /cvs/ports/x11/tellico-kde4/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- distinfo 2 May 2015 15:30:31 -0000 1.2 +++ distinfo 15 Nov 2016 18:13:57 -0000 @@ -1,2 +1,2 @@ -SHA256 (tellico-2.3.10.tar.bz2) = 6RYQH4a2+EO4W+QuhUWqdEHNSWy7m4FZDi4L0DpY+qo= -SIZE (tellico-2.3.10.tar.bz2) = 4877384 +SHA256 (tellico-2.3.11.tar.bz2) = MGR1b24WYtBzhcN/WCGg9r6LIrbeytF9aFJTYBbKISg= +SIZE (tellico-2.3.11.tar.bz2) = 5174873 Index: patches/patch-src_fetch_allocinefetcher_cpp =================================================================== RCS file: patches/patch-src_fetch_allocinefetcher_cpp diff -N patches/patch-src_fetch_allocinefetcher_cpp --- patches/patch-src_fetch_allocinefetcher_cpp 2 May 2015 15:30:31 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,31 +0,0 @@ -$OpenBSD: patch-src_fetch_allocinefetcher_cpp,v 1.1 2015/05/02 15:30:31 zhuk Exp $ -Be sure to download image data in fetchers before setting field -(upstream 2510d692). ---- src/fetch/allocinefetcher.cpp.orig Sun Feb 15 22:23:56 2015 -+++ src/fetch/allocinefetcher.cpp Sat May 2 18:10:19 2015 -@@ -25,6 +25,7 @@ - #include <config.h> - #include "allocinefetcher.h" - #include "../collections/videocollection.h" -+#include "../images/imagefactory.h" - #include "../entry.h" - #include "../gui/guiproxy.h" - #include "../tellico_utils.h" -@@ -219,6 +220,17 @@ Tellico::Data::EntryPtr AbstractAllocineFetcher::fetch - } - populateEntry(entry, result); - #endif -+ -+ // image might still be a URL -+ const QString image_id = entry->field(QLatin1String("cover")); -+ if(image_id.contains(QLatin1Char('/'))) { -+ const QString id = ImageFactory::addImage(image_id, true /* quiet */); -+ if(id.isEmpty()) { -+ message(i18n("The cover image could not be loaded."), MessageHandler::Warning); -+ } -+ // empty image ID is ok -+ entry->setField(QLatin1String("cover"), id); -+ } - - // don't want to include id - entry->collection()->removeField(QLatin1String("allocine-code")); Index: patches/patch-src_fetch_discogsfetcher_cpp =================================================================== RCS file: patches/patch-src_fetch_discogsfetcher_cpp diff -N patches/patch-src_fetch_discogsfetcher_cpp --- patches/patch-src_fetch_discogsfetcher_cpp 2 May 2015 15:30:31 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,93 +0,0 @@ -$OpenBSD: patch-src_fetch_discogsfetcher_cpp,v 1.1 2015/05/02 15:30:31 zhuk Exp $ -1. Unbreak build (upstream d4a7f2b2). -2. Unbreak fetching Discogs images (upstream 61c9b539). -3. Be sure to download image data in fetchers before setting field - (upstream 2510d692). ---- src/fetch/discogsfetcher.cpp.orig Sun Feb 15 22:23:56 2015 -+++ src/fetch/discogsfetcher.cpp Sat May 2 18:16:23 2015 -@@ -25,6 +25,7 @@ - #include <config.h> - #include "discogsfetcher.h" - #include "../collections/musiccollection.h" -+#include "../images/imagefactory.h" - #include "../gui/guiproxy.h" - #include "../core/filehandler.h" - #include "../tellico_utils.h" -@@ -117,7 +118,6 @@ void DiscogsFetcher::search() { - case Keyword: - u.setPath(QLatin1String("/database/search")); - u.addQueryItem(QLatin1String("q"), request().value); -- //u.addQueryItem(QLatin1String("type"), QLatin1String("all")); - break; - - case Raw: -@@ -187,6 +187,17 @@ Tellico::Data::EntryPtr DiscogsFetcher::fetchEntryHook - } - #endif - -+ const QString image_id = entry->field(QLatin1String("cover")); -+ // if it's still a url, we need to load it -+ if(image_id.contains(QLatin1Char('/'))) { -+ const QString id = ImageFactory::addImage(image_id, true /* quiet */); -+ if(id.isEmpty()) { -+ message(i18n("The cover image could not be loaded."), MessageHandler::Warning); -+ } -+ // empty image ID is ok -+ entry->setField(QLatin1String("cover"), id); -+ } -+ - // don't want to include ID field - entry->setField(QLatin1String("discogs-id"), QString()); - -@@ -265,9 +276,9 @@ void DiscogsFetcher::slotComplete(KJob* job_) { - } - - QJson::Parser parser; -- const QVariantMap result = parser.parse(data).toMap(); -+ const QVariantMap resultMap = parser.parse(data).toMap(); - -- if(value(result, "message").startsWith(QLatin1String("Invalid consumer token"))) { -+ if(value(resultMap, "message").startsWith(QLatin1String("Invalid consumer token"))) { - message(i18n("The Discogs.com server reports a token error."), - MessageHandler::Error); - stop(); -@@ -275,7 +286,7 @@ void DiscogsFetcher::slotComplete(KJob* job_) { - } - - int count = 0; -- foreach(const QVariant& result, result.value(QLatin1String("results")).toList()) { -+ foreach(const QVariant& result, resultMap.value(QLatin1String("results")).toList()) { - if(count >= DISCOGS_MAX_RETURNS_TOTAL) { - break; - } -@@ -313,6 +324,13 @@ void DiscogsFetcher::populateEntry(Data::EntryPtr entr - } - entry_->setField(QLatin1String("label"), labels.join(FieldFormat::delimiterString())); - -+ // thumb images are only returned in search, not in a full request -+ // so include them now, even though they're only needed for full data -+ const QString coverUrl = value(resultMap_, "thumb"); -+ if(!coverUrl.isEmpty()) { -+ entry_->setField(QLatin1String("cover"), coverUrl); -+ } -+ - // if we only need cursory data, then we're done - if(!fullData_) { - return; -@@ -384,16 +402,6 @@ void DiscogsFetcher::populateEntry(Data::EntryPtr entr - } - - entry_->setField(QLatin1String("comments"), value(resultMap_, "notes")); -- -- -- /* cover image authentication with personal token does not work yet -- QUrl coverUrl = value(resultMap_, "thumb"); -- if(!coverUrl.isEmpty()) { -- // also need authentication -- coverUrl.addQueryItem(QLatin1String("token"), m_apiKey); -- entry_->setField(QLatin1String("cover"), coverUrl.toString()); -- } -- */ - } - - Tellico::Fetch::ConfigWidget* DiscogsFetcher::configWidget(QWidget* parent_) const { Index: patches/patch-src_fetch_moviemeterfetcher_cpp =================================================================== RCS file: patches/patch-src_fetch_moviemeterfetcher_cpp diff -N patches/patch-src_fetch_moviemeterfetcher_cpp --- patches/patch-src_fetch_moviemeterfetcher_cpp 2 May 2015 15:30:31 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,31 +0,0 @@ -$OpenBSD: patch-src_fetch_moviemeterfetcher_cpp,v 1.1 2015/05/02 15:30:31 zhuk Exp $ -Be sure to download image data in fetchers before setting field -(upstream 2510d692). ---- src/fetch/moviemeterfetcher.cpp.orig Sun Feb 15 22:23:56 2015 -+++ src/fetch/moviemeterfetcher.cpp Sat May 2 18:10:19 2015 -@@ -25,6 +25,7 @@ - #include <config.h> - #include "moviemeterfetcher.h" - #include "../collections/videocollection.h" -+#include "../images/imagefactory.h" - #include "../gui/guiproxy.h" - #include "../core/filehandler.h" - #include "../tellico_utils.h" -@@ -160,6 +161,17 @@ Tellico::Data::EntryPtr MovieMeterFetcher::fetchEntryH - populateEntry(entry, parser.parse(data).toMap(), true); - } - #endif -+ -+ // image might still be URL -+ const QString image_id = entry->field(QLatin1String("cover")); -+ if(image_id.contains(QLatin1Char('/'))) { -+ const QString id = ImageFactory::addImage(image_id, true /* quiet */); -+ if(id.isEmpty()) { -+ message(i18n("The cover image could not be loaded."), MessageHandler::Warning); -+ } -+ // empty image ID is ok -+ entry->setField(QLatin1String("cover"), id); -+ } - - // don't want to include ID field - entry->setField(QLatin1String("moviemeter-id"), QString()); Index: patches/patch-src_fetch_themoviedbfetcher_cpp =================================================================== RCS file: patches/patch-src_fetch_themoviedbfetcher_cpp diff -N patches/patch-src_fetch_themoviedbfetcher_cpp --- patches/patch-src_fetch_themoviedbfetcher_cpp 2 May 2015 15:30:31 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,31 +0,0 @@ -$OpenBSD: patch-src_fetch_themoviedbfetcher_cpp,v 1.1 2015/05/02 15:30:31 zhuk Exp $ -Be sure to download image data in fetchers before setting field -(upstream 2510d692). ---- src/fetch/themoviedbfetcher.cpp.orig Sun Feb 15 22:23:56 2015 -+++ src/fetch/themoviedbfetcher.cpp Sat May 2 18:10:19 2015 -@@ -25,6 +25,7 @@ - #include <config.h> - #include "themoviedbfetcher.h" - #include "../collections/videocollection.h" -+#include "../images/imagefactory.h" - #include "../gui/combobox.h" - #include "../gui/guiproxy.h" - #include "../core/filehandler.h" -@@ -200,6 +201,17 @@ Tellico::Data::EntryPtr TheMovieDBFetcher::fetchEntryH - populateEntry(entry, parser.parse(data).toMap(), true); - } - #endif -+ -+ // image might still be a URL -+ const QString image_id = entry->field(QLatin1String("cover")); -+ if(image_id.contains(QLatin1Char('/'))) { -+ const QString id = ImageFactory::addImage(image_id, true /* quiet */); -+ if(id.isEmpty()) { -+ message(i18n("The cover image could not be loaded."), MessageHandler::Warning); -+ } -+ // empty image ID is ok -+ entry->setField(QLatin1String("cover"), id); -+ } - - // don't want to include TMDb ID field - entry->setField(QLatin1String("tmdb-id"), QString()); Index: patches/patch-src_fetch_vndbfetcher_cpp =================================================================== RCS file: patches/patch-src_fetch_vndbfetcher_cpp diff -N patches/patch-src_fetch_vndbfetcher_cpp --- patches/patch-src_fetch_vndbfetcher_cpp 2 May 2015 15:30:31 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-src_fetch_vndbfetcher_cpp,v 1.1 2015/05/02 15:30:31 zhuk Exp $ -Be sure to download image data in fetchers before setting field -(upstream 2510d692). ---- src/fetch/vndbfetcher.cpp.orig Sun Feb 15 22:23:56 2015 -+++ src/fetch/vndbfetcher.cpp Sat May 2 18:10:19 2015 -@@ -161,6 +161,17 @@ Tellico::Data::EntryPtr VNDBFetcher::fetchEntryHook(ui - return Data::EntryPtr(); - } - -+ // image might still be a URL -+ const QString image_id = entry->field(QLatin1String("cover")); -+ if(image_id.contains(QLatin1Char('/'))) { -+ const QString id = ImageFactory::addImage(image_id, true /* quiet */); -+ if(id.isEmpty()) { -+ message(i18n("The cover image could not be loaded."), MessageHandler::Warning); -+ } -+ // empty image ID is ok -+ entry->setField(QLatin1String("cover"), id); -+ } -+ - return entry; - } - Index: patches/patch-src_tests_discogsfetchertest_cpp =================================================================== RCS file: patches/patch-src_tests_discogsfetchertest_cpp diff -N patches/patch-src_tests_discogsfetchertest_cpp --- patches/patch-src_tests_discogsfetchertest_cpp 2 May 2015 15:30:31 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,59 +0,0 @@ -$OpenBSD: patch-src_tests_discogsfetchertest_cpp,v 1.1 2015/05/02 15:30:31 zhuk Exp $ -Unbreak fetching Discogs images (upstream 61c9b539). ---- src/tests/discogsfetchertest.cpp.orig Sun Feb 15 22:23:56 2015 -+++ src/tests/discogsfetchertest.cpp Sat May 2 18:10:19 2015 -@@ -86,12 +86,9 @@ void DiscogsFetcherTest::testTitle() { - QVERIFY(!entry->field(QLatin1String("year")).isEmpty()); - QVERIFY(!entry->field(QLatin1String("track")).isEmpty()); - -- //OAuth is now required -- /* - QVERIFY(!entry->field(QLatin1String("cover")).isEmpty()); - const Tellico::Data::Image& img = Tellico::ImageFactory::imageById(entry->field(QLatin1String("cover"))); - QVERIFY(!img.isNull()); --*/ - } - - void DiscogsFetcherTest::testPerson() { -@@ -114,12 +111,10 @@ void DiscogsFetcherTest::testPerson() { - QCOMPARE(entry->field(QLatin1String("artist")), QLatin1String("Evanescence")); - QVERIFY(!entry->field(QLatin1String("title")).isEmpty()); - QVERIFY(!entry->field(QLatin1String("label")).isEmpty()); -- //OAuth is now required -- /* -+ - QVERIFY(!entry->field(QLatin1String("cover")).isEmpty()); - const Tellico::Data::Image& img = Tellico::ImageFactory::imageById(entry->field(QLatin1String("cover"))); - QVERIFY(!img.isNull()); -- */ - } - - void DiscogsFetcherTest::testKeyword() { -@@ -143,12 +138,10 @@ void DiscogsFetcherTest::testKeyword() { - QCOMPARE(entry->field(QLatin1String("artist")), QLatin1String("Evanescence")); - QVERIFY(!entry->field(QLatin1String("label")).isEmpty()); - QVERIFY(!entry->field(QLatin1String("year")).isEmpty()); -- // OAuth is now required -- /* -+ - QVERIFY(!entry->field(QLatin1String("cover")).isEmpty()); - const Tellico::Data::Image& img = Tellico::ImageFactory::imageById(entry->field(QLatin1String("cover"))); - QVERIFY(!img.isNull()); -- */ - } - - // use the Raw query type to fully test the data for a Discogs release -@@ -181,13 +174,6 @@ void DiscogsFetcherTest::testRawData() { - QStringList trackList = Tellico::FieldFormat::splitTable(entry->field("track")); - QCOMPARE(trackList.count(), 14); - QCOMPARE(trackList.at(0), QLatin1String("Haunted::Evanescence::4:04")); -- -- // OAuth is now required -- /* -- QVERIFY(!entry->field(QLatin1String("cover")).isEmpty()); -- const Tellico::Data::Image& img = Tellico::ImageFactory::imageById(entry->field(QLatin1String("cover"))); -- QVERIFY(!img.isNull()); --*/ - } - - // do another check to make sure the Vinyl format is captured Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/tellico-kde4/pkg/PLIST,v retrieving revision 1.2 diff -u -p -u -p -r1.2 PLIST --- pkg/PLIST 2 May 2015 15:30:31 -0000 1.2 +++ pkg/PLIST 15 Nov 2016 18:13:57 -0000 @@ -47,8 +47,7 @@ share/apps/tellico/entry-templates/Video share/apps/tellico/gcstar2tellico.xsl share/apps/tellico/giantbomb2tellico.xsl share/apps/tellico/goodreads2tellico.xsl -share/apps/tellico/griffith2tellico.py -share/apps/tellico/griffith2tellico.pyc +share/apps/tellico/griffith2tellico.xsl share/apps/tellico/hddvd-logo.png share/apps/tellico/isbndb2tellico.xsl share/apps/tellico/mods2tellico.xsl @@ -133,6 +132,7 @@ share/apps/tellico/tellico2html.xsl share/apps/tellico/tellico2onix.xsl share/apps/tellico/tellicoui.rc share/apps/tellico/thegamesdb2tellico.xsl +share/apps/tellico/unixref2tellico.xsl share/apps/tellico/vhs-logo.png share/apps/tellico/vinoxml2tellico.xsl share/apps/tellico/welcome.html
