Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 544734 - media-sound/cantata-2.0.0 version bump
Summary: media-sound/cantata-2.0.0 version bump
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo KDE team
URL: https://github.com/gentoo/gentoo/pull...
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-03-28 09:23 UTC by Franz Trischberger
Modified: 2016-05-04 07:18 UTC (History)
7 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
Renamed ebuild from 1.5.1 (cantata-2.0.0.ebuild,2.96 KB, text/plain)
2016-03-10 19:40 UTC, Ivan Grynko
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Franz Trischberger 2015-03-28 09:23:56 UTC
--- cantata-1.5.1.ebuild        2015-03-28 09:22:11.636341641 +0100
+++ cantata-1.5.2.ebuild        2015-03-28 09:52:41.196218174 +0100
@@ -28,10 +28,8 @@
 "
 
 RDEPEND="
-       dev-libs/qjson
        sys-libs/zlib
        x11-libs/libX11
-       || ( kde-apps/oxygen-icons $(add_kdebase_dep oxygen-icons) )
        cdda? ( media-sound/cdparanoia )
        cddb? ( media-libs/libcddb )
        kde? ( $(add_kdebase_dep kwalletd) )
@@ -50,6 +48,7 @@
                dev-qt/qtdbus:4
                dev-qt/qtgui:4
                dev-qt/qtsvg:4
