rev 8703 - in branches/kde4/packages/kdebase-workspace/debian: . patches
Armin Berres
trigger-guest at alioth.debian.org
Wed Jan 2 15:31:17 UTC 2008
Author: trigger-guest
Date: 2008-01-02 15:31:17 +0000 (Wed, 02 Jan 2008)
New Revision: 8703
Modified:
branches/kde4/packages/kdebase-workspace/debian/changelog
branches/kde4/packages/kdebase-workspace/debian/control
branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install
branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-dev.install
branches/kde4/packages/kdebase-workspace/debian/kdm.install
branches/kde4/packages/kdebase-workspace/debian/klipper.install
branches/kde4/packages/kdebase-workspace/debian/libplasma-dev.install
branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff
branches/kde4/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff
branches/kde4/packages/kdebase-workspace/debian/patches/15_revert_kgreeter.cpp_to_rc2.diff
branches/kde4/packages/kdebase-workspace/debian/patches/series
Log:
update for lates snapshot
Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog 2008-01-02 15:06:41 UTC (rev 8702)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog 2008-01-02 15:31:17 UTC (rev 8703)
@@ -1,8 +1,12 @@
-kdebase-workspace (4:3.98.0~svn753247-2) UNRELEASED; urgency=low
+kdebase-workspace (4:3.98.0~svn755919-1) UNRELEASED; urgency=low
+ * Svn snapshot of revision 755919.
+ * Update installed files.
+ * Update patches.
+ * Raise build-dep to >= 4:3.98.0~svn755919-1.
* Make kdebase-workspace-data conflict with KDE 3's kdebase-data.
- -- Armin Berres <trigger+debian at space-based.de> Wed, 02 Jan 2008 11:57:57 +0100
+ -- Armin Berres <trigger+debian at space-based.de> Wed, 02 Jan 2008 15:27:27 +0000
kdebase-workspace (4:3.98.0~svn753247-1) experimental; urgency=low
Modified: branches/kde4/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/control 2008-01-02 15:06:41 UTC (rev 8702)
+++ branches/kde4/packages/kdebase-workspace/debian/control 2008-01-02 15:31:17 UTC (rev 8703)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>. Armin Berres <trigger+debian at space-based.de>, Modestas Vainius <modestas at vainius.eu>
-Build-Depends: cdbs, debhelper (>= 5), quilt, cmake, kdepimlibs5-dev (>= 4:3.98.0~svn753247-1),
+Build-Depends: cdbs, debhelper (>= 5), quilt, cmake, kdepimlibs5-dev (>= 4:3.98.0~svn755919-1),
libbluetooth-dev, libcaptury-dev, libnm-util-dev, libqimageblitz-dev,
libraw1394-dev, libsensors-dev, libstrigiqtdbusclient-dev (>= 0.5.7), libusb-dev,
libxkbfile-dev, libxcomposite-dev, libxdamage-dev, libxfixes-dev,
@@ -54,7 +54,7 @@
Package: kdebase-workspace-dev
Section: kde
Architecture: any
-Depends: ${shlibs:Depends}, kdebase-workspace (= ${binary:Version}), kdepimlibs5-dev (>= 4:3.98.0~svn753247-1),
+Depends: ${shlibs:Depends}, kdebase-workspace (= ${binary:Version}), kdepimlibs5-dev (>= 4:3.98.0~svn755919-1),
libplasma-dev, libbluetooth-dev, libcaptury-dev, libnm-util-dev, libqimageblitz-dev,
libraw1394-dev, libsensors-dev, libstrigiqtdbusclient-dev (>= 0.5.7), libusb-dev,
libxkbfile-dev, libxcomposite-dev, libxdamage-dev, libxfixes-dev,
@@ -171,7 +171,7 @@
Section: libdevel
Architecture: all
Priority: optional
-Depends: libplasma1 (= ${binary:Version}), kdelibs5-dev (>= 4:3.98.0~svn753247-1)
+Depends: libplasma1 (= ${binary:Version}), kdelibs5-dev (>= 4:3.98.0~svn755919-1)
Replaces: kdebase-workspace-dev (<< 4:3.96.0)
Description: development files for the plasma kde4 desktop
This package contains headers and other development files needed to compile
Modified: branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install 2008-01-02 15:06:41 UTC (rev 8702)
+++ branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install 2008-01-02 15:31:17 UTC (rev 8703)
@@ -1,5 +1,6 @@
etc/kde4/background.knsrc
etc/kde4/kdm.knsrc
+etc/kde4/wallpaper.knsrc
usr/share/applications/kde4/kmenuedit.desktop
usr/share/applications/kde4/krandrtray.desktop
usr/share/applications/kde4/ktip.desktop
@@ -108,27 +109,20 @@
usr/share/doc/kde4/HTML/en/plasma/index.cache.bz2
usr/share/doc/kde4/HTML/en/plasma/index.docbook
usr/share/icons/hicolor/128x128/apps/ksplash.png
-usr/share/icons/hicolor/128x128/apps/ktip.png
usr/share/icons/hicolor/16x16/apps/khotkeys.png
usr/share/icons/hicolor/16x16/apps/kmenuedit.png
usr/share/icons/hicolor/16x16/apps/ksplash.png
-usr/share/icons/hicolor/16x16/apps/ktip.png
usr/share/icons/hicolor/16x16/apps/kxkb.png
usr/share/icons/hicolor/22x22/apps/kmenuedit.png
usr/share/icons/hicolor/22x22/apps/ksplash.png
-usr/share/icons/hicolor/22x22/apps/ktip.png
usr/share/icons/hicolor/32x32/apps/khotkeys.png
usr/share/icons/hicolor/32x32/apps/kmenuedit.png
usr/share/icons/hicolor/32x32/apps/ksplash.png
-usr/share/icons/hicolor/32x32/apps/ktip.png
usr/share/icons/hicolor/32x32/apps/kxkb.png
usr/share/icons/hicolor/48x48/apps/kmenuedit.png
usr/share/icons/hicolor/48x48/apps/ksplash.png
-usr/share/icons/hicolor/48x48/apps/ktip.png
usr/share/icons/hicolor/48x48/apps/kxkb.png
usr/share/icons/hicolor/64x64/apps/ksplash.png
-usr/share/icons/hicolor/64x64/apps/ktip.png
-usr/share/icons/hicolor/scalable/apps/ktip.svgz
usr/share/icons/oxygen/128x128/apps/kcmkwm.png
usr/share/icons/oxygen/16x16/apps/computer.png
usr/share/icons/oxygen/16x16/apps/daemon.png
@@ -152,27 +146,15 @@
usr/share/icons/oxygen/64x64/apps/networkmanager.png
usr/share/icons/oxygen/scalable/apps/kcmkwm.svgz
usr/share/icons/oxygen/scalable/apps/kwin.svgz
-usr/share/kde4/apps/color-schemes/BlueDeep.colors
-usr/share/kde4/apps/color-schemes/CherryBlossom.colors
-usr/share/kde4/apps/color-schemes/Chrome.colors
-usr/share/kde4/apps/color-schemes/Desert.colors
-usr/share/kde4/apps/color-schemes/EveningLilac.colors
-usr/share/kde4/apps/color-schemes/HighlandMist.colors
usr/share/kde4/apps/color-schemes/Honeycomb.colors
-usr/share/kde4/apps/color-schemes/MidnightMeadow.colors
usr/share/kde4/apps/color-schemes/Norway.colors
usr/share/kde4/apps/color-schemes/ObsidianCoast.colors
usr/share/kde4/apps/color-schemes/Oxygen.colors
usr/share/kde4/apps/color-schemes/Steel.colors
-usr/share/kde4/apps/color-schemes/StoneOrchid.colors
-usr/share/kde4/apps/color-schemes/Terra.colors
-usr/share/kde4/apps/color-schemes/WhitePeach.colors
-usr/share/kde4/apps/color-schemes/Whitewater.colors
usr/share/kde4/apps/color-schemes/WontonSoup.colors
usr/share/kde4/apps/desktoptheme/default/colors
usr/share/kde4/apps/desktoptheme/default/dialogs/background.svg
-usr/share/kde4/apps/desktoptheme/default/dialogs/shutdowndlgbuttonglow.svg
-usr/share/kde4/apps/desktoptheme/default/dialogs/shutdowndlg.svg
+usr/share/kde4/apps/desktoptheme/default/dialogs/shutdowndialog.svg
usr/share/kde4/apps/desktoptheme/default/widgets/analog_meter.svg
usr/share/kde4/apps/desktoptheme/default/widgets/background.svg
usr/share/kde4/apps/desktoptheme/default/widgets/bar_meter_horizontal.svg
@@ -215,7 +197,6 @@
usr/share/kde4/apps/kcontrol/pics/logo.png
usr/share/kde4/apps/kcontrol/pics/mini-world.png
usr/share/kde4/apps/kcontrol/pics/monitor.png
-usr/share/kde4/apps/kdewizard/pics/wizard_small.png
usr/share/kde4/apps/kdewizard/tips
usr/share/kde4/apps/kdisplay/app-defaults/AAAAAAGeneral.ad
usr/share/kde4/apps/kdisplay/app-defaults/AAAMotif.ad
@@ -246,7 +227,6 @@
usr/share/kde4/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new.png
usr/share/kde4/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new_sep.png
usr/share/kde4/apps/kmenuedit/kmenueditui.rc
-usr/share/kde4/apps/ksmserver/pics/shutdownkonq.png
usr/share/kde4/apps/ksplash/Themes/Default/1600x1200/background.png
usr/share/kde4/apps/ksplash/Themes/Default/1600x1200/description.txt
usr/share/kde4/apps/ksplash/Themes/Default/1600x1200/icon1_anim.png
@@ -259,10 +239,6 @@
usr/share/kde4/apps/ksplash/Themes/Default/1600x1200/icon4.png
usr/share/kde4/apps/ksplash/Themes/Default/1600x1200/icon5_anim.png
usr/share/kde4/apps/ksplash/Themes/Default/1600x1200/icon5.png
-usr/share/kde4/apps/ksplash/Themes/Default/1600x1200/icon6_anim.png
-usr/share/kde4/apps/ksplash/Themes/Default/1600x1200/icon6.png
-usr/share/kde4/apps/ksplash/Themes/Default/1600x1200/icon7_anim.png
-usr/share/kde4/apps/ksplash/Themes/Default/1600x1200/icon7.png
usr/share/kde4/apps/ksplash/Themes/Default/Preview.png
usr/share/kde4/apps/ksplash/Themes/Default/Theme.rc
usr/share/kde4/apps/ksplash/Themes/None/Theme.rc
Modified: branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-dev.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-dev.install 2008-01-02 15:06:41 UTC (rev 8702)
+++ branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-dev.install 2008-01-02 15:31:17 UTC (rev 8703)
@@ -14,6 +14,7 @@
usr/include/ksysguard/ProcessFilter.h
usr/include/ksysguard/process.h
usr/include/ksysguard/ProcessModel.h
+usr/include/kwinconfig.h
usr/include/kwineffects.h
usr/include/kwinglobals.h
usr/include/kworkspace/kwindowlistmenu.h
@@ -42,6 +43,9 @@
usr/include/solid/control/singletondefs.h
usr/include/solid/control/solid_control_export.h
usr/include/solid/control/wirelessnetwork.h
+usr/include/taskmanager/startup.h
+usr/include/taskmanager/task.h
+usr/include/taskmanager/taskmanager.h
usr/lib/libkdecorations.so
usr/lib/libkscreensaver.so
usr/lib/libksgrd.so
Modified: branches/kde4/packages/kdebase-workspace/debian/kdm.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdm.install 2008-01-02 15:06:41 UTC (rev 8702)
+++ branches/kde4/packages/kdebase-workspace/debian/kdm.install 2008-01-02 15:31:17 UTC (rev 8703)
@@ -1,12 +1,3 @@
-etc/kde4/kdm/backgroundrc
-etc/kde4/kdm/kdmrc
-etc/kde4/kdm/README
-etc/kde4/kdm/Xaccess
-etc/kde4/kdm/Xreset
-etc/kde4/kdm/Xsession
-etc/kde4/kdm/Xsetup
-etc/kde4/kdm/Xstartup
-etc/kde4/kdm/Xwilling
../local/kdm.options etc/kde4/kdm/
usr/bin/genkdmconf
usr/bin/kdm
Modified: branches/kde4/packages/kdebase-workspace/debian/klipper.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/klipper.install 2008-01-02 15:06:41 UTC (rev 8702)
+++ branches/kde4/packages/kdebase-workspace/debian/klipper.install 2008-01-02 15:31:17 UTC (rev 8703)
@@ -1,3 +1,4 @@
+etc/kde4/klipperrc
usr/bin/klipper
usr/lib/libkdeinit4_klipper.so
usr/share/applications/kde4/klipper.desktop
Modified: branches/kde4/packages/kdebase-workspace/debian/libplasma-dev.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/libplasma-dev.install 2008-01-02 15:06:41 UTC (rev 8702)
+++ branches/kde4/packages/kdebase-workspace/debian/libplasma-dev.install 2008-01-02 15:31:17 UTC (rev 8703)
@@ -1,11 +1,14 @@
usr/include/KDE/Plasma/AbstractRunner
+usr/include/KDE/Plasma/Animator
usr/include/KDE/Plasma/Applet
usr/include/KDE/Plasma/AppletBrowser
usr/include/KDE/Plasma/ConfigXml
usr/include/KDE/Plasma/Containment
+usr/include/KDE/Plasma/Corona
usr/include/KDE/Plasma/DataContainer
usr/include/KDE/Plasma/DataEngine
usr/include/KDE/Plasma/DataEngineManager
+usr/include/KDE/Plasma/Dialog
usr/include/KDE/Plasma/GLApplet
usr/include/KDE/Plasma/Package
usr/include/KDE/Plasma/PackageMetadata
@@ -53,7 +56,6 @@
usr/include/plasma/searchmatch.h
usr/include/plasma/shadowitem_p.h
usr/include/plasma/svg.h
-usr/include/plasma/taskmanager.h
usr/include/plasma/theme.h
usr/include/plasma/uiloader.h
usr/include/plasma/view.h
Modified: branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff 2008-01-02 15:06:41 UTC (rev 8702)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff 2008-01-02 15:31:17 UTC (rev 8703)
@@ -1,9 +1,9 @@
--- a/kdm/kfrontend/CMakeLists.txt
+++ b/kdm/kfrontend/CMakeLists.txt
-@@ -111,5 +111,5 @@
-
- ## use 'GENKDMCONF_FLAGS=... make install' to override
+@@ -113,5 +113,5 @@
+ set(KDM_PATH "$ENV{DESTDIR}${CONFIG_INSTALL_DIR}/kdm")
+ set(FACE_SRC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/pics")
install(CODE "
--exec_program(${CMAKE_CURRENT_BINARY_DIR}/genkdmconf ARGS --in \$DESTDIR${CONFIG_INSTALL_DIR}/kdm --no-in-notice --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics \$GENKDMCONF_FLAGS)
-+exec_program(${CMAKE_CURRENT_BINARY_DIR}/genkdmconf ARGS --in \$DESTDIR${CONFIG_INSTALL_DIR}/kdm --no-in-notice --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics --no-old \$GENKDMCONF_FLAGS)
+-exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in '${KDM_PATH}' --no-in-notice --face-src '${FACE_SRC_PATH}' \$GENKDMCONF_FLAGS)
++exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in '${KDM_PATH}' --no-in-notice --face-src '${FACE_SRC_PATH}' \$GENKDMCONF_FLAGS --no-old)
")
Modified: branches/kde4/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff 2008-01-02 15:06:41 UTC (rev 8702)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff 2008-01-02 15:31:17 UTC (rev 8703)
@@ -1,6 +1,6 @@
--- a/kdm/kfrontend/kgreeter.cpp
+++ b/kdm/kfrontend/kgreeter.cpp
-@@ -332,7 +332,6 @@
+@@ -388,7 +388,6 @@
KGreeter::putSession( const QString &type, const QString &name, bool hid, const char *exe )
{
int prio = exe ? (!strcmp( exe, "default" ) ? 0 :
@@ -8,7 +8,7 @@
!strcmp( exe, "failsafe" ) ? 3 : 2) : 2;
for (int i = 0; i < sessionTypes.size(); i++)
if (sessionTypes[i].type == type) {
-@@ -361,7 +360,6 @@
+@@ -417,7 +416,6 @@
dsk.readEntry( "Exec" ).toLatin1() );
}
putSession( "default", i18n("Default"), false, "default" );
Modified: branches/kde4/packages/kdebase-workspace/debian/patches/15_revert_kgreeter.cpp_to_rc2.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/15_revert_kgreeter.cpp_to_rc2.diff 2008-01-02 15:06:41 UTC (rev 8702)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/15_revert_kgreeter.cpp_to_rc2.diff 2008-01-02 15:31:17 UTC (rev 8703)
@@ -1,182 +1,182 @@
---- kdebase-workspace-3.97.0/kdm/kfrontend/kgreeter.cpp 2007-12-05 16:12:43.000000000 +0200
-+++ kdebase-workspace-3.98.0~svn753247/kdm/kfrontend/kgreeter.cpp 2007-12-27 02:22:32.000000000 +0200
-@@ -38,20 +38,24 @@
+--- a/kdm/kfrontend/kgreeter.cpp
++++ b/kdm/kfrontend/kgreeter.cpp
+@@ -38,24 +38,20 @@
#include <KConfigGroup>
#include <QAction>
-+#include <QBuffer>
+-#include <QBuffer>
#include <QDir>
#include <QFile>
-+#include <QImageReader>
+-#include <QImageReader>
#include <QKeyEvent>
#include <QLabel>
#include <QListWidget>
#include <QListWidgetItem>
#include <QMenu>
#include <QMovie>
-+#include <QPainter>
+-#include <QPainter>
#include <QPushButton>
#include <QStyle>
#include <sys/types.h>
#include <stdlib.h>
#include <unistd.h>
-+#include <fcntl.h>
+-#include <fcntl.h>
#include <pwd.h>
#include <grp.h>
-@@ -63,7 +67,7 @@
+@@ -67,7 +63,7 @@
: QListWidget( parent )
, cachedSizeHint( -1, 0 )
{
-- setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Ignored );
-+ setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Ignored );
+- setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Ignored );
++ setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Ignored );
setUniformItemSizes( true );
setVerticalScrollMode( ScrollPerPixel );
setIconSize( QSize( 48, 48 ) );
-@@ -179,6 +183,23 @@
+@@ -183,23 +179,6 @@
delete stsGroup;
}
-+static void
-+expandFace( QImage &img )
-+{
-+ if (img.width() < 48) {
-+ QImage nimg( 48, img.height(), QImage::Format_ARGB32 );
-+ nimg.fill( 0 );
-+ QPainter p( &nimg );
-+ p.drawImage( (48 - img.width()) / 2, 0, img );
-+ img = nimg;
-+ }
-+}
-+
-+#define FILE_LIMIT_ICON 20
-+#define FILE_LIMIT_IMAGE 200
-+#define PIXEL_LIMIT_ICON 100
-+#define PIXEL_LIMIT_IMAGE 300
-+
+-static void
+-expandFace( QImage &img )
+-{
+- if (img.width() < 48) {
+- QImage nimg( 48, img.height(), QImage::Format_ARGB32 );
+- nimg.fill( 0 );
+- QPainter p( &nimg );
+- p.drawImage( (48 - img.width()) / 2, 0, img );
+- img = nimg;
+- }
+-}
+-
+-#define FILE_LIMIT_ICON 20
+-#define FILE_LIMIT_IMAGE 200
+-#define PIXEL_LIMIT_ICON 100
+-#define PIXEL_LIMIT_IMAGE 300
+-
void
KGreeter::insertUser( const QImage &default_pix,
const QString &username, struct passwd *ps )
-@@ -197,16 +218,48 @@
+@@ -218,48 +197,16 @@
nd = 1;
QImage p;
do {
-- QString fn = dp ?
-- QFile::decodeName( ps->pw_dir ) + "/.face" :
-- _faceDir + '/' + username + ".face";
-- if (p.load( fn + ".icon" ) || p.load( fn )) {
-- QSize ns( 48, 48 );
-- if (p.size() != ns)
-- p = p.convertToFormat( QImage::Format_RGB32 ).scaled( ns, Qt::KeepAspectRatio, Qt::SmoothTransformation );
-- goto gotit;
-+ dp ^= 1;
-+ QByteArray fn = !dp ?
-+ QByteArray( ps->pw_dir ) + '/' :
-+ QFile::encodeName( _faceDir + '/' + username );
-+ fn += ".face.icon";
-+ int fd, ico;
-+ if ((fd = open( fn.data(), O_RDONLY | O_NONBLOCK )) < 0) {
-+ fn.chop( 5 );
-+ if ((fd = open( fn.data(), O_RDONLY | O_NONBLOCK )) < 0)
-+ continue;
-+ ico = 0;
-+ } else
-+ ico = 1;
-+ QFile f;
-+ f.open( fd, QFile::ReadOnly );
-+ int fs = f.size();
-+ if (fs > (ico ? FILE_LIMIT_ICON : FILE_LIMIT_IMAGE) * 1000) {
-+ logWarn( "%s exceeds file size limit (%dkB)\n",
-+ fn.data(), ico ? FILE_LIMIT_ICON : FILE_LIMIT_IMAGE );
-+ continue;
-+ }
-+ QByteArray fc = f.read( fs );
-+ ::close( fd );
-+ QBuffer buf( &fc );
-+ buf.open( QBuffer::ReadOnly );
-+ QImageReader ir( &buf );
-+ QSize sz = ir.size();
-+ int lim = ico ? PIXEL_LIMIT_ICON : PIXEL_LIMIT_IMAGE;
-+ if (sz.width() > lim || sz.height() > lim) {
-+ logWarn( "%s exceeds image dimension limit (%dx%d)\n",
-+ fn.data(), lim, lim );
-+ continue;
-+ }
-+ sz.scale( 48, 48, Qt::KeepAspectRatio );
-+ ir.setScaledSize( sz );
-+ p = ir.read();
-+ if (p.isNull()) {
-+ logInfo( "%s is no valid image\n", fn.data() );
-+ continue;
+- dp ^= 1;
+- QByteArray fn = !dp ?
+- QByteArray( ps->pw_dir ) + '/' :
+- QFile::encodeName( _faceDir + '/' + username );
+- fn += ".face.icon";
+- int fd, ico;
+- if ((fd = open( fn.data(), O_RDONLY | O_NONBLOCK )) < 0) {
+- fn.chop( 5 );
+- if ((fd = open( fn.data(), O_RDONLY | O_NONBLOCK )) < 0)
+- continue;
+- ico = 0;
+- } else
+- ico = 1;
+- QFile f;
+- f.open( fd, QFile::ReadOnly );
+- int fs = f.size();
+- if (fs > (ico ? FILE_LIMIT_ICON : FILE_LIMIT_IMAGE) * 1000) {
+- logWarn( "%s exceeds file size limit (%dkB)\n",
+- fn.data(), ico ? FILE_LIMIT_ICON : FILE_LIMIT_IMAGE );
+- continue;
+- }
+- QByteArray fc = f.read( fs );
+- ::close( fd );
+- QBuffer buf( &fc );
+- buf.open( QBuffer::ReadOnly );
+- QImageReader ir( &buf );
+- QSize sz = ir.size();
+- int lim = ico ? PIXEL_LIMIT_ICON : PIXEL_LIMIT_IMAGE;
+- if (sz.width() > lim || sz.height() > lim) {
+- logWarn( "%s exceeds image dimension limit (%dx%d)\n",
+- fn.data(), lim, lim );
+- continue;
+- }
+- sz.scale( 48, 48, Qt::KeepAspectRatio );
+- ir.setScaledSize( sz );
+- p = ir.read();
+- if (p.isNull()) {
+- logInfo( "%s is no valid image\n", fn.data() );
+- continue;
++ QString fn = dp ?
++ QFile::decodeName( ps->pw_dir ) + "/.face" :
++ _faceDir + '/' + username + ".face";
++ if (p.load( fn + ".icon" ) || p.load( fn )) {
++ QSize ns( 48, 48 );
++ if (p.size() != ns)
++ p = p.convertToFormat( QImage::Format_RGB32 ).scaled( ns, Qt::KeepAspectRatio, Qt::SmoothTransformation );
++ goto gotit;
}
-- dp = 1 - dp;
-+ expandFace( p );
-+ goto gotit;
+- expandFace( p );
+- goto gotit;
++ dp = 1 - dp;
} while (--nd >= 0);
p = default_pix;
gotit:
-@@ -268,9 +321,11 @@
+@@ -321,11 +268,9 @@
if (!default_pix.load( _faceDir + "/.default.face" ))
logError( "Cannot open default user face\n" );
QSize ns( 48, 48 );
-- if (default_pix.size() != ns)
-+ if (default_pix.size() != ns) {
+- if (default_pix.size() != ns) {
++ if (default_pix.size() != ns)
default_pix =
-- default_pix.convertToFormat( QImage::Format_RGB32 ).scaled( ns, Qt::KeepAspectRatio, Qt::SmoothTransformation );
-+ default_pix.convertToFormat( QImage::Format_ARGB32 ).scaled( ns, Qt::KeepAspectRatio, Qt::SmoothTransformation );
-+ expandFace( default_pix );
-+ }
+- default_pix.convertToFormat( QImage::Format_ARGB32 ).scaled( ns, Qt::KeepAspectRatio, Qt::SmoothTransformation );
+- expandFace( default_pix );
+- }
++ default_pix.convertToFormat( QImage::Format_RGB32 ).scaled( ns, Qt::KeepAspectRatio, Qt::SmoothTransformation );
}
if (_showUsers == SHOW_ALL) {
UserList noUsers( _noUsers );
-@@ -316,6 +371,7 @@
+@@ -371,7 +316,6 @@
}
}
endpwent();
-+ endgrent();
+- endgrent();
if (_sortUsers) {
if (userView)
userView->sortItems();
-@@ -380,14 +436,16 @@
+@@ -434,16 +378,14 @@
{
struct passwd *pw;
-- if (userView && (pw = getpwnam( curUser.toLocal8Bit().data() ))) {
-- QString theUser = QString::fromLocal8Bit( pw->pw_name );
-- for (int i = 0, rc = userView->model()->rowCount(); i < rc; i++) {
-- UserListViewItem *item =
-- static_cast<UserListViewItem *>(userView->item( i ));
-- if (item->login == theUser) {
-- userView->setCurrentItem( item );
-- goto oke;
-+ if (userView) {
-+ if ((pw = getpwnam( curUser.toLocal8Bit().data() ))) {
-+ QString theUser = QString::fromLocal8Bit( pw->pw_name );
-+ for (int i = 0, rc = userView->model()->rowCount(); i < rc; i++) {
-+ UserListViewItem *item =
-+ static_cast<UserListViewItem *>(userView->item( i ));
-+ if (item->login == theUser) {
-+ userView->setCurrentItem( item );
-+ goto oke;
-+ }
+- if (userView) {
+- if ((pw = getpwnam( curUser.toLocal8Bit().data() ))) {
+- QString theUser = QString::fromLocal8Bit( pw->pw_name );
+- for (int i = 0, rc = userView->model()->rowCount(); i < rc; i++) {
+- UserListViewItem *item =
+- static_cast<UserListViewItem *>(userView->item( i ));
+- if (item->login == theUser) {
+- userView->setCurrentItem( item );
+- goto oke;
+- }
++ if (userView && (pw = getpwnam( curUser.toLocal8Bit().data() ))) {
++ QString theUser = QString::fromLocal8Bit( pw->pw_name );
++ for (int i = 0, rc = userView->model()->rowCount(); i < rc; i++) {
++ UserListViewItem *item =
++ static_cast<UserListViewItem *>(userView->item( i ));
++ if (item->login == theUser) {
++ userView->setCurrentItem( item );
++ goto oke;
}
}
userView->clearSelection();
-@@ -810,14 +868,14 @@
+@@ -866,14 +808,14 @@
if ((itm = themer->findNode( "language_button" ))) // not implemented yet
itm->setVisible( false );
--#ifdef WITH_KDM_XCONSOLE
- if (console_node) {
-+#ifdef WITH_KDM_XCONSOLE
+- if (console_node) {
+ #ifdef WITH_KDM_XCONSOLE
++ if (console_node) {
if (consoleView)
console_node->setWidget( consoleView );
else
-+#endif
+-#endif
console_rect->setVisible( false );
}
--#endif
++#endif
if (xauth_warning && (_authorized || !_authComplain))
xauth_warning->setVisible( false );
Modified: branches/kde4/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/series 2008-01-02 15:06:41 UTC (rev 8702)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/series 2008-01-02 15:31:17 UTC (rev 8703)
@@ -7,4 +7,4 @@
12_be_better_at_honouring_user_kdm_theming.diff
13_kdm_override_docs.diff
14_correct_kde4home_for_kstartupconfig4.diff
-15_revert_kgreeter.cpp_to_rc2.diff -p1 -R
+15_revert_kgreeter.cpp_to_rc2.diff -R
More information about the pkg-kde-commits
mailing list