public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/haruna] epel10: Merge branch f44 into epel10
@ 2026-07-30 15:38 Troy Dawson
  0 siblings, 0 replies; only message in thread
From: Troy Dawson @ 2026-07-30 15:38 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/haruna
Branch : epel10
Commit : cf8a335622fd36711c8a7a9d5adbe544d1ed2ed9
Author : Troy Dawson <tdawson@redhat.com>
Date   : 2026-07-30T08:38:29-07:00
Stats  : +81/-3 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/haruna/c/cf8a335622fd36711c8a7a9d5adbe544d1ed2ed9?branch=epel10

Log:
Merge branch f44 into epel10

---
diff --git a/haruna-1.8.0-fix-hang-on-start.patch b/haruna-1.8.0-fix-hang-on-start.patch
new file mode 100644
index 0000000..1fb6292
--- /dev/null
+++ b/haruna-1.8.0-fix-hang-on-start.patch
@@ -0,0 +1,75 @@
+From 410dc2accb033f4fa837156ec1f91cd87708bef8 Mon Sep 17 00:00:00 2001
+From: Yaroslav Sidlovsky <zawertun@gmail.com>
+Date: Mon, 18 May 2026 16:33:40 +0300
+Subject: [PATCH] Revert "Playlist: add mainWindow property and replace
+ Window.window usage with it"
+
+This reverts commit 27dccce62ca2136641325e8cd425cd01cf81f314.
+---
+ src/playlist/Playlist.qml | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/src/playlist/Playlist.qml b/src/playlist/Playlist.qml
+index 4854a21a..cb29b005 100644
+--- a/src/playlist/Playlist.qml
++++ b/src/playlist/Playlist.qml
+@@ -26,13 +26,12 @@ Page {
+     required property MpvVideo m_mpv
+     required property Loader m_advancedSortWindowLoader
+ 
+-    property Main mainWindow: Window.window as Main
+-    property bool isSmallWindowSize: mainWindow.width < 600
++    property bool isSmallWindowSize: Window.window.width < 600
+     property int buttonSize: isSmallWindowSize ? Kirigami.Units.iconSizes.small : Kirigami.Units.iconSizes.smallMedium
+     property alias scrollPositionTimer: scrollPositionTimer
+     property alias playlistView: playlistView
+     property real customWidth: PlaylistSettings.playlistWidth
+-    property real fsScale: mainWindow.isFullScreen() && PlaylistSettings.bigFontFullscreen ? 1.36 : 1
++    property real fsScale: Window.window.isFullScreen() && PlaylistSettings.bigFontFullscreen ? 1.36 : 1
+ 
+     width: limitWidth(customWidth) * fsScale
+ 
+@@ -40,11 +39,11 @@ Page {
+         if (PlaylistSettings.style === "compact") {
+             return 380
+         } else {
+-            return Math.min(Math.max(pWidth, 260), mainWindow.width - 50)
++            return Math.min(Math.max(pWidth, 260), Window.window.width - 50)
+         }
+     }
+ 
+-    x: PlaylistSettings.position === "right" ? mainWindow.width : -width
++    x: PlaylistSettings.position === "right" ? Window.window.width : -width
+     y: 0
+     padding: 0
+     state: PlaylistSettings.rememberState
+@@ -558,7 +557,7 @@ Page {
+ 
+                 if (PlaylistSettings.position === "right") {
+                     let mX = root.m_mpv.mapFromItem(this, mouseX, mouseY).x
+-                    var w = root.limitWidth(root.mainWindow.width - mX)
++                    var w = root.limitWidth(Window.window.width - mX)
+                 } else {
+                     let mX = playlistView.mapFromItem(this, mouseX, mouseY).x
+                     var w = root.limitWidth(mX)
+@@ -994,7 +993,7 @@ Page {
+ 
+             PropertyChanges {
+                 root.x: PlaylistSettings.position === "right"
+-                        ? root.mainWindow.width
++                        ? root.Window.window.width
+                         : -width
+                 root.visible: false
+             }
+@@ -1004,7 +1003,7 @@ Page {
+ 
+             PropertyChanges {
+                 root.x: PlaylistSettings.position === "right"
+-                        ? root.mainWindow.width - root.width + 2
++                        ? root.Window.window.width - root.width + 2
+                         : 0
+                 root.visible: true
+             }
+-- 
+2.54.0
+

diff --git a/haruna.spec b/haruna.spec
index 7b30eb4..ff9f6ec 100644
--- a/haruna.spec
+++ b/haruna.spec
@@ -1,5 +1,5 @@
 Name:    haruna
-Version: 1.7.1
+Version: 1.8.1
 Release: %autorelease
 Summary: Open source video player built with Qt/QML and libmpv
 
@@ -11,6 +11,8 @@ Source2: gpgkey-4E421C6554B89766DF9B7A37E12AB207C8755905.gpg
 
 ## upstream patches
 
+## upstreamable patches
+
 BuildRequires: cmake
 BuildRequires: gnupg2
 BuildRequires: gcc-c++
@@ -29,6 +31,7 @@ BuildRequires: cmake(Qt6Qml)
 BuildRequires: cmake(Qt6Quick)
 BuildRequires: cmake(Qt6QuickControls2)
 BuildRequires: cmake(Qt6Core5Compat)
+BuildRequires: cmake(Qt6ShaderTools)
 
 BuildRequires: cmake(KF6ColorScheme)
 BuildRequires: cmake(KF6Config)

diff --git a/sources b/sources
index f4f9eb9..318c1b7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (haruna-1.7.1.tar.xz) = 0024e8d0f4fc7dd4704e91d84e9302e779874e113747f301272ce5e7d388ed421af54f816ff704d4292c2f1ab659d777ac4296183adb891cd5c0a83e2dff69f6
-SHA512 (haruna-1.7.1.tar.xz.sig) = 087cc7f0f0a389717aa2241264fe172d22ed2e6b19d486a381eb6a1be9542cc3df8e2f5cafe2be1f3bd010e12b58ac7b39f20fa86d7f3e0582090c58514e9b3e
+SHA512 (haruna-1.8.1.tar.xz) = a564e2c88928a875efa249f242162d5e8082f2fdf8d8eb61077e7062333a8b126d2fd2a8f734dce6229dca15415b01cc0f15482ac050c12081989546a5b298c7
+SHA512 (haruna-1.8.1.tar.xz.sig) = 2e62a8980e5e62cb91e16f032b5abe771b9525e1c475621c1c45b1973a9fcb56b3041979a47aae69357dc498d5a1dc3d5f7c2315877bd90e972326d98b7c6fe8

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-30 15:38 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-30 15:38 [rpms/haruna] epel10: Merge branch f44 into epel10 Troy Dawson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox