summaryrefslogtreecommitdiffstats
path: root/source/kde/kdelibs
diff options
context:
space:
mode:
Diffstat (limited to 'source/kde/kdelibs')
-rw-r--r--source/kde/kdelibs/fixPopupForPlasmaboard.diff43
-rwxr-xr-xsource/kde/kdelibs/kdelibs.SlackBuild11
-rw-r--r--source/kde/kdelibs/kdesu-allow_NOPASS_in_suauth.patch135
-rw-r--r--source/kde/kdelibs/local.options1
-rw-r--r--source/kde/kdelibs/slack-desc2
5 files changed, 57 insertions, 135 deletions
diff --git a/source/kde/kdelibs/fixPopupForPlasmaboard.diff b/source/kde/kdelibs/fixPopupForPlasmaboard.diff
deleted file mode 100644
index cf6dec7ca..000000000
--- a/source/kde/kdelibs/fixPopupForPlasmaboard.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: kdelibs/plasma/popupapplet.cpp
-===================================================================
---- kdelibs/plasma/popupapplet.cpp (Revision 976120)
-+++ kdelibs/plasma/popupapplet.cpp (Arbeitskopie)
-@@ -275,11 +275,7 @@
- //stuff out of your Dialog (extenders). Monitor WindowDeactivate events so we can
- //emulate the same kind of behavior as Qt::Popup (close when you click somewhere
- //else.
-- dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
-- updateDialogFlags();
-- KWindowSystem::setState(dialog->winId(), NET::SkipTaskbar | NET::SkipPager);
-- dialog->installEventFilter(q);
--
-+
- q->setMinimumSize(QSize(0, 0));
- if (gWidget) {
- Corona *corona = qobject_cast<Corona *>(gWidget->scene());
-@@ -289,14 +285,25 @@
- corona->addOffscreenWidget(gWidget);
- dialog->setGraphicsWidget(gWidget);
- }
-+
-+ dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | (gWidget->windowFlags() & Qt::X11BypassWindowManagerHint));
- } else if (qWidget) {
- QVBoxLayout *l_layout = new QVBoxLayout(dialog);
- l_layout->setSpacing(0);
- l_layout->setMargin(0);
- l_layout->addWidget(qWidget);
- dialog->adjustSize();
-+
-+ dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | (qWidget->windowFlags() & Qt::X11BypassWindowManagerHint));
- }
-+ else {
-+ dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
-+ }
-+ updateDialogFlags();
-+ KWindowSystem::setState(dialog->winId(), NET::SkipTaskbar | NET::SkipPager);
-+ dialog->installEventFilter(q);
-
-+
- QObject::connect(dialog, SIGNAL(dialogResized()), q, SLOT(dialogSizeChanged()));
- QObject::connect(dialog, SIGNAL(dialogVisible(bool)), q, SLOT(dialogStatusChanged(bool)));
- }
diff --git a/source/kde/kdelibs/kdelibs.SlackBuild b/source/kde/kdelibs/kdelibs.SlackBuild
index 656ee6678..aa6ddde09 100755
--- a/source/kde/kdelibs/kdelibs.SlackBuild
+++ b/source/kde/kdelibs/kdelibs.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,11 +47,6 @@ echo "Building kdelibs-$VERSION..."
tar xvf $CWD/../src/kdelibs-$VERSION.tar.?z* || exit 1
cd kdelibs-$VERSION
-zcat $CWD/fixPopupForPlasmaboard.diff.gz | patch -p1 --verbose || exit 1
-( cd kdesu
- zcat $CWD/kdesu-allow_NOPASS_in_suauth.patch.gz | patch -p1 --verbose || exit 1
-) || exit 1
-
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -62,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 \
@@ -75,6 +71,9 @@ cd build
make install DESTDIR=$PKG || exit 1
cd -
+# Move the polkit dbus configuration files to the proper place:
+mv $PKG/etc/kde/dbus-1 $PKG/etc/
+
if [ -d $PKG/usr/man ]; then
gzip -9 $PKG/usr/man/man?/*
fi
diff --git a/source/kde/kdelibs/kdesu-allow_NOPASS_in_suauth.patch b/source/kde/kdelibs/kdesu-allow_NOPASS_in_suauth.patch
index 8d2168c3a..64b4d5af2 100644
--- a/source/kde/kdelibs/kdesu-allow_NOPASS_in_suauth.patch
+++ b/source/kde/kdelibs/kdesu-allow_NOPASS_in_suauth.patch
@@ -1,94 +1,61 @@
diff -Naur kdesu/stub.cpp kdesu.new/stub.cpp
--- kdesu/stub.cpp 2008-05-21 08:08:55.000000000 -0300
-+++ kdesu.new/stub.cpp 2009-08-06 04:06:43.000000000 -0300
-@@ -111,7 +111,7 @@
- if (line.isNull())
- return -1;
-
-- if (line == "kdesu_stub")
-+ if ((line == "kdesu_stub")||(line == "Password authentication bypassed."))
- {
- // This makes parsing a lot easier.
++++ kdesu.new/stub.cpp 2009-10-13 01:32:10.000000000 -0300
+@@ -105,6 +105,7 @@
+ int StubProcess::ConverseStub(int check)
+ {
+ QByteArray line, tmp;
++
+ while (1)
+ {
+ line = readLine();
+@@ -117,7 +118,17 @@
enableLocalEcho(false);
+ if (check) writeLine("stop");
+ else writeLine("ok");
+- } else if (line == "display") {
++ break;
++ }
++ }
++
++ while (1)
++ {
++ line = readLine();
++ if (line.isNull())
++ return -1;
++
++ if (line == "display") {
+ writeLine(display());
+ } else if (line == "display_auth") {
+ #ifdef Q_WS_X11
diff -Naur kdesu/su.cpp kdesu.new/su.cpp
--- kdesu/su.cpp 2008-05-21 08:08:55.000000000 -0300
-+++ kdesu.new/su.cpp 2009-08-06 04:10:55.000000000 -0300
-@@ -163,7 +163,7 @@
- }
- // kDebug(900) << k_lineinfo << "Done StubProcess::exec()";
-
-- SuErrors ret = (SuErrors) ConverseSU(password);
-+ SuErrors ret = (SuErrors) ConverseSU(password,check);
- // kDebug(900) << k_lineinfo << "Conversation returned " << ret;
-
- if (ret == error)
-@@ -172,6 +172,7 @@
- kError(900) << k_lineinfo << "Conversation with su failed\n";
- return ret;
- }
-+
- if (check == NeedPassword)
- {
- if (ret == killme)
-@@ -235,10 +236,10 @@
-
- /*
- * Conversation with su: feed the password.
--* Return values: -1 = error, 0 = ok, 1 = kill me, 2 not authorized
-+* Return values: -1 = error, 0 = ok, 1 = kill me, 2 = not authorized
- */
-
--int SuProcess::ConverseSU(const char *password)
-+int SuProcess::ConverseSU(const char *password, int check)
- {
- enum { WaitForPrompt, CheckStar, HandleStub } state = WaitForPrompt;
- int colon;
-@@ -265,6 +266,27 @@
- return ok;
- }
-
-+ if (line == "Password authentication bypassed.")
-+ {
-+ if (check == 2)
-+ {
-+ unreadLine(line);
-+ return ok;
-+ }
-+ else
-+ {
-+ if (checkPid(m_Pid))
-+ {
-+ state=HandleStub;
-+ }
-+ else
-+ {
-+ return error;
-+ }
-+ }
-+ break;
-+ }
-+
++++ kdesu.new/su.cpp 2009-10-19 00:21:31.000000000 -0200
+@@ -258,13 +258,6 @@
+ //////////////////////////////////////////////////////////////////////////
+ case WaitForPrompt:
+ {
+- // In case no password is needed.
+- if (line == "kdesu_stub")
+- {
+- unreadLine(line);
+- return ok;
+- }
+-
while(waitMS(fd(),100)>0)
{
// There is more output available, so the previous line
-@@ -293,7 +315,7 @@
+@@ -279,6 +272,13 @@
+ kDebug(900) << k_lineinfo << "Read line <" << more << ">";
}
- if ((colon == 1) && (line[j] == ':'))
- {
-- if (password == 0L)
-+ if (password == 0L)
- return killme;
- if (!checkPid(m_Pid))
- {
-diff -Naur kdesu/su.h kdesu.new/su.h
---- kdesu/su.h 2008-05-21 08:08:55.000000000 -0300
-+++ kdesu.new/su.h 2009-08-06 02:50:02.000000000 -0300
-@@ -62,7 +62,7 @@
-
- private:
- enum SuErrors { error=-1, ok=0, killme=1, notauthorized=2 } ;
-- int ConverseSU(const char *password);
-+ int ConverseSU(const char *password, int check=NoCheck);
- protected:
- virtual void virtual_hook( int id, void* data );
++ // In case no password is needed.
++ if (line == "kdesu_stub")
++ {
++ unreadLine(line);
++ return ok;
++ }
++
+ // Match "Password: " with the regex ^[^:]+:[\w]*$.
+ const uint len = line.length();
+ for (i=0,j=0,colon=0; i<len; i++)
diff --git a/source/kde/kdelibs/local.options b/source/kde/kdelibs/local.options
deleted file mode 100644
index a837340db..000000000
--- a/source/kde/kdelibs/local.options
+++ /dev/null
@@ -1 +0,0 @@
-BUILD=3
diff --git a/source/kde/kdelibs/slack-desc b/source/kde/kdelibs/slack-desc
index a07f7efff..a89ea3c8a 100644
--- a/source/kde/kdelibs/slack-desc
+++ b/source/kde/kdelibs/slack-desc
@@ -8,7 +8,7 @@
|-----handy-ruler------------------------------------------------------|
kdelibs: kdelibs (KDE libraries)
kdelibs:
-kdelibs: System libraries and other resources required by KDE.
+kdelibs: System libraries and other resources required for the KDE Platform.
kdelibs:
kdelibs:
kdelibs:
generated by cgit v1.2.3 (git 2.26.2) at 2024-04-28 18:34:07 +0000