Commit 36fb6b04 authored by Fabian's avatar Fabian

kf5-kde-workspace: initial import

parent 0b266e41
# Contributor: Andrea Scarpino <andrea@archlinux.org>
source ../frameworks.conf
pkgname=kf5-kde-workspace
_pkgname=kde-workspace
pkgver=0.plasma2tp
pkgrel=1
pkgdesc='Provides the interface and basic tools for the KDE workspace'
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kde-workspace'
license=('LGPL')
depends=('frameworkintegration' 'kcmutils' 'knotifyconfig' 'kprintutils'
'kdesu' 'knewstuff' 'khtml' 'libdbusmenu-qt5' 'glu'
'libxkbfile' 'libxcursor' 'lm_sensors' 'libraw1394' 'libusb-compat'
'pciutils' 'libbsd' 'kf5-akonadi-git' 'qt5-webkit' 'kconfig' 'kf5umbrella'
'kidletime' 'kitemmodels' 'threadweaver' 'kunitconversion' 'kross' 'kdoctools' 'kdeclarative' 'plasma-framework' 'freetype2')
makedepends=('extra-cmake-modules' 'git' 'qt5-tools')
options=("debug")
source=(${_pkgname}-${pkgver}.tar.bz2::"http://quickgit.kde.org/?p=kde-workspace.git&a=snapshot&h=4ba62f3059b3243ca3cd997a07af80555a3f4265&fmt=tbz2"
'presentwindows.patch'
'kglobalaccel.patch'
'kstyle.patch'
'kstyle2.patch'
'knotifyconfig.patch')
md5sums=('SKIP'
'fd1a81676059ce7a8117ce0bb91a706a'
'c966db3a7a532eeacff52767ce045a8d'
'b3c4bb931592092a70b7a4ac301df348'
'3540a5325a25e9bfd914d0d3c4eb7019'
'f952c70b34b5ced3c895da7fa20c7357')
prepare() {
mkdir -p build
cd ${_pkgname}
patch -p1 -i "${srcdir}"/presentwindows.patch
patch -p1 -i "${srcdir}"/kglobalaccel.patch
patch -p1 -i "${srcdir}"/kstyle.patch
patch -p1 -i "${srcdir}"/kstyle2.patch
patch -p1 -i "${srcdir}"/knotifyconfig.patch
}
build() {
#export XDG_DATA_DIRS="/opt/kf5/share:$XDG_DATA_DIRS"
#export CMAKE_PREFIX_PATH="/opt/kf5"
cd build
# a hack, why isn't the header detected without it
# doesn't look in the right place for it
# -> /usr/include/ft2build.h:56:38: fatal error: freetype/config/ftheader.h:
CXXFLAGS="${CXXFLAGS} -I/usr/include/freetype2" cmake ../${_pkgname} \
-DCMAKE_BUILD_TYPE=${KFBuildType} \
-DCMAKE_INSTALL_PREFIX=${KFInstallPrefix} \
-DLIB_INSTALL_DIR=lib \
-DWITH_libgps=OFF \
-DSYSCONF_INSTALL_DIR=/etc
make
}
check() {
cd build
make test || return 0
}
package() {
cd build
make DESTDIR="${pkgdir}" install
}
From: David Faure <faure@kde.org>
Date: Wed, 01 Jan 2014 12:57:28 +0000
Subject: This needs kglobalaccel:
X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=1baf101e2b33dc2cb9d239df19eab1a73e2f0917
---
This needs kglobalaccel:
./ksldapp.cpp:39:#include <KGlobalAccel>
./ksldapp.cpp:125: KGlobalAccel::self()
---
--- a/ksmserver/screenlocker/CMakeLists.txt
+++ b/ksmserver/screenlocker/CMakeLists.txt
@@ -31,6 +31,7 @@
target_link_libraries(screenlocker_static kworkspace
Qt5::X11Extras
KF5::IdleTime
+ KF5::GlobalAccel
${X11_LIBRARIES}
${X11_Xcursor_LIB}
${XCB_XCB_LIBRARY}
From: David Faure <faure@kde.org>
Date: Thu, 02 Jan 2014 00:58:01 +0000
Subject: re-enable linking to KF5::NotifyConfig, otherwise the header is not found
X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=ad6c6f9a690efa13253a8e4e2b31e92dca9a0fe8
---
re-enable linking to KF5::NotifyConfig, otherwise the header is not found
---
--- a/plasma/generic/dataengines/notifications/CMakeLists.txt
+++ b/plasma/generic/dataengines/notifications/CMakeLists.txt
@@ -18,7 +18,7 @@
KF5::Notifications
KF5::Plasma
KF5::Service
- #KF5::NotifyConfig
+ KF5::NotifyConfig
)
install(TARGETS plasma_engine_notifications DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine)
--- a/plasma/generic/dataengines/notifications/notificationsengine.cpp
+++ b/plasma/generic/dataengines/notifications/notificationsengine.cpp
@@ -297,8 +297,7 @@
void NotificationsEngine::configureNotification(const QString &appName)
{
-#warning "reenable once KNotifyConfigWidget works again"
-// KNotifyConfigWidget::configure(0, appName);
+ KNotifyConfigWidget::configure(0, appName);
}
K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(notifications, NotificationsEngine, "plasma-dataengine-notifications.json")
From: David Faure <faure@kde.org>
Date: Wed, 01 Jan 2014 18:46:25 +0000
Subject: remove unused include (not found, since not linking to kstyle)
X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=eed6be98535e782b0d7327d57bab5171a55e1538
---
remove unused include (not found, since not linking to kstyle)
---
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -45,7 +45,6 @@
#include <ksavefile.h>
#include <ktemporaryfile.h>
#include <KLocalizedString>
-#include <kstyle.h>
#include "krdb.h"
#ifdef HAVE_X11
From: David Faure <faure@kde.org>
Date: Wed, 01 Jan 2014 19:18:19 +0000
Subject: remove unused includes that now break compilation
X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=119db0a609288d46c6e41939275c88d2356f8cdc
---
remove unused includes that now break compilation
---
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -38,7 +38,6 @@
#include <kapplication.h>
#include <kcombobox.h>
#include <kmessagebox.h>
-#include <kstyle.h>
#include <kstandarddirs.h>
#include <kautostart.h>
#include <KDebug>
--- a/plasma/desktop/applets/pager/plugin/pager.cpp
+++ b/plasma/desktop/applets/pager/plugin/pager.cpp
@@ -30,8 +30,6 @@
#include <QTextDocument>
#include <QDesktopWidget>
-#include <KCModuleInfo>
-#include <KCModuleProxy>
#include <KColorScheme>
#include <KGlobalSettings>
#include <KIconLoader>
From: Christophe Giboudeaux <cgiboudeaux@gmx.com>
Date: Thu, 02 Jan 2014 18:20:42 +0000
Subject: kdeclarative.h is not needed there
X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=c258e5c952fe325502ad548f7b9c5cd57d72c146
---
kdeclarative.h is not needed there
---
--- a/kwin/effects/presentwindows/presentwindows.cpp
+++ b/kwin/effects/presentwindows/presentwindows.cpp
@@ -25,7 +25,6 @@
#include <QAction>
#include <KDE/KGlobalAccel>
#include <KDE/KLocalizedString>
-#include <kdeclarative/kdeclarative.h>
#include <kwinglutils.h>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment