Page MenuHomeFreeBSD

Update audio/cantata to 2.1.0
ClosedPublic

Authored by tcberner on Jul 31 2017, 9:49 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Jun 16, 2:45 PM
Unknown Object (File)
Fri, Jun 7, 2:34 AM
Unknown Object (File)
Fri, Jun 7, 2:34 AM
Unknown Object (File)
Fri, Jun 7, 2:34 AM
Unknown Object (File)
Fri, Jun 7, 2:34 AM
Unknown Object (File)
Fri, Jun 7, 2:34 AM
Unknown Object (File)
Wed, Jun 5, 10:12 PM
Unknown Object (File)
May 22 2024, 4:09 AM
Subscribers

Details

Reviewers
adridg
rakuco
Group Reviewers
kde
Commits
rP447021: Update audio/cantata to 2.1.0
Summary
  • Disable UDev detection, as it can pickup libudev-devd.
  • Remove the git-patches
  • Add to new fixes (already reported).
Test Plan
  • I'll test it later...

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

Add patch to fix the VLC streaming option.

Add to new fixes (already reported).

Can you add links to the upstream bug reports or pull requests to the new patches?

audio/cantata/files/patch-devices_cddbinterface.cpp
8 ↗(On Diff #31418)

What exactly is this fixing? To me it looks like adding at(i) there will get you a single character from the translated string.

FAILED: CMakeFiles/cantata.dir/devices/cddbinterface.cpp.o 
/usr/local/libexec/ccache/c++  -DQT_CONCURRENT_LIB -DQT_CORE_LIB -DQT_DBUS_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_NETWORK_LIB -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT -DQT_SQL_LIB -DQT_SVG_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -I/usr/local/include/taglib-extras -isystem /usr/local/include/qt5 -isystem /usr/local/include/qt5/QtMultimedia -isystem /usr/local/include/qt5/QtNetwork -isystem /usr/local/include/qt5/QtCore -isystem /usr/local/lib/qt5/mkspecs/freebsd-clang -isystem /usr/local/include/qt5/QtGui -isystem /usr/local/include -I/wrkdirs/usr/ports/audio/cantata/work/cantata-2.1.0/3rdparty -I/wrkdirs/usr/ports/audio/cantata/work/cantata-2.1.0 -I. -isystem /usr/local/include/qt5/QtWidgets -isystem /usr/local/include/qt5/QtXml -isystem /usr/local/include/qt5/QtConcurrent -isystem /usr/local/include/qt5/QtSvg -isystem /usr/local/include/qt5/QtSql -isystem /usr/local/include/qt5/QtDBus -I/usr/local/include/taglib -I/usr/local/include/neon -I/usr/local/include/libxml2 -std=c++11 -O2 -pipe -fstack-protector -isystem /usr/local/include -fno-strict-aliasing  -isystem /usr/local/include -O2 -pipe -fstack-protector -isystem /usr/local/include -fno-strict-aliasing  -isystem /usr/local/include -fPIE   -I/usr/local/include/taglib -I/usr/local/include/taglib-extras -fPIC -std=gnu++11 -MD -MT CMakeFiles/cantata.dir/devices/cddbinterface.cpp.o -MF CMakeFiles/cantata.dir/devices/cddbinterface.cpp.o.d -o CMakeFiles/cantata.dir/devices/cddbinterface.cpp.o -c /wrkdirs/usr/ports/audio/cantata/work/cantata-2.1.0/devices/cddbinterface.cpp
/wrkdirs/usr/ports/audio/cantata/work/cantata-2.1.0/devices/cddbinterface.cpp:161:127: error: cannot initialize a parameter of type 'const char *' with an lvalue of type 'int'
                        cddb_track_set_title(track, te.entry.control&0x04 ? dataTrack().toUtf8().constData() : tr("Track %1", i).toUtf8().constData());
                                                                                                                              ^
/wrkdirs/usr/ports/audio/cantata/work/cantata-2.1.0/devices/cddbinterface.h:37:5: note: passing argument to parameter 'c' here
    Q_OBJECT
    ^
/usr/local/include/qt5/QtCore/qobjectdefs.h:205:5: note: expanded from macro 'Q_OBJECT'
    QT_TR_FUNCTIONS \
    ^
/usr/local/include/qt5/QtCore/qobjectdefs.h:136:57: note: expanded from macro 'QT_TR_FUNCTIONS'
    static inline QString tr(const char *s, const char *c = Q_NULLPTR, int n = -1) \
                                                        ^
1 error generated.
audio/cantata/files/patch-devices_cddbinterface.cpp
8 ↗(On Diff #31418)

.arg(), not .at()

lgtm

audio/cantata/files/patch-devices_cddbinterface.cpp
8 ↗(On Diff #31418)

Duh :D

This revision is now accepted and ready to land.Aug 1 2017, 12:47 PM
This revision was automatically updated to reflect the committed changes.