--- qtgrilo-0.0.20130610.orig/debian/changelog +++ qtgrilo-0.0.20130610/debian/changelog @@ -0,0 +1,24 @@ +qtgrilo (0.0.20130610-0ubuntu3) trusty; urgency=medium + + * Rebuild against Qt 5.2.1 + * Prevent 'signals' from GDBus from clashing with Qt's 'signals' + (LP: #1287180) + + -- Timo Jyrinki Wed, 05 Mar 2014 10:19:57 +0200 + +qtgrilo (0.0.20130610-0ubuntu2) saucy; urgency=low + + * New bzr checkout. + - Changes recommended from upstream after they included the changes to add + genre, cover art, year and track number. + - Fix the import path after adding versioning to the installation path and + the Debian package. + - Add trackNumber property to order tracks. + + -- Victor Thompson Wed, 18 Sep 2013 13:32:54 -0500 + +qtgrilo (0.0.20130610-0ubuntu1) saucy; urgency=low + + * Initial release. + + -- Victor Thompson Thu, 15 Aug 2013 18:12:36 -0500 --- qtgrilo-0.0.20130610.orig/debian/compat +++ qtgrilo-0.0.20130610/debian/compat @@ -0,0 +1 @@ +9 --- qtgrilo-0.0.20130610.orig/debian/control +++ qtgrilo-0.0.20130610/debian/control @@ -0,0 +1,24 @@ +Source: qtgrilo +Section: libs +Priority: optional +Maintainer: Ubuntu Developers +Build-Depends: debhelper (>= 9.0.0), + qtbase5-dev, + qtdeclarative5-dev, + qt5-default, + pkg-kde-tools, + libgrilo-0.2-dev, +Standards-Version: 3.9.4 +Homepage: http://qt-project.org/ + +Package: qtdeclarative5-qtgrilo0.1 +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: Nemo QML plugin - Grilo + Qt is a cross-platform C++ application framework. Qt's primary feature + is its rich set of widgets that provide standard GUI functionality. + . + This package contains the Grilo plugin of the Nemo QML plugins collection. + --- qtgrilo-0.0.20130610.orig/debian/copyright +++ qtgrilo-0.0.20130610/debian/copyright @@ -0,0 +1,46 @@ +Format: http://dep.debian.net/deps/dep5 +Upstream-Name: qtgrilo +Source: https://github.com/nemomobile/qtgrilo + +Files: * +Copyright: 2013 Nemo Mobile + 2012-2013 Jolla Ltd. +License: LGPL-2.1+ + +License: LGPL-2.1+ + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU Lesser General + Public License can be found in "/usr/share/common-licenses/LGPL-2.1". + +Files: debian/* +Copyright: 2013 Victor Thompson +License: GPL-3.0+ + +License: GPL-3.0+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". --- qtgrilo-0.0.20130610.orig/debian/rules +++ qtgrilo-0.0.20130610/debian/rules @@ -0,0 +1,18 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) +export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) +export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed + +%: + dh $@ --fail-missing + +override_dh_auto_configure: + qmake + +override_dh_builddeb: + dh_builddeb -- -Zxz + --- qtgrilo-0.0.20130610.orig/debian/watch +++ qtgrilo-0.0.20130610/debian/watch @@ -0,0 +1,3 @@ +version=3 +https://github.com/nemomobile/qtgrilo/releases \ + /nemomobile/qtgrilo/archive/(.+)\.tar\.gz --- qtgrilo-0.0.20130610.orig/declarative/declarative.pro +++ qtgrilo-0.0.20130610/declarative/declarative.pro @@ -11,7 +11,7 @@ OTHER_FILES += $${EXAMPLE} TARGET = qmlgriloplugin -PLUGIN_IMPORT_PATH = org/nemomobile/grilo +PLUGIN_IMPORT_PATH = org/nemomobile/grilo.0.1 SOURCES += griloplugin.cpp grilomodel.cpp griloregistry.cpp grilomedia.cpp grilodatasource.cpp \ grilobrowse.cpp grilosearch.cpp griloquery.cpp grilomultisearch.cpp --- qtgrilo-0.0.20130610.orig/declarative/grilodatasource.h +++ qtgrilo-0.0.20130610/declarative/grilodatasource.h @@ -24,6 +24,8 @@ #ifndef GRILO_DATA_SOURCE_H #define GRILO_DATA_SOURCE_H +/* Fix FTBFS from clashing 'signals' definition (LP: #1287180) */ +#define __G_DBUS_INTROSPECTION_H__ #include #include #include --- qtgrilo-0.0.20130610.orig/declarative/grilomedia.cpp +++ qtgrilo-0.0.20130610/declarative/grilomedia.cpp @@ -91,6 +91,42 @@ return QString(); } +QString GriloMedia::genre() const +{ + if (GRL_IS_MEDIA_AUDIO(m_media)) { + return QString::fromUtf8(grl_media_audio_get_genre(GRL_MEDIA_AUDIO(m_media))); + } + + return QString(); +} + +QUrl GriloMedia::thumbnail() const +{ + if (GRL_IS_MEDIA(m_media)) { + return QUrl(grl_media_get_thumbnail(GRL_MEDIA(m_media))); + } + + return QUrl(); +} + +int GriloMedia::year() const +{ + if (GRL_IS_MEDIA(m_media)) { + return g_date_time_get_year(grl_media_get_creation_date(GRL_MEDIA(m_media))); + } + + return 0; +} + +int GriloMedia::trackNumber() const +{ + if (GRL_IS_MEDIA_AUDIO(m_media)) { + return grl_media_audio_get_track_number(GRL_MEDIA_AUDIO(m_media)); + } + + return 0; +} + int GriloMedia::childCount() const { if (GRL_IS_MEDIA_BOX(m_media)) { --- qtgrilo-0.0.20130610.orig/declarative/grilomedia.h +++ qtgrilo-0.0.20130610/declarative/grilomedia.h @@ -24,6 +24,8 @@ #ifndef GRILO_MEDIA_H #define GRILO_MEDIA_H +/* Fix FTBFS from clashing 'signals' definition (LP: #1287180) */ +#define __G_DBUS_INTROSPECTION_H__ #include #include #include @@ -39,6 +41,10 @@ Q_PROPERTY(QString author READ author CONSTANT); Q_PROPERTY(QString album READ album CONSTANT); Q_PROPERTY(QString artist READ artist CONSTANT); + Q_PROPERTY(QString genre READ genre CONSTANT); + Q_PROPERTY(QUrl thumbnail READ thumbnail CONSTANT); + Q_PROPERTY(int year READ year CONSTANT); + Q_PROPERTY(int trackNumber READ trackNumber CONSTANT); Q_PROPERTY(int childCount READ childCount CONSTANT); Q_PROPERTY(QString mimeType READ mimeType CONSTANT); public: @@ -53,6 +59,10 @@ QString author() const; QString album() const; QString artist() const; + QString genre() const; + QUrl thumbnail() const; + int year() const; + int trackNumber() const; int childCount() const; QString mimeType() const; --- qtgrilo-0.0.20130610.orig/declarative/griloplugin.h +++ qtgrilo-0.0.20130610/declarative/griloplugin.h @@ -26,6 +26,8 @@ #include #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +/* Fix FTBFS from clashing 'signals' definition (LP: #1287180) */ +# define __G_DBUS_INTROSPECTION_H__ # include # define QDeclarativeExtensionPlugin QQmlExtensionPlugin #else --- qtgrilo-0.0.20130610.orig/declarative/griloregistry.h +++ qtgrilo-0.0.20130610/declarative/griloregistry.h @@ -24,6 +24,8 @@ #ifndef GRILO_REGISTRY_H #define GRILO_REGISTRY_H +/* Fix FTBFS from clashing 'signals' definition (LP: #1287180) */ +#define __G_DBUS_INTROSPECTION_H__ #include #include --- qtgrilo-0.0.20130610.orig/declarative/qmldir +++ qtgrilo-0.0.20130610/declarative/qmldir @@ -1 +1,2 @@ +module org.nemomobile.grilo plugin qmlgriloplugin --- qtgrilo-0.0.20130610.orig/example/fs.qml +++ qtgrilo-0.0.20130610/example/fs.qml @@ -1,6 +1,6 @@ -import QtQuick 1.0 +import QtQuick 2.0 import org.nemomobile.grilo 0.1 -import QtMultimediaKit 1.1 +import QtMultimedia 5.0 Item { width: 400 --- qtgrilo-0.0.20130610.orig/example/tracker.qml +++ qtgrilo-0.0.20130610/example/tracker.qml @@ -1,6 +1,6 @@ -import QtQuick 1.0 +import QtQuick 2.0 import org.nemomobile.grilo 0.1 -import QtMultimediaKit 1.1 +import QtMultimedia 5.0 Item { width: 400 --- qtgrilo-0.0.20130610.orig/example/youtube.qml +++ qtgrilo-0.0.20130610/example/youtube.qml @@ -1,6 +1,6 @@ -import QtQuick 1.0 +import QtQuick 2.0 import org.nemomobile.grilo 0.1 -import QtMultimediaKit 1.1 +import QtMultimedia 5.0 Item { width: 400 @@ -76,6 +76,6 @@ anchors.top: list.bottom height: parent.height / 3 width: parent.width - anchors.horizontalCenter: paremt.horizontalCenter + anchors.horizontalCenter: parent.horizontalCenter } }