Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace qtscript with qt qml #10

Closed
Show file tree
Hide file tree
Changes from 45 commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
9b4fad1
Restore compilation job and fix old dependency to amarok_lastfm_share…
pcgomes Feb 28, 2020
730d49c
Restore compilation job and fix old dependency to amarok_lastfm_share…
pcgomes Mar 6, 2020
68a37e0
Remove unsupported neighbour method, remove deprecated groups ref and
pcgomes Mar 9, 2020
b9f900e
Remove remaining references to neighbours
pcgomes Mar 12, 2020
464a006
Fix segfault when destroying LastFmService
pcgomes Mar 18, 2020
8a4cc3a
Merge pull request #1 from pcgomes/lastfm_service
pcgomes Mar 18, 2020
8f885c9
Replaced static exports with a generated export header
pcgomes Mar 31, 2020
78a644c
Merge pull request #2 from pcgomes/lastfm_service
pcgomes Mar 31, 2020
9789fb5
Fix crash for wrongly connecting Token::destroyed signal
pcgomes Apr 1, 2020
e85dbce
Fix dialog's layout and resizing
pcgomes Apr 2, 2020
892760a
Fix double dialog box for transcoding
pcgomes Apr 3, 2020
2922c10
Merge pull request #3 from pcgomes/fix_import_to_collecton
pcgomes Apr 3, 2020
efd1964
Fix Copying dialog at filebrowser to open
pcgomes Apr 4, 2020
2af5922
Fix importing of files to local collection
pcgomes Apr 4, 2020
126d6c6
Fix sizing issues and wrong layout
pcgomes Apr 5, 2020
924f25e
Remove include to removed widget
pcgomes Apr 5, 2020
509ab69
Merge pull request #4 from pcgomes/fix_import_to_collecton
pcgomes Apr 5, 2020
afb3799
Merge branch 'master' of /home/pedro/tmp/amarok-cgit
pcgomes Apr 7, 2020
22f66c0
Merge branch 'master' of /home/pedro/tmp/amarok-official
pcgomes Apr 11, 2020
5bed8a9
Added config for .deb package for Kubuntu 19.10
pcgomes Apr 11, 2020
bfe215c
Merge pull request #5 from pcgomes/packaging_for_kubuntu_19.10
pcgomes Apr 11, 2020
26af953
Merge branch 'master' of amarok-gitlab
pcgomes Apr 13, 2020
62df38f
Added info about unstable repo
pcgomes Apr 13, 2020
035a6f7
Merge pull request #6 from pcgomes/update_description
pcgomes Apr 13, 2020
190013b
Merge branch 'master' of /home/pedro/tmp/amarok-gitlab
pcgomes Apr 17, 2020
f516a29
Fix the define used to distinguish MariaDB from Mysql
pcgomes Apr 17, 2020
f0a96db
Merge pull request #7 from pcgomes/fix_detection_mariadb_10.1
pcgomes Apr 17, 2020
ffcee38
Merge branch 'master' of /home/pedro/tmp/amarok-gitlab
pcgomes Apr 18, 2020
0788e26
Add dockerfiles for cross-distro builds
pcgomes Apr 18, 2020
ef8fd3e
Merge pull request #8 from pcgomes/add_dockerfiles
pcgomes Apr 18, 2020
e742f94
Merge branch 'master' of /home/pedro/tmp/amarok-gitlab
pcgomes Apr 24, 2020
e4febb8
Fix Breadcrumb widget
pcgomes Apr 24, 2020
acdf8cc
Merge pull request #9 from pcgomes/fix_breadcumb_widget_spacing
pcgomes Apr 24, 2020
a423b83
Fix Dockerfile to use master branch
pcgomes Apr 24, 2020
fd2c4a0
Merge pull request #10 from pcgomes/add_dockerfiles
pcgomes Apr 24, 2020
766e07b
Added Ubuntu 20.04 Dockerfile
pcgomes Apr 25, 2020
8d4e5d0
Merge pull request #11 from pcgomes/add_dockerfiles
pcgomes Apr 25, 2020
b22b0e0
Add missing compat package for Mariadb
pcgomes Apr 25, 2020
f975cdc
Merge pull request #12 from pcgomes/dockerfiles
pcgomes Apr 25, 2020
8fb0e87
Fix stylesheet
pcgomes Apr 25, 2020
1747cd5
Reorganized packaging and Dockerfiles
pcgomes Apr 25, 2020
d50d4e5
Merge pull request #13 from pcgomes/fix_playlistdock
pcgomes Apr 25, 2020
e11e6ae
Merge pull request #14 from pcgomes/distribution
pcgomes Apr 25, 2020
983115b
Fixed changelogs
pcgomes Apr 29, 2020
2b0ccbc
Merge pull request #15 from pcgomes/distribution
pcgomes Apr 29, 2020
1cae151
SVN_SILENT made messages (.desktop file) - always resolve ours
May 3, 2020
2c24f48
Replaced QtScript* refs with QJS* and added class to replace QTScript…
pcgomes Apr 29, 2020
a6c324c
Merge branch 'master' of https://invent.kde.org/kde/amarok
pcgomes May 4, 2020
5201bda
Merge pull request #16 from pcgomes/distribution
pcgomes May 4, 2020
147388c
Change minor version to 70 to avoid conflict with other ppas
pcgomes May 5, 2020
878ee93
Merge pull request #17 from pcgomes/distribution
pcgomes May 5, 2020
32f71d9
Replaced QtScript* refs with QJS* and added class to replace QTScript…
pcgomes Apr 29, 2020
df4428e
Fix breadcumb widget
Apr 24, 2020
7caf58d
Merge branch 'master' into fix_breadcumb_widget
pcgomes May 6, 2020
af8a83e
Merge pull request #18 from pcgomes/fix_breadcumb_widget
pcgomes May 6, 2020
5ceb4a0
Merge branch 'replace_Qtscript_with_QtQml' of https://github.com/pcgo…
pcgomes May 7, 2020
ae9dc2b
- Fixed several qScriptRegisterMetaType with lambda-functions
pcgomes May 15, 2020
debee3f
First compiling version
pcgomes May 17, 2020
41f87f9
Functioning script console
pcgomes Jun 1, 2020
a579cec
First functional version with radio station service script
pcgomes Jun 7, 2020
ebd9e4f
Merge branch 'master' of https://invent.kde.org/multimedia/amarok
pcgomes Jun 11, 2020
007fac4
Summary: Fix crash when closing dialog to edit filter
pcgomes Jun 12, 2020
0282816
Merge pull request #19 from pcgomes/bug_421456-crash_when_exiting_edi…
pcgomes Jun 12, 2020
17e04d1
* Set new release 2.9.70+1SNAPSHOT20200612103823+0200
pcgomes Jun 12, 2020
cc8dbbb
Merge pull request #20 from pcgomes/distribution
pcgomes Jun 12, 2020
46309cb
Added missing time and author to changelogs
pcgomes Jun 12, 2020
42b1fdb
Merge pull request #21 from pcgomes/distribution
pcgomes Jun 12, 2020
dc90880
Fix forgotten versions at changelog files
pcgomes Jun 12, 2020
b6067f8
Merge pull request #22 from pcgomes/distribution
pcgomes Jun 12, 2020
38646e6
Replaced QtScript* refs with QJS* and added class to replace QTScript…
pcgomes Apr 29, 2020
601e608
- Fixed several qScriptRegisterMetaType with lambda-functions
pcgomes May 15, 2020
d245811
First compiling version
pcgomes May 17, 2020
77d4152
Functioning script console
pcgomes Jun 1, 2020
478411e
First functional version with radio station service script
pcgomes Jun 7, 2020
c9f1989
Merge branch 'master' of https://invent.kde.org/multimedia/amarok
pcgomes Jun 14, 2020
4965faf
Merge branch 'master' of https://github.com/pcgomes/amarok
pcgomes Jun 15, 2020
769219a
Fix crash when changing from categories with child submenu
pcgomes Jun 16, 2020
3cdcb06
Merge pull request #23 from pcgomes/fix_breadcumb_widget
pcgomes Jun 16, 2020
ed1f6a7
Release v2.9.70+1SNAPSHOT20200616130454+0200
pcgomes Jun 16, 2020
fa1b2d7
Merge pull request #24 from pcgomes/distribution
pcgomes Jun 16, 2020
c6d850c
Merge branch 'replace_Qtscript_with_QtQml' of https://github.com/pcgo…
pcgomes Jun 17, 2020
e086cb8
Reads script.spec files as .desktop files correctly
pcgomes Jun 23, 2020
c94465a
Merge branch 'master' of https://invent.kde.org/multimedia/amarok
pcgomes Jun 23, 2020
30079d6
Merge pull request #25 from pcgomes/replace_Qtscript_with_QtQml
pcgomes Jun 23, 2020
3daf23a
Release of v2.9.70+1SNAPSHOT20200623170346+0200
pcgomes Jun 23, 2020
7287b42
Merge pull request #26 from pcgomes/distribution
pcgomes Jun 23, 2020
a6e76fb
Merge branch 'master' of https://github.com/pcgomes/amarok
pcgomes Jun 23, 2020
69a5db3
Reshipping of version with new scripting engine
pcgomes Jun 26, 2020
cdfa769
Merge pull request #27 from pcgomes/distribution
pcgomes Jun 26, 2020
97b622d
Merge branch 'master' of https://github.com/pcgomes/amarok
pcgomes Jun 26, 2020
2046c7b
Amarok 2.9.70+1SNAPSHOT20200626191036+0200
pcgomes Jun 26, 2020
f39612a
Merge pull request #28 from pcgomes/distribution
pcgomes Jun 26, 2020
f0b8b55
Removed newErrorObject and throwError to compile with QT 5.8
pcgomes Jun 27, 2020
848286f
Merge pull request #29 from pcgomes/replace_Qtscript_with_QtQml
pcgomes Jun 27, 2020
6aebf1f
Use https for bugs.kde.org
Jun 28, 2020
b038be6
Fix compilation error of code compatible to QT 5.8
pcgomes Jun 29, 2020
2b62863
Merge pull request #30 from pcgomes/replace_Qtscript_with_QtQml
pcgomes Jun 29, 2020
5f51f43
Update README
pcgomes Jun 29, 2020
e980395
Update README
pcgomes Jun 29, 2020
4a121a9
Fix compilation error of code compatible to QT 5.8
pcgomes Jun 29, 2020
5944513
Merge branch 'replace_Qtscript_with_QtQml' of https://github.com/pcgo…
pcgomes Jun 30, 2020
5b8e981
Merge pull request #31 from pcgomes/replace_Qtscript_with_QtQml
pcgomes Jun 30, 2020
7aed1c2
configurePhonon needs to display kcm_pulseaudio module rather than kc…
Jun 30, 2020
99b74f1
Fix compilation error for older Qt versions
Jun 30, 2020
03536f7
Merge pull request #33 from RobertAJMarshall/fixScriptCompile
pcgomes Jun 30, 2020
252eafa
Merge pull request #32 from RobertAJMarshall/fixPhononConfig
pcgomes Jun 30, 2020
3ac1d3b
Amarok 2.9.70+1SNAPSHOT20200630174341+0200
pcgomes Jun 30, 2020
1c4b8ef
Merge pull request #34 from pcgomes/2.9.70+1SNAPSHOT20200630174341+0200
pcgomes Jun 30, 2020
99653e7
Amarok 2.9.70+1SNAPSHOT20200630174341+0200
pcgomes Jun 30, 2020
cee1427
Merge branch '2.9.70+1SNAPSHOT20200630174341+0200' of https://github.…
pcgomes Jun 30, 2020
9445ba8
2.9.70+1SNAPSHOT20200630174341+0200
pcgomes Jun 30, 2020
3739558
Merge pull request #35 from pcgomes/2.9.70+1SNAPSHOT20200630174341+0200
pcgomes Jun 30, 2020
74a9a8a
Replace usage of QJSEngine:importModule to compile with QT5.8
pcgomes Jul 1, 2020
6a3ba0c
Merge pull request #36 from pcgomes/replace_Qtscript_with_QtQml
pcgomes Jul 1, 2020
7c91e0e
Amarok 2.9.70+1SNAPSHOT20200701124447+0200
pcgomes Jul 1, 2020
7d8d2e4
Merge pull request #37 from pcgomes/2.9.70+1SNAPSHOT20200701124447+0200
pcgomes Jul 1, 2020
358dcf3
Drop old copy of Qt modeltest
Jul 3, 2020
aead085
qVariantFromValue() -> QVariant::fromValue()
Jul 3, 2020
12a162e
Remove metadependency that breaks Neon
pcgomes Jul 3, 2020
8ee1993
Merge pull request #38 from pcgomes/2.9.70+1SNAPSHOT20200703102146+0200
pcgomes Jul 3, 2020
5678b64
SVN_SILENT made messages (.desktop file) - always resolve ours
Jul 7, 2020
0e2ef25
SVN_SILENT made messages (.desktop file) - always resolve ours
Jul 9, 2020
fb5b5ab
SVN_SILENT made messages (.desktop file) - always resolve ours
Jul 13, 2020
df34fd7
Summary: Fix crash when closing dialog to edit filter
pcgomes Jul 30, 2020
4ae1085
Fix breadcrumb widget for left menu
pcgomes Jul 31, 2020
3b5d5e1
appdata: use canonical help URL
Aug 8, 2020
79e4791
First version with working qt bindings
pcgomes Aug 9, 2020
78f6c12
Fix "const" issue and added final classes for UL
pcgomes Aug 13, 2020
bf340b7
SVN_SILENT made messages (.desktop file) - always resolve ours
Aug 19, 2020
474c2a4
cmake: install amarok.knsrc in newer ECM 5.58.0+ location
Aug 28, 2020
d282578
SVN_SILENT made messages (.desktop file) - always resolve ours
Aug 29, 2020
acd4691
GIT_SILENT made messages (after extraction)
Sep 2, 2020
8d9d4c3
SVN_SILENT made messages (.desktop file) - always resolve ours
Sep 10, 2020
fe8b9d2
Concluded first implementation of port to QJSEngine
pcgomes Sep 13, 2020
853adf5
Merge pull request #39 from pcgomes/replace_Qtscript_with_QtQml
pcgomes Sep 13, 2020
9025dea
Merge branch 'master' of /home/pedro/tmp/amarok-gitlab
pcgomes Sep 15, 2020
24ce8e1
Release v2.9.70+1SNAPSHOT20200915122323+0200
pcgomes Sep 15, 2020
5ee6237
Merge pull request #40 from pcgomes/2.9.70+1SNAPSHOT20200915122323+0200
pcgomes Sep 15, 2020
516eb4f
Fixed compilation error when optional qttools5-dev is not present
pcgomes Sep 16, 2020
bc48c08
Merge pull request #41 from pcgomes/replace_Qtscript_with_QtQml
pcgomes Sep 16, 2020
c8be587
Release of v2.9.70+1SNAPSHOT20200916171021+0200
pcgomes Sep 16, 2020
87c25d0
Merge pull request #42 from pcgomes/2.9.70+1SNAPSHOT20200916171021+0200
pcgomes Sep 16, 2020
818ad8b
Fix error at CMake with QUiTools detection
pcgomes Sep 16, 2020
5540bc4
Merge pull request #43 from pcgomes/replace_Qtscript_with_QtQml
pcgomes Sep 16, 2020
45a732b
Fix error at CMake to detect QUiTools
pcgomes Sep 16, 2020
ab4a2de
Merge pull request #44 from pcgomes/2.9.70+1SNAPSHOT20200916214648+0200
pcgomes Sep 16, 2020
db5a1e0
Fix QIODevice::OpenMode flags that are not present at QT 5.8
pcgomes Sep 17, 2020
2559183
Merge pull request #45 from pcgomes/replace_Qtscript_with_QtQml
pcgomes Sep 17, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion Mainpage.dox
Original file line number Diff line number Diff line change
Expand Up @@ -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
<!--
Expand Down
5 changes: 2 additions & 3 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ Amarok - the audio player for KDE
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.
Fell free to contact me with suggestions and bug reports.
Feel free to contact me with suggestions and bug reports.

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 the should be fully usable.
I rebase from the official repository before a new release. Thus, new packages incorporate other people's improvements, and should be fully usable.
2 changes: 2 additions & 0 deletions data/amarok.notifyrc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
37 changes: 37 additions & 0 deletions distribution/deb_packaging/ubuntu/18.04/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,40 @@
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
Expand Down
12 changes: 6 additions & 6 deletions distribution/deb_packaging/ubuntu/18.04/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ Build-Depends: debhelper-compat (= 11),
qttools5-dev,
qtwebengine5-dev
Standards-Version: 4.4.0
Homepage: https://github.com/pcgomes/amarok
#Vcs-Browser: https://salsa.debian.org/debian/amarok
#Vcs-Git: https://salsa.debian.org/debian/amarok.git
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
Since (K)ubuntu 19.10, applications that were not ported to QT5 are no longer supported.
Amarok has not been completely ported yet, but is usable. So I create packages for KDE5
until the final port is concluded.
(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.
3 changes: 3 additions & 0 deletions distribution/deb_packaging/ubuntu/18.04/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ override_dh_auto_configure:
# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo

override_dh_shlibdeps:
# Remove metapackage to be compatible with Neon
dh_shlibdeps -- -xqtdeclarative-abi-5-9-5
37 changes: 37 additions & 0 deletions distribution/deb_packaging/ubuntu/19.10/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,40 @@
amarok (2:2.9.70+1SNAPSHOT20200916214648+0200-0ubuntu1ppa1~ubuntu19.10.1) eoan; 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~ubuntu19.10.1) eoan; 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~ubuntu19.10.1) eoan; 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~ubuntu19.10.1) eoan; 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~ubuntu19.10.1) eoan; 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~ubuntu19.10.1) eoan; 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~ubuntu19.10.1) eoan; urgency=medium

* Second release of script engine porting to QJSEngine
Expand Down
12 changes: 6 additions & 6 deletions distribution/deb_packaging/ubuntu/19.10/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@ Build-Depends: debhelper-compat (= 12),
qttools5-dev,
qtwebengine5-dev
Standards-Version: 4.4.0
Homepage: https://github.com/pcgomes/amarok
#Vcs-Browser: https://salsa.debian.org/debian/amarok
#Vcs-Git: https://salsa.debian.org/debian/amarok.git
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
Since (K)ubuntu 19.10, applications that were not ported to QT5 are no longer supported.
Amarok has not been completely ported yet, but is usable. So I create packages for KDE5
until the final port is concluded.
(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.
3 changes: 3 additions & 0 deletions distribution/deb_packaging/ubuntu/19.10/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ override_dh_auto_configure:
# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DMYSQLCONFIG_EXECUTABLE=/usr/bin/mariadb_config

override_dh_shlibdeps:
# Remove metapackage to be compatible with Neon
dh_shlibdeps -- -xqtdeclarative-abi-5-12-4
37 changes: 37 additions & 0 deletions distribution/deb_packaging/ubuntu/20.04/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,40 @@
amarok (2:2.9.70+1SNAPSHOT20200916214648+0200-0ubuntu1ppa1~ubuntu20.04.1) focal; 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~ubuntu20.04.1) focal; 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~ubuntu20.04.1) focal; 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~ubuntu20.04.1) focal; 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~ubuntu20.04.1) focal; 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~ubuntu20.04.1) focal; 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~ubuntu20.04.1) focal; urgency=medium

* Second release of script engine porting to QJSEngine
Expand Down
12 changes: 6 additions & 6 deletions distribution/deb_packaging/ubuntu/20.04/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@ Build-Depends: debhelper-compat (= 12),
qttools5-dev,
qtwebengine5-dev
Standards-Version: 4.4.0
Homepage: https://github.com/pcgomes/amarok
#Vcs-Browser: https://salsa.debian.org/debian/amarok
#Vcs-Git: https://salsa.debian.org/debian/amarok.git
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
Since (K)ubuntu 19.10, applications that were not ported to QT5 are no longer supported.
Amarok has not been completely ported yet, but is usable. So I create packages for KDE5
until the final port is concluded.
(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.
3 changes: 3 additions & 0 deletions distribution/deb_packaging/ubuntu/20.04/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ override_dh_auto_configure:
# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DMYSQLCONFIG_EXECUTABLE=/usr/bin/mariadb_config

override_dh_shlibdeps:
# Remove metapackage to be compatible with Neon
dh_shlibdeps -- -xqtdeclarative-abi-5-12-8
9 changes: 9 additions & 0 deletions distribution/deb_packaging/ubuntu/changelog_edit.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash
DATENOW=$(date "+%s"); for i in 18.04_bionic 19.10_eoan 20.04_focal; do version=$(echo $i|cut -d_ -f1); code=$(echo $i|cut -d_ -f2); cat << EOF > ${version}/new_cl_entry; cat ${version}/new_cl_entry ${version}/debian/changelog > ${version}/new_cl; mv ${version}/new_cl ${version}/debian/changelog; rm ${version}/new_cl*; done
amarok (2:2.9.70+1SNAPSHOT$(date -d "@${DATENOW}" +"%Y%m%d%H%M%S%z")-0ubuntu1ppa1~ubuntu${version}.1) ${code}; urgency=medium

* Fix compilation error when optional qttools5-dev is not present

-- Pedro de Carvalho Gomes <pedrogomes81@gmail.com> $(date -R -d "@${DATENOW}")

EOF
2 changes: 1 addition & 1 deletion release_scripts/generate_changelog.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
$changelog.gsub!(/\n{2,}/, "\n")

# Replace bug number with direct link to bugs.kde.org
$changelog.gsub!(/BR (\d+)/, '<a href="http://bugs.kde.org/show_bug.cgi?id=\\1">\\0</a>')
$changelog.gsub!(/BR (\d+)/, '<a href="https://bugs.kde.org/show_bug.cgi?id=\\1">\\0</a>')

# Make bullets
bullet_item_regexp =
Expand Down
6 changes: 5 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,11 @@ install(FILES amarok_codecinstall.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPE
install(FILES amarok_append.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/ServiceMenus)
install(FILES amarok-play-audiocd.desktop DESTINATION ${KDE_INSTALL_DATADIR}/solid/actions)

install(FILES amarok.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
if( ${ECM_VERSION} STRGREATER "5.58.0" )
install(FILES amarok.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
else()
install(FILES amarok.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
endif()

# protocol handlers
install(FILES amarokurls/amarok.protocol DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
Expand Down
2 changes: 1 addition & 1 deletion src/EngineController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ EngineController::restoreSession()
Meta::TrackPtr track = CollectionManager::instance()->trackForUrl( url );

// Only give a resume time for local files, because resuming remote protocols can have weird side effects.
// See: http://bugs.kde.org/show_bug.cgi?id=172897
// See: https://bugs.kde.org/show_bug.cgi?id=172897
if( url.isLocalFile() )
play( track, AmarokConfig::resumeTime(), AmarokConfig::resumePaused() );
else
Expand Down
2 changes: 1 addition & 1 deletion src/aboutdialog/ExtendedAboutDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ ExtendedAboutDialog::ExtendedAboutDialog(const KAboutData &about, const OcsData
if (!aboutData->customAuthorTextEnabled())
{
if (aboutData->bugAddress().isEmpty() || aboutData->bugAddress() == "submit@bugs.kde.org")
bugsLabel->setText( i18n("Please use <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> to report bugs.\n") );
bugsLabel->setText( i18n("Please use <a href=\"https://bugs.kde.org\">https://bugs.kde.org</a> to report bugs.\n") );
else
{
if(aboutData->authors().count() == 1 && (aboutData->authors().first().emailAddress() == aboutData->bugAddress()))
Expand Down
4 changes: 2 additions & 2 deletions src/amarok-contextapplet.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Comment=Plugin for Amarok
Comment[be]=Утулка для Amarok
Comment[bg]=Приставка за Amarok
Comment[bs]=Priključak za Amarok
Comment[ca]=Connector per l'Amarok
Comment[ca@valencia]=Connector per l'Amarok
Comment[ca]=Connector per a l'Amarok
Comment[ca@valencia]=Connector per a l'Amarok
Comment[cs]=Modul pro AmaroK
Comment[csb]=Wtëkôcz dlô Amaroka
Comment[da]=Plugin til Amarok
Expand Down
4 changes: 2 additions & 2 deletions src/amarok-plugin.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Comment=Plugin for Amarok
Comment[be]=Утулка для Amarok
Comment[bg]=Приставка за Amarok
Comment[bs]=Priključak za Amarok
Comment[ca]=Connector per l'Amarok
Comment[ca@valencia]=Connector per l'Amarok
Comment[ca]=Connector per a l'Amarok
Comment[ca@valencia]=Connector per a l'Amarok
Comment[cs]=Modul pro AmaroK
Comment[csb]=Wtëkôcz dlô Amaroka
Comment[da]=Plugin til Amarok
Expand Down
2 changes: 1 addition & 1 deletion src/browsers/BrowserCategoryListModel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ BrowserCategoryListModel::data( const QModelIndex &index, int role ) const
return QVariant( m_categories[index.row()]->longDescription() );

case CustomCategoryRoles::CategoryRole:
return qVariantFromValue( m_categories[index.row()] );
return QVariant::fromValue( m_categories[index.row()] );

default:
return QVariant();
Expand Down
2 changes: 1 addition & 1 deletion src/browsers/CollectionTreeView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1150,7 +1150,7 @@ CollectionTreeView::createExtendedActions( const QModelIndexList &indices )
QActionList gActions = The::globalCollectionActions()->actionsFor( item->data() );
foreach( QAction *action, gActions )
{
if( action ) // Can become 0-pointer, see http://bugs.kde.org/show_bug.cgi?id=183250
if( action ) // Can become 0-pointer, see https://bugs.kde.org/show_bug.cgi?id=183250
{
actions.append( action );
debug() << "Got global action: " << action->text();
Expand Down
2 changes: 1 addition & 1 deletion src/configdialog/dialogs/PlaybackConfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ PlaybackConfig::configurePhonon() //SLOT
KCMultiDialog KCM;

KCM.setWindowTitle( i18n( "Sound System - Amarok" ) );
KCM.addModule( QStringLiteral("kcm_phonon") );
KCM.addModule( QStringLiteral("kcm_pulseaudio") );
KCM.exec();
}

Expand Down
3 changes: 3 additions & 0 deletions src/context/applets/albums/package/metadata.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,10 @@ Comment[el]=Διαχειριστής εξωφύλλου άλμπουμ για τ
Comment[en_GB]=Album cover manager for Amarok
Comment[es]=Gestor de portadas de álbumes para Amarok
Comment[et]=Amaroki kaanepildihaldur
Comment[eu]=Amarok-en album azal kudeatzailea
Comment[fr]=Gestionnaire de pochettes d'album pour Amarok
Comment[gl]=Xestor de portadas de álbums para Amarok
Comment[id]=Pengelola sampul album untuk Amarok
Comment[it]=Gestore delle copertine per Amarok
Comment[ko]=Amarok 앨범 커버 관리자
Comment[nl]=Albumhoesbeheerder voor Amarok
Expand Down
4 changes: 4 additions & 0 deletions src/context/applets/analyzer/package/metadata.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Name[el]=Αναλυτής
Name[en_GB]=Analyser
Name[es]=Analizador
Name[et]=Analüüsija
Name[eu]=Analizatzailea
Name[fi]=Analysaattori
Name[fr]=Analyseur
Name[gl]=Analizador
Expand Down Expand Up @@ -49,7 +50,10 @@ Comment[el]=Μικροεφαρμογή ανάλυσης για το AmaroK
Comment[en_GB]=Analyser applet for Amarok
Comment[es]=Miniaplicación de análisis para Amarok
Comment[et]=Amaroki analüüsiaplett
Comment[eu]=Amarok-erako analizatzaile aplikaziotxoa
Comment[fr]=Module d'analyseur pour Amarok
Comment[gl]=Trebello de analizador para Amarok
Comment[id]=Applet analyzer untuk Amarok
Comment[it]=Applet dell'analizzatore per Amarok
Comment[ko]=Amarok 분석기 애플릿
Comment[nl]=Analyse-applet voor Amarok
Expand Down
3 changes: 3 additions & 0 deletions src/context/applets/currenttrack/package/metadata.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,10 @@ Comment[el]=Μικροεφαρμογή τρέχοντος κομματιού γ
Comment[en_GB]=Current track applet for Amarok
Comment[es]=Miniaplicación de pista actual para Amarok
Comment[et]=Amaroki aktiivse raja aplett
Comment[eu]=Amarok-erako uneko pistako aplikaziotxoa
Comment[fr]=Module de piste actuelle pour Amarok
Comment[gl]=Trebello de pista actual para Amarok
Comment[id]=Applet trek saat ini untuk Amarok
Comment[it]=Applet della traccia attuale per Amarok
Comment[ko]=Amarok 현재 트랙 애플릿
Comment[nl]=Huidig track-applet voor Amarok
Expand Down