diff --git a/kde/applications/cantor/cantor-19.12.0-MSVC-libmarkdown.diff b/kde/applications/cantor/cantor-19.12.0-MSVC-libmarkdown.diff deleted file mode 100644 index 3664ae38..00000000 --- a/kde/applications/cantor/cantor-19.12.0-MSVC-libmarkdown.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff -ruN cantor-19.12.0.orig/thirdparty/discount-2.2.6-patched/cmake/CMakeLists.txt cantor-19.12.0/thirdparty/discount-2.2.6-patched/cmake/CMakeLists.txt ---- cantor-19.12.0.orig/thirdparty/discount-2.2.6-patched/cmake/CMakeLists.txt 2019-12-05 23:56:54.000000000 +0100 -+++ cantor-19.12.0/thirdparty/discount-2.2.6-patched/cmake/CMakeLists.txt 2019-12-30 09:28:27.956544404 +0100 -@@ -141,8 +141,10 @@ - "${_ROOT}/html5.c" - "${_ROOT}/flags.c") - --set_target_properties(libmarkdown PROPERTIES -- OUTPUT_NAME markdown) -+if(NOT MSVC) -+ set_target_properties(libmarkdown PROPERTIES -+ OUTPUT_NAME markdown) -+endif() - - if(NOT ${PROJECT_NAME}_ONLY_LIBRARY) - add_library(common OBJECT diff --git a/kde/applications/cantor/cantor-19.12.1-Windows.diff b/kde/applications/cantor/cantor-19.12.1-Windows.diff deleted file mode 100644 index 94f1297a..00000000 --- a/kde/applications/cantor/cantor-19.12.1-Windows.diff +++ /dev/null @@ -1,40 +0,0 @@ -diff -ruNa cantor-19.12.1.orig/src/backends/R/rserver/rcallbacks.cpp cantor-19.12.1/src/backends/R/rserver/rcallbacks.cpp ---- cantor-19.12.1.orig/src/backends/R/rserver/rcallbacks.cpp 2020-01-06 14:49:54.000000000 +0100 -+++ cantor-19.12.1/src/backends/R/rserver/rcallbacks.cpp 2020-02-02 11:31:24.881735681 +0100 -@@ -26,7 +26,9 @@ - #include - - #include -+#ifndef Q_OS_WIN - #include -+#endif - - RServer* server; - Expression* currentExpression; -diff -ruNa cantor-19.12.1.orig/src/backends/R/rserver/rserver.cpp cantor-19.12.1/src/backends/R/rserver/rserver.cpp ---- cantor-19.12.1.orig/src/backends/R/rserver/rserver.cpp 2020-01-06 14:49:54.000000000 +0100 -+++ cantor-19.12.1/src/backends/R/rserver/rserver.cpp 2020-02-02 10:40:27.197011563 +0100 -@@ -33,7 +33,11 @@ - #include - #include - -+#ifdef Q_OS_WIN -+#include -+#else - #include -+#endif - - //R includes - #include -diff -ruNa cantor-19.12.1.orig/src/backends/R/rsession.cpp cantor-19.12.1/src/backends/R/rsession.cpp ---- cantor-19.12.1.orig/src/backends/R/rsession.cpp 2020-01-06 14:49:54.000000000 +0100 -+++ cantor-19.12.1/src/backends/R/rsession.cpp 2020-02-02 10:39:21.189441040 +0100 -@@ -62,7 +62,7 @@ - m_process->waitForReadyRead(); - qDebug()<readAllStandardOutput(); - -- m_rServer = new org::kde::Cantor::R(QString::fromLatin1("org.kde.Cantor.R-%1").arg(m_process->pid()), QLatin1String("/"), QDBusConnection::sessionBus(), this); -+ m_rServer = new org::kde::Cantor::R(QString::fromLatin1("org.kde.Cantor.R-%1").arg(m_process->processId()), QLatin1String("/"), QDBusConnection::sessionBus(), this); - - connect(m_rServer, &org::kde::Cantor::R::statusChanged, this, &RSession::serverChangedStatus); - connect(m_rServer, &org::kde::Cantor::R::expressionFinished, this, &RSession::expressionFinished); diff --git a/kde/applications/cantor/cantor.py b/kde/applications/cantor/cantor.py index 11becb87..b57c82b9 100644 --- a/kde/applications/cantor/cantor.py +++ b/kde/applications/cantor/cantor.py @@ -1,60 +1,56 @@ import info class subinfo(info.infoclass): def setTargets(self): self.versionInfo.setDefaultValues() - #for ver in ["19.12.0", "19.12.1", "19.12.2"]: - # self.patchToApply[ver] = [('cantor-19.12.0-MSVC-libmarkdown.diff', 1)] - #for ver in ["19.12.1", "19.12.2"]: - # self.patchToApply[ver] += [('cantor-19.12.1-Windows.diff', 1)] self.description = "Cantor" # master has several patches for Windows if CraftCore.compiler.isWindows or CraftCore.compiler.isMacOS: self.defaultTarget = 'master' def setDependencies(self): self.runtimeDependencies["virtual/base"] = None self.buildDependencies["kde/frameworks/extra-cmake-modules"] = None self.buildDependencies["dev-utils/png2ico"] = None self.runtimeDependencies["libs/qt5/qtbase"] = None self.runtimeDependencies["qt-libs/poppler"] = None # R backend fails compiling with MSVC if not CraftCore.compiler.isMSVC(): self.runtimeDependencies["binary/r-base"] = None # we use Crafts python #self.runtimeDependencies["dev-utils/python3"] = None #self.runtimeDependencies["binary/python-libs"] = None self.runtimeDependencies["kde/frameworks/tier1/kconfig"] = None self.runtimeDependencies["kde/frameworks/tier2/kcrash"] = None self.runtimeDependencies["kde/frameworks/tier2/kdoctools"] = None self.runtimeDependencies["kde/frameworks/tier3/knewstuff"] = None self.runtimeDependencies["kde/frameworks/tier3/kiconthemes"] = None self.runtimeDependencies["kde/frameworks/tier3/ktexteditor"] = None self.runtimeDependencies["kde/frameworks/tier1/kcoreaddons"] = None self.runtimeDependencies["kde/frameworks/tier1/karchive"] = None self.runtimeDependencies["kde/frameworks/tier3/kparts"] = None self.runtimeDependencies["kde/frameworks/tier2/kpty"] = None self.runtimeDependencies["kde/frameworks/tier3/ktextwidgets"] = None self.runtimeDependencies["kde/frameworks/tier3/kio"] = None self.runtimeDependencies["kde/frameworks/tier1/ki18n"] = None self.runtimeDependencies["kde/frameworks/tier3/kxmlgui"] = None self.runtimeDependencies["kde/applications/analitza"] = None from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__(self): CMakePackageBase.__init__(self) if CraftCore.compiler.isWindows: self.subinfo.options.make.supportsMultijob = False # R backend fail compiling on Windows #self.r_dir = os.path.join(CraftCore.standardDirs.craftRoot(), "lib", "R", "bin", "x64") #self.subinfo.options.configure.args = "-DR_EXECUTABLE=" + OsUtils.toUnixPath(os.path.join(self.r_dir, "R.exe")) #self.subinfo.options.configure.args += " -DR_R_LIBRARY=" + OsUtils.toUnixPath(os.path.join(self.r_dir, "R.dll")) pythonPath = CraftCore.settings.get("Paths", "PYTHON") self.subinfo.options.configure.args += f" -DPYTHONLIBS3_LIBRARY=\"{pythonPath}\libs\python38.lib\" -DPYTHONLIBS3_INCLUDE_DIR=\"{pythonPath}\include\"" diff --git a/kde/applications/elisa/0001-disable-playlist-animations-to-fix-display-corruptio.patch b/kde/applications/elisa/0001-disable-playlist-animations-to-fix-display-corruptio.patch deleted file mode 100644 index a871f1f7..00000000 --- a/kde/applications/elisa/0001-disable-playlist-animations-to-fix-display-corruptio.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 1691274e52b8a76f760bad1333746fde4f5973c7 Mon Sep 17 00:00:00 2001 -From: Alexander Stippich -Date: Mon, 20 Jan 2020 08:11:13 +0100 -Subject: [PATCH] disable playlist animations to fix display corruption - -BUG: 398093 -BUG: 406524 ---- - src/qml/PlayListBasicView.qml | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/qml/PlayListBasicView.qml b/src/qml/PlayListBasicView.qml -index 6c50f227..c3491f54 100644 ---- a/src/qml/PlayListBasicView.qml -+++ b/src/qml/PlayListBasicView.qml -@@ -61,6 +61,10 @@ ListView { - anchors.fill: playListView - } - -+ /* currently disabled animations due to display corruption -+ because of https://bugreports.qt.io/browse/QTBUG-49868 -+ causing https://bugs.kde.org/show_bug.cgi?id=406524 -+ and https://bugs.kde.org/show_bug.cgi?id=398093 - add: Transition { - NumberAnimation { - property: "opacity"; -@@ -91,6 +95,7 @@ ListView { - duration: 100; - easing.type: Easing.InOutQuad} - } -+ */ - - model: DelegateModel { - id: playListModelDelegate --- -2.25.0 - diff --git a/kde/applications/elisa/0001-remove-code-duplication-by-moving-signal-to-base-cla.patch b/kde/applications/elisa/0001-remove-code-duplication-by-moving-signal-to-base-cla.patch deleted file mode 100644 index 041cefb0..00000000 --- a/kde/applications/elisa/0001-remove-code-duplication-by-moving-signal-to-base-cla.patch +++ /dev/null @@ -1,79 +0,0 @@ -From f8cd299e7bacec2843688dc9e05fd7cb51ab4160 Mon Sep 17 00:00:00 2001 -From: Matthieu Gallien -Date: Mon, 20 Jan 2020 07:43:31 +0100 -Subject: [PATCH 1/4] remove code duplication by moving signal to base class - ---- - src/models/abstractmediaproxymodel.h | 5 +++++ - src/models/alltracksproxymodel.h | 5 ----- - src/models/gridviewproxymodel.h | 5 ----- - src/models/singlealbumproxymodel.h | 5 ----- - 4 files changed, 5 insertions(+), 15 deletions(-) - -diff --git a/src/models/abstractmediaproxymodel.h b/src/models/abstractmediaproxymodel.h -index d11d6b51..c64456dc 100644 ---- a/src/models/abstractmediaproxymodel.h -+++ b/src/models/abstractmediaproxymodel.h -@@ -75,6 +75,11 @@ Q_SIGNALS: - - void sortedAscendingChanged(); - -+ void entriesToEnqueue(const ElisaUtils::EntryDataList &newEntries, -+ ElisaUtils::PlayListEntryType databaseIdType, -+ ElisaUtils::PlayListEnqueueMode enqueueMode, -+ ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay); -+ - protected: - - bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override = 0; -diff --git a/src/models/alltracksproxymodel.h b/src/models/alltracksproxymodel.h -index 6ea926e0..99da6b04 100644 ---- a/src/models/alltracksproxymodel.h -+++ b/src/models/alltracksproxymodel.h -@@ -36,11 +36,6 @@ public: - - Q_SIGNALS: - -- void entriesToEnqueue(const ElisaUtils::EntryDataList &newEntries, -- ElisaUtils::PlayListEntryType databaseIdType, -- ElisaUtils::PlayListEnqueueMode enqueueMode, -- ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay); -- - public Q_SLOTS: - - void enqueueToPlayList(); -diff --git a/src/models/gridviewproxymodel.h b/src/models/gridviewproxymodel.h -index 61cbe433..cb6a0311 100644 ---- a/src/models/gridviewproxymodel.h -+++ b/src/models/gridviewproxymodel.h -@@ -41,11 +41,6 @@ public: - - Q_SIGNALS: - -- void entriesToEnqueue(const ElisaUtils::EntryDataList &newEntries, -- ElisaUtils::PlayListEntryType databaseIdType, -- ElisaUtils::PlayListEnqueueMode enqueueMode, -- ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay); -- - void dataTypeChanged(); - - public Q_SLOTS: -diff --git a/src/models/singlealbumproxymodel.h b/src/models/singlealbumproxymodel.h -index c113bdb0..bc58c23d 100644 ---- a/src/models/singlealbumproxymodel.h -+++ b/src/models/singlealbumproxymodel.h -@@ -36,11 +36,6 @@ public: - - Q_SIGNALS: - -- void entriesToEnqueue(const ElisaUtils::EntryDataList &newEntries, -- ElisaUtils::PlayListEntryType databaseIdType, -- ElisaUtils::PlayListEnqueueMode enqueueMode, -- ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay); -- - public Q_SLOTS: - - void enqueueToPlayList(); --- -2.25.0 - diff --git a/kde/applications/elisa/0001-use-global-menu-only-on-linux-due-to-behavior-differ.patch b/kde/applications/elisa/0001-use-global-menu-only-on-linux-due-to-behavior-differ.patch deleted file mode 100644 index 1e2dba4a..00000000 --- a/kde/applications/elisa/0001-use-global-menu-only-on-linux-due-to-behavior-differ.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 0ad92f7d174b25bc3c4a7a29184f8665a58cd119 Mon Sep 17 00:00:00 2001 -From: Matthieu Gallien -Date: Fri, 13 Dec 2019 09:53:23 +0100 -Subject: [PATCH 1/3] use global menu only on linux due to behavior difference - on Windows - -on Windows, the menu is always shown like a traditionnal menu inside the -window. We do not want that. ---- - src/qml/ElisaMainWindow.qml | 6 ------ - src/qml/PlatformIntegration.qml | 6 ++++++ - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/qml/ElisaMainWindow.qml b/src/qml/ElisaMainWindow.qml -index 1151c90..1319a4e 100644 ---- a/src/qml/ElisaMainWindow.qml -+++ b/src/qml/ElisaMainWindow.qml -@@ -21,7 +21,6 @@ import QtQuick.Layouts 1.1 - import QtQuick.Window 2.2 - import org.kde.elisa 1.0 - import Qt.labs.settings 1.0 --import Qt.labs.platform 1.0 as NativeMenu - - ApplicationWindow { - id: mainWindow -@@ -79,11 +78,6 @@ ApplicationWindow { - id: applicationMenu - } - -- NativeMenu.MenuBar { -- NativeApplicationMenu { -- } -- } -- - SystemPalette { - id: myPalette - colorGroup: SystemPalette.Active -diff --git a/src/qml/PlatformIntegration.qml b/src/qml/PlatformIntegration.qml -index cc6ef9b..36f4984 100644 ---- a/src/qml/PlatformIntegration.qml -+++ b/src/qml/PlatformIntegration.qml -@@ -16,6 +16,7 @@ - */ - - import QtQuick 2.7 -+import Qt.labs.platform 1.0 as NativeMenu - import org.kde.elisa 1.0 - - Item { -@@ -29,6 +30,11 @@ Item { - - signal raisePlayer() - -+ NativeMenu.MenuBar { -+ NativeApplicationMenu { -+ } -+ } -+ - Mpris2 { - id: mpris2Interface - --- -2.24.0 - diff --git a/kde/applications/elisa/0002-ensure-that-the-metadata-dialog-has-a-title-and-stan.patch b/kde/applications/elisa/0002-ensure-that-the-metadata-dialog-has-a-title-and-stan.patch deleted file mode 100644 index ecd02496..00000000 --- a/kde/applications/elisa/0002-ensure-that-the-metadata-dialog-has-a-title-and-stan.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 77bc9b24bd0e4d50194e9afa7187bba989a620f6 Mon Sep 17 00:00:00 2001 -From: Matthieu Gallien -Date: Fri, 13 Dec 2019 11:32:27 +0100 -Subject: [PATCH 2/3] ensure that the metadata dialog has a title and standard - buttons - -fix dialog on Windows that was without title and buttons - -no regression on Plasma ---- - src/qml/MediaTrackMetadataView.qml | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/qml/MediaTrackMetadataView.qml b/src/qml/MediaTrackMetadataView.qml -index b074dc4..118cea9 100644 ---- a/src/qml/MediaTrackMetadataView.qml -+++ b/src/qml/MediaTrackMetadataView.qml -@@ -50,7 +50,8 @@ Window { - } - - modality: Qt.NonModal -- flags: Qt.Dialog | Qt.WindowCloseButtonHint -+ flags: Qt.Dialog | Qt.CustomizeWindowHint | Qt.WindowTitleHint -+ | Qt.WindowCloseButtonHint | Qt.WindowMinimizeButtonHint | Qt.WindowMaximizeButtonHint - - color: myPalette.window - --- -2.24.0 - diff --git a/kde/applications/elisa/0002-fix-problems-with-wrong-type-passed-from-qml-to-c.patch b/kde/applications/elisa/0002-fix-problems-with-wrong-type-passed-from-qml-to-c.patch deleted file mode 100644 index 7285f327..00000000 --- a/kde/applications/elisa/0002-fix-problems-with-wrong-type-passed-from-qml-to-c.patch +++ /dev/null @@ -1,171 +0,0 @@ -From fcb76aec4fbd74c218c4e6e17c20a9e3c433f55e Mon Sep 17 00:00:00 2001 -From: Matthieu Gallien -Date: Sun, 19 Jan 2020 11:21:17 +0100 -Subject: [PATCH 2/4] fix problems with wrong type passed from qml to c++ - -BUG: 415827 ---- - src/models/abstractmediaproxymodel.cpp | 37 ++++++++++++++++++++++++++ - src/models/abstractmediaproxymodel.h | 16 +++++++++++ - src/qml/DataGridView.qml | 3 +-- - src/qml/DataListView.qml | 2 -- - 4 files changed, 54 insertions(+), 4 deletions(-) - -diff --git a/src/models/abstractmediaproxymodel.cpp b/src/models/abstractmediaproxymodel.cpp -index a4c7a3e8..68d2eb6e 100644 ---- a/src/models/abstractmediaproxymodel.cpp -+++ b/src/models/abstractmediaproxymodel.cpp -@@ -18,6 +18,8 @@ - - #include "abstractmediaproxymodel.h" - -+#include "mediaplaylist.h" -+ - #include - - AbstractMediaProxyModel::AbstractMediaProxyModel(QObject *parent) : QSortFilterProxyModel(parent) -@@ -77,10 +79,45 @@ bool AbstractMediaProxyModel::sortedAscending() const - return sortOrder() ? false : true; - } - -+MediaPlayList *AbstractMediaProxyModel::playList() const -+{ -+ return mPlayList; -+} -+ - void AbstractMediaProxyModel::sortModel(Qt::SortOrder order) - { - this->sort(0, order); - Q_EMIT sortedAscendingChanged(); - } - -+void AbstractMediaProxyModel::setPlayList(MediaPlayList *playList) -+{ -+ disconnectPlayList(); -+ -+ if (mPlayList == playList) { -+ return; -+ } -+ -+ mPlayList = playList; -+ Q_EMIT playListChanged(); -+ -+ connectPlayList(); -+} -+ -+void AbstractMediaProxyModel::disconnectPlayList() -+{ -+ if (mPlayList) { -+ disconnect(this, &AbstractMediaProxyModel::entriesToEnqueue, -+ mPlayList, static_cast(&MediaPlayList::enqueue)); -+ } -+} -+ -+void AbstractMediaProxyModel::connectPlayList() -+{ -+ if (mPlayList) { -+ connect(this, &AbstractMediaProxyModel::entriesToEnqueue, -+ mPlayList, static_cast(&MediaPlayList::enqueue)); -+ } -+} -+ - #include "moc_abstractmediaproxymodel.cpp" -diff --git a/src/models/abstractmediaproxymodel.h b/src/models/abstractmediaproxymodel.h -index c64456dc..f594d0d2 100644 ---- a/src/models/abstractmediaproxymodel.h -+++ b/src/models/abstractmediaproxymodel.h -@@ -28,6 +28,8 @@ - #include - #include - -+class MediaPlayList; -+ - class ELISALIB_EXPORT AbstractMediaProxyModel : public QSortFilterProxyModel - { - -@@ -47,6 +49,8 @@ class ELISALIB_EXPORT AbstractMediaProxyModel : public QSortFilterProxyModel - READ sortedAscending - NOTIFY sortedAscendingChanged) - -+ Q_PROPERTY(MediaPlayList* playList READ playList WRITE setPlayList NOTIFY playListChanged) -+ - public: - - explicit AbstractMediaProxyModel(QObject *parent = nullptr); -@@ -59,6 +63,8 @@ public: - - bool sortedAscending() const; - -+ MediaPlayList* playList() const; -+ - public Q_SLOTS: - - void setFilterText(const QString &filterText); -@@ -67,6 +73,8 @@ public Q_SLOTS: - - void sortModel(Qt::SortOrder order); - -+ void setPlayList(MediaPlayList* playList); -+ - Q_SIGNALS: - - void filterTextChanged(const QString &filterText); -@@ -75,6 +83,8 @@ Q_SIGNALS: - - void sortedAscendingChanged(); - -+ void playListChanged(); -+ - void entriesToEnqueue(const ElisaUtils::EntryDataList &newEntries, - ElisaUtils::PlayListEntryType databaseIdType, - ElisaUtils::PlayListEnqueueMode enqueueMode, -@@ -84,6 +94,10 @@ protected: - - bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override = 0; - -+ void disconnectPlayList(); -+ -+ void connectPlayList(); -+ - QString mFilterText; - - int mFilterRating = 0; -@@ -94,6 +108,8 @@ protected: - - QThreadPool mThreadPool; - -+ MediaPlayList* mPlayList = nullptr; -+ - }; - - #endif // ABSTRACTMEDIAPROXYMODEL_H -diff --git a/src/qml/DataGridView.qml b/src/qml/DataGridView.qml -index 87266c71..593ac458 100644 ---- a/src/qml/DataGridView.qml -+++ b/src/qml/DataGridView.qml -@@ -57,8 +57,7 @@ FocusScope { - - sourceModel: realModel - dataType: modelType -- -- onEntriesToEnqueue: elisa.mediaPlayList.enqueue(newEntries, databaseIdType, enqueueMode, triggerPlay) -+ playList: elisa.mediaPlayList - } - - GridBrowserView { -diff --git a/src/qml/DataListView.qml b/src/qml/DataListView.qml -index 53fffe5c..05289f57 100644 ---- a/src/qml/DataListView.qml -+++ b/src/qml/DataListView.qml -@@ -75,8 +75,6 @@ FocusScope { - id: proxyModel - - sourceModel: realModel -- -- onEntriesToEnqueue: elisa.mediaPlayList.enqueue(newEntries, databaseIdType, enqueueMode, triggerPlay) - } - - Loader { --- -2.25.0 - diff --git a/kde/applications/elisa/0003-add-back-missing-icons-for-windows-task-bar-integrat.patch b/kde/applications/elisa/0003-add-back-missing-icons-for-windows-task-bar-integrat.patch deleted file mode 100644 index bff18ab8..00000000 --- a/kde/applications/elisa/0003-add-back-missing-icons-for-windows-task-bar-integrat.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 23a77a4b60fedf3e5411c485ef42424039c6f8ba Mon Sep 17 00:00:00 2001 -From: Matthieu Gallien -Date: Fri, 13 Dec 2019 18:24:06 +0100 -Subject: [PATCH 3/3] add back missing icons for windows task bar integration - ---- - src/windows/WindowsTheme.qml | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/windows/WindowsTheme.qml b/src/windows/WindowsTheme.qml -index 650ca7d..271e25a 100644 ---- a/src/windows/WindowsTheme.qml -+++ b/src/windows/WindowsTheme.qml -@@ -20,4 +20,9 @@ import QtQuick.Controls 2.2 - - BaseTheme { - property real mediaPlayerControlOpacity: 0.8 -+ -+ property string skipBackwardIcon: 'image://icon/media-skip-backward' -+ property string pauseIcon: 'image://icon/media-playback-pause' -+ property string playIcon: 'image://icon/media-playback-start' -+ property string skipForwardIcon: 'image://icon/media-skip-forward' - } --- -2.24.0 - diff --git a/kde/applications/elisa/0003-fix-enqueue-not-working-for-views-that-display-list-.patch b/kde/applications/elisa/0003-fix-enqueue-not-working-for-views-that-display-list-.patch deleted file mode 100644 index 5efabc86..00000000 --- a/kde/applications/elisa/0003-fix-enqueue-not-working-for-views-that-display-list-.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6d0454526fe4be1892812db2c0bc324f6a5669b7 Mon Sep 17 00:00:00 2001 -From: Matthieu Gallien -Date: Tue, 21 Jan 2020 17:19:54 +0100 -Subject: [PATCH 3/4] fix enqueue not working for views that display list of - tracks - ---- - src/qml/DataListView.qml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qml/DataListView.qml b/src/qml/DataListView.qml -index 05289f57..0e501266 100644 ---- a/src/qml/DataListView.qml -+++ b/src/qml/DataListView.qml -@@ -75,6 +75,7 @@ FocusScope { - id: proxyModel - - sourceModel: realModel -+ playList: elisa.mediaPlayList - } - - Loader { --- -2.25.0 - diff --git a/kde/applications/elisa/0004-fix-enqueue-from-FileBrowserView-with-Qt-5.14.patch b/kde/applications/elisa/0004-fix-enqueue-from-FileBrowserView-with-Qt-5.14.patch deleted file mode 100644 index 54e3108c..00000000 --- a/kde/applications/elisa/0004-fix-enqueue-from-FileBrowserView-with-Qt-5.14.patch +++ /dev/null @@ -1,162 +0,0 @@ -From 4a47e32dadbfaf0066bb5e700ea1f2e29987f5e7 Mon Sep 17 00:00:00 2001 -From: Matthieu Gallien -Date: Tue, 21 Jan 2020 21:35:01 +0100 -Subject: [PATCH 4/4] fix enqueue from FileBrowserView with Qt 5.14 - ---- - src/models/filebrowserproxymodel.cpp | 36 ++++++++++++++++++++++++++++ - src/models/filebrowserproxymodel.h | 16 +++++++++++++ - src/qml/FileBrowserView.qml | 3 +-- - 3 files changed, 53 insertions(+), 2 deletions(-) - -diff --git a/src/models/filebrowserproxymodel.cpp b/src/models/filebrowserproxymodel.cpp -index 48a36d73..cbc29ae9 100644 ---- a/src/models/filebrowserproxymodel.cpp -+++ b/src/models/filebrowserproxymodel.cpp -@@ -19,6 +19,7 @@ - #include "filebrowserproxymodel.h" - - #include "filebrowsermodel.h" -+#include "mediaplaylist.h" - - #include - #include -@@ -138,6 +139,22 @@ QString FileBrowserProxyModel::parentFolder() const - } - } - -+void FileBrowserProxyModel::disconnectPlayList() -+{ -+ if (mPlayList) { -+ disconnect(this, &FileBrowserProxyModel::filesToEnqueue, -+ mPlayList, static_cast(&MediaPlayList::enqueue)); -+ } -+} -+ -+void FileBrowserProxyModel::connectPlayList() -+{ -+ if (mPlayList) { -+ connect(this, &FileBrowserProxyModel::filesToEnqueue, -+ mPlayList, static_cast(&MediaPlayList::enqueue)); -+ } -+} -+ - void FileBrowserProxyModel::openParentFolder() - { - auto fileBrowserModel = dynamic_cast(sourceModel()); -@@ -216,10 +233,29 @@ void FileBrowserProxyModel::setSourceModel(QAbstractItemModel *sourceModel) - openFolder(mTopFolder, true); - } - -+MediaPlayList *FileBrowserProxyModel::playList() const -+{ -+ return mPlayList; -+} -+ - void FileBrowserProxyModel::sortModel(Qt::SortOrder order) - { - this->sort(0,order); - Q_EMIT sortedAscendingChanged(); - } - -+void FileBrowserProxyModel::setPlayList(MediaPlayList *playList) -+{ -+ disconnectPlayList(); -+ -+ if (mPlayList == playList) { -+ return; -+ } -+ -+ mPlayList = playList; -+ Q_EMIT playListChanged(); -+ -+ connectPlayList(); -+} -+ - #include "moc_filebrowserproxymodel.cpp" -diff --git a/src/models/filebrowserproxymodel.h b/src/models/filebrowserproxymodel.h -index b07052dd..f7705890 100644 ---- a/src/models/filebrowserproxymodel.h -+++ b/src/models/filebrowserproxymodel.h -@@ -31,6 +31,8 @@ - - #include - -+class MediaPlayList; -+ - class ELISALIB_EXPORT FileBrowserProxyModel : public KDirSortFilterProxyModel - { - Q_OBJECT -@@ -52,6 +54,8 @@ class ELISALIB_EXPORT FileBrowserProxyModel : public KDirSortFilterProxyModel - READ sortedAscending - NOTIFY sortedAscendingChanged) - -+ Q_PROPERTY(MediaPlayList* playList READ playList WRITE setPlayList NOTIFY playListChanged) -+ - public: - - explicit FileBrowserProxyModel(QObject *parent = nullptr); -@@ -68,6 +72,8 @@ public: - - void setSourceModel(QAbstractItemModel *sourceModel) override; - -+ MediaPlayList* playList() const; -+ - public Q_SLOTS: - - void enqueueToPlayList(); -@@ -82,6 +88,8 @@ public Q_SLOTS: - - void sortModel(Qt::SortOrder order); - -+ void setPlayList(MediaPlayList* playList); -+ - Q_SIGNALS: - - void filesToEnqueue(const ElisaUtils::EntryDataList &newFiles, -@@ -97,6 +105,8 @@ Q_SIGNALS: - - void sortedAscendingChanged(); - -+ void playListChanged(); -+ - protected: - - bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override; -@@ -105,6 +115,10 @@ private: - - QString parentFolder() const; - -+ void disconnectPlayList(); -+ -+ void connectPlayList(); -+ - QString mTopFolder; - - FileScanner mFileScanner; -@@ -117,6 +131,8 @@ private: - - QThreadPool mThreadPool; - -+ MediaPlayList* mPlayList = nullptr; -+ - }; - - #endif // FILEBROWSERPROXYMODEL_H -diff --git a/src/qml/FileBrowserView.qml b/src/qml/FileBrowserView.qml -index 0cdb9af4..311127f0 100644 ---- a/src/qml/FileBrowserView.qml -+++ b/src/qml/FileBrowserView.qml -@@ -47,8 +47,7 @@ FocusScope { - id: proxyModel - - sourceModel: realModel -- -- onFilesToEnqueue: elisa.mediaPlayList.enqueue(newFiles, databaseIdType, enqueueMode, triggerPlay) -+ playList: elisa.mediaPlayList - } - - MouseArea { --- -2.25.0 - diff --git a/kde/applications/elisa/elisa.py b/kde/applications/elisa/elisa.py index 7b623e36..3b7b5fcd 100644 --- a/kde/applications/elisa/elisa.py +++ b/kde/applications/elisa/elisa.py @@ -1,72 +1,60 @@ import info from CraftConfig import * from CraftOS.osutils import OsUtils class subinfo( info.infoclass ): def setTargets( self ): self.versionInfo.setDefaultValues() self.displayName = "Elisa" self.description = "the Elisa music player" - self.patchToApply["19.12.0"] = [ - ("0001-use-global-menu-only-on-linux-due-to-behavior-differ.patch", 1), - ("0002-ensure-that-the-metadata-dialog-has-a-title-and-stan.patch", 1), - ("0003-add-back-missing-icons-for-windows-task-bar-integrat.patch", 1), - ] - self.patchToApply["19.12.1"] = [ - ("0001-remove-code-duplication-by-moving-signal-to-base-cla.patch", 1), - ("0002-fix-problems-with-wrong-type-passed-from-qml-to-c.patch", 1), - ("0003-fix-enqueue-not-working-for-views-that-display-list-.patch", 1), - ("0004-fix-enqueue-from-FileBrowserView-with-Qt-5.14.patch", 1), - ("0001-disable-playlist-animations-to-fix-display-corruptio.patch", 1), - ] self.patchToApply["19.12.3"] = [ ("0001-avoid-binding-loop-on-the-height-being-linked-to-its.patch", 1), ] def setDependencies( self ): self.runtimeDependencies["virtual/base"] = None self.buildDependencies["kde/frameworks/extra-cmake-modules"] = None self.runtimeDependencies["libs/qt5/qtbase"] = None self.runtimeDependencies["libs/qt5/qtgraphicaleffects"] = None self.runtimeDependencies["libs/qt5/qtmultimedia"] = None self.runtimeDependencies["libs/qt5/qtquickcontrols"] = None self.runtimeDependencies["libs/qt5/qtquickcontrols2"] = None self.runtimeDependencies["libs/qt5/qtsvg"] = None self.runtimeDependencies["libs/qt5/qtwinextras"] = None self.runtimeDependencies["binary/vlc"] = None self.runtimeDependencies["kde/frameworks/tier1/kconfig"] = None self.runtimeDependencies["kde/frameworks/tier3/kcmutils"] = None self.runtimeDependencies["kde/frameworks/tier3/qqc2-desktop-style"] = None self.runtimeDependencies["kde/frameworks/tier2/kfilemetadata"] = None self.runtimeDependencies["kde/frameworks/tier1/ki18n"] = None self.runtimeDependencies["kde/frameworks/tier3/kdeclarative"] = None self.runtimeDependencies["kde/frameworks/tier1/kcoreaddons"] = None self.runtimeDependencies["kde/frameworks/tier2/kdoctools"] = None self.runtimeDependencies["kde/frameworks/tier2/kcrash"] = None self.runtimeDependencies["kde/frameworks/tier3/kxmlgui"] = None self.runtimeDependencies["kde/frameworks/tier1/kirigami"] = None from Package.CMakePackageBase import * class Package( CMakePackageBase ): def __init__(self): CMakePackageBase.__init__(self) def createPackage(self): self.defines["executable"] = "bin\\elisa.exe" self.defines["icon"] = os.path.join(self.packageDir(), "elisa.ico") self.defines["icon_png"] = os.path.join(self.packageDir(), ".assets", "44-apps-elisa.png") self.defines["icon_png_44"] = os.path.join(self.packageDir(), ".assets", "44-apps-elisa.png") self.defines["mimetypes"] = ["audio/mpeg", "audio/mp4"] self.defines["file_types"] = [".mp3", ".ogg", ".m4a", ".flac", ".wav", ".m3u", ".opus"] self.blacklist_file.append(os.path.join(self.packageDir(), 'blacklist.txt')) self.ignoredPackages.append("binary/mysql") self.ignoredPackages.append("libs/dbus") return TypePackager.createPackage(self) diff --git a/kde/applications/okular/okular.py b/kde/applications/okular/okular.py index c9b15d54..bc0155b4 100644 --- a/kde/applications/okular/okular.py +++ b/kde/applications/okular/okular.py @@ -1,70 +1,69 @@ import info class subinfo(info.infoclass): def setTargets(self): self.versionInfo.setDefaultValues() self.description = "KDE document viewer" self.displayName = "Okular" - self.patchToApply["19.12.2"] = [ - ("breeze.patch", 1), - ] + for ver in ["master"] + self.versionInfo.tarballs(): + self.patchToApply[ver] = [("breeze.patch", 1)] def setDependencies(self): self.buildDependencies["libs/chm"] = None self.runtimeDependencies["libs/qt5/qtbase"] = None self.runtimeDependencies["qt-libs/poppler"] = None self.runtimeDependencies["libs/tiff"] = None self.runtimeDependencies["libs/djvu"] = None self.runtimeDependencies["libs/zlib"] = None self.runtimeDependencies["libs/freetype"] = None self.runtimeDependencies["libs/ebook-tools"] = None self.buildDependencies["libs/libspectre"] = None self.runtimeDependencies["libs/ghostscript"] = None self.runtimeDependencies["kde/applications/libkexiv2"] = None self.runtimeDependencies["kde/kdegraphics/kdegraphics-mobipocket"] = None self.runtimeDependencies["kde/frameworks/tier1/karchive"] = None self.runtimeDependencies["kde/frameworks/tier3/kbookmarks"] = None self.runtimeDependencies["kde/frameworks/tier1/kconfig"] = None self.runtimeDependencies["kde/frameworks/tier3/kconfigwidgets"] = None self.runtimeDependencies["kde/frameworks/tier1/kcoreaddons"] = None self.runtimeDependencies["kde/frameworks/tier1/kdbusaddons"] = None self.runtimeDependencies["kde/frameworks/tier3/kactivities"] = None self.runtimeDependencies["kde/frameworks/tier3/kjs"] = None self.runtimeDependencies["kde/frameworks/tier3/kio"] = None self.runtimeDependencies["kde/frameworks/tier3/kparts"] = None self.runtimeDependencies["kde/frameworks/tier1/threadweaver"] = None self.runtimeDependencies["kde/frameworks/tier3/kwallet"] = None self.runtimeDependencies["kde/frameworks/tier3/khtml"] = None # try to use Breeze style as Windows style has severe issues for e.g. scaling self.runtimeDependencies["kde/plasma/breeze"] = None from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__(self): CMakePackageBase.__init__(self) def createPackage(self): self.blacklist_file.append(os.path.join(self.packageDir(), "blacklist.txt")) self.defines["executable"] = r"bin\okular.exe" self.defines["mimetypes"] = ["application/pdf"] self.defines["file_types"] = [".pdf", ".mobi", ".epub", ".tiff", ".djvu"] # okular icons self.defines["icon"] = os.path.join(self.packageDir(), "okular.ico") self.defines["icon_png"] = os.path.join(self.sourceDir(), "ui", "data", "icons", "150-apps-okular.png") self.defines["icon_png_44"] = os.path.join(self.sourceDir(), "ui", "data", "icons", "44-apps-okular.png") # this requires an 310x150 variant in addition! #self.defines["icon_png_310x310"] = os.path.join(self.sourceDir(), "ui", "data", "icons", "310-apps-okular.png") self.ignoredPackages.append("binary/mysql") self.ignoredPackages.append("dev-utils/sed") self.ignoredPackages.append("kde/frameworks/kdesignerplugin") self.ignoredPackages.append("kde/frameworks/kemoticons") return TypePackager.createPackage(self)