Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kf6-kirigami for openSUSE:Factory
checked in at 2025-06-24 20:45:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kf6-kirigami (Old)
and /work/SRC/openSUSE:Factory/.kf6-kirigami.new.7067 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf6-kirigami"
Tue Jun 24 20:45:21 2025 rev:20 rq:1288099 version:6.15.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kf6-kirigami/kf6-kirigami.changes
2025-06-18 16:00:15.626421796 +0200
+++ /work/SRC/openSUSE:Factory/.kf6-kirigami.new.7067/kf6-kirigami.changes
2025-06-24 20:45:26.807095606 +0200
@@ -1,0 +2,6 @@
+Tue Jun 24 00:00:45 UTC 2025 - Christophe Marin <christo...@krop.fr>
+
+- Add upstream fix:
+ * 0001-Revert-Properly-Align-menubar-when-there-is-a-sideba.patch
+
+-------------------------------------------------------------------
New:
----
0001-Revert-Properly-Align-menubar-when-there-is-a-sideba.patch
----------(New B)----------
New:- Add upstream fix:
* 0001-Revert-Properly-Align-menubar-when-there-is-a-sideba.patch
----------(New E)----------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kf6-kirigami.spec ++++++
--- /var/tmp/diff_new_pack.RMtcJ0/_old 2025-06-24 20:45:27.459122637 +0200
+++ /var/tmp/diff_new_pack.RMtcJ0/_new 2025-06-24 20:45:27.459122637 +0200
@@ -33,6 +33,8 @@
Source1: %{rname}-%{version}.tar.xz.sig
Source2: frameworks.keyring
%endif
+# PATCH-FIX-UPSTREAM
+Patch0: 0001-Revert-Properly-Align-menubar-when-there-is-a-sideba.patch
BuildRequires: kf6-extra-cmake-modules >= %{_kf6_version}
BuildRequires: qt6-gui-private-devel >= %{qt6_version}
BuildRequires: cmake(Qt6Concurrent) >= %{qt6_version}
++++++ 0001-Revert-Properly-Align-menubar-when-there-is-a-sideba.patch ++++++
>From 21788be688de90d4f12edb9f45967a481801bd5e Mon Sep 17 00:00:00 2001
From: Yuki Joou <yukij...@kemonomimi.gay>
Date: Sun, 22 Jun 2025 11:48:55 +0200
Subject: [PATCH] Revert "Properly Align menubar when there is a sidebar
drawer"
This reverts commit 640985886bc48fbbbe7b858cd2dd966d9edea431.
It seems another bit of the code is now handling the menubar, and having this
makes the menubar go off-screen when using a drawer, like in the case of merkuro
---
src/controls/AbstractApplicationWindow.qml | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/controls/AbstractApplicationWindow.qml
b/src/controls/AbstractApplicationWindow.qml
index cbcec9c6..23bbbb34 100644
--- a/src/controls/AbstractApplicationWindow.qml
+++ b/src/controls/AbstractApplicationWindow.qml
@@ -243,11 +243,6 @@ QQC2.ApplicationWindow {
contentItem.anchors.leftMargin: root.globalDrawer &&
root.globalDrawer.modal === false && (!root.pageStack ||
root.pageStack.leftSidebar !== root.globalDrawer) ? root.globalDrawer.width *
root.globalDrawer.position : 0
contentItem.anchors.rightMargin: root.contextDrawer &&
root.contextDrawer.modal === false ? root.contextDrawer.width *
root.contextDrawer.position : 0
- Binding {
- target: root.menuBar
- property: "x"
- value: -contentItem.x
- }
Binding {
target: root.header
property: "x"
--
2.50.0
