KDE · pcgomes · Feb 28, 2020 · Mar 6, 2020 · Mar 9, 2020 · Mar 12, 2020
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,14 +28,17 @@ include(FindPkgConfig)
 include(CMakePushCheckState)
 include(GenerateExportHeader)
 
-find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Core DBus Gui QuickWidgets Qml Script ScriptTools Sql Svg Test Widgets Xml)
+find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Core DBus Gui QuickWidgets Qml Sql Svg Test Widgets Xml )
 
 find_package(Qt5QuickControls2 ${QT_REQUIRED_VERSION})
 set_package_properties(Qt5QuickControls2 PROPERTIES TYPE RUNTIME PURPOSE "Needed by the player's context area")
 
 find_package(Qt5WebEngine ${QT_REQUIRED_VERSION})
 set_package_properties(Qt5WebEngine PROPERTIES TYPE OPTIONAL PURPOSE "Needed by the wikipedia applet")
 
+find_package(Qt5UiTools ${QT_REQUIRED_VERSION})
+set_package_properties(Qt5UiTools PROPERTIES TYPE OPTIONAL PURPOSE "Needed by the scripting engine")
+
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     Archive
     Attica

diff --git a/MAINTAINERS b/MAINTAINERS
@@ -2,4 +2,4 @@ Amarok does not have clear maintainers of all parts of the codebase. The current
 
 You are welcome to work on any part of it provided you coordinate with others working in that part.
 
-If you need to contact someone about a particular part it is best to contact the developer mailing list at amarok-devel@kde.org or the assignee of the corresponding component on http://bugs.kde.org directly.
+If you need to contact someone about a particular part it is best to contact the developer mailing list at amarok-devel@kde.org or the assignee of the corresponding component on https://bugs.kde.org directly.
diff --git a/Mainpage.dox b/Mainpage.dox
@@ -13,7 +13,7 @@ of the <a href="http://techbase.kde.org">KDE Techbase</a>.
 
 @maintainers
 Amarok does not have clear maintainers of any part of the codebase. You are welcome to work on any part of it provided  you coordinate with others working in that part. <br/>
-If you need to contact someone about a particular part it is best to contact the developer mailing list at amarok-devel@kde.org or the assignee of the corresponding component on http://bugs.kde.org directly.
+If you need to contact someone about a particular part it is best to contact the developer mailing list at amarok-devel@kde.org or the assignee of the corresponding component on https://bugs.kde.org directly.
 
 @authors
 <!--

diff --git a/README b/README
@@ -1,170 +1,10 @@
 Amarok - the audio player for KDE
 ===================================
 
