jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

kde-workspace: update to 4.11.4.

Browse source
This commit is contained in:
Juan RP 2013-12-17 11:54:17 +01:00
parent f9568d620c
commit e5c5fa9eda
5 changed files with 49 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
srcpkgs/kde-workspace/INSTALL
View file

@ -1,5 +0,0 @@
case "$ACTION" in
post)
genkdmconf --no-old --no-backup >/dev/null 2>&1
;;
esac

2
srcpkgs/kde-workspace/REMOVE
View file

@ -1,5 +1,5 @@
case "$ACTION" in
post)
pre)
if [ -d usr/share/apps/kdm/faces ]; then
rm -rf usr/share/apps/kdm/faces
fi

55
srcpkgs/kde-workspace/patches/kdebug-324574.patch
View file

@ -1,55 +0,0 @@
From: Weng Xuetian <wengxt@gmail.com>
Date: Mon, 09 Sep 2013 15:43:06 +0000
Subject: Delay KDE class initialization to main loop
X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=2e5a2450762f8dedf9ffd77028ed06b3a39a807d
---
Delay KDE class initialization to main loop
Gui platform plugin is loaded during QApplication construction, but it
relies on some KApplication/QApplication data to work correctly.
This patch delays the initialization to main loop, to ensure
KApplication/QApplication is already constructed.
BUG: 324574
FIXED-IN: 4.11.2
REVIEW: 112602
---
--- qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
+++ qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
@@ -28,6 +28,7 @@
#include <KDE/KFileDialog>
#include <KDE/KColorDialog>
#include <QtCore/QHash>
+#include <QtCore/QTimer>
#include <QtGui/QFileDialog>
#include <QtGui/QColorDialog>
#include <QtGui/QApplication>
@@ -153,9 +154,7 @@
public:
KQGuiPlatformPlugin()
{
- connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()), this, SLOT(updateToolbarIcons()));
- connect(KGlobalSettings::self(), SIGNAL(toolbarAppearanceChanged(int)), this, SLOT(updateToolbarStyle()));
- connect(KGlobalSettings::self(), SIGNAL(kdisplayStyleChanged()), this, SLOT(updateWidgetStyle()));
+ QMetaObject::invokeMethod(this, "init", Qt::QueuedConnection);
}
virtual QStringList keys() const { return QStringList() << QLatin1String("kde"); }
@@ -340,6 +339,13 @@
}
private slots:
+ void init()
+ {
+ connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()), this, SLOT(updateToolbarIcons()));
+ connect(KGlobalSettings::self(), SIGNAL(toolbarAppearanceChanged(int)), this, SLOT(updateToolbarStyle()));
+ connect(KGlobalSettings::self(), SIGNAL(kdisplayStyleChanged()), this, SLOT(updateWidgetStyle()));
+ }
+
void updateToolbarStyle()
{
//from gtksymbol.cpp

20
srcpkgs/kde-workspace/patches/patch-kdm_kcm_main.cpp Normal file
View file

@ -0,0 +1,20 @@
$NetBSD: patch-kdm_kcm_main.cpp,v 1.1 2012/03/19 19:44:03 markd Exp $
Allow $PKG_SYSCONFDIR/kdm/kdmrc to override the one under $PREFIX
--- kdm/kcm/main.cpp.orig 2010-05-27 17:23:09.000000000 +0000
+++ kdm/kcm/main.cpp
@@ -281,8 +281,12 @@ KConfig *KDModule::createTempConfig()
pTempConfigFile->open();
QString tempConfigName = pTempConfigFile->fileName();
+ QFile confFile (QString::fromLatin1( "@PKG_SYSCONFDIR@" "/kdm/kdmrc" ));
+ if ( !confFile.exists() )
+ confFile.setFileName (QString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
+
KConfig *pSystemKDMConfig = new KConfig(
- QString::fromLatin1(KDE_CONFDIR "/kdm/kdmrc"), KConfig::SimpleConfig);
+ confFile.fileName(), KConfig::SimpleConfig);
KConfig *pTempConfig = pSystemKDMConfig->copyTo(tempConfigName);
pTempConfig->sync();

37
srcpkgs/kde-workspace/template
View file

@ -1,16 +1,18 @@
# Template file for 'kde-workspace'
pkgname=kde-workspace
version=4.11.1
revision=3
version=4.11.4
revision=1
short_desc="Provides the interface and basic tools for the KDE workspace"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL, LGPL, FDL"
homepage="http://www.kde.org"
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
checksum=78a157b09412de8067998268b0543f90c8120c3968a197d1ddd183eae6b5ff6e
checksum=13420aeac5a6e0143f497fe988e6396f62d12862ae33ea1e1139d8137c07f16f
build_style=cmake
configure_args="-DKDE4_BUILD_TESTS=OFF -DWITH_Xmms=OFF -DWITH_libgps=OFF -DWITH_CkConnector=OFF"
configure_args="-DKDE4_BUILD_TESTS=OFF -DSYSCONF_INSTALL_DIR=/etc
-DWITH_Xmms=OFF -DWITH_libgps=OFF -DWITH_CkConnector=OFF
-DFREETYPE_INCLUDE_DIRS=/usr/include/freetype2"
# XXX qalculate, prison.
hostmakedepends="cmake automoc4 pkg-config"
@ -20,10 +22,14 @@ makedepends="openssl-devel qt-devel phonon-devel libdbusmenu-qt-devel strigi-dev
libjpeg-turbo-devel libpng-devel libXcursor-devel libXi-devel libxkbfile-devel
libXrandr-devel libXfixes-devel libSM-devel libXcomposite-devel libXdamage-devel
libXtst-devel libXft-devel glib-devel fontconfig-devel nepomuk-core-devel>=${version}
akonadi-devel kdepimlibs-devel>=${version} qjson-devel libsensors-devel
akonadi-devel kdepimlibs-devel>=${version} qjson-devel libsensors-devel wayland-devel
NetworkManager-devel pciutils-devel MesaLib-devel pam-devel libusb-compat-devel
libraw1394-devel python-devel kde-wallpapers>=${version} kde-base-artwork>=${version}"
pre_configure() {
sed -e "s,@PKG_SYSCONFDIR@,/etc,g" -i kdm/kcm/main.cpp
}
post_install() {
vmkdir etc/pam.d
for f in kde kde-np kscreensaver; do
@ -34,6 +40,9 @@ post_install() {
vmkdir usr/share/xsessions
ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop \
${DESTDIR}/usr/share/xsessions
install -Dm644 ${DESTDIR}/usr/share/config/kdm/kdmrc \
${DESTDIR}/etc/kdm/kdmrc
}
kde-workspace-devel_package() {
@ -46,21 +55,31 @@ kde-workspace-devel_package() {
}
}
kde-python_package() {
short_desc+=" - Python 2 bindings"
pycompile_module="PyKDE4"
pycompile_dirs="usr/share/apps/plasma_scriptengine_python"
pkg_install() {
vmove usr/lib/python2.7
vmove usr/share/apps/plasma_scriptengine_python
vmove "/usr/share/kde4/services/plasma-scriptengine*"
}
}
kde-workspace_package() {
depends="python kde-wallpapers>=${version} kde-base-artwork>=${version}"
depends="kde-wallpapers>=${version} kde-base-artwork>=${version}"
conf_files="
/etc/kdm/kdmrc
/etc/ksysguarddrc
/etc/pam.d/kde-np.pam
/etc/pam.d/kde.pam
/etc/pam.d/kscreensaver.pam
/usr/share/config/kdm/kdmrc"
/etc/pam.d/kscreensaver.pam"
system_accounts="kdm"
kdm_homedir="/var/lib/kdm"
make_dirs="
/etc/kde/env 0755 root root
/etc/kde/shutdown 0755 root root
/var/lib/kdm 0755 kdm kdm"
pycompile_module="PyKDE4"
pkg_install() {
vmove all
}