+               dev-libs/qjson
        )
        replaygain? (
                media-sound/mpg123

* IMHO PROXY_CONFIG would not hurt - if it actually built. patch required...
* dev-libs/qjson is only needed with qt4, qtcore:5 ships json support itself. This dep would have pulled in qt4 here for no reason.
* Also oxygen-icons is only needed for non-linux-systems (see CMakeLists.txt:902)
* I am not sure about HTTP_STREAM_PLAYBACK and REMOTE_DEVICES. I could tune up the ebuild further to add support for that (plus optional libvlc support) if there is interest.
Comment 1 Franz Trischberger 2015-03-28 09:24:59 UTC
Damn, wrong diff... (correct download link missing) Sorry for the noice

--- cantata-1.5.1.ebuild        2015-03-28 09:22:11.636341641 +0100
+++ cantata-1.5.2.ebuild        2015-03-28 10:22:38.357096892 +0100
@@ -10,7 +10,7 @@
 
 DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
 HOMEPAGE="https://code.google.com/p/cantata/"
-SRC_URI="https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60UktwaTRMTjRIUW8 -> ${P}.tar.bz2"
+SRC_URI="https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60LV9rM3RMQk85Z1E -> ${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="4"
@@ -28,10 +28,8 @@
 "
 
 RDEPEND="
-       dev-libs/qjson
        sys-libs/zlib
        x11-libs/libX11
-       || ( kde-apps/oxygen-icons $(add_kdebase_dep oxygen-icons) )
        cdda? ( media-sound/cdparanoia )
        cddb? ( media-libs/libcddb )
        kde? ( $(add_kdebase_dep kwalletd) )
@@ -50,6 +48,7 @@
                dev-qt/qtdbus:4
                dev-qt/qtgui:4
                dev-qt/qtsvg:4
+               dev-libs/qjson
        )
        replaygain? (
                media-sound/mpg12
Comment 2 Franz Trischberger 2015-03-28 10:58:43 UTC
Ok, ENABLE_PROXY_CONFIG with Qt5 was fixed with
https://code.google.com/p/cantata/source/detail?r=5710
Waiting for feedback.
Comment 3 Johannes Huber (RETIRED) gentoo-dev 2015-03-29 11:15:44 UTC
>  RDEPEND="
> -       dev-libs/qjson
>         sys-libs/zlib
>         x11-libs/libX11
> -       || ( kde-apps/oxygen-icons $(add_kdebase_dep oxygen-icons) )
>         cdda? ( media-sound/cdparanoia )
>         cddb? ( media-libs/libcddb )
>         kde? ( $(add_kdebase_dep kwalletd) )
> @@ -50,6 +48,7 @@
>                 dev-qt/qtdbus:4
>                 dev-qt/qtgui:4
>                 dev-qt/qtsvg:4
> +               dev-libs/qjson

Two questions about the bump patch: 

1. Why is qjson moved?
2. Why is oxygen-icons dropped?
Comment 4 Franz Trischberger 2015-03-29 11:29:22 UTC
(In reply to Johannes Huber from comment #3)
> >  RDEPEND="
> > -       dev-libs/qjson
> >         sys-libs/zlib
> >         x11-libs/libX11
> > -       || ( kde-apps/oxygen-icons $(add_kdebase_dep oxygen-icons) )
> >         cdda? ( media-sound/cdparanoia )
> >         cddb? ( media-libs/libcddb )
> >         kde? ( $(add_kdebase_dep kwalletd) )
> > @@ -50,6 +48,7 @@
> >                 dev-qt/qtdbus:4
> >                 dev-qt/qtgui:4
> >                 dev-qt/qtsvg:4
> > +               dev-libs/qjson
> 
> Two questions about the bump patch: 
> 

Quoting CMakeLists.txt.

> 1. Why is qjson moved?
L. 361 FF
# For Qt5, we use Qt's own QJSonDocument class, so no need to find libqjson
if (NOT ENABLE_QT5 AND NOT WIN32 AND NOT APPLE)
    find_package(QJSON)
endif (NOT ENABLE_QT5 AND NOT WIN32 AND NOT APPLE)

Therefor we only need qjson for qt4.

> 2. Why is oxygen-icons dropped?
L. 902 FF
    if (NOT CMAKE_SYSTEM_NAME MATCHES Linux)
        message("-----------------------------------------------------------------------------")
        message("-- You NEED to have the Oxygen icons installed!!!")
        message("-----------------------------------------------------------------------------")
        message("")
    endif (NOT CMAKE_SYSTEM_NAME MATCHES Linux)

As we actually build on Linux  we don't need to install oxygen-icons. For me it actually picks up breeze icons.
Comment 5 Alexandre 2015-05-11 20:57:33 UTC
Seems 1.6.0 is out:

https://github.com/CDrummond/cantata/blob/master/ChangeLog
Comment 6 Franz Trischberger 2015-06-07 12:31:28 UTC
(In reply to Alexandre from comment #5)
> Seems 1.6.0 is out:
> 
> https://github.com/CDrummond/cantata/blob/master/ChangeLog

Craig adds changes to the next release target in CHANGES file while he fixes/implements things.
According to this link
https://github.com/CDrummond/cantata/wiki/Previous-(Google-Code)-Downloads
1.5.2 was the last release on google code, the github repo has no release yet, so I think 1.5.2 is the last released version.
Comment 7 Alexandre 2016-01-24 16:03:02 UTC
Seems Canata-2.0.0 is out: https://github.com/cdrummond/cantata/tree/2.0
Comment 8 Ivan Grynko 2016-03-10 19:40:43 UTC
Created attachment 427924 [details]
Renamed ebuild from 1.5.1
Comment 9 Alexandre 2016-04-28 19:56:05 UTC
The current provided 2.0.0 version do not compile any more against the last version of Qt (~amd). The fix is already on git master (2.0.50), for the 2.0.1 version to come.
Comment 10 Johannes Huber (RETIRED) gentoo-dev 2016-05-04 07:18:06 UTC
Thanks all.

commit 06f9b9bb9f1ef48268fe62845c5dd8816cb3b58f
Author: civil@gentoo.org <civil@gentoo.org>
Date:   Wed Mar 30 01:18:56 2016 +0200

    media-sound/cantata: version bump 2.0.0
    
    Gentoo-bug: 544734
    
    Package-Manager: portage-2.2.28
    
    Signed-off-by: Johannes Huber <johu@gentoo.org>