summaryrefslogtreecommitdiff
path: root/user/plasma-desktop
diff options
context:
space:
mode:
Diffstat (limited to 'user/plasma-desktop')
-rw-r--r--user/plasma-desktop/APKBUILD14
-rw-r--r--user/plasma-desktop/cmake-fixes.patch174
2 files changed, 181 insertions, 7 deletions
diff --git a/user/plasma-desktop/APKBUILD b/user/plasma-desktop/APKBUILD
index 963cfc1dd..4d7883931 100644
--- a/user/plasma-desktop/APKBUILD
+++ b/user/plasma-desktop/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
-# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=plasma-desktop
-pkgver=5.12.7
+pkgver=5.12.8
pkgrel=0
pkgdesc="Modern, functional, integrated libre desktop environment"
url="https://www.kde.org/plasma-desktop"
@@ -25,10 +25,11 @@ makedepends="cmake qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtx11extras-dev
xorg-server-dev kwin-dev kscreenlocker-dev baloo-dev xcb-util-image-dev
xf86-input-libinput-dev breeze-dev xkeyboard-config extra-cmake-modules"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/plasma-desktop-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/$pkgver/plasma-desktop-$pkgver.tar.xz
+ cmake-fixes.patch
+ "
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -45,13 +46,12 @@ build() {
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="671108c3c1c46bc0dfdbc2eb1438654c84ee3bc098c137466ab28d230651f20251894b3008a030a0c3bf2aa4904cca61418c458f41a023042630c6f80d4bf41d plasma-desktop-5.12.7.tar.xz"
+sha512sums="dc55d9a894c52c44cd2aff844793e038dd66854862a212d47dfb0144dd489c3ae8d2c4e289a1e76c3d31ca68a8543bb511623f96617db799d28009736591c58f plasma-desktop-5.12.8.tar.xz
+45119bbd7b6f7803323410acac6c5cb2be232f776e6009938e932976091ca188f4a52ba0bca814212353856a8eb87700d86b2452d9cb925c4f6f1bf3577065b7 cmake-fixes.patch"
diff --git a/user/plasma-desktop/cmake-fixes.patch b/user/plasma-desktop/cmake-fixes.patch
new file mode 100644
index 000000000..c6457351a
--- /dev/null
+++ b/user/plasma-desktop/cmake-fixes.patch
@@ -0,0 +1,174 @@
+From bcd8015eaf3638fca0e369955aa1a4290d079ef8 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sun, 31 Mar 2019 19:49:40 +0200
+Subject: Harmonize use of HAVE_X11, using cmakedefine01.
+
+Fixes: config-X11.h:44:18: warning: "TRUE" is not defined, evaluates to 0 [-Wundef]
+
+It should *all* be ported to cmakedefine01...
+---
+ CMakeLists.txt | 3 +++
+ config-X11.h.cmake | 2 +-
+ kcms/fonts/fonts.cpp | 4 ++--
+ kcms/fonts/fonts.h | 4 ++--
+ 4 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 036d781..df43295 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -88,6 +88,9 @@ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
+ TYPE REQUIRED
+ PURPOSE "Required for building the X11 based workspace"
+ )
++if(X11_FOUND)
++ set(HAVE_X11 1)
++endif()
+
+ find_package(UDev)
+ set_package_properties(UDev PROPERTIES DESCRIPTION "UDev library"
+diff --git a/config-X11.h.cmake b/config-X11.h.cmake
+index 60286dd..ae8978a 100644
+--- a/config-X11.h.cmake
++++ b/config-X11.h.cmake
+@@ -41,4 +41,4 @@
+ #cmakedefine HAS_RANDR_1_3 1
+
+ /* Define if you have X11 at all */
+-#define HAVE_X11 ${X11_FOUND}
+\ No newline at end of file
++#cmakedefine01 HAVE_X11
+diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp
+index f336518..218c3eb 100644
+--- a/kcms/fonts/fonts.cpp
++++ b/kcms/fonts/fonts.cpp
+@@ -224,7 +224,7 @@
+ }
+
+ /**** FontAASettings ****/
+-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
++#if defined(HAVE_FONTCONFIG) && HAVE_X11
+ FontAASettings::FontAASettings(QWidget *parent)
+ : QDialog(parent),
+ changesMade(false)
+@@ -501,13 +501,13 @@
+
+ void FontAASettings::changed()
+ {
+-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
++#if defined(HAVE_FONTCONFIG) && HAVE_X11
+ changesMade = true;
+ enableWidgets();
+ #endif
+ }
+
+-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
++#if defined(HAVE_FONTCONFIG) && HAVE_X11
+ int FontAASettings::exec()
+ {
+ const int i = QDialog::exec();
+@@ -643,7 +643,7 @@
+ QGridLayout *lay = new QGridLayout();
+ layout->addLayout(lay);
+ lay->setColumnStretch(3, 10);
+-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
++#if defined(HAVE_FONTCONFIG) && HAVE_X11
+ QLabel *label = 0L;
+ label = new QLabel(i18n("Use a&nti-aliasing:"), this);
+ label->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+@@ -692,7 +692,7 @@
+ lay->addWidget(spinboxDpi, 1, 1);
+ layout->addStretch(1);
+
+-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
++#if defined(HAVE_FONTCONFIG) && HAVE_X11
+ aaSettings = new FontAASettings(this);
+ #endif
+
+@@ -720,7 +720,7 @@
+ fontUseList.at(i)->setDefault();
+ }
+
+-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
++#if defined(HAVE_FONTCONFIG) && HAVE_X11
+ useAA = AASystem;
+ cbAA->setCurrentIndex(useAA);
+ aaSettings->defaults();
+@@ -739,7 +739,7 @@
+ (*it)->readFont();
+ }
+
+-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
++#if defined(HAVE_FONTCONFIG) && HAVE_X11
+ useAA_original = useAA = aaSettings->load() ? AAEnabled : AADisabled;
+ cbAA->setCurrentIndex(useAA);
+ #endif
+@@ -762,7 +762,7 @@
+ spinboxDpi->setValue(dpicfg);
+ dpi_original = dpicfg;
+ };
+-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
++#if defined(HAVE_FONTCONFIG) && HAVE_X11
+ if (cfgfonts.readEntry("dontChangeAASettings", true)) {
+ useAA_original = useAA = AASystem;
+ cbAA->setCurrentIndex(useAA);
+@@ -791,7 +791,7 @@
+ } else {
+ cfgfonts.writeEntry("forceFontDPI", dpi);
+ }
+-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
++#if defined(HAVE_FONTCONFIG) && HAVE_X11
+ cfgfonts.writeEntry("dontChangeAASettings", cbAA->currentIndex() == AASystem);
+ #endif
+ cfgfonts.sync();
+@@ -817,7 +817,7 @@
+ // Don't overwrite global settings unless explicitly asked for - e.g. the system
+ // fontconfig setup may be much more complex than this module can provide.
+ // TODO: With AASystem the changes already made by this module should be reverted somehow.
+-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
++#if defined(HAVE_FONTCONFIG) && HAVE_X11
+ bool aaSave = false;
+ if (cbAA->currentIndex() == AAEnabled ) {
+ aaSave = aaSettings->save(KXftConfig::AntiAliasing::Enabled);
+@@ -870,7 +870,7 @@
+
+ void KFonts::slotUseAntiAliasing()
+ {
+-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
++#if defined(HAVE_FONTCONFIG) && HAVE_X11
+ useAA = static_cast< AASetting >(cbAA->currentIndex());
+ aaSettingsButton->setEnabled(useAA == AAEnabled);
+ emit changed(true);
+@@ -879,7 +879,7 @@
+
+ void KFonts::slotCfgAa()
+ {
+-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
++#if defined(HAVE_FONTCONFIG) && HAVE_X11
+ if (aaSettings->exec()) {
+ emit changed(true);
+ }
+diff --git a/kcms/fonts/fonts.h b/kcms/fonts/fonts.h
+index f7ade6b..d760e52 100644
+--- a/kcms/fonts/fonts.h
++++ b/kcms/fonts/fonts.h
+@@ -80,7 +80,7 @@
+
+ public:
+
+-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
++#if defined(HAVE_FONTCONFIG) && HAVE_X11
+ FontAASettings(QWidget *parent);
+
+ bool save(KXftConfig::AntiAliasing::State aaState);
+@@ -135,7 +135,7 @@
+ void slotCfgAa();
+
+ private:
+-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
++#if defined(HAVE_FONTCONFIG) && HAVE_X11
+ enum AASetting { AAEnabled, AASystem, AADisabled };
+ AASetting useAA, useAA_original;
+ QComboBox *cbAA;
+--
+cgit v1.1
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-27 14:34:49 +0000