Djam/kdebase4-workspace
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/kdebase4-workspace.git synced 2025-02-24 10:12:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

New version 4.11.10, drop no longer needed patches (sync with Cooker)

Browse source
This commit is contained in:
Andrey Bondrov 2014-06-16 17:56:49 +11:00
parent 6edcab6b4e
commit 32d4a99301
5 changed files with 11 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,3 +1,3 @@
sources:
kdebase-workspace-kdm-2.7.2.tar.bz2: b5cfb60419c724831941fb724d4148987adc40ba
kde-workspace-4.11.8.tar.xz: e44b73ea1e2446258882d10694ca2896e1cc6b17
kde-workspace-4.11.10.tar.xz: 2968043563e25d2d2618c9f49fdfbab5fa14c8cd

20
kde-workspace-4.10.3-powerdevil-systemd.patch
View file

@ -1,20 +0,0 @@
--- a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp 2013-05-03 08:36:45.000000000 +0400
+++ b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp 2013-05-22 11:42:45.033840636 +0400
@@ -138,7 +138,7 @@
// Supported suspend methods
SuspendMethods supported = UnknownSuspendMethod;
- if (m_login1Interface && checkSystemdVersion(195)) {
+ if (m_login1Interface && checkSystemdVersion(194)) {
QDBusPendingReply<QString> canSuspend = m_login1Interface.data()->asyncCall("CanSuspend");
canSuspend.waitForFinished();
if (canSuspend.isValid() && (canSuspend.value() == "yes" || canSuspend.value() == "challenge"))
@@ -291,7 +291,7 @@
KJob* PowerDevilUPowerBackend::suspend(PowerDevil::BackendInterface::SuspendMethod method)
{
- if (m_login1Interface && checkSystemdVersion(195)) {
+ if (m_login1Interface && checkSystemdVersion(194)) {
return new Login1SuspendJob(m_login1Interface.data(), method, supportedSuspendMethods());
} else {
return new UPowerSuspendJob(m_upowerInterface, method, supportedSuspendMethods());

11
kdebase-workspace-4.8.2-hide-trash.patch
View file

@ -1,11 +0,0 @@
diff -urN kde-workspace-4.8.2.orig/plasma/desktop/applets/trash/plasma-applet-trash.desktop kde-workspace-4.8.2/plasma/desktop/applets/trash/plasma-applet-trash.desktop
--- kde-workspace-4.8.2.orig/plasma/desktop/applets/trash/plasma-applet-trash.desktop 2012-03-30 04:02:31.000000000 +0600
+++ kde-workspace-4.8.2/plasma/desktop/applets/trash/plasma-applet-trash.desktop 2012-04-24 12:13:13.762087732 +0600
@@ -154,6 +154,7 @@
Comment[zh_TW]=存取已刪除的項目
Type=Service
Icon=user-trash
+NoDisplay=true
X-KDE-ServiceTypes=Plasma/Applet
X-KDE-Library=plasma_applet_trash

116
kdebase4-workspace-4.11.8-fix-screenlocker-ulock.patch
View file

@ -1,116 +0,0 @@
diff --git ksmserver/screenlocker/greeter/greeterapp.cpp ksmserver/screenlocker/greeter/greeterapp.cpp
index c5e2f85..475d223 100644
--- ksmserver/screenlocker/greeter/greeterapp.cpp
+++ ksmserver/screenlocker/greeter/greeterapp.cpp
@@ -383,6 +383,12 @@ void UnlockApp::setImmediateLock(bool immediate)
m_immediateLock = immediate;
}
+void UnlockApp::switchToImmediateLock()
+{
+ setImmediateLock(true);
+ setLockedPropertyOnViews();
+}
+
bool UnlockApp::eventFilter(QObject *obj, QEvent *event)
{
if (obj != this && event->type() == QEvent::Show) {
diff --git ksmserver/screenlocker/greeter/greeterapp.h ksmserver/screenlocker/greeter/greeterapp.h
index 8b79188..895337e 100644
--- ksmserver/screenlocker/greeter/greeterapp.h
+++ ksmserver/screenlocker/greeter/greeterapp.h
@@ -44,6 +44,7 @@ public:
void setTesting(bool enable);
void setImmediateLock(bool immediateLock);
+ void switchToImmediateLock();
public Q_SLOTS:
void desktopResized();
diff --git ksmserver/screenlocker/greeter/main.cpp ksmserver/screenlocker/greeter/main.cpp
index d898734..d5c6a2b 100644
--- ksmserver/screenlocker/greeter/main.cpp
+++ ksmserver/screenlocker/greeter/main.cpp
@@ -24,11 +24,28 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
+#include <signal.h>
+
#include "greeterapp.h"
static const char description[] = I18N_NOOP( "Greeter for the KDE Plasma Workspaces Screen locker" );
static const char version[] = "0.1";
+ScreenLocker::UnlockApp *m_instance;
+
+static void signalhandler(int signum)
+{
+ switch(signum)
+ {
+ case SIGTERM: //SIGHUP:
+ m_instance->exit(1);
+ break;
+ case SIGUSR1:
+ m_instance->switchToImmediateLock();
+ break;
+ }
+}
+
int main(int argc, char* argv[])
{
KAboutData aboutData( "kscreenlocker_greet", 0, ki18n( "KScreenLocker Greeter" ),
@@ -60,6 +77,7 @@ int main(int argc, char* argv[])
KCmdLineArgs::addCmdLineOptions(options);
ScreenLocker::UnlockApp app;
+ m_instance = &app;
KGlobal::locale()->insertCatalog(QLatin1String( "libkworkspace" ));
app.disableSessionManagement(); // manually-started
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
@@ -75,5 +93,12 @@ int main(int argc, char* argv[])
// This allow ksmserver to know when the applicaion has actually finished setting itself up.
// Crucial for blocking until it is ready, ensuring locking happens before sleep, e.g.
std::cout << "Locked at " << QDateTime::currentDateTime().toTime_t() << std::endl;
+
+ struct sigaction sa;
+ sa.sa_handler = signalhandler;
+ sigemptyset(&sa.sa_mask);
+ sa.sa_flags = 0;
+ sigaction(SIGTERM /*SIGHUP*/, &sa, 0);
+ sigaction(SIGUSR1, &sa, 0);
return app.exec();
}
diff --git ksmserver/screenlocker/ksldapp.cpp ksmserver/screenlocker/ksldapp.cpp
index 3dfcc9e..d43fde7 100644
--- ksmserver/screenlocker/ksldapp.cpp
+++ ksmserver/screenlocker/ksldapp.cpp
@@ -46,6 +46,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <X11/Xlib.h>
// other
#include <unistd.h>
+#include <signal.h>
namespace ScreenLocker
{
@@ -174,6 +175,10 @@ void KSldApp::lock(bool immediateLock)
// already locked or acquiring lock, no need to lock again
// but make sure it's really locked
endGraceTime();
+ if (immediateLock) {
+ // signal the greeter to switch to immediateLock mode
+ kill(m_lockProcess->pid(), SIGUSR1);
+ }
return;
}
@@ -369,7 +374,8 @@ void KSldApp::unlock()
return;
}
s_graceTimeKill = true;
- m_lockProcess->kill();
+ // signal greeter to quit
+ m_lockProcess->terminate(); //kill(m_lockProcess->pid(), SIGHUP);
}
void KSldApp::inhibit()

27
kdebase4-workspace.spec
View file

@ -11,8 +11,8 @@
Summary: KDE 4 application workspace components
Name: kdebase4-workspace
Version: 4.11.8
Release: 3
Version: 4.11.10
Release: 1
Epoch: 2
License: GPLv2+
Group: Graphical desktop/KDE
@ -51,12 +51,6 @@ Patch6: kde-workspace-4.10.3-pager-icons.patch
Patch7: kde-workspace-4.10.3-devicenotifier.patch
# Fix screenlocker greeter focus after Alt modifier is pressed (keyboard layout switching etc)
Patch8: kde-workspace-4.10.3-greeter.patch
# Patch from OpenSUSE, fixes 2 issues:
# * password input dialog was not shown under certain circumstances
# (kde#327947, kde#329076, bnc#864305)
# * screensaver processes might keep running in background when
# unlocking the screen (kde#224200, bnc#809835)
Patch9: kdebase4-workspace-4.11.8-fix-screenlocker-ulock.patch
# Prefer system locale for KDM when reading it from KDM config fails
Patch10: kde-workspace-4.10.3-fix-kcmkdm-locale.patch
Patch11: kdebase-workspace-4.2.0-fix_gtkrc_iaora.patch
@ -78,11 +72,8 @@ Patch27: kde-workspace-4.11.6-dbus-wallpaper.patch
Patch50: kde-workspace-4.11.3-decorations.patch
Patch100: kdebase-workspace-4.8.1-hideklipper.patch
Patch101: kdebase-workspace-4.8.97-klippermenu.patch
Patch103: kdebase-workspace-4.8.2-hide-trash.patch
Patch104: kdebase-workspace-4.7.3.fedora-kdm-plymouth.patch
Patch106: kdebase-workspace-4.11.0-no-hal.patch
# Make systemd 194 handle upower stuff
Patch107: kde-workspace-4.10.3-powerdevil-systemd.patch
# Backports
@ -124,6 +115,7 @@ BuildRequires: pkgconfig(lua)
%if %{with_networkmanager}
BuildRequires: pkgconfig(NetworkManager)
%endif
BuildRequires: pkgconfig(python)
BuildRequires: pkgconfig(qimageblitz)
BuildRequires: pkgconfig(smbclient)
BuildRequires: pkgconfig(xcb-image)
@ -1546,7 +1538,6 @@ based on kdebase.
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p0
%patch10 -p1
%patch11 -p1
%patch12 -p1
@ -1559,14 +1550,9 @@ based on kdebase.
%patch50 -p1
%patch100 -p1
%patch101 -p1
%patch103 -p1
%patch104 -p1
%patch106 -p1
%if %{mdvver} == 201210
%patch107 -p1
%endif
rm -fr kdm/kfrontend libs/kdm
tar xf %{SOURCE6}
@ -1664,6 +1650,13 @@ for f in %{buildroot}%{_kde_applicationsdir}/*.desktop ; do
done
%changelog
* Thu Jun 12 2014 Andrey Bondrov <andrey.bondrov@rosalab.ru> 2:4.11.10-1
- New version 4.11.10
- Drop hide-trash patch because of OpenMandriva bug #770
- Drop no longer needed fix-screenlocker-ulock patch
- Drop no longer needed powerdevil-systemd patch
- Add pkgconfig(python) to BuildRequires
* Tue Apr 08 2014 Andrey Bondrov <andrey.bondrov@rosalab.ru> 2:4.11.8-2
- Add fix-screenlocker-ulock patch from OpenSUSE to fix issues with unlock