diff options
Diffstat (limited to '')
| -rw-r--r-- | source/kde/kdebase-runtime/kdebase-runtime-text-render-969192.diff | 14 | ||||
| -rwxr-xr-x | source/kde/kdebase-runtime/kdebase-runtime.SlackBuild | 6 | ||||
| -rw-r--r-- | source/kde/kdebase-runtime/slack-desc | 2 | ||||
| -rw-r--r-- | source/kde/kdebase-workspace/kcmshell_root_privilege.patch | 43 | ||||
| -rwxr-xr-x | source/kde/kdebase-workspace/kdebase-workspace.SlackBuild | 13 | ||||
| -rw-r--r-- | source/kde/kdebase-workspace/kdebase-workspace.kdm.server.timeout.diff | 14 | ||||
| -rw-r--r-- | source/kde/kdebase-workspace/slack-desc | 6 | ||||
| -rwxr-xr-x | source/kde/kdebase-workspace/xinit/xinitrc.kde | 2 | ||||
| -rwxr-xr-x | source/kde/kdebase/kdebase.SlackBuild | 5 | ||||
| -rw-r--r-- | source/kde/kdebase/module_manager_include.diff | 19 | ||||
| -rw-r--r-- | source/kde/kdebase/slack-desc | 8 | ||||
| -rw-r--r-- | source/kde/kdebindings/local.options (renamed from source/kde/kdebase-runtime/local.options) | 0 |
12 files changed, 103 insertions, 29 deletions
diff --git a/source/kde/kdebase-runtime/kdebase-runtime-text-render-969192.diff b/source/kde/kdebase-runtime/kdebase-runtime-text-render-969192.diff deleted file mode 100644 index 811f922e3..000000000 --- a/source/kde/kdebase-runtime/kdebase-runtime-text-render-969192.diff +++ /dev/null @@ -1,14 +0,0 @@ -Index: trunk/KDE/kdebase/runtime/kstyles/oxygen/oxygen.cpp -=================================================================== ---- trunk/KDE/kdebase/runtime/kstyles/oxygen/oxygen.cpp (revision 969191) -+++ trunk/KDE/kdebase/runtime/kstyles/oxygen/oxygen.cpp (revision 969192) -@@ -3067,7 +3067,8 @@ - - if (const QStyleOptionToolButton* tbOpt = qstyleoption_cast<const QStyleOptionToolButton*>(option)) { - if ((!tbOpt->icon.isNull()) && (!tbOpt->text.isEmpty()) && tbOpt->toolButtonStyle == Qt::ToolButtonTextUnderIcon) -- size.setHeight(size.height()-9); -+ // TODO: Make this font size dependent -+ size.setHeight(size.height()-5); - } - - // We want to avoid super-skiny buttons, for things like "up" when icons + text diff --git a/source/kde/kdebase-runtime/kdebase-runtime.SlackBuild b/source/kde/kdebase-runtime/kdebase-runtime.SlackBuild index 90b25549d..0b2cddc80 100755 --- a/source/kde/kdebase-runtime/kdebase-runtime.SlackBuild +++ b/source/kde/kdebase-runtime/kdebase-runtime.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -47,9 +47,6 @@ echo "Building kdebase-runtime-$VERSION..." tar xvf $CWD/../src/kdebase-runtime-$VERSION.tar.?z* || exit 1 cd kdebase-runtime-$VERSION -# Fix a bug where the top and bottom of text is improperly cropped: -zcat $CWD/kdebase-runtime-text-render-969192.diff.gz | patch -p4 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -60,6 +57,7 @@ find . \ mkdir -p build cd build cmake \ + $KDE_OPT_ARGS \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/source/kde/kdebase-runtime/slack-desc b/source/kde/kdebase-runtime/slack-desc index 0b8de17be..09bf5774f 100644 --- a/source/kde/kdebase-runtime/slack-desc +++ b/source/kde/kdebase-runtime/slack-desc @@ -5,7 +5,7 @@ # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -kdebase-runtime: kdebase-runtime +kdebase-runtime: kdebase-runtime (KDE runtime core) kdebase-runtime: kdebase-runtime: This package contains core components of the KDE base runtime module. kdebase-runtime: diff --git a/source/kde/kdebase-workspace/kcmshell_root_privilege.patch b/source/kde/kdebase-workspace/kcmshell_root_privilege.patch new file mode 100644 index 000000000..f81a98ed9 --- /dev/null +++ b/source/kde/kdebase-workspace/kcmshell_root_privilege.patch @@ -0,0 +1,43 @@ +--- kdebase-workspace-4.3.85/systemsettings/core/ModuleView.cpp~ 2009-12-11 00:14:03.000000000 +0100 ++++ kdebase-workspace-4.3.85/systemsettings/core/ModuleView.cpp 2009-12-22 15:47:35.000000000 +0100 +@@ -40,6 +40,7 @@ + #include <KCModuleProxy> + #include <KStandardGuiItem> + #include <KDialogButtonBox> ++#include <KStandardDirs> + #include <kauthaction.h> + + #include "MenuItem.h" +@@ -129,6 +130,32 @@ + return; + } + ++ if ( menuItem->service()->property( "X-KDE-RootOnly", QVariant::Bool ).toBool() ) { ++ QString kdesu = KStandardDirs::findExe( "kdesu" ); ++ QString cmd = menuItem->service()->exec().trimmed(); ++ ++ /* Prepare the process to run the kcmshell */ ++ if ( cmd.left(5) == "kdesu" ) ++ { ++ cmd = cmd.remove(0,5).trimmed(); ++ ++ /* Remove all kdesu switches */ ++ while ( cmd.length() > 1 && cmd[ 0 ] == '-' ) ++ cmd = cmd.remove( 0, cmd.indexOf( ' ' ) ).trimmed(); ++ } ++ ++ if ( cmd.left(9) == "kcmshell4" ) ++ cmd = cmd.remove(0,9).trimmed(); ++ ++ QStringList args; ++ args << "-i" << QString( menuItem->service()->icon() ) << "-c" << QString( "%1 %2 --lang %3" ).arg( KStandardDirs::locate("exe", "kcmshell4") ).arg( cmd ).arg( KGlobal::locale()->language() ); ++ ++ kDebug() << "Starting root module: " << args; ++ QProcess::startDetached( kdesu, args ); ++ ++ return; ++ } ++ + QList<KCModuleInfo*> modules; + if ( menuItem->children().empty() ) { + modules << &menuItem->item(); diff --git a/source/kde/kdebase-workspace/kdebase-workspace.SlackBuild b/source/kde/kdebase-workspace/kdebase-workspace.SlackBuild index 63e5b2512..1dd46d610 100755 --- a/source/kde/kdebase-workspace/kdebase-workspace.SlackBuild +++ b/source/kde/kdebase-workspace/kdebase-workspace.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -53,9 +53,15 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +cat $CWD/kcmshell_root_privilege.patch | patch -p1 --verbose || exit 1 + +# Increase the timeout to accomodate slow-to-initialize video chipset drivers: +zcat $CWD/kdebase-workspace.kdm.server.timeout.diff.gz | patch -p1 --verbose || exit 1 + mkdir -p build cd build cmake \ + $KDE_OPT_ARGS \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ @@ -72,6 +78,8 @@ if [ -d $PKG/usr/man ]; then gzip -9 $PKG/usr/man/man?/* fi +# Use ck-launch-session in runlevel 3, +# to start and attach a ConsoleKit session to the X session: mkdir -p $PKG/etc/X11/xinit cat $CWD/xinit/xinitrc.kde > $PKG/etc/X11/xinit/xinitrc.kde chmod 0755 $PKG/etc/X11/xinit/xinitrc.kde @@ -96,6 +104,9 @@ mkdir -p $PKG/etc/kde mv $PKG/usr/share/config/kdm $PKG/etc/kde ( cd $PKG/usr/share/config ; ln -sf ../../../etc/kde/kdm . ) +# Move the polkit dbus configuration files to the proper place: +mv $PKG/etc/kde/dbus-1 $PKG/etc/ + # This is fubar: rm -f $PKG/usr/share/icons/hicolor/index.theme diff --git a/source/kde/kdebase-workspace/kdebase-workspace.kdm.server.timeout.diff b/source/kde/kdebase-workspace/kdebase-workspace.kdm.server.timeout.diff new file mode 100644 index 000000000..56deff547 --- /dev/null +++ b/source/kde/kdebase-workspace/kdebase-workspace.kdm.server.timeout.diff @@ -0,0 +1,14 @@ +--- ./kdm/config.def.orig 2010-02-26 12:32:20.000000000 -0600 ++++ ./kdm/config.def 2010-05-03 22:11:48.000000000 -0500 +@@ -1332,9 +1332,9 @@ + + Key: ServerTimeout + Type: int +-Default: 15 ++Default: 45 + User: core +-Instance: #:*/ ++Instance: :*/ + Comment: + How long to wait for a local &X-Server; to come up. + Description: diff --git a/source/kde/kdebase-workspace/slack-desc b/source/kde/kdebase-workspace/slack-desc index e828d208f..87f2c4182 100644 --- a/source/kde/kdebase-workspace/slack-desc +++ b/source/kde/kdebase-workspace/slack-desc @@ -1,8 +1,8 @@ |-----handy-ruler------------------------------------------------------| -kdebase-workspace: kdebase-workspace - the KDE Workspace +kdebase-workspace: kdebase-workspace (KDE Plasma Desktop) kdebase-workspace: -kdebase-workspace: The KDE Workspace (kdebase-workspace) package consists of what is -kdebase-workspace: essentially the KDE workspace presented to the user. +kdebase-workspace: This package provides the essential parts of the KDE Plasma Desktop +kdebase-workspace: that are presented to the user. kdebase-workspace: kdebase-workspace: kdebase-workspace: diff --git a/source/kde/kdebase-workspace/xinit/xinitrc.kde b/source/kde/kdebase-workspace/xinit/xinitrc.kde index 2fda1fab2..5e11a9ac7 100755 --- a/source/kde/kdebase-workspace/xinit/xinitrc.kde +++ b/source/kde/kdebase-workspace/xinit/xinitrc.kde @@ -25,4 +25,4 @@ if [ -f $usermodmap ]; then fi # Start the window manager: -startkde +ck-launch-session startkde diff --git a/source/kde/kdebase/kdebase.SlackBuild b/source/kde/kdebase/kdebase.SlackBuild index 54a01f2a7..89ff3a503 100755 --- a/source/kde/kdebase/kdebase.SlackBuild +++ b/source/kde/kdebase/kdebase.SlackBuild @@ -46,6 +46,7 @@ cd $TMP echo "Building kdebase-$VERSION..." tar xvf $CWD/../src/kdebase-$VERSION.tar.?z* || exit 1 cd kdebase-$VERSION + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -56,6 +57,7 @@ find . \ mkdir -p build cd build cmake \ + $KDE_OPT_ARGS \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ @@ -63,6 +65,7 @@ cd build -DMAN_INSTALL_DIR=/usr/man \ -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DRUN_KAPPFINDER=ON \ .. make $NUMJOBS || exit 1 make install DESTDIR=$PKG || exit 1 @@ -84,7 +87,7 @@ chmod 0755 $PKG/etc/profile.d/* # still documented in the help manual. Here's a way to get the same # thing, and it works here, but I honestly don't know how it will act # everywhere with every shell. I just know it works with bash and ksh -sed -i 's/Exec=konsole/Exec=konsole -e $SHELL -l/' \ +sed -i -e 's/Exec=konsole/Exec=konsole -e $SHELL -l/' \ $PKG/usr/share/applications/kde4/konsole.desktop ## I find this a little bit too bright... <change by pjv> diff --git a/source/kde/kdebase/module_manager_include.diff b/source/kde/kdebase/module_manager_include.diff new file mode 100644 index 000000000..498b2afb0 --- /dev/null +++ b/source/kde/kdebase/module_manager_include.diff @@ -0,0 +1,19 @@ +--- trunk/KDE/kdebase/apps/konqueror/sidebar/module_manager.h 2009/11/13 18:46:51 1048689 ++++ trunk/KDE/kdebase/apps/konqueror/sidebar/module_manager.h 2010/01/07 20:09:11 1071281 +@@ -18,6 +18,9 @@ + Boston, MA 02110-1301, USA. + */ + ++#ifndef MODULE_MANAGER_H ++#define MODULE_MANAGER_H ++ + #include <QStringList> + #include <kservice.h> + class KConfigGroup; +@@ -74,3 +77,5 @@ + KConfigGroup *m_config; // owned by SidebarWidget + QString m_localPath; // local path + }; ++ ++#endif + diff --git a/source/kde/kdebase/slack-desc b/source/kde/kdebase/slack-desc index 34e3c5d08..bf91423e9 100644 --- a/source/kde/kdebase/slack-desc +++ b/source/kde/kdebase/slack-desc @@ -6,11 +6,11 @@ # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -kdebase: kdebase (KDE base package) +kdebase: kdebase (KDE core applications and files) +kdebase: +kdebase: This package provides the core applications and infrastructure files +kdebase: for the KDE Plasma Desktop. kdebase: -kdebase: kdebase is the second mandatory package (besides kdelibs) for the -kdebase: K Desktop Environment. Here we have various applications and -kdebase: infrastructure files and libraries. kdebase: kdebase: kdebase: diff --git a/source/kde/kdebase-runtime/local.options b/source/kde/kdebindings/local.options index aae3c765c..aae3c765c 100644 --- a/source/kde/kdebase-runtime/local.options +++ b/source/kde/kdebindings/local.options |