rpms/kdebase-workspace/devel kdebase-workspace-4.4.80-battery-plasmoid-showremainingtime.patch, NONE, 1.1 kdebase-workspace-4.4.80-kdm_plymouth081.patch, NONE, 1.1 kdebase-workspace-4.4.80-redhat-startkde.patch, NONE, 1.1 .cvsignore, 1.52, 1.53 kdebase-workspace.spec, 1.395, 1.396 sources, 1.60, 1.61 kdebase-workspace-4.3.95-redhat-startkde.patch, 1.1, NONE kdebase-workspace-4.3.98-battery-plasmoid-showremainingtime.patch, 1.1, NONE kdebase-workspace-4.4.2-kdm_plymouth081.patch, 1.2, NONE
Jaroslav Reznik
jreznik at fedoraproject.org
Fri May 21 11:57:15 UTC 2010
Author: jreznik
Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6792
Modified Files:
.cvsignore kdebase-workspace.spec sources
Added Files:
kdebase-workspace-4.4.80-battery-plasmoid-showremainingtime.patch
kdebase-workspace-4.4.80-kdm_plymouth081.patch
kdebase-workspace-4.4.80-redhat-startkde.patch
Removed Files:
kdebase-workspace-4.3.95-redhat-startkde.patch
kdebase-workspace-4.3.98-battery-plasmoid-showremainingtime.patch
kdebase-workspace-4.4.2-kdm_plymouth081.patch
Log Message:
* Fri May 21 2010 Jaroslav Reznik <jreznik at redhat.com> - 4.4.80-1
- 4.5 Beta 1 (4.4.80)
kdebase-workspace-4.4.80-battery-plasmoid-showremainingtime.patch:
battery.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- NEW FILE kdebase-workspace-4.4.80-battery-plasmoid-showremainingtime.patch ---
diff -up kdebase-workspace-4.4.80/plasma/generic/applets/battery/battery.cpp.showremainingtime kdebase-workspace-4.4.80/plasma/generic/applets/battery/battery.cpp
--- kdebase-workspace-4.4.80/plasma/generic/applets/battery/battery.cpp.showremainingtime 2010-05-16 12:04:32.000000000 +0200
+++ kdebase-workspace-4.4.80/plasma/generic/applets/battery/battery.cpp 2010-05-21 12:46:26.437154419 +0200
@@ -688,7 +688,11 @@ void Battery::updateStatus()
m_acInfoLabel->setText(i18n("Not plugged in"));
}
- if (showRemainingTime && m_remainingMSecs > 0) {
+ // Always show the remaining time in the popup.
+ // We don't just set m_showRemainingTime to true by default because
+ // that'd try to use the time also for the icon. That won't fit on
+ // small panels.
+ if (m_remainingMSecs > 0) {
m_remainingTimeLabel->show();
m_remainingInfoLabel->show();
// we don't have too much accuracy so only give hours and minutes
kdebase-workspace-4.4.80-kdm_plymouth081.patch:
dm.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
dm.h | 4 ++
server.c | 5 ++
3 files changed, 122 insertions(+)
--- NEW FILE kdebase-workspace-4.4.80-kdm_plymouth081.patch ---
Description: Add support for smooth transition from Plymouth's bootsplash
If possible, KDM will try to deactivate plymouth, start X (with -nr) on
the active vt and leave the bootsplash on the screen until the graphical
login takes place.
Forwarded: no
Bug: https://bugs.launchpad.net/ubuntu/+source/kdebase-workspace/+bug/540177
Author: Alberto Milone <alberto.milone at canonical.com>
Bulletproof X bits (cf. kubuntu_33_kdm_bulletproof_x.diff) ripped out by
Kevin Kofler <Kevin at tigcc.ticalc.org>
diff -up kdebase-workspace-4.4.80/kdm/backend/dm.c.kdm_plymouth kdebase-workspace-4.4.80/kdm/backend/dm.c
--- kdebase-workspace-4.4.80/kdm/backend/dm.c.kdm_plymouth 2010-03-03 19:26:52.000000000 +0100
+++ kdebase-workspace-4.4.80/kdm/backend/dm.c 2010-05-21 12:56:02.652091933 +0200
@@ -1328,6 +1328,81 @@ getBusyVTs( void )
return activeVTs;
}
+static int
+get_active_vt (void)
+{
+ int console_fd;
+ struct vt_stat console_state = { 0 };
+ console_fd = open ("/dev/tty0", O_RDONLY | O_NOCTTY);
+ if (console_fd < 0) {
+ goto out;
+ }
+ if (ioctl (console_fd, VT_GETSTATE, &console_state) < 0) {
+ goto out;
+ }
+out:
+ if (console_fd >= 0) {
+ close (console_fd);
+ }
+ return console_state.v_active;
+}
+
+static int
+plymouth_is_running (void)
+{
+ int status;
+ status = system ("/bin/plymouth --ping");
+
+ return WIFEXITED (status) && WEXITSTATUS (status) == 0;
+}
+
+static int
+plymouth_has_active_vt (void)
+{
+ int status;
+ status = system ("/bin/plymouth --has-active-vt");
+
+ return WIFEXITED (status) && WEXITSTATUS (status) == 0;
+}
+
+static int
+plymouth_prepare_for_transition (void)
+{
+ int status;
+ status = system ("/bin/plymouth deactivate");
+
+ return WIFEXITED (status) && WEXITSTATUS (status) == 0;
+}
+
+int
+plymouth_quit_with_transition (void)
+{
+ int status;
+ status = system ("/bin/plymouth quit --retain-splash");
+
+ return WIFEXITED (status) && WEXITSTATUS (status) == 0;
+}
+
+static int
+plymouth_quit_without_transition (void)
+{
+ int status;
+ status = system ("/bin/plymouth quit");
+
+ return WIFEXITED (status) && WEXITSTATUS (status) == 0;
+}
+
+static int
+triggered_to_force_display_on_active_vt (void)
+{
+ int should_force_display_on_active_vt;
+ should_force_display_on_active_vt=open("/var/spool/gdm/force-display-on-active-vt", O_RDONLY);
+ if ( should_force_display_on_active_vt >= 0 )
+ close(should_force_display_on_active_vt);
+ unlink("/var/spool/gdm/force-display-on-active-vt");
+ return should_force_display_on_active_vt;
+}
+
static void
allocateVT( struct display *d )
{
@@ -1337,6 +1412,44 @@ allocateVT( struct display *d )
if ((d->displayType & d_location) == dLocal &&
d->status == notRunning && !d->serverVT && d->reqSrvVT >= 0)
{
+
+ /* check for pymouth using old/deprecated method first */
+ if ( triggered_to_force_display_on_active_vt() >= 0 ) {
+ int vt;
+ vt = get_active_vt();
+ if (vt > 0) {
+ d->serverVT = vt;
+ return;
+ }
+ }
+
+ /* check for plymouth using newer methods */
+ d->plymouth_is_running = plymouth_is_running ();
+ if (d->plymouth_is_running) {
+ /* call plymouth deactivate */
+ plymouth_prepare_for_transition ();
+ if (plymouth_has_active_vt ()) {
+ /* plymouth was displaying a splash screen and has
+ * terminated leaving it on screen
+ */
+ int vt;
+ vt = get_active_vt ();
+ if (vt > 0) {
+ /* start the X server on the active vt */
+ d->serverVT = vt;
+ return;
+ }
+ }
+ else {
+ /* plymouth might have been running but did not display
+ * a splash screen.
+ */
+
+ /* call plymouth quit and start the X server as usual */
+ d->plymouth_is_running = !plymouth_quit_without_transition ();
+ }
+ }
+
if (d->reqSrvVT && d->reqSrvVT < 16)
d->serverVT = d->reqSrvVT;
else {
diff -up kdebase-workspace-4.4.80/kdm/backend/dm.h.kdm_plymouth kdebase-workspace-4.4.80/kdm/backend/dm.h
--- kdebase-workspace-4.4.80/kdm/backend/dm.h.kdm_plymouth 2010-04-15 10:59:31.000000000 +0200
+++ kdebase-workspace-4.4.80/kdm/backend/dm.h 2010-05-21 13:07:19.025216900 +0200
@@ -292,6 +292,8 @@ struct display {
int authNum; /* number of authorizations */
char *authFile; /* file to store authorization in */
char *greeterAuthFile; /* file to store authorization for greeter in */
+
+ int plymouth_is_running; /* Plymouth's status */
};
#define d_location 1
@@ -404,6 +406,8 @@ int anyDisplaysLeft( void );
void forEachDisplay( void (*f)( struct display * ) );
#ifdef HAVE_VTS
void forEachDisplayRev( void (*f)( struct display * ) );
+/* function for plymouth */
+int plymouth_quit_with_transition (void);
#endif
void removeDisplay( struct display *old );
struct display
diff -up kdebase-workspace-4.4.80/kdm/backend/server.c.kdm_plymouth kdebase-workspace-4.4.80/kdm/backend/server.c
--- kdebase-workspace-4.4.80/kdm/backend/server.c.kdm_plymouth 2010-05-16 12:04:29.000000000 +0200
+++ kdebase-workspace-4.4.80/kdm/backend/server.c 2010-05-21 12:56:02.653092289 +0200
@@ -139,6 +139,11 @@ startServerSuccess()
struct display *d = startingServer;
d->serverStatus = ignore;
serverTimeout = TO_INF;
+ if (d->plymouth_is_running) {
+ debug( "Quitting Plymouth with transition\n" );
+ d->plymouth_is_running = !plymouth_quit_with_transition ();
+ debug ("Is Plymouth still running? %s\n", d->plymouth_is_running ? "yes" : "no");
+ }
debug( "X server ready, starting session\n" );
startDisplayP2( d );
}
kdebase-workspace-4.4.80-redhat-startkde.patch:
startkde.cmake | 63 ++++++++++++++++++++++++++++++++++++++-------------------
1 file changed, 43 insertions(+), 20 deletions(-)
--- NEW FILE kdebase-workspace-4.4.80-redhat-startkde.patch ---
diff -up kdebase-workspace-4.4.80/startkde.cmake.redhat-startkde kdebase-workspace-4.4.80/startkde.cmake
--- kdebase-workspace-4.4.80/startkde.cmake.redhat-startkde 2010-03-10 11:42:55.000000000 +0100
+++ kdebase-workspace-4.4.80/startkde.cmake 2010-05-21 12:36:47.953154458 +0200
@@ -25,12 +25,12 @@ elif test $kcheckrunning_result -eq 2 ;
exit 1
fi
-# Set the background to plain grey.
+# Set the background to the Red Hat default.
# The standard X background is nasty, causing moire effects and exploding
# people's heads. We use colours from the standard KDE palette for those with
# palettised displays.
if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
- xsetroot -solid "#000000"
+ xsetroot -solid "#103D77"
fi
# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
@@ -48,22 +48,6 @@ if [ "x$MALLOC_CHECK_" = "x" ] && [ -x /
export MALLOC_CHECK_
fi
-# in case we have been started with full pathname spec without being in PATH
-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
-if [ -n "$bindir" ]; then
- qbindir=`$bindir/kde4-config --qt-binaries`
- if [ -n "$qbindir" ]; then
- case $PATH in
- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
- *) PATH=$qbindir:$PATH; export PATH;;
- esac
- fi
- case $PATH in
- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
- *) PATH=$bindir:$PATH; export PATH;;
- esac
-fi
-
# Boot sequence:
#
# kdeinit is used to fork off processes which improves memory usage
@@ -84,6 +68,35 @@ fi
kdehome=$HOME/@KDE_DEFAULT_HOME@
test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
+# Read LANG and write the country part to kdeglobals
+# de_AT.UTF-8 => Country=at
+# This is necessary because klocale.cpp (kdelibs) does only try to read the value
+# from kdeglobals and then falls back to default instead of triyng to detect it
+
+if [ ! -e $kdehome/share/config/kdeglobals ] || [ ! `grep "Country=" $kdehome/share/config/kdeglobals` ]; then
+ if [ ! $LANG ]; then
+ if [ -e /etc/default/locale ]; then
+ localefile='/etc/default/locale'
+ elif [ -e /etc/environment ]; then
+ localefile='/etc/environment'
+ fi
+ if [ $localefile ]; then
+ locale=`sed -ne 's/^LANG="\(.*\)"$/\1/p' $localefile`
+ fi
+ else
+ locale=$LANG
+ fi
+ if [ $locale ]; then
+ country=`echo $locale | sed -ne 's/^[A-Za-z]*_\([A-Za-z]*\).*$/\1/p'|tr 'A-Z' 'a-z'`
+ if [ ! $country = "" ]; then
+cat >>$kdehome/share/config/kdeglobals <<EOF
+[Locale]
+Country=$country
+EOF
+ fi
+ fi
+fi
+
# see kstartupconfig source for usage
mkdir -m 700 -p $kdehome
mkdir -m 700 -p $kdehome/share
@@ -100,7 +113,15 @@ kcmrandrrc [Screen2]
kcmrandrrc [Screen3]
kcmfonts General forceFontDPI 0
kdeglobals Locale Language '' # trigger requesting languages from KLocale
+kdeglobals Locale Country ''
EOF
+# read the default KSplash theme to use out of kde-settings
+if [ -e /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc ]
+ then eval `grep '^Theme=' /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc`
+ if [ -n "$Theme" ]
+ then sed -i -e "s/Default/$Theme/g" $kdehome/share/config/startupconfigkeys
+ fi
+fi
kstartupconfig4
returncode=$?
if test $returncode -ne 0; then
@@ -221,8 +242,9 @@ fi
# better use the Autostart folder.
libpath=`kde4-config --path lib | tr : '\n'`
+envpath=/etc/kde/env/
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'` $envpath ; do
for file in "$prefix"*.sh; do
test -r "$file" && . "$file"
done
@@ -435,7 +457,8 @@ kde3 dcopserver_shutdown --wait 2>/dev/n
echo 'startkde: Running shutdown scripts...' 1>&2
# Run scripts found in $KDEDIRS/shutdown
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'`; do
+shutdownpath=/etc/kde/shutdown/
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'` $shutdownpath; do
for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
test -x "$prefix$file" && "$prefix$file"
done
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore 30 Apr 2010 14:10:41 -0000 1.52
+++ .cvsignore 21 May 2010 11:57:14 -0000 1.53
@@ -1 +1 @@
-kdebase-workspace-4.4.3.tar.bz2
+kdebase-workspace-4.4.80.tar.bz2
Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -p -r1.395 -r1.396
--- kdebase-workspace.spec 8 May 2010 21:27:24 -0000 1.395
+++ kdebase-workspace.spec 21 May 2010 11:57:14 -0000 1.396
@@ -15,8 +15,8 @@
Summary: KDE Workspace
Name: kdebase-workspace
-Version: 4.4.3
-Release: 2%{?dist}
+Version: 4.4.80
+Release: 1%{?dist}
License: GPLv2
Group: User Interface/Desktops
@@ -24,7 +24,7 @@ URL: http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: kdebase-workspace-4.3.95-redhat-startkde.patch
+Patch1: kdebase-workspace-4.4.80-redhat-startkde.patch
Patch2: kdebase-workspace-4.3.98-plasma-konsole.patch
Patch3: kdebase-workspace-4.3.75-show_systemsettings.patch
%if 0%{?polkit_1}
@@ -44,14 +44,14 @@ Patch13: kdebase-workspace-4.2.0-pykde4.
Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
Patch15: kdebase-workspace-4.3.75-kio_sysinfo.patch
# show the remaining time in the battery plasmoid's popup (#515166)
-Patch16: kdebase-workspace-4.3.98-battery-plasmoid-showremainingtime.patch
+Patch16: kdebase-workspace-4.4.80-battery-plasmoid-showremainingtime.patch
# allow adding a "Leave..." button which brings up the complete shutdown dialog
# to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
# default Leave submenu
Patch17: kdebase-workspace-4.4.0-classicmenu-logout.patch
Patch18: kdebase-workspace-4.4.2-kdm_plymouth.patch
# kubuntu kudos! bulletproof-X bits ripped out
-Patch19: kdebase-workspace-4.4.2-kdm_plymouth081.patch
+Patch19: kdebase-workspace-4.4.80-kdm_plymouth081.patch
Patch20: kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch
# support the widgetStyle4 hack in the Qt KDE platform plugin
Patch21: kdebase-workspace-4.3.98-platformplugin-widgetstyle4.patch
@@ -61,10 +61,6 @@ Patch22: kdebase-workspace-4.4.0-classic
# upstreamable patches:
# "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
Patch50: kdebase-workspace-4.3.3-kde#171685.patch
-# kubuntu working to upstream this
-# FIXME: Not upstreamed yet --Ben (4.3.80)
-#Patch51: http://bazaar.launchpad.net/~kubuntu-members/kdebase-workspace/ubuntu/annotate/head%3A/debian/patches/kubuntu_101_brightness_fn_keys_and_osd.diff
-Patch51: kdebase-workspace-4.3.95-brightness_keys.patch
# 4.4 patches
@@ -326,8 +322,6 @@ Requires: akonadi
# upstream patches
%patch50 -p1 -b .kde#171685
-# kubuntu patches
-%patch51 -p1 -b .brightness_keys
# 4.4 patches
@@ -681,6 +675,9 @@ fi
%changelog
+* Fri May 21 2010 Jaroslav Reznik <jreznik at redhat.com> - 4.4.80-1
+- 4.5 Beta 1 (4.4.80)
+
* Sat May 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-2
- rebuild (gpsd,kdelibs)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources 30 Apr 2010 14:10:41 -0000 1.60
+++ sources 21 May 2010 11:57:15 -0000 1.61
@@ -1 +1 @@
-c334e70b425cbae2efc5a7e7dda4365f kdebase-workspace-4.4.3.tar.bz2
+21f0c3e5f97ce525d5090ab0538c805a kdebase-workspace-4.4.80.tar.bz2
--- kdebase-workspace-4.3.95-redhat-startkde.patch DELETED ---
--- kdebase-workspace-4.3.98-battery-plasmoid-showremainingtime.patch DELETED ---
--- kdebase-workspace-4.4.2-kdm_plymouth081.patch DELETED ---
More information about the scm-commits
mailing list