GitLab

The port to KF5 didn't encompass tunepimp, which was outdated even in
KDE4 times.  This is just a simple build fix since we're in middle of
release tagging, but in the future we will also need to audit the dead
code that's not likely to be replaced by musicbrainz's current
recommendations for client libs.

When building master with gcc 4.8, the build fails with errors like
this:
error: no matching function for call to
'MediaPlayer2Player::connect(QPointer<PlayerManager>&, void
(PlayerManager::*)(const FileHandle&), MediaPlayer2Player* const, void
(MediaPlayer2Player::*)()const)'

See also https://bugreports.qt.io/browse/QTBUG-48988

This patch fixes it.

The fix is similar to fixes in other applications, e.g.
https://cgit.kde.org/kdevelop.git/commit/?h=5.2&id=6d5bdbba0a04d7180bda1f6bb47acb386575a561

Differential Revision: https://phabricator.kde.org/D8716

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

And crashes involving other action invocations.  We need to guard
against KSNI::action everywhere action() is called, not just in the
ctor.  A good Junior Job might be going through and renaming the
JuK-specific ActionCollection and action() functions to something a
little less likely to conflict with KDE or Qt namespace.

Commit b7ed1ed7 was accidentally pushed
when I pushed the FreeBSD build fix, but was missing the dir separator.

Need to define QUrl in mediafiles, this worked on Linux for some reason.

Was broken when porting away from KStandardDirs.  The code to extract
embedded cover art needs to know the name to extract the art into, but
QStandardPaths::locate() wouldn't return that name unless it already
existed somehow.

Based on the patch submitted nearly 3 years ago by James Smith. :(
This matches the behavior of many other media players supporting MPRIS2.

REVIEW:121731
FIXED-IN:17.12

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Otherwise our config doesn't get saved, though this seemed to work fine
in earlier KDE desktops.

Before this, we used a convention involving object names assigned in the
.ui XML to figure out at runtime which QCheckBoxes were used to enable
which widgets for multi-item edit ("configuration by convention" before
Rails made it cool!).

But, I found it hard to understand years later so I'm trying for
something more direct.  Hopefully it will be easier to understand to
whoever reads this 10 years from now.

Moving 'frameworks' back into master to serve as the active branch of
development.

This required a wide assortment of fixes, including deleting
needless #include <koldfoo.h> headers, some minor additional porting
tasks, and adding in includes that were previously only implicitly
included.

Most are just worked around in some fashion but better to weed out
warnings from features that don't work right now so that actual issues
that might be introduced are that much more apparent.