summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Krzyszkowiak2019-04-10 21:28:08 +0200
committerSebastian Krzyszkowiak2019-04-10 21:28:29 +0200
commit24dbe569bb8fed623b2ef0bafdf13edd822b4b91 (patch)
tree13d097b8e95758aa43d8eb48e0ffc78a15c20ad6
parent23bb83ad286a924dc0b47a1c911f89992dbd0c8a (diff)
downloadaur-24dbe569bb8fed623b2ef0bafdf13edd822b4b91.tar.gz
update to 5.15.4
-rw-r--r--.SRCINFO10
-rw-r--r--386d3b8ed1e0595c9fc6e21643ff748402171429.patch46
-rw-r--r--PKGBUILD12
3 files changed, 60 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bfb1bf8b080..03d8f6fb566 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = breeze-kde4
pkgdesc = Artwork, styles and assets for the Breeze visual style for the Plasma Desktop
- pkgver = 5.14.5
+ pkgver = 5.15.4
pkgrel = 1
url = https://www.kde.org/workspaces/plasmadesktop/
arch = x86_64
@@ -16,14 +16,16 @@ pkgbase = breeze-kde4
depends = hicolor-icon-theme
depends = kdelibs
optdepends = kcmutils: for breeze-settings
- source = https://download.kde.org/stable/plasma/5.14.5/breeze-5.14.5.tar.xz
- source = https://download.kde.org/stable/plasma/5.14.5/breeze-5.14.5.tar.xz.sig
+ source = https://download.kde.org/stable/plasma/5.15.4/breeze-5.15.4.tar.xz
+ source = https://download.kde.org/stable/plasma/5.15.4/breeze-5.15.4.tar.xz.sig
+ source = 386d3b8ed1e0595c9fc6e21643ff748402171429.patch
validpgpkeys = 2D1D5B0588357787DE9EE225EC94D18F7F05997E
validpgpkeys = 0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D
validpgpkeys = D07BD8662C56CB291B316EB2F5675605C74E02CF
validpgpkeys = 1FA881591C26B276D7A5518EEAAF29B42A678C20
- sha256sums = e78e6eec31cf8fb7c6d1d823e07bebcabf978ba94772081490a38a5ac5871796
+ sha256sums = e5b174d9509f3dcb85b0865b8bc8d40e2e2fb0f9373eda1877e5874a9c456958
sha256sums = SKIP
+ sha256sums = 59a8b0c2b469903e818cb17c32a9ce267a0359a1c43f81089bc4d363d8913a71
pkgname = breeze-kde4
diff --git a/386d3b8ed1e0595c9fc6e21643ff748402171429.patch b/386d3b8ed1e0595c9fc6e21643ff748402171429.patch
new file mode 100644
index 00000000000..53ca7e350dd
--- /dev/null
+++ b/386d3b8ed1e0595c9fc6e21643ff748402171429.patch
@@ -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(
diff --git a/PKGBUILD b/PKGBUILD
index 35ce36d627f..4f73ce05744 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea@archlinux.org>
pkgname=breeze-kde4
-pkgver=5.14.5
+pkgver=5.15.4
pkgrel=1
arch=(x86_64)
pkgdesc='Artwork, styles and assets for the Breeze visual style for the Plasma Desktop'
@@ -13,9 +13,11 @@ depends=(frameworkintegration kdecoration breeze-icons kwayland hicolor-icon-the
makedepends=(extra-cmake-modules kcmutils automoc4)
optdepends=('kcmutils: for breeze-settings')
groups=(plasma)
-source=("https://download.kde.org/stable/plasma/$pkgver/breeze-$pkgver.tar.xz"{,.sig})
-sha256sums=('e78e6eec31cf8fb7c6d1d823e07bebcabf978ba94772081490a38a5ac5871796'
- 'SKIP')
+source=("https://download.kde.org/stable/plasma/$pkgver/breeze-$pkgver.tar.xz"{,.sig}
+ "386d3b8ed1e0595c9fc6e21643ff748402171429.patch")
+sha256sums=('e5b174d9509f3dcb85b0865b8bc8d40e2e2fb0f9373eda1877e5874a9c456958'
+ 'SKIP'
+ '59a8b0c2b469903e818cb17c32a9ce267a0359a1c43f81089bc4d363d8913a71')
validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E' # Jonathan Riddell <jr@jriddell.org>
'0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D' # Bhushan Shah <bshah@kde.org>
'D07BD8662C56CB291B316EB2F5675605C74E02CF' # David Edmundson <davidedmundson@kde.org>
@@ -23,6 +25,8 @@ validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E' # Jonathan Riddell <jr
prepare() {
mkdir -p build
+ cd breeze-$pkgver
+ patch -p1 < ../386d3b8ed1e0595c9fc6e21643ff748402171429.patch
}
build() {