[arch-commits] Commit in kdebase/trunk (9 files)
Pierre Schmitz
pierre at archlinux.org
Wed Jul 23 23:01:02 UTC 2008
Date: Wednesday, July 23, 2008 @ 19:01:01
Author: pierre
Revision: 6127
upgpkg: kdebase 4.1.0-1
updating to 4.1.0
Modified:
kdebase/trunk/PKGBUILD
Deleted:
kdebase/trunk/fix-hal.patch
kdebase/trunk/fix-nfs.patch
kdebase/trunk/kdesu-3.5.9-glibc28-struct-ucred.patch
kdebase/trunk/kdm-grub.patch
kdebase/trunk/kdm-zsh-profile.patch
kdebase/trunk/lmsensors.patch
kdebase/trunk/post-kde-3.5.5.patch
kdebase/trunk/tango.diff
----------------------------------------+
PKGBUILD | 86 +++++-----------------
fix-hal.patch | 75 -------------------
fix-nfs.patch | 16 ----
kdesu-3.5.9-glibc28-struct-ucred.patch | 19 ----
kdm-grub.patch | 35 --------
kdm-zsh-profile.patch | 12 ---
lmsensors.patch | 121 -------------------------------
post-kde-3.5.5.patch | 93 -----------------------
tango.diff | 25 ------
9 files changed, 21 insertions(+), 461 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-07-23 22:59:47 UTC (rev 6126)
+++ PKGBUILD 2008-07-23 23:01:01 UTC (rev 6127)
@@ -1,71 +1,27 @@
-# $Id$
-# Contributor: Roman Kreisel <roman.kreisel at epost.de>
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# $ Id: $
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
pkgname=kdebase
-pkgver=3.5.9
-kdever=3.5.9 # if minor 0, then without .0
-pkgrel=5
-pkgdesc="KDE Base Programs."
-arch=(i686 x86_64)
-url="http://www.kde.org"
-license=('GPL')
+pkgver=4.1.0
+pkgrel=1
+pkgdesc="KDE Base Applications"
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
groups=('kde')
-makedepends=('samba>=3.0.30-2' 'jre' 'imake' 'xorg-font-utils' 'pkgconfig')
-depends=('kdelibs>=3.5.9-5' 'libldap' 'eject>=2.1.5' 'lm_sensors>=3.0.0' 'mtools' 'libusb' 'libraw1394' 'cyrus-sasl>=2.1.22-9' \
- 'libxcomposite' 'libxdamage' 'hal>=0.5.8.1-2' 'pmount>=0.9.13-2' 'libxxf86misc' 'libxkbfile' 'libxss' \
- 'libfontenc' 'dbus-qt3' 'xorg-xauth' 'db>=4.7')
-backup=('opt/kde/share/config/kdm/Xservers' 'opt/kde/share/config/kdm/kdmrc' \
- 'opt/kde/share/config/kdm/Xaccess' 'opt/kde/share/config/kdm/Xresources' )
+depends=('libraw1394' 'kdebase-runtime')
+makedepends=('kdebase-workspace' 'pkgconfig' 'cmake' 'automoc4')
+options=('docs')
+source=("ftp://ftp.archlinux.org/other/kde/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('419bc56c2f39a123735a0fb472a3b644')
-# for easier build, just uncomment the mirror you want to use
- mirror="ftp.solnet.ch/mirror/KDE" # updated every 2 hours, very fast for Europe
-# mirror="ftp.kde.org/pub/kde/" # main server
-# mirror="ibiblio.org/pub/mirrors/kde/" # ibiblio mirror
-# parallel builds break kcontrol and whatnot
-options=(!makeflags)
-source=(ftp://$mirror/stable/$kdever/src/$pkgname-$pkgver.tar.bz2
- tango.diff kdm-grub.patch fix-hal.patch kdm-zsh-profile.patch
- kdesu-3.5.9-glibc28-struct-ucred.patch)
-md5sums=('c8c35389a238aa1b73e68ef5298eadf8'
- '43232dcb916b1d25e0ad7ef3575763a4'
- 'f8645dc5d0044476a01c9c6a95c4853f'
- '6202110beb1faf768c3f76e2b4e811b7'
- '40f5556820d52a14e9d9722a5a8a491e'
- '77078f9599ed93f28006ae853e6c7623')
-
build() {
- # Source the QT and KDE profile
- [ "$QTDIR" = "" ] && source /etc/profile.d/qt3.sh
- [ "$KDEDIR" = "" ] && source /etc/profile.d/kde.sh
- # start building
- cd $startdir/src/$pkgname-$pkgver
- patch -Np1 -i ../kdm-grub.patch || return 1
- patch -Np1 -i ../kdm-zsh-profile.patch || return 1
- patch -Np0 -i ../tango.diff || return 1
- # fix hal #8342
- patch -Np1 -i ../fix-hal.patch || return 1
- # fix a glibc2.8 build issue see http://bugs.gentoo.org/show_bug.cgi?id=225727
- patch -Np1 -i ../kdesu-3.5.9-glibc28-struct-ucred.patch || return 1
- sed -i -e 's/applications-merged/kde-applications-merged/g' applnk/Makefile.{am,in}
- #make -f admin/Makefile.common || return 1
- ./configure --prefix=/opt/kde --with-dpms --build="${CHOST}" --host="${CHOST}" \
- --disable-dependency-tracking --disable-debug --enable-gcc-hidden-visibility --enable-final \
- --enable-new-ldflags LDFLAGS="${LDFLAGS} -L/opt/kde/lib"
- # --enable-final # remove this if you build with < 512mb ram.
- make || return 1
- make DESTDIR=$startdir/pkg install || return 1
-
- # fix kdm config stuff
- cd $startdir/src/$pkgname-$pkgver/kdm
- make DESTDIR=$startdir/pkg GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
-
- # make kdm compliant with the new *dm scheme
- install -D -m 644 $startdir/src/$pkgname-$pkgver/kdm/kfrontend/sessions/kde.desktop \
- $startdir/pkg/etc/X11/sessions/kde.desktop
-
- # Adding new defaults for kdm
- cd $startdir/pkg/opt/kde/share/config/kdm
- mv kdmrc kdmrc.default
- mv backgroundrc backgroundrc.default
+ cd $srcdir
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+ make DESTDIR=$pkgdir install
}
Deleted: fix-hal.patch
===================================================================
--- fix-hal.patch 2008-07-23 22:59:47 UTC (rev 6126)
+++ fix-hal.patch 2008-07-23 23:01:01 UTC (rev 6127)
@@ -1,75 +0,0 @@
-diff -r -u kdebase-3.5.5a.dfsg.1.orig/kioslave/media/mediamanager/halbackend.cpp kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.cpp
---- kdebase-3.5.5a.dfsg.1.orig/kioslave/media/mediamanager/halbackend.cpp 2007-01-25 12:34:07.805485000 +0300
-+++ kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.cpp 2007-01-25 16:46:59.118184525 +0300
-@@ -745,6 +745,33 @@
- s_HALBackend->DeviceCondition(udi, condition_name);
- }
-
-+QStringList HALBackend::getHALmountoptions(QString udi)
-+{
-+ const char* _ppt_string;
-+ LibHalVolume* volume;
-+ LibHalDrive* drive;
-+
-+ QString _ppt_QString;
-+
-+ volume = libhal_volume_from_udi( m_halContext, udi.latin1() );
-+ if( volume )
-+ drive = libhal_drive_from_udi( m_halContext, libhal_volume_get_storage_device_udi( volume ) );
-+ else
-+ drive = libhal_drive_from_udi( m_halContext, udi.latin1() );
-+
-+ if( !drive )
-+ return QString::null;
-+
-+ if( volume )
-+ _ppt_string = libhal_volume_policy_get_mount_options ( drive, volume, NULL );
-+ else
-+ _ppt_string = libhal_drive_policy_get_mount_options ( drive, NULL );
-+
-+ _ppt_QString = QString(_ppt_string ? _ppt_string : "");
-+
-+ return QStringList::split(",",_ppt_QString);
-+}
-+
- QStringList HALBackend::mountoptions(const QString &name)
- {
- const Medium* medium = m_mediaList.findById(name);
-@@ -1069,10 +1096,25 @@
- soptions << QString("data=ordered");
- }
-
-+ QStringList hal_mount_options = getHALmountoptions(medium->id());
-+ for (QValueListIterator<QString> it=hal_mount_options.begin();it!=hal_mount_options.end();it++)
-+ {
-+ soptions << *it;
-+ kdDebug()<<"HALOption: "<<*it<<endl;
-+ if ((*it).startsWith("iocharset="))
-+ {
-+ soptions.remove("utf8");
-+ kdDebug()<<"\"iocharset=\" found. Removing \"utf8\" from options."<<endl;
-+ }
-+ }
-+
- const char **options = new const char*[soptions.size() + 1];
- uint noptions = 0;
- for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions)
-+ {
- options[noptions] = (*it).latin1();
-+ kdDebug()<<"Option: "<<*it<<endl;
-+ }
- options[noptions] = NULL;
-
- QString qerror = mount_priv(medium->id().latin1(), mount_point.utf8(), options, noptions, dbus_connection);
-diff -r -u kdebase-3.5.5a.dfsg.1.orig/kioslave/media/mediamanager/halbackend.h kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.h
---- kdebase-3.5.5a.dfsg.1.orig/kioslave/media/mediamanager/halbackend.h 2007-01-25 12:34:07.133446000 +0300
-+++ kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.h 2007-01-25 16:33:54.413638693 +0300
-@@ -192,6 +192,7 @@
- const char* message
- );
-
-+ QStringList getHALmountoptions(QString udi);
- /* HAL and DBus structures */
- private:
- /**
-
Deleted: fix-nfs.patch
===================================================================
--- fix-nfs.patch 2008-07-23 22:59:47 UTC (rev 6126)
+++ fix-nfs.patch 2008-07-23 23:01:01 UTC (rev 6127)
@@ -1,16 +0,0 @@
-Index: kioslave/media/mediamanager/halbackend.cpp
-===================================================================
---- kioslave/media/mediamanager/halbackend.cpp (revision 724099)
-+++ kioslave/media/mediamanager/halbackend.cpp (revision 724100)
-@@ -74,7 +74,10 @@
- const QPtrList<Medium> medlist = m_mediaList.list();
- QPtrListIterator<Medium> it (medlist);
- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it)
-- unmount(current_medium->id());
-+ {
-+ if( !current_medium->id().startsWith( "/org/kde" ))
-+ unmount(current_medium->id());
-+ }
-
-
- /* Remove all the registered media first */
Deleted: kdesu-3.5.9-glibc28-struct-ucred.patch
===================================================================
--- kdesu-3.5.9-glibc28-struct-ucred.patch 2008-07-23 22:59:47 UTC (rev 6126)
+++ kdesu-3.5.9-glibc28-struct-ucred.patch 2008-07-23 23:01:01 UTC (rev 6127)
@@ -1,19 +0,0 @@
---- kdebase/kdesu/configure.in.in 2006/10/04 23:00:23 592501
-+++ kdebase/kdesu/configure.in.in 2008/04/13 14:06:43 796383
-@@ -1,6 +1,15 @@
- dnl Check for "struct ucred"
- AC_MSG_CHECKING("struct ucred")
--AC_EGREP_HEADER([struct ucred], [sys/socket.h], have_ucred=yes)
-+AC_TRY_COMPILE(
-+[
-+ #define _GNU_SOURCE 1
-+ #include <sys/socket.h>
-+],
-+[
-+ struct ucred red;
-+], have_ucred=yes
-+ , have_ucred=no
-+)
- if test "$have_ucred" = "yes"; then
- AC_DEFINE(HAVE_STRUCT_UCRED, 1, [Define if you have the struct ucred])
- AC_MSG_RESULT(yes)
Deleted: kdm-grub.patch
===================================================================
--- kdm-grub.patch 2008-07-23 22:59:47 UTC (rev 6126)
+++ kdm-grub.patch 2008-07-23 23:01:01 UTC (rev 6127)
@@ -1,35 +0,0 @@
-diff -Naur kdm-3.5.5-orig/kdm/backend/bootman.c kdm-3.5.5/kdm/backend/bootman.c
---- kdm-3.5.5-orig/kdm/backend/bootman.c 2006-10-01 19:32:15.000000000 +0200
-+++ kdm-3.5.5/kdm/backend/bootman.c 2006-11-05 03:03:54.000000000 +0100
-@@ -82,7 +82,7 @@
- int len;
- char line[1000];
-
-- if (!grub && !(grub = locate( "grub" )))
-+ if (!grub && !(grub = locate( "grub-set-default" )))
- return BO_NOMAN;
-
- *def = 0;
-@@ -132,19 +132,14 @@
- static void
- commitGrub( void )
- {
-- FILE *f;
-- int pid;
-- static const char *args[] = { 0, "--batch", "--no-floppy", 0 };
-+ char command[256];
-
- if (sdRec.bmstamp != mTime( GRUB_MENU ) &&
- setGrub( sdRec.osname, &sdRec ) != BO_OK)
- return;
-
-- args[0] = grub;
-- if ((f = pOpen( (char **)args, 'w', &pid ))) {
-- fprintf( f, "savedefault --default=%d --once\n", sdRec.osindex );
-- pClose( f, pid );
-- }
-+ sprintf(command, "%s %d", grub, sdRec.osindex);
-+ system(command);
- }
-
- static char *lilo;
Deleted: kdm-zsh-profile.patch
===================================================================
--- kdm-zsh-profile.patch 2008-07-23 22:59:47 UTC (rev 6126)
+++ kdm-zsh-profile.patch 2008-07-23 23:01:01 UTC (rev 6127)
@@ -1,12 +0,0 @@
-diff -Nura kdebase-3.5.9/kdm/kfrontend/genkdmconf.c kdebase-3.5.9.new/kdm/kfrontend/genkdmconf.c
---- kdebase-3.5.9/kdm/kfrontend/genkdmconf.c 2008-02-13 09:40:49.000000000 +0000
-+++ kdebase-3.5.9.new/kdm/kfrontend/genkdmconf.c 2008-05-16 12:47:36.000000000 +0000
-@@ -662,7 +662,7 @@
- " [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc\n"
- " zhome=${ZDOTDIR:-$HOME}\n"
- " # zshenv is always sourced automatically.\n"
--" [ -f $zdir/zprofile ] && . $zdir/zprofile\n"
-+" [ -f /etc/profile ] && . /etc/profile\n"
- " [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
- " [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
- " [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
Deleted: lmsensors.patch
===================================================================
--- lmsensors.patch 2008-07-23 22:59:47 UTC (rev 6126)
+++ lmsensors.patch 2008-07-23 23:01:01 UTC (rev 6127)
@@ -1,121 +0,0 @@
---- ksysguard/ksysguardd/Linux/lmsensors.c~ 2005-10-10 17:04:31.000000000 +0200
-+++ ksysguard/ksysguardd/Linux/lmsensors.c 2007-12-05 12:51:39.000000000 +0100
-@@ -29,9 +28,9 @@
-
- #include "lmsensors.h"
-
--#ifdef HAVE_SENSORS_SENSORS_H
-+#ifdef HAVE_LMSENSORS
- #include <sensors/sensors.h>
--
-+#define BUFFER_SIZE_LMSEN 300
- typedef struct
- {
- char* fullName;
-@@ -49,11 +48,15 @@
-
- static LMSENSOR* findMatchingSensor( const char* name )
- {
-- long idx;
-+ INDEX idx;
- LMSENSOR key;
- LMSENSOR* s;
-
-+ if(name == NULL || name[0] == '\0') return 0;
- key.fullName = strdup( name );
-+ int end = strlen(key.fullName)-1;
-+ if(key.fullName[end] == '?')
-+ key.fullName[end] = '\0';
- if ( ( idx = search_ctnr( LmSensors, sensorCmp, &key ) ) < 0 ) {
- free( key.fullName );
- return 0;
-@@ -65,9 +68,21 @@
- return s;
- }
-
-+static const char *chipName(const sensors_chip_name *chip) {
-+ static char buffer[256];
-+ if (chip->bus == SENSORS_CHIP_NAME_BUS_ISA)
-+ sprintf (buffer, "%s-isa-%04x", chip->prefix, chip->addr);
-+ else if (chip->bus == SENSORS_CHIP_NAME_BUS_PCI)
-+ sprintf (buffer, "%s-pci-%04x", chip->prefix, chip->addr);
-+ else
-+ sprintf (buffer, "%s-i2c-%d-%02x", chip->prefix, chip->bus, chip->addr);
-+ return buffer;
-+}
-+
- void initLmSensors( struct SensorModul* sm )
- {
- const sensors_chip_name* scn;
-+ char buffer[BUFFER_SIZE_LMSEN];
- int nr = 0;
-
- FILE* input;
-@@ -90,23 +105,23 @@
- const sensors_feature_data* sfd;
- nr1 = nr2 = 0;
- while ( ( sfd = sensors_get_all_features( *scn, &nr1, &nr2 ) ) != 0 ) {
-- if ( sfd->mapping == SENSORS_NO_MAPPING ) {
-+ if ( sfd->mapping == SENSORS_NO_MAPPING && sfd->mode & SENSORS_MODE_R /* readable feature */) {
- LMSENSOR* p;
- char* label;
-- char* s;
-
-- sensors_get_label( *scn, sfd->number, &label );
-+ if(sensors_get_label( *scn, sfd->number, &label ) != 0)
-+ continue; /*error*/
-+ if(sensors_get_ignored( *scn, sfd->number) != 1 )
-+ continue; /* 1 for not ignored, 0 for ignore, <0 for error */
-+ double result;
-+ if(sensors_get_feature( *scn, sfd->number, &result) != 0 )
-+ continue; /* Make sure this feature actually works. 0 for success, <0 for fail */
-+
- p = (LMSENSOR*)malloc( sizeof( LMSENSOR ) );
-
-- p->fullName = (char*)malloc( strlen( "lmsensors/" ) +
-- strlen( scn->prefix ) + 1 +
-- strlen( label ) + 1 );
-- sprintf( p->fullName, "lmsensors/%s/%s", scn->prefix, label );
--
-- /* Make sure that name contains only propper characters. */
-- for ( s = p->fullName; *s; s++ )
-- if ( *s == ' ' )
-- *s = '_';
-+ snprintf( buffer, BUFFER_SIZE_LMSEN, "lmsensors/%s/%s", chipName(scn), sfd->name );
-+
-+ p->fullName = strndup(buffer, BUFFER_SIZE_LMSEN);
-
- p->scn = scn;
- p->sfd = sfd;
-@@ -123,6 +138,7 @@
- bsort_ctnr( LmSensors, sensorCmp );
- }
-
-+
- void exitLmSensors( void )
- {
- destr_ctnr( LmSensors, free );
-@@ -152,10 +168,21 @@
- }
-
- /* TODO: print real name here */
-- fprintf( CurrentClient, "Sensor Info\t0\t0\t\n" );
-+ char *label;
-+ if(sensors_get_label( *s->scn, s->sfd->number, &label ) != 0) { /*error*/
-+ fprintf( CurrentClient, "0\n" );
-+ return;
-+ }
-+ if( strncmp(s->sfd->name, "temp", sizeof("temp")-1) == 0)
-+ fprintf( CurrentClient, "%s\t0\t0\t°C\n", label );
-+ else if( strncmp(s->sfd->name, "fan", sizeof("fan")-1) == 0)
-+ fprintf( CurrentClient, "%s\t0\t0\trpm\n", label );
-+ else
-+ fprintf( CurrentClient, "%s\t0\t0\tV\n", label ); /* For everything else, say it's in volts. */
-+
- }
-
--#else /* HAVE_SENSORS_SENSORS_H */
-+#else /* HAVE_LMSENSORS */
-
- /* dummy version for systems that have no lmsensors support */
-
Deleted: post-kde-3.5.5.patch
===================================================================
--- post-kde-3.5.5.patch 2008-07-23 22:59:47 UTC (rev 6126)
+++ post-kde-3.5.5.patch 2008-07-23 23:01:01 UTC (rev 6127)
@@ -1,93 +0,0 @@
---- kwin/client.cpp #594158:594159
-+++ kwin/client.cpp
-@@ -477,17 +477,30 @@
- // calls it or when the decoration is created/destroyed
-
- if( Shape::version() >= 0x11 ) // 1.1, has input shape support
-- { // there appears to be no way to find out if a window has input
-- // shape set or not, so always set propagate the input shape
-- // (it's the same like the bounding shape by default)
-- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0,
-+ { // There appears to be no way to find out if a window has input
-+ // shape set or not, so always propagate the input shape
-+ // (it's the same like the bounding shape by default).
-+ // Also, build the shape using a helper window, not directly
-+ // in the frame window, because the sequence set-shape-to-frame,
-+ // remove-shape-of-client, add-input-shape-of-client has the problem
-+ // that after the second step there's a hole in the input shape
-+ // until the real shape of the client is added and that can make
-+ // the window lose focus (which is a problem with mouse focus policies)
-+ static Window helper_window = None;
-+ if( helper_window == None )
-+ helper_window = XCreateSimpleWindow( qt_xdisplay(), qt_xrootwin(),
-+ 0, 0, 1, 1, 0, 0, 0 );
-+ XResizeWindow( qt_xdisplay(), helper_window, width(), height());
-+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, 0, 0,
- frameId(), ShapeBounding, ShapeSet );
-- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput,
-+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput,
- clientPos().x(), clientPos().y(),
- window(), ShapeBounding, ShapeSubtract );
-- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput,
-+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput,
- clientPos().x(), clientPos().y(),
- window(), ShapeInput, ShapeUnion );
-+ XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0,
-+ helper_window, ShapeInput, ShapeSet );
- }
- }
-
---- kioslave/media/mediamanager/halbackend.cpp #593834:593835
-+++ kioslave/media/mediamanager/halbackend.cpp
-@@ -215,11 +215,6 @@
- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) )
- return;
-
-- if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" &&
-- !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) &&
-- ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) )
-- return;
--
- /* Query drive udi */
- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device");
- /* We don't list floppy volumes because we list floppy drives */
-@@ -240,7 +235,19 @@
-
- /* Create medium */
- Medium* medium = new Medium(udi, "");
-+ setVolumeProperties(medium);
-
-+ if ( isInFstab( medium ).isNull() )
-+ {
-+ // if it's not mountable by user and not by HAL, don't show it at all
-+ if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" &&
-+ !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) &&
-+ ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) )
-+ {
-+ delete medium;
-+ return;
-+ }
-+ }
- QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi));
- kdDebug() << "automount " << options["automount"] << endl;
- if (options["automount"] == "true" && allowNotification ) {
-@@ -248,7 +255,6 @@
- if (!error.isEmpty())
- kdDebug() << "error " << error << endl;
- }
-- setVolumeProperties(medium);
- m_mediaList.addMedium(medium, allowNotification);
-
- return;
-@@ -992,7 +998,10 @@
-
- for (; it!=end; ++it)
- {
-- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl;
-+ QString reald = (*it)->realDeviceName();
-+ if ( reald.endsWith( "/" ) )
-+ reald = reald.left( reald.length() - 1 );
-+ kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl;
- if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) )
- {
- QStringList opts = (*it)->mountOptions();
Deleted: tango.diff
===================================================================
--- tango.diff 2008-07-23 22:59:47 UTC (rev 6126)
+++ tango.diff 2008-07-23 23:01:01 UTC (rev 6127)
@@ -1,25 +0,0 @@
-Index: kdialog/kdialog.cpp
-===================================================================
---- kdialog/kdialog.cpp (revision 495779)
-+++ kdialog/kdialog.cpp (working copy)
-@@ -622,6 +622,20 @@
- context = KIcon::Application;
- else if ( contextStr == QString::fromLatin1( "Actions" ) )
- context = KIcon::Action;
-+ else if ( contextStr == QString::fromLatin1( "Animations" ) )
-+ context = KIcon::Animation;
-+ else if ( contextStr == QString::fromLatin1( "Categories" ) )
-+ context = KIcon::Category;
-+ else if ( contextStr == QString::fromLatin1( "Emblems" ) )
-+ context = KIcon::Emblem;
-+ else if ( contextStr == QString::fromLatin1( "Emotes" ) )
-+ context = KIcon::Emote;
-+ else if ( contextStr == QString::fromLatin1( "International" ) )
-+ context = KIcon::International;
-+ else if ( contextStr == QString::fromLatin1( "Places" ) )
-+ context = KIcon::Place;
-+ else if ( contextStr == QString::fromLatin1( "Status" ) )
-+ context = KIcon::StatusIcon;
-
- KIconDialog dlg(0, "icon dialog");
- kapp->setTopWidget( &dlg );
More information about the arch-commits
mailing list