From 400205142a424625ae072e089f26cdf031ce3bef Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Mon, 30 Dec 2019 22:51:14 +0000 Subject: user/plasma-desktop: Bump to 5.12.9 --- user/plasma-desktop/APKBUILD | 12 +++++++----- user/plasma-desktop/headers.patch | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 user/plasma-desktop/headers.patch (limited to 'user/plasma-desktop') diff --git a/user/plasma-desktop/APKBUILD b/user/plasma-desktop/APKBUILD index 4d7883931..6d3b2d33d 100644 --- a/user/plasma-desktop/APKBUILD +++ b/user/plasma-desktop/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=plasma-desktop -pkgver=5.12.8 +pkgver=5.12.9 pkgrel=0 pkgdesc="Modern, functional, integrated libre desktop environment" url="https://www.kde.org/plasma-desktop" @@ -13,7 +13,7 @@ depends="breeze breeze-icons oxygen ttf-liberation" # shell/QML dependencies depends="$depends kde-cli-tools kded kwin qt5-qtgraphicaleffects setxkbmap" # Good Ideas™ to have -depends="$depends consolekit kdeclarative" +depends="$depends consolekit2 kdeclarative" makedepends="cmake qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtx11extras-dev qt5-qtsvg-dev kdelibs4support-dev xf86-input-synaptics-dev kauth-dev plasma-framework-dev kdoctools-dev ki18n-dev @@ -27,6 +27,7 @@ makedepends="cmake qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtx11extras-dev subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/plasma-desktop-$pkgver.tar.xz cmake-fixes.patch + headers.patch " build() { @@ -41,7 +42,7 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_TESTING=OFF \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -53,5 +54,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dc55d9a894c52c44cd2aff844793e038dd66854862a212d47dfb0144dd489c3ae8d2c4e289a1e76c3d31ca68a8543bb511623f96617db799d28009736591c58f plasma-desktop-5.12.8.tar.xz -45119bbd7b6f7803323410acac6c5cb2be232f776e6009938e932976091ca188f4a52ba0bca814212353856a8eb87700d86b2452d9cb925c4f6f1bf3577065b7 cmake-fixes.patch" +sha512sums="0fea993cb522f3e17ccae95e47ed4f4d44f91e9288e962f95fd7b410f09fbf8a8e7b0d20505d3d8bcc8805a38824b52a9c9c718b6e895db14a6c753dabedd824 plasma-desktop-5.12.9.tar.xz +45119bbd7b6f7803323410acac6c5cb2be232f776e6009938e932976091ca188f4a52ba0bca814212353856a8eb87700d86b2452d9cb925c4f6f1bf3577065b7 cmake-fixes.patch +38711ee002c1d5e38175cf010fc21e86348c2824a20f39616c87c295f4dd62b6fe4a1ea19aa9057502b6a7af095d1341cbca33c3fab8ff13264120164602787d headers.patch" diff --git a/user/plasma-desktop/headers.patch b/user/plasma-desktop/headers.patch new file mode 100644 index 000000000..b68ef8436 --- /dev/null +++ b/user/plasma-desktop/headers.patch @@ -0,0 +1,35 @@ +From 18001c2926dc7d8f57060e34114283d6c2138471 Mon Sep 17 00:00:00 2001 +From: Frederik Gladhorn +Date: Thu, 18 Jul 2019 09:55:00 +0200 +Subject: Fix build, include QTime + +Summary: The type is used, but was not directly included. Fixes build with Qt 5.13. + +Reviewers: #plasma, broulik + +Reviewed By: #plasma, broulik + +Subscribers: plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D22522 +--- + kcms/dateandtime/dtime.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/kcms/dateandtime/dtime.h b/kcms/dateandtime/dtime.h +index cceb071..965b487 100644 +--- a/kcms/dateandtime/dtime.h ++++ b/kcms/dateandtime/dtime.h +@@ -26,6 +26,7 @@ + + #include + #include ++#include + #include + #include + #include +-- +cgit v1.1 + -- cgit v1.2.3-60-g2f50