-There are many media players around these days, it's true. What's missing from most
-players is a user interface that doesn't get in the way of the user. How many
-buttons do you have to press for simply adding some new tracks to the playlist?
-Amarok tries to be a little different, providing a simple drag and drop interface
-that really makes playlist handling easy.
+This *personal* repository is a clone of the official Amarok repository (https://invent.kde.org/kde/amarok).
+Here I publish my ongoing improvements, which are also sent upstream once they are completed.
+You are welcome to use it. But the code might be unstable, and is supported by no one else but me.
+Feel free to contact me with suggestions and bug reports.
 
-
- FEATURES
-==========
-
-    * Quick and simple drag and drop playlist creation
-    * Music library
-    * Cross platform: Support for Unix, MacOS X and Windows
-    * Plays all audio formats known to man
-    * Cover art download using Last.fm services
-    * Automatic play-statistics generation (iRate style)
-    * Full lyrics download
-    * Learn about your music with integrated Wikipedia
-    * Full Last.fm support
-    * gpodder.net support
-    * Configurable on screen display for track changes
-    * Podcast support
-    * iPod support, as well as other media players
-    * Powerful scripting interface
-    * Integration with Plasma and KDE Applications
-    * Integration with multiple web sources including Magnatune, Jamendo,
-      Ampache, MP3tunes, and others.
---------------------------------------------------------------------------------
-
-
- DEPENDENCIES
-==============
-
-The following list should give you an impression what's required but it might
-not be entirely up to date. You can always look at CMakeLists.txt to discover
-the most recent dependencies.
-
-Required
-    * KDE Frameworks 5 (for an exact list look at CMakeLists.txt)
-      https://www.kde.org
-
-    * Phonon 4.6.60 (with support for Qt5) and one of the following backends:
-      * phonon-gstreamer 4.6.3 (or newer)
-      * phonon-vlc 0.6.1 (or newer; as of 0.6.1 doesn't yet play Audio CDs, bug 313046)
-
-    * Qt 5.8 (or newer)
-      https://qt.io/
-
-    * TagLib 1.7 (or newer)
-      (Metadata tagging library)
-
-    * TagLib Extras 1.0.1 (or newer)
-      (Support for metadata reading of additional file types)
-      svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib-extras
-
-    * MySQL 5.0 (or newer) Embedded: libmysqld compiled with fPIC
-      (In-process database support)
-
-Optional
-    * Taglib 1.8 for support of MOD, IT, S3M and XM files
-    * Taglib 1.9 for support of Opus files
-      http://taglib.org/
-      https://github.com/taglib/taglib
-
-    * iPod support requires:
-      * libgpod 0.8.2 (or newer)
-        http://www.gtkpod.org/libgpod/
-      * optional iPod album artwork support requires:
-        * libgpod built with GDKPixBuf support enabled
-        * GDKPixBuf 2.0 (or newer) itself
-
-    * libmtp 1.0.0 (or newer)
-      (MTP device support)
-      http://libmtp.sourceforge.net/
-
-    * Spectrum analyzer requires:
-      * QtOpenGL
-
-    * Mp3tunes.com integration (including syncronization) requires:
-      * OpenSSL https://www.openssl.org
-      * libxml2 http://xmlsoft.org
-      * libcurl https://curl.haxx.se
-      * Glib2 https://www.gtk.org
-      * Loudmouth, the Jabber library, http://www.loudmouth-project.org/
-      * Qt must be compiled with Glib enabled
-
-    * Liblastfm 1.0.3 (or newer)
-      (For scrobbling, internet radio, and artist info)
-      http://cdn.last.fm/client/liblastfm-1.0.3.tar.gz
-      https://github.com/eartle/liblastfm
-
-    * MySQL 5.0 (or newer) Server (external database support)
-
-    * MusicBrainz-based audio fingerprint tag lookup requires:
-      * FFmpeg 0.7.0 (or newer) - https://ffmpeg.org/
-        * libavcodec & libavformat specifically
-      * LibOFA - http://code.google.com/p/musicip-libofa/
-
-    * gpodder.net Podcast Provider & Service
-      * libmygpo-qt 1.0.9 (or newer)
-         Actually it needs the to-be-released 1.10. Or you use 1.0.9 and add the
-         patches from the following pull requests:
-         - https://github.com/gpodder/libmygpo-qt/pull/12
-         - https://github.com/gpodder/libmygpo-qt/pull/13
-
-    * Transcoding requires (at runtime):
-      * FFmpeg 0.7.0 (or newer) - https://ffmpeg.org/
-      * For all supported encoders to be available in Amarok, FFmpeg needs to
-        support the following codecs:
-        * aac (introduced in 3.0, https://www.ffmpeg.org/index.html#aac_encoder_stable)
-        * alac
-        * flac
-        * opus
-        * libmp3lame (NOT just "mp3")
-        * libvorbis (NOT just "vorbis")
-        * wmav2
-
-    * CD support requires:
-      * audiocd-kio - https://www.kde.org/ (part of KDE multimedia)
-
-    * Building tests require:
-      * gmock 1.4 (or newer) - https://github.com/google/googletest
-
-Please note that if compiling from source you also need to install -dev/-devel
-versions of these packages, depending on your distribution.
---------------------------------------------------------------------------------
-
-
- IMPORTANT INSTALL INSTRUCTIONS
-================================
-
-To compile from source, please refer to the INSTALL file.
-
-Packages for popular distributions are available at https://amarok.kde.org
---------------------------------------------------------------------------------
-
-
- FURTHER RESOURCES
-===================
-
-For answers to problems like "Amarok won't play any MP3s!" and "My MP3s skip
-and stutter!" please visit:
-
-   https://amarok.kde.org/
---------------------------------------------------------------------------------
-
-
- CONTRIBUTING
-==============
-
-If you wish to contribute to Amarok, you should build it from Git and subscribe
-to the amarok AT kde.org mailing list. The IRC channel is also a place where
-it's nice to be. There you can talk to other developers easily, and you can see
-instant notifications of commits to the Git master repository. For instant email
-notification of commits, visit http://commitfilter.kde.org/ , and http://amarok.be/fisheye
-provides a slightly-less-instant overview.
-
-More information at:
-https://community.kde.org/Amarok/Development/Join
-
-See you on IRC!
-
---------------------------------------------------------------------------------
-
-WWW:  https://amarok.kde.org
-MAIL: amarok@kde.org
-IRC:  irc.freenode.net - #amarok, #amarok.de, #amarok.es, #amarok.fr
+Packages for (k)Ubuntu 19.10 (or newer) are available at https://launchpad.net/~pgomes/+archive/ubuntu/amarok
+I rebase from the official repository before a new release. Thus, new packages incorporate other people's improvements, and should be fully usable.
diff --git a/data/amarok.notifyrc b/data/amarok.notifyrc
@@ -167,6 +167,7 @@ Name[en_GB]=Message
 Name[eo]=Mesaĝo
 Name[es]=Mensaje
 Name[et]=Teade
+Name[eu]=Mezua
 Name[fi]=Viesti
 Name[fr]=Message
 Name[ga]=Teachtaireacht
@@ -211,6 +212,7 @@ Comment[el]=Το Amarok εξέδωσε ένα μη κατηγοριοποιημ
 Comment[en_GB]=Amarok issued an uncategorised text message
 Comment[es]=Amarok emitió un mensaje de texto no clasificado
 Comment[et]=Amarok andis liigitamata tekstiteate
+Comment[eu]=Amarok-ek kategoriarik gabeko testu mezu bat eman du
 Comment[fi]=Amarok lähetti luokittelemattoman tekstiviestin
 Comment[fr]=Amarok a émis un message de texte sans catégorie
 Comment[ga]=Chuir Amarok teachtaireacht téacs gan catagóir amach

diff --git a/distribution/deb_packaging/ubuntu/18.04/debian/changelog b/distribution/deb_packaging/ubuntu/18.04/debian/changelog
@@ -0,0 +1,87 @@
+amarok (2:2.9.70+1SNAPSHOT20200916214648+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Fix compilation error when optional qttools5-dev is not present
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Wed, 16 Sep 2020 21:46:48 +0200
+
+amarok (2:2.9.70+1SNAPSHOT20200916171021+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Fix compilation error when optional qttools5-dev is not present
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Wed, 16 Sep 2020 17:10:21 +0200
+
+amarok (2:2.9.70+1SNAPSHOT20200915122323+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Port scripting engine from QTScript to QJSEngine
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Tue, 15 Sep 2020 12:23:23 +0200
+
+amarok (2:2.9.70+1SNAPSHOT20200703102146+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Remove dependency to metapackage qtdeclarative-abi that prevents installation to Neon
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 03 Jul 2020 10:21:46 +0200
+
+amarok (2:2.9.70+1SNAPSHOT20200701124447+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Replace usage of QJSEngine:importModule to compile with QT5.8
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Wed, 01 Jul 2020 12:44:47 +0200
+
+amarok (2:2.9.70+1SNAPSHOT20200630174341+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Change numbering to old Ubuntu scheme
+  * Fix compilation error for scripting code compatible with QT 5.8
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Tue, 30 Jun 2020 17:43:41 +0200
+
+amarok (2.9.70+1SNAPSHOT20200626194036+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Second release of script engine porting to QJSEngine
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 26 Jun 2020 19:40:36 +0200
+
+amarok (2.9.70+1SNAPSHOT20200623170346+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * First release of script engine porting to QJSEngine
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Tue, 23 Jun 2020 17:03:46 +0200
+
+amarok (2.9.70+1SNAPSHOT20200616130454+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Fix crash in breadcrumb when deleting the child menu of a category
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Tue, 16 Jun 2020 13:04:54 +0200
+
+amarok (2.9.70+1SNAPSHOT20200612103823+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Fix crash when closing Edit Filter dialog
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 12 Jun 2020 10:38:23 +0200
+
+amarok (2.9.70+1SNAPSHOT20200504192042+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Fix error message at PlaylistDock
+  * add Dockerfile for Neon 18.04 and Ubuntu 20.04
+  * add debian packaging conf for Ubuntu 20.04 
+  * Reorganize dir structure for packaging configuration and Dockerfiles
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Sat, 25 Apr 2020 22:38:26 +0200
+
+amarok (2.9.70+1SNAPSHOT20200424193358+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Fix breadcrumb
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 24 Apr 2020 19:34:09 +0200
+
+amarok (2.9.70+1SNAPSHOT20200410173239+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * add missing libkf5doctools-dev to control file
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 10 Apr 2020 17:32:23 +0200
+
+amarok (2.9.70+1SNAPSHOT20200407170839+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Initial release 
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Tue, 07 Apr 2020 17:16:20 +0200
diff --git a/distribution/deb_packaging/ubuntu/18.04/debian/control b/distribution/deb_packaging/ubuntu/18.04/debian/control
@@ -0,0 +1,77 @@
+Source: amarok
+Section: sound
+Priority: optional
+Maintainer: Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+Build-Depends: debhelper-compat (= 11),
+               cmake,
+               extra-cmake-modules,
+               kirigami2-dev,
+               libaio-dev,
+               libavcodec-dev,
+               libavdevice-dev,
+               libavformat-dev,
+               libavutil-dev,
+               libcurl4-openssl-dev,
+               libfftw3-dev,
+               libgcrypt20-dev,
+               libgdk-pixbuf2.0-dev,
+               libkf5archive-dev,
+               libkf5attica-dev,
+               libkf5codecs-dev,
+               libkf5config-dev,
+               libkf5configwidgets-dev,
+               libkf5coreaddons-dev,
+               libkf5crash-dev,
+               libkf5dbusaddons-dev,
+               libkf5declarative-dev,
+               libkf5dnssd-dev,
+               libkf5doctools-dev,
+               libkf5globalaccel-dev,
+               libkf5guiaddons-dev,
+               libkf5i18n-dev,
+               libkf5iconthemes-dev,
+               libkf5kcmutils-dev,
+               libkf5kio-dev,
+               libkf5newstuff-dev,
+               libkf5notifications-dev,
+               libkf5notifyconfig-dev,
+               libkf5package-dev,
+               libkf5solid-dev,
+               libkf5texteditor-dev,
+               libkf5threadweaver-dev,
+               libkf5wallet-dev,
+               libkf5widgetsaddons-dev,
+               libkf5windowsystem-dev,
+               liblastfm5-dev,
+               libloudmouth1-dev,
+               libmariadbd-dev,
+               libmariadb-dev,
+               libmtp-dev,
+               libmygpo-qt-dev,
+               libofa0-dev,
+               libphonon4qt5-dev,
+               libpostproc-dev,
+               libqt5svg5-dev,
+               libssl-dev,
+               libswscale-dev,
+               libtag1-dev,
+               libtag-extras-dev,
+               libxml2-dev,
+               pkg-config,
+               qtdeclarative5-dev,
+               qtquickcontrols2-5-dev,
+               qtscript5-dev,
+               qttools5-dev,
+               qtwebengine5-dev
+Standards-Version: 4.4.0
+Homepage: https://amarok.kde.org/
+Vcs-Browser: https://github.com/pcgomes/amarok
+Vcs-Git: https://github.com/pcgomes/amarok.git
+
+Package: amarok
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Amarok for KDE5
+ (K)ubuntu, starting from 19.10, does not support applications that were not ported to QT5.
+ Amarok has not concluded the ported yet, but is usable. So I create packages for KDE5
+ until the port is concluded, and (K)ubuntu releases Amarok packages again.