diff --git a/0001-Fix-build-with-Qt-4.patch b/0001-Fix-build-with-Qt-4.patch new file mode 100644 index 0000000..7a52c0e --- /dev/null +++ b/0001-Fix-build-with-Qt-4.patch @@ -0,0 +1,49 @@ +From 386d3b8ed1e0595c9fc6e21643ff748402171429 Mon Sep 17 00:00:00 2001 +From: Vlad Zagorodniy +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( +-- +2.20.1 + diff --git a/breeze-5.15.3.tar.xz b/breeze-5.15.3.tar.xz deleted file mode 100644 index b92ac3a..0000000 --- a/breeze-5.15.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4be0b50deb6a3b42e3c09461ebef76f0af758c400c998b627bc72931d8b3fe50 -size 25147828 diff --git a/breeze-5.15.3.tar.xz.sig b/breeze-5.15.3.tar.xz.sig deleted file mode 100644 index e9d2c2c..0000000 --- a/breeze-5.15.3.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAlyHm1wACgkQ7JTRj38F -mX52agf/ZrDbCTUnh4BF4qmOD2q3uwpsazVTZr8Mzm42vlhyef22egi1cd51qpXj -D9+lyYzkCAM3ZAvddi/85DdcbqmIsf+BdtRafnDtbctrrwni/7u0k5hVVrXp9w8M -YvEk2Oj8FNc5PnjR4N7AkaVuMEnDM5tYnbk2Z5CTklYK45StvSaYteNB+BdXJf6N -0Cus+a4nWCDlDfIEpvLtH+EZm+6IakpUauiCwuRZg/o139T8VvCtg6ayOPpoF5qE -+KOCHz9fkMt6NS3+jxUdjMb3YxwClw+RRA2g3VpByRuDlzi8fcnlT+e9VdlRS1JL -un71w19EdDdkbRnL+ja/h5Zs9CgwTw== -=uqOr ------END PGP SIGNATURE----- diff --git a/breeze-5.15.4.tar.xz b/breeze-5.15.4.tar.xz new file mode 100644 index 0000000..8e02689 --- /dev/null +++ b/breeze-5.15.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5b174d9509f3dcb85b0865b8bc8d40e2e2fb0f9373eda1877e5874a9c456958 +size 25144180 diff --git a/breeze-5.15.4.tar.xz.sig b/breeze-5.15.4.tar.xz.sig new file mode 100644 index 0000000..0222845 --- /dev/null +++ b/breeze-5.15.4.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAlyjTRMACgkQ7JTRj38F +mX7d3AgAr9HiLarfXsNVv3U5Cw30BJ+DWsrJpNyqABIg6UlXg2XtK0DBOV5e56tY +ULWsmDMTdtJCer9WHPlpPjVhZhLyMgfh3YgvlpunVsprCPa1xgb4yBSDhL+E31F7 +We5bj5FgXjR0+Fcdqu4QMzi76W7cRaNzfyN/ghzOM4APHkmonhktkkur7tbvMeeU +xVyNZRuA8kMRt371C2YjYPj+abeUQY0rj2FsE8HKPewrxKEqRIA88T6XYYg3uTAW +YTmgYU9VC4clt55AP9065EvvEPBRxvH+cB1mzl6/GfWPVP9pTGzY1//oMn2mQPtN +BxxzLm0efHNhNY/Yl0SCbRpfjlmEoA== +=Okzh +-----END PGP SIGNATURE----- diff --git a/breeze.changes b/breeze.changes index c57e76c..f98a7cc 100644 --- a/breeze.changes +++ b/breeze.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Apr 2 12:40:56 UTC 2019 - fabian@ritter-vogt.de + +- Update to 5.15.4 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.15.4.php +- Changes since 5.15.3: + * Compute correct position of drag button press on X11 + ------------------------------------------------------------------- Thu Mar 14 09:12:34 UTC 2019 - Fabian Vogt diff --git a/breeze.spec b/breeze.spec index 8e0c44d..f6645f3 100644 --- a/breeze.spec +++ b/breeze.spec @@ -22,7 +22,7 @@ %{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: breeze -Version: 5.15.3 +Version: 5.15.4 Release: 0 Summary: Plasma Desktop artwork, styles and assets License: GPL-2.0-or-later diff --git a/breeze4-style.changes b/breeze4-style.changes index de73542..3b14744 100644 --- a/breeze4-style.changes +++ b/breeze4-style.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Apr 2 12:40:56 UTC 2019 - fabian@ritter-vogt.de + +- Update to 5.15.4 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.15.4.php +- Changes since 5.15.3: + * Compute correct position of drag button press on X11 +- Add patch to fix build: + * 0001-Fix-build-with-Qt-4.patch + ------------------------------------------------------------------- Tue Mar 12 13:15:20 UTC 2019 - fabian@ritter-vogt.de diff --git a/breeze4-style.spec b/breeze4-style.spec index 62077ad..700700d 100644 --- a/breeze4-style.spec +++ b/breeze4-style.spec @@ -17,7 +17,7 @@ Name: breeze4-style -Version: 5.15.3 +Version: 5.15.4 Release: 0 Summary: Plasma Desktop artwork, styles and assets License: GPL-2.0-or-later @@ -30,6 +30,8 @@ Source2: plasma.keyring %endif # PATCH-FIX-OPENSUSE add-support-for-Q3ListView-to-the-KDE4-style.patch boo#973728 wbauer@tmo.at -- fixes collapse/expand icon in Q3ListView that still may be used by some KDE4 applications (knode e.g.) Patch0: add-support-for-Q3ListView-to-the-KDE4-style.patch +# PATCH-FIX-UPSTREAM +Patch1: 0001-Fix-build-with-Qt-4.patch BuildRequires: automoc4 BuildRequires: cmake >= 2.8.12 BuildRequires: kde4-filesystem