Windows fixes

2023-10-22 19:07:43 +02:00
14 changed files with 27 additions and 28 deletions
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.16.0)
 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "23")
 set(RELEASE_SERVICE_VERSION_MINOR "08")
-set(RELEASE_SERVICE_VERSION_MICRO "3")
+set(RELEASE_SERVICE_VERSION_MICRO "2")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")

 project(audiotube VERSION ${RELEASE_SERVICE_VERSION})
@@ -113,7 +113,6 @@ SPDX-License-Identifier: CC0-1.0
  <content_rating type="oars-1.0"/>
  <url type="homepage">https://apps.kde.org/en/audiotube</url>
  <releases>
-    <release version="23.08.3" date="2023-11-09"/>
    <release version="23.08.2" date="2023-10-12"/>
    <release version="23.08.1" date="2023-09-14"/>
    <release version="23.08.0" date="2023-08-24"/>
@@ -197,7 +196,7 @@ SPDX-License-Identifier: CC0-1.0
    <p xml:lang="en-GB">AudioTube can search YouTube Music, list albums and artists, play automatically generated playlists, albums and allows to put your own playlist together.</p>
    <p xml:lang="eo">AudioTube povas serĉi YouTube Music, listigi albumojn kaj artistojn, ludi aŭtomate generitajn ludlistojn, albumojn kaj permesas kunmeti vian propran ludliston.</p>
    <p xml:lang="es">AudioTube puede buscar música de YouTube, listar álbumes y artistas, reproducir las listas de reproducción generadas, álbumes y le permite crear su propia lista de reproducción.</p>
-    <p xml:lang="eu">«AudioTube»k «YouTube Music»n bilatu dezake, albumak eta artistak zerrendatu, automatikoki sortutako jotze-zerrendak eta albumak jo, eta zure jotze-zerrenda osatzeko aukera eskaintzen dizu.</p>
+    <p xml:lang="eu">AudioTube-k YouTube Music-en bilatu dezake, albumak eta artistak zerrendatu, automatikoki sortutako jotze-zerrendak eta albumak jo, eta zure jotze-zerrenda osatzeko aukera eskaintzen dizu.</p>
    <p xml:lang="fi">AudioTube osaa etsiä YouTube Music -haun, albumien ja artistien luettelun, luotujen soittolistojen automaattisen toiston ja omien soittolistojen kokoamisen.</p>
    <p xml:lang="fr">AudioTube peut effectuer des recherches de musiques sur la partie « Musique » de YouTube, établir une liste d'albums et d'artistes, lire des listes de lecture générées automatiquement, des albums et permet de composer sa propre liste de lecture.</p>
    <p xml:lang="gl">AudioTube pode buscar en YouTube Music, listar álbums e intérpretes, reproducir listas xeradas automaticamente e álbums, e permítelle confeccionar listas.</p>
@@ -65,7 +65,7 @@ Comment[ru]=Клиент для YouTube Music
 Comment[sk]=Hudobný klient YouTube
 Comment[sl]=Glasbeni odjemalec Youtube
 Comment[sv]=YouTube-musikprogram
-Comment[tr]=YouTube Müzik İstemcisi
+Comment[tr]=YouTube Müzik istemcisi
 Comment[uk]=Музичний клієнт YouTube
 Comment[x-test]=xxYouTube Music clientxx
 Comment[zh_CN]=YouTube Music 客户端
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the audiotube package.
 #
 # Automatically generated, 2021.
-# SPDX-FileCopyrightText: 2021, 2022, 2023 Eloy Cuadra <[email protected]>
+# Eloy Cuadra <[email protected]>, 2021, 2022, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
 "POT-Creation-Date: 2023-07-09 00:59+0000\n"
-"PO-Revision-Date: 2023-11-02 01:27+0100\n"
+"PO-Revision-Date: 2023-07-05 18:57+0200\n"
 "Last-Translator: Eloy Cuadra <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
 "Language: es\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 23.08.2\n"
+"X-Generator: Lokalize 23.04.2\n"

 #: asyncytmusic.cpp:65
 #, kde-format
@@ -515,7 +515,7 @@ msgstr "[email protected]"
 #: main.cpp:74
 #, kde-format
 msgid "Unofficial API for YouTube Music"
-msgstr "API no oficial de YouTube Music"
+msgstr "API no oficial para YouTube Music"

 #: playlistimporter.cpp:23
 #, kde-format
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 23.08.2\n"
+"X-Generator: Lokalize 23.08.1\n"

 #: asyncytmusic.cpp:65
 #, kde-format
@@ -1,6 +1,6 @@
-# Copyright (C) 2023 This file is copyright:
+# Copyright (C) YEAR This file is copyright:
 # This file is distributed under the same license as the audiotube package.
-# SPDX-FileCopyrightText: 2023 Adrián Chaves (Gallaecio)
+# Adrián Chaves (Gallaecio) <[email protected]>, 2023.
 #
 msgid ""
 msgstr ""
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 23.08.2\n"
+"X-Generator: Lokalize 23.04.2\n"

 #: asyncytmusic.cpp:65
 #, kde-format
@@ -131,7 +131,7 @@ parts:
        - pandoc
        - zip
        build-snaps:
-        - ffmpeg-2204-sdk
+        - ffmpeg-2204
        build-environment:
        - LD_LIBRARY_PATH: /snap/ffmpeg-2204/current/usr/lib:/snap/ffmpeg-2204/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$CRAFT_STAGE/usr/lib:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kf5-5-110-qt-5-15-11-core22-sdk/current/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kf5-5-110-qt-5-15-11-core22-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kf5-5-110-qt-5-15-11-core22-sdk/current/usr/lib:/snap/kf5-5-110-qt-5-15-11-core22-sdk/current/usr/lib/vala-current:/snap/kf5-5-110-qt-5-15-11-core22-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pulseaudio
        stage-packages:
@@ -164,7 +164,7 @@ parts:
        source: https://github.com/sigma67/ytmusicapi.git
        source-tag: 1.1.0
        python-packages:
-        - "requests>=2.22"
+        - requests >= 2.22
        - "setuptools>=65"
        - "setuptools_scm[toml]>=7"
        build-packages:
@@ -199,11 +199,6 @@ parts:
        - qcoro-qt5-dev
        stage-packages:
        - gstreamer1.0-alsa
-        - gstreamer1.0-plugins-base
-        - gstreamer1.0-plugins-bad
-        - gstreamer1.0-plugins-good
-        - gstreamer1.0-plugins-ugly
-        - gstreamer1.0-libav
        - libasound2
        - libasound2-data
        - libasound2-plugins
@@ -218,6 +213,11 @@ parts:
        - qml-module-org-kde-qqc2desktopstyle
        - qt5-image-formats-plugins
        - libqcoro5core0
+        - gstreamer1.0-plugins-base
+        - gstreamer1.0-plugins-bad
+        - gstreamer1.0-plugins-good
+        - gstreamer1.0-plugins-ugly
+        - gstreamer1.0-libav
        - libblas3
        stage-snaps:
        - ffmpeg-2204
@@ -99,7 +99,6 @@ private:
                interface->reportResult(val);
                interface->reportFinished();
            } catch (const std::exception &err) {
-                interface->reportResult({});
                interface->reportFinished();
                Q_EMIT errorOccurred(QString::fromLocal8Bit(err.what()));
            }
@@ -15,7 +15,7 @@
 class QDBusPendingCallWatcher;
 class DBusExtendedPendingCallWatcher;

-class QT_DBUS_EXTENDED_EXPORT DBusExtendedAbstractInterface: public QDBusAbstractInterface
+class DBusExtendedAbstractInterface: public QDBusAbstractInterface
 {
    Q_OBJECT

@@ -12,7 +12,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QString>

-class MPRIS_QT_EXPORT Mpris : public QObject
+class  Mpris : public QObject
 {
    Q_OBJECT

@@ -25,7 +25,7 @@
 class MprisRootInterface;
 class MprisPlayerInterface;
 class QDBusPendingCallWatcher;
-class MPRIS_QT_EXPORT MprisController : public QObject
+class  MprisController : public QObject
 {
    Q_OBJECT

@@ -24,7 +24,7 @@
 #include <QtCore/QVariant>

 class QSignalMapper;
-class MPRIS_QT_EXPORT MprisManager : public QObject
+class MprisManager : public QObject
 {
    Q_OBJECT

@@ -17,7 +17,7 @@

 class MprisRootAdaptor;
 class MprisPlayerAdaptor;
-class MPRIS_QT_EXPORT MprisPlayer : public QObject,
+class MprisPlayer : public QObject,
                                    protected QDBusContext
 {
    Q_OBJECT
@@ -20,7 +20,11 @@ void pyPrintPretty(py::handle obj) {
    py::print(json.attr("dumps")(obj, "indent"_a=py::int_(4)));
 }

+#if Q_OS_WINDOWS
 #define UNEXPORT __attribute__ ((visibility("hidden")))
+#else
+#define UNEXPORT
+#endif

 struct UNEXPORT YTMusicPrivate {
    py::scoped_interpreter guard {};
@@ -36,9 +40,6 @@ struct UNEXPORT YTMusicPrivate {
            ytmusicapi_module = py::module::import("ytmusicapi");
            ytmusic = ytmusicapi_module.attr("YTMusic")(auth, user, requests_session, proxies, language);

-            // Some of the called python code randomly fails if the encoding is not utf8
-            setenv("LC_ALL", "en_US.utf8", true);
-
            auto oldVersion = ytmusicapi_module.attr("__dict__").contains("_version");
            if (oldVersion) {
                std::cerr << "Running with outdated and untested version of ytmusicapi." << std::endl;