#include <QDebug> to fix build with qt 6.9.0

2025-05-09 12:46:52 +10:00
10 changed files with 22 additions and 41 deletions
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.16.0)
 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "25")
 set(RELEASE_SERVICE_VERSION_MINOR "07")
-set(RELEASE_SERVICE_VERSION_MICRO "80")
+set(RELEASE_SERVICE_VERSION_MICRO "70")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")

 project(audiotube VERSION ${RELEASE_SERVICE_VERSION})
@@ -8,8 +8,8 @@
    "sources": [
        {
            "type": "archive",
-            "url": "https://download.kde.org/stable/kirigami-addons/kirigami-addons-1.8.1.tar.xz",
-            "sha256": "00028ae4df99e250518345ea28d9cdf49d700e9acac482734bb51384da11f945",
+            "url": "https://download.kde.org/stable/kirigami-addons/kirigami-addons-1.5.0.tar.xz",
+            "sha256": "f9dfd191022b633ea3348f84730d7158a159dfe49668dba0a9e9bd678ac44e54",
            "x-checker-data": {
                "type": "anitya",
                "project-id": 242933,
@@ -91,8 +91,6 @@ SPDX-License-Identifier: CC0-1.0
    <name translate="no">KDE</name>
  </developer>
  <releases>
-    <release version="25.04.3" date="2025-07-03"/>
-    <release version="25.04.2" date="2025-06-05"/>
    <release version="25.04.1" date="2025-05-08"/>
    <release version="25.04.0" date="2025-04-17"/>
    <release version="24.12.3" date="2025-03-06"/>
@@ -34,8 +34,8 @@
            "sources": [
                {
                    "type": "file",
-                    "url": "https://files.pythonhosted.org/packages/fd/e1/fa0dd2150b7b1033d917f37067c594160772fa607f311f10d4b881768b36/yt_dlp-2025.6.9-py3-none-any.whl",
-                    "sha256": "ebdfda9ffa807f6a26aed7c8f906e5557cd06b4c388dc547df1ec2078631fca8",
+                    "url": "https://files.pythonhosted.org/packages/64/22/1918d2c8c123e9157efd7c2063ea89b4826f904d67b17e77152862ac3347/yt_dlp-2024.11.18-py3-none-any.whl",
+                    "sha256": "b9741695911dc566498b5f115cdd6b1abbc5be61cb01fd98abe649990a41656c",
                    "x-checker-data": {
                        "type": "pypi",
                        "name": "yt-dlp",
@@ -54,8 +54,8 @@
            "sources": [
                {
                    "type": "archive",
-                    "url": "https://github.com/danvratil/qcoro/archive/refs/tags/v0.12.0.tar.gz",
-                    "sha256": "809afafab61593f994c005ca6e242300e1e3e7f4db8b5d41f8c642aab9450fbc",
+                    "url": "https://github.com/danvratil/qcoro/archive/refs/tags/v0.11.0.tar.gz",
+                    "sha256": "9942c5b4c533192f6c5954dc6d10178b3829075e6a621b67df73f0a4b74d8297",
                    "x-checker-data": {
                        "type": "anitya",
                        "project-id": 236236,
@@ -175,7 +175,7 @@ msgstr "Llista de reproducció nova"
 #: contents/ui/dialogs/RenamePlaylistDialog.qml:16
 #, kde-format
 msgid "Rename playlist"
-msgstr "Canvia el nom de la llista de reproducció"
+msgstr "Canvia el nom la llista de reproducció"

 #: contents/ui/LibraryPage.qml:31 contents/ui/LibraryPage.qml:134
 #: contents/ui/NavigationBar.qml:47 contents/ui/NavigationBar.qml:53
@@ -14,8 +14,8 @@ msgstr ""
 "X-Crowdin-Project: kdeorg\n"
 "X-Crowdin-Project-ID: 269464\n"
 "X-Crowdin-Language: zh-CN\n"
-"X-Crowdin-File: /kf6-stable/messages/audiotube/audiotube.pot\n"
-"X-Crowdin-File-ID: 52528\n"
+"X-Crowdin-File: /kf6-trunk/messages/audiotube/audiotube.pot\n"
+"X-Crowdin-File-ID: 48698\n"

 #: asyncytmusic.cpp:65
 #, kde-format
@@ -1,12 +1,13 @@
-# SPDX-FileCopyrightText: 2024, 2025 Scarlett Moore <[email protected]>
+# SPDX-FileCopyrightText: 2024 Scarlett Moore <[email protected]>
 #
 # SPDX-License-Identifier: CC0-1.0

 name: audiotube
 confinement: strict
 grade: stable
-base: core24
+base: core22
 adopt-info: audiotube
+compression: lzo

 apps:
  audiotube:
@@ -17,7 +18,6 @@ apps:
    command: usr/bin/audiotube
    environment:
      PYTHONPATH: ${SNAP}/usr/lib/python3/dist-packages:${PYTHONPATH}
-      ALSA_CONFIG_PATH: "$SNAP/kf6/etc/asound.conf"
    plugs:
      - home
      - audio-playback
@@ -28,10 +28,6 @@ apps:
    slots:
      - audiotube-mpris

-layout:
-  /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/alsa-lib:
-    bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/alsa-lib
-
 slots:
  audiotube-mpris:
    interface: mpris
@@ -62,14 +58,14 @@ parts:
      - -usr/bin/Activate.ps1
      - -usr/bin/python
      - -usr/bin/python3
-      - -usr/bin/python3.12
+      - -usr/bin/python3.10
      - -usr/bin/pip
      - -usr/bin/pip3
      - -usr/bin/pip3.10
      - -usr/bin/wheel
-      - -usr/lib/python3.12/dist-packages/pip*
-      - -usr/lib/python3.12/dist-packages/pkg_resources
-      - -usr/lib/python3.12/dist-packages/setuptools*
+      - -usr/lib/python3.10/dist-packages/pip*
+      - -usr/lib/python3.10/dist-packages/pkg_resources
+      - -usr/lib/python3.10/dist-packages/setuptools*
      - -pyvenv.cfg
      - -lib
      - -lib64
@@ -77,7 +73,7 @@ parts:
      - -share
    organize:
      bin: usr/bin
-      lib/python3.12/site-packages: usr/lib/python3/dist-packages
+      lib/python3.10/site-packages: usr/lib/python3/dist-packages

  audiotube:
    after:
@@ -99,10 +95,7 @@ parts:
    stage-packages:
      - libsqlite3-0
      - libwebp7
-      - libpulse0
-      - libxkbcommon0
    source: .
-    source-type: local
    cmake-parameters:
      - -DCMAKE_INSTALL_PREFIX=/usr
      - -DCMAKE_BUILD_TYPE=Release
@@ -120,4 +113,4 @@ parts:
      - -usr/lib/aspell/*
      - -usr/share/lintian
    build-environment:
-      - PYTHONPATH: ${CRAFT_STAGE}/lib/python3.12/site-packages:${CRAFT_STAGE}/usr/lib/python3/dist-packages
+      - PYTHONPATH: ${CRAFT_STAGE}/lib/python3.10/site-packages:${CRAFT_STAGE}/usr/lib/python3/dist-packages
@@ -135,20 +135,8 @@ Flickable {
        sourceComponent: MediaPlayer {
            id: audio

-            property int prevPlaybackState: MediaPlayer.StoppedState
            source: info.audioUrl
            onSourceChanged: play()
-
-            onPlaybackStateChanged : {
-                if (mediaStatus == MediaPlayer.BufferingMedia && playbackState == MediaPlayer.StoppedState && prevPlaybackState == MediaPlayer.PlayingState) {
-                    Qt.callLater(function() {
-                        play()
-                        console.log("force play on stuck with BufferingMedia & StoppedState");
-                    })
-                }
-                prevPlaybackState = playbackState
-            }
-
            onMediaStatusChanged: {
                if (mediaStatus === MediaPlayer.EndOfMedia) {
                    console.log("Song ended");
@@ -106,7 +106,7 @@ void Library::refreshPlaybackHistory()
 {
    // playbackHistory
    auto future = m_database->getResults<PlayedSong>(
-        u"select * from played_songs natural join songs order by played_songs.rowid desc"_s);
+        u"select * from played_songs natural join songs"_s);
    m_playbackHistory = new PlaybackHistoryModel(std::move(future), this);

    // mostPlayed
@@ -2,6 +2,8 @@
 //
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL

+#include <QDebug>
+
 #include "videoinfoextractor.h"

 #include "asyncytmusic.h"