Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package haruna for openSUSE:Factory checked in at 2021-08-25 20:57:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/haruna (Old) and /work/SRC/openSUSE:Factory/.haruna.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "haruna" Wed Aug 25 20:57:56 2021 rev:7 rq:913984 version:0.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/haruna/haruna.changes 2021-08-20 16:58:26.666822124 +0200 +++ /work/SRC/openSUSE:Factory/.haruna.new.1899/haruna.changes 2021-08-25 20:59:22.161069729 +0200 @@ -1,0 +2,6 @@ +Mon Aug 23 06:51:44 UTC 2021 - Luigi Baldoni <aloi...@gmx.com> + +- Add haruna-icon_path.patch and haruna-playlist_noid.patch + (backported fixes) + +------------------------------------------------------------------- New: ---- haruna-icon_path.patch haruna-playlist_noid.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haruna.spec ++++++ --- /var/tmp/diff_new_pack.JuXqAu/_old 2021-08-25 20:59:22.629069114 +0200 +++ /var/tmp/diff_new_pack.JuXqAu/_new 2021-08-25 20:59:22.637069104 +0200 @@ -23,6 +23,10 @@ License: CC-BY-4.0 AND GPL-3.0-or-later AND WTFPL URL: https://invent.kde.org/multimedia/haruna Source0: https://invent.kde.org/multimedia/haruna/-/archive/v%{version}/%{name}-v%{version}.tar.gz +# PATCH-FIX-UPSTREAM haruna-icon_path.patch +Patch0: haruna-icon_path.patch +# PATCH-FIX-UPSTREAM haruna-playlist_noid.patch +Patch1: haruna-playlist_noid.patch BuildRequires: cmake >= 3.15 BuildRequires: extra-cmake-modules >= 1.0.0 BuildRequires: hicolor-icon-theme @@ -58,6 +62,8 @@ %prep %setup -q -n %{name}-v%{version} +%patch0 -p1 +%patch1 -p1 %build %cmake @@ -74,7 +80,6 @@ %doc README.md %{_bindir}/%{name} %{_datadir}/applications/org.kde.haruna.desktop -# (kde#441229) %{_datadir}/icons/hicolor/*/apps/org.kde.haruna.svg %{_datadir}/metainfo/org.kde.haruna.metainfo.xml ++++++ haruna-icon_path.patch ++++++ >From 7abb6b27b0df765088d7c165894b644066216d01 Mon Sep 17 00:00:00 2001 From: Luigi Baldoni <aloi...@gmx.com> Date: Sun, 22 Aug 2021 13:26:58 +0200 Subject: [PATCH] Fix bug 441229 - install icon in the correct path BUG: 441229 --- data/CMakeLists.txt | 2 +- data/sc-apps-org.kde.haruna.svg | 18 ++++++++++++++++++ data/sc-apps-org.kde.haruna.svg.license | 2 ++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 data/sc-apps-org.kde.haruna.svg create mode 100644 data/sc-apps-org.kde.haruna.svg.license diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 6878bfd..6500270 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -6,4 +6,4 @@ install(FILES org.kde.haruna.desktop DESTINATION ${KDE_INSTALL_APPDIR}) install(FILES org.kde.haruna.metainfo.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) -ecm_install_icons(ICONS 256-apps-org.kde.haruna.svg DESTINATION ${KDE_INSTALL_ICONDIR}) +ecm_install_icons(ICONS sc-apps-org.kde.haruna.svg DESTINATION ${KDE_INSTALL_ICONDIR}) diff --git a/data/sc-apps-org.kde.haruna.svg b/data/sc-apps-org.kde.haruna.svg new file mode 100644 index 0000000..8d4cba1 --- /dev/null +++ b/data/sc-apps-org.kde.haruna.svg @@ -0,0 +1,18 @@ +<svg width="256" height="256" version="1.1" viewBox="0 0 67.733332 67.733335" xmlns="http://www.w3.org/2000/svg";> + <g transform="translate(0,-229.26665)"> + <rect x="1.3229166" y="230.85416" width="64.822914" height="64.822906" ry="6.6145768" fill="#2f3134" stroke-width=".31620926"/> + <rect x="13.229167" y="241.43748" width="11.906249" height="43.656258" rx="0" ry="0" fill="#e6e6e6" stroke-width=".35179207"/> + <g fill="#333" stroke-width=".19843754"> + <rect x="17.197916" y="248.05206" width="3.9687498" height="3.9687521"/> + <rect x="17.197916" y="261.28122" width="3.9687498" height="3.9687524"/> + <rect x="17.197916" y="274.51041" width="3.9687498" height="3.9687524"/> + </g> + <rect x="42.333332" y="241.43748" width="11.906249" height="43.656258" rx="0" ry="0" fill="#e6e6e6" stroke-width=".35179207"/> + <g fill="#333" stroke-width=".19843754"> + <rect x="46.302082" y="248.05206" width="3.9687498" height="3.9687524"/> + <rect x="46.302082" y="261.28122" width="3.9687498" height="3.9687526"/> + <rect x="46.302082" y="274.51041" width="3.9687498" height="3.9687526"/> + </g> + <rect x="23.8125" y="258.63541" width="19.843748" height="9.2604103" ry="0" fill="#e6e6e6" stroke-width=".28420806"/> + </g> +</svg> diff --git a/data/sc-apps-org.kde.haruna.svg.license b/data/sc-apps-org.kde.haruna.svg.license new file mode 100644 index 0000000..7e42993 --- /dev/null +++ b/data/sc-apps-org.kde.haruna.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: 2020 George Florea B??nu?? <georgefb...@gmail.com> +SPDX-License-Identifier: CC-BY-4.0 -- GitLab ++++++ haruna-playlist_noid.patch ++++++ >From a2bf43ce527bad90353ec911c4c24412ff703445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?George=20Florea=20B=C4=83nu=C8=99?= <georgefb...@gmail.com> Date: Sun, 22 Aug 2021 22:12:52 +0300 Subject: [PATCH] PlayList: remove ids from playlist items Having ids crashes the app on older versions of Qt BUG: 441258 --- src/qml/PlayListItem.qml | 8 ++++++-- src/qml/PlayListItemWithThumbnail.qml | 9 +-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/qml/PlayListItem.qml b/src/qml/PlayListItem.qml index ee2bf9b..544271e 100644 --- a/src/qml/PlayListItem.qml +++ b/src/qml/PlayListItem.qml @@ -20,7 +20,6 @@ Kirigami.BasicListItem { property string rowNumber: (index + 1).toString() property var alpha: PlaylistSettings.overlayVideo ? 0.6 : 1 - height: label.font.pointSize * 3 + PlaylistSettings.rowHeight padding: 0 backgroundColor: { let color = model.isPlaying ? Kirigami.Theme.highlightColor : Kirigami.Theme.backgroundColor @@ -68,7 +67,7 @@ Kirigami.BasicListItem { LabelWithTooltip { id: label - toolTipFontSize: label.font.pointSize + 2 + toolTipFontSize: font.pointSize + 2 color: Kirigami.Theme.textColor horizontalAlignment: Qt.AlignLeft @@ -82,6 +81,11 @@ Kirigami.BasicListItem { layer.enabled: true Layout.fillWidth: true Layout.leftMargin: PlaylistSettings.showRowNumber || isPlaying ? 0 : Kirigami.Units.largeSpacing + Binding { + target: root + property: "height" + value: font.pointSize * 3 + PlaylistSettings.rowHeight + } } Label { diff --git a/src/qml/PlayListItemWithThumbnail.qml b/src/qml/PlayListItemWithThumbnail.qml index 0f81756..e4d0c4a 100644 --- a/src/qml/PlayListItemWithThumbnail.qml +++ b/src/qml/PlayListItemWithThumbnail.qml @@ -42,8 +42,6 @@ Kirigami.BasicListItem { spacing: Kirigami.Units.largeSpacing Label { - id: rowNumberLabel - text: pad(root.rowNumber, playlistView.count.toString().length) visible: PlaylistSettings.showRowNumber font.pointSize: (window.isFullScreen() && playList.bigFont) @@ -60,7 +58,6 @@ Kirigami.BasicListItem { } Rectangle { - id: separator width: 1 color: Kirigami.Theme.alternateBackgroundColor @@ -69,8 +66,6 @@ Kirigami.BasicListItem { } Item { - id: thumbnail - width: (root.height - 20) * 1.33333 height: root.height - 20 @@ -118,10 +113,8 @@ Kirigami.BasicListItem { } LabelWithTooltip { - id: label - text: PlaylistSettings.showMediaTitle ? model.title : model.name - toolTipFontSize: label.font.pointSize + 2 + toolTipFontSize: font.pointSize + 2 color: Kirigami.Theme.textColor horizontalAlignment: Qt.AlignLeft verticalAlignment: Qt.AlignVCenter -- GitLab
