automatic version update by autodist [release 5.15.4-1mamba;Thu Apr 04 2019]

This commit is contained in:
Automatic Build System 2024-01-05 20:55:40 +01:00
parent 8427e5ddd5
commit 57ea368d3a
2 changed files with 52 additions and 1 deletions

View File

@ -0,0 +1,46 @@
From 386d3b8ed1e0595c9fc6e21643ff748402171429 Mon Sep 17 00:00:00 2001
From: Vlad Zagorodniy <vladzzag@gmail.com>
Date: Tue, 2 Apr 2019 16:01:19 +0300
Subject: [PATCH] Fix build with Qt 4
Reviewers: #plasma, davidedmundson, fvogt
Reviewed By: #plasma, davidedmundson, fvogt
Subscribers: fvogt, plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D20201
---
kstyle/breezewindowmanager.cpp | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/kstyle/breezewindowmanager.cpp b/kstyle/breezewindowmanager.cpp
index aba29eef..5ca3fea5 100644
--- a/kstyle/breezewindowmanager.cpp
+++ b/kstyle/breezewindowmanager.cpp
@@ -895,20 +895,15 @@ namespace Breeze
// connection
auto connection( Helper::connection() );
- #if QT_VERSION >= 0x050300
- const qreal dpiRatio = window->devicePixelRatio();
- #else
- const qreal dpiRatio = 1;
- #endif
-
#if BREEZE_USE_KDE4
auto net_connection = QX11Info::display();
+ const QPoint native = position;
#else
auto net_connection = connection;
- #endif
-
+ const qreal dpiRatio = window->devicePixelRatio();
const QPoint origin = window->screen()->geometry().topLeft();
const QPoint native = (position - origin) * dpiRatio + origin;
+ #endif
xcb_ungrab_pointer( connection, XCB_TIME_CURRENT_TIME );
NETRootInfo( net_connection, NET::WMMoveResize ).moveResizeRequest(

View File

@ -1,7 +1,7 @@
%define majver %(echo %version | cut -d. -f1-2)
Name: breeze
Version: 5.15.3
Version: 5.15.4
Release: 1mamba
Summary: Breeze Dark Desktop Design Language by the KDE VDG
Group: Graphical Desktop/Look 'n' feel
@ -10,6 +10,7 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://www.kde.org
Source: http://download.kde.org/stable/plasma/%{version}/breeze-%{version}.tar.xz
Patch0: breeze-5.15.4-libqt4.patch
License: GPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
@ -52,6 +53,7 @@ Breeze Dark Desktop Design Language by the KDE VDG for KDE4.
%prep
%setup -q
#-D -T
%patch0 -p1
%build
%cmake_kde5 -d build
@ -122,6 +124,9 @@ ln -s %{_kde5_libdir}/kconf_update_bin/kde4breeze %{buildroot}%{_kde4_libdir}/kc
%{_kde4_datadir}/kstyle/themes/breeze.themerc
%changelog
* Thu Apr 04 2019 Automatic Build System <autodist@mambasoft.it> 5.15.4-1mamba
- automatic version update by autodist
* Wed Mar 13 2019 Automatic Build System <autodist@mambasoft.it> 5.15.3-1mamba
- automatic version update by autodist