Hello community, here is the log from the commit of package kdeutils4 for openSUSE:Factory checked in at Fri Nov 5 16:38:34 CET 2010. -------- --- KDE/kdeutils4/kdeutils4.changes 2010-10-01 00:07:19.000000000 +0200 +++ kdeutils4/kdeutils4.changes 2010-10-28 22:14:25.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 28 22:14:21 CEST 2010 - dmueller@suse.de + +- update to 4.5.3 + * see http://kde.org/announcements/changelogs/changelog4_5_2to4_5_3.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdeutils-4.5.2.tar.bz2 New: ---- kdeutils-4.5.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeutils4.spec ++++++ --- /var/tmp/diff_new_pack.0vbWWF/_old 2010-11-05 16:37:30.000000000 +0100 +++ /var/tmp/diff_new_pack.0vbWWF/_new 2010-11-05 16:37:30.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdeutils4 (Version 4.5.2) +# spec file for package kdeutils4 (Version 4.5.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -34,7 +34,7 @@ Group: Productivity/Other Summary: Base Package of KDE Utility Programs Url: http://www.kde.org -Version: 4.5.2 +Version: 4.5.3 Release: 1 Source0: kdeutils-%version.tar.bz2 Patch: 4_5_BRANCH.diff @@ -337,7 +337,7 @@ %files -n kwalletmanager -f filelists/kwallet %defattr(-,root,root) %doc AUTHORS COPYING COPYING.DOC README -/usr/share/kde4/apps/kwalletmanager +%_kde4_appsdir/kwalletmanager %package -n kwikdisk License: GPLv2+ ++++++ kdeutils-4.5.2.tar.bz2 -> kdeutils-4.5.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.5.2/ark/app/ark_addtoservicemenu.desktop new/kdeutils-4.5.3/ark/app/ark_addtoservicemenu.desktop --- old/kdeutils-4.5.2/ark/app/ark_addtoservicemenu.desktop 2010-09-30 23:23:18.000000000 +0200 +++ new/kdeutils-4.5.3/ark/app/ark_addtoservicemenu.desktop 2010-10-28 19:35:24.000000000 +0200 @@ -66,6 +66,7 @@ Name[cs]=Sem Name[da]=Her Name[de]=Hier +Name[el]=Εδώ Name[en_GB]=Here Name[es]=Aquí Name[et]=Siia @@ -116,9 +117,10 @@ Name[ar]=ك أرشيف ZIP Name[ca]=Com a arxiu ZIP Name[ca@valencia]=Com a arxiu ZIP -Name[cs]=Jako ZIP archív +Name[cs]=Jako archiv ZIP Name[da]=Som ZIP-arkiv Name[de]=Als ZIP-Archiv +Name[el]=Ως Αρχειοθήκη ZIP Name[en_GB]=As ZIP Archive Name[es]=Como archivo comprimido ZIP Name[et]=ZIP-arhiivina @@ -169,9 +171,10 @@ Name[ar]=كأرشيف RAR Name[ca]=Com a arxiu RAR Name[ca@valencia]=Com a arxiu RAR -Name[cs]=Jako RAR archív +Name[cs]=Jako archiv RAR Name[da]=Som RAR-arkiv Name[de]=Als RAR-Archiv +Name[el]=Ως Αρχειοθήκη RAR Name[en_GB]=As RAR Archive Name[es]=Como archivo comprimido RAR Name[et]=RAR-arhiivina @@ -222,9 +225,10 @@ Name[ar]=كأرشيف ZIP/TAR Name[ca]=Com a arxiu ZIP/TAR Name[ca@valencia]=Com a arxiu ZIP/TAR -Name[cs]=Jako ZIP/TAR archív +Name[cs]=Jako archiv ZIP/TAR Name[da]=Som ZIP-/TAR-arkiv Name[de]=Als ZIP/TAR-Archiv +Name[el]=Ως Αρχειοθήκη ZIP/TAR Name[en_GB]=As ZIP/TAR Archive Name[es]=Como archivo comprimido ZIP/TAR Name[et]=ZIP/TAR-arhiivina @@ -277,6 +281,7 @@ Name[cs]=Zkomprimovat do... Name[da]=Komprimér til... Name[de]=Komprimieren nach ... +Name[el]=Συμπίεση σε... Name[en_GB]=Compress To... Name[es]=Comprimir en... Name[et]=Paki asukohta... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.5.2/ark/app/ark_dndextract.desktop new/kdeutils-4.5.3/ark/app/ark_dndextract.desktop --- old/kdeutils-4.5.2/ark/app/ark_dndextract.desktop 2010-09-30 23:23:18.000000000 +0200 +++ new/kdeutils-4.5.3/ark/app/ark_dndextract.desktop 2010-10-28 19:35:24.000000000 +0200 @@ -9,6 +9,7 @@ Name[cs]=Rozbalit Arkem sem Name[da]=Pak ud med Ark her Name[de]=Ark – Hierher auspacken +Name[el]=Ark εξαγωγή εδώ Name[en_GB]=Ark Extract Here Name[es]=Extraer aquí con Ark Name[et]=Paki siia lahti diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.5.2/ark/app/ark_servicemenu.desktop new/kdeutils-4.5.3/ark/app/ark_servicemenu.desktop --- old/kdeutils-4.5.2/ark/app/ark_servicemenu.desktop 2010-09-30 23:23:18.000000000 +0200 +++ new/kdeutils-4.5.3/ark/app/ark_servicemenu.desktop 2010-10-28 19:35:24.000000000 +0200 @@ -13,9 +13,10 @@ Name[ar]=فك الأرشيف هنا Name[ca]=Extreu l'arxiu aquí Name[ca@valencia]=Extreu l'arxiu ací -Name[cs]=Rozbalit archív sem +Name[cs]=Rozbalit archiv sem Name[da]=Udpak arkiv her Name[de]=Archiv hierher auspacken +Name[el]=Εξαγωγή αρχειοθήκης εδώ Name[en_GB]=Extract Archive Here Name[es]=Extraer archivo comprimido aquí Name[et]=Paki arhiiv siia lahti @@ -65,9 +66,10 @@ Name[ar]=فك الأرشيف إلى... Name[ca]=Extreu l'arxiu a... Name[ca@valencia]=Extreu l'arxiu a... -Name[cs]=Rozbalit archív do... +Name[cs]=Rozbalit archiv do... Name[da]=Udpak arkiv til... Name[de]=Archiv auspacken nach ... +Name[el]=Εξαγωγή αρχειοθήκης σε... Name[en_GB]=Extract Archive To... Name[es]=Extraer archivo comprimido en... Name[et]=Paki arhiiv lahti... @@ -117,9 +119,10 @@ Name[ar]=فك الأرشيف هنا ، تعرف تلقائي للمجلدات الفرعية Name[ca]=Extreu l'arxiu aquí, detecta automàticament la subcarpeta Name[ca@valencia]=Extreu l'arxiu ací, detecta automàticament la subcarpeta -Name[cs]=Rozbalit archív sem, automaticky detekovat podsložku +Name[cs]=Rozbalit archiv sem, automaticky detekovat podsložku Name[da]=Udpak arkiv her og find automatisk undermappe Name[de]=Archiv hierher auspacken, Unterordner selbständig ermitteln +Name[el]=Εξαγωγή αρχειοθήκης εδώ, αυτόματη επιλογή υποφακέλου Name[en_GB]=Extract Archive Here, Autodetect Subfolder Name[es]=Extraer archivo comprimido aquí, autodetectar subcarpeta Name[et]=Paki arhiiv siia lahti, tuvasta automaatselt alamkataloog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.5.2/ark/part/ark_part.desktop new/kdeutils-4.5.3/ark/part/ark_part.desktop --- old/kdeutils-4.5.2/ark/part/ark_part.desktop 2010-07-23 23:15:47.000000000 +0200 +++ new/kdeutils-4.5.3/ark/part/ark_part.desktop 2010-10-28 19:35:24.000000000 +0200 @@ -75,7 +75,7 @@ Comment[br]=Ostilh merañ an dielloù Comment[ca]=Eina per a treballar amb arxius Comment[ca@valencia]=Eina per a treballar amb arxius -Comment[cs]=Program pro práci s archívy +Comment[cs]=Program pro práci s archivy Comment[cy]=Erfyn Triniaeth Archif Comment[da]=Arkivbehandlingsværktøj Comment[de]=Archiv-Verwaltung diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.5.2/ark/part/part.cpp new/kdeutils-4.5.3/ark/part/part.cpp --- old/kdeutils-4.5.2/ark/part/part.cpp 2010-08-27 10:13:22.000000000 +0200 +++ new/kdeutils-4.5.3/ark/part/part.cpp 2010-10-28 19:35:24.000000000 +0200 @@ -39,6 +39,7 @@ #include <KAction> #include <KSelectAction> #include <KActionCollection> +#include <KGuiItem> #include <KIcon> #include <KTempDir> #include <KMessageBox> @@ -46,6 +47,7 @@ #include <KFileDialog> #include <KConfigGroup> #include <KStandardDirs> +#include <KStandardGuiItem> #include <KToggleAction> #include <KIO/Job> #include <KIO/NetAccess> @@ -339,7 +341,7 @@ if (arguments().metaData()["createNewArchive"] == "true") { if (QFileInfo(localFile).exists()) { - int overwrite = KMessageBox::questionYesNo(NULL, i18n("The file '%1' already exists. Would you like to open it instead?", localFile), i18nc("@title:window", "File Exists") , KGuiItem(i18n("Open File")), KGuiItem(i18n("Cancel"))); + int overwrite = KMessageBox::questionYesNo(NULL, i18n("The file '%1' already exists. Would you like to open it instead?", localFile), i18nc("@title:window", "File Exists"), KGuiItem(i18n("Open File")), KStandardGuiItem::cancel()); if (overwrite == KMessageBox::No) return false; @@ -724,7 +726,7 @@ { kDebug() ; - const int reallyDelete = KMessageBox::questionYesNo(NULL, i18n("Deleting these files is not undoable. Are you sure you want to do this?"), i18nc("@title:window", "Delete files") , KGuiItem(i18n("Delete files")), KGuiItem(i18n("Cancel"))); + const int reallyDelete = KMessageBox::questionYesNo(NULL, i18n("Deleting these files is not undoable. Are you sure you want to do this?"), i18nc("@title:window", "Delete files") , KStandardGuiItem::del(), KStandardGuiItem::cancel()); if (reallyDelete == KMessageBox::No) return; @@ -767,7 +769,7 @@ int overwrite = KMessageBox::warningContinueCancel(widget(), i18n("A file named <b>%1</b> already exists. Are you sure you want to overwrite it?", saveUrl.fileName()), QString(), - KGuiItem(i18n("Overwrite"))); + KStandardGuiItem::overwrite()); if (overwrite != KMessageBox::Continue) { return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.5.2/ark/plugins/cli7zplugin/kerfuffle_cli7z.desktop new/kdeutils-4.5.3/ark/plugins/cli7zplugin/kerfuffle_cli7z.desktop --- old/kdeutils-4.5.2/ark/plugins/cli7zplugin/kerfuffle_cli7z.desktop 2010-09-30 23:23:18.000000000 +0200 +++ new/kdeutils-4.5.3/ark/plugins/cli7zplugin/kerfuffle_cli7z.desktop 2010-10-28 19:35:24.000000000 +0200 @@ -15,7 +15,7 @@ Name[ar]=ملحق أرشيف 7zip Name[ca]=Connector per arxius 7zip Name[ca@valencia]=Connector per arxius 7zip -Name[cs]=Modul pro 7zip archív +Name[cs]=Modul pro 7zip archiv Name[da]=7zip arkiv-plugin Name[de]=7zip-Archiv-Modul Name[el]=Πρόσθετο αρχειοθήκης 7zip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.5.2/ark/plugins/clirarplugin/kerfuffle_clirar.desktop new/kdeutils-4.5.3/ark/plugins/clirarplugin/kerfuffle_clirar.desktop --- old/kdeutils-4.5.2/ark/plugins/clirarplugin/kerfuffle_clirar.desktop 2010-09-30 23:23:19.000000000 +0200 +++ new/kdeutils-4.5.3/ark/plugins/clirarplugin/kerfuffle_clirar.desktop 2010-10-28 19:35:24.000000000 +0200 @@ -15,7 +15,7 @@ Name[ar]=ملحق أرشيف RAR Name[ca]=Connector per arxius RAR Name[ca@valencia]=Connector per arxius RAR -Name[cs]=Modul pro RAR archív +Name[cs]=Modul pro RAR archiv Name[da]=RAR arkiv-plugin Name[de]=RAR-Archiv-Modul Name[el]=πρόσθετο αρχειοθήκης RAR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.5.2/ark/plugins/clizipplugin/kerfuffle_clizip.desktop new/kdeutils-4.5.3/ark/plugins/clizipplugin/kerfuffle_clizip.desktop --- old/kdeutils-4.5.2/ark/plugins/clizipplugin/kerfuffle_clizip.desktop 2010-09-30 23:23:19.000000000 +0200 +++ new/kdeutils-4.5.3/ark/plugins/clizipplugin/kerfuffle_clizip.desktop 2010-10-28 19:35:24.000000000 +0200 @@ -15,9 +15,10 @@ Name[ar]=ملحق أرشيف ZIP Name[ca]=Connector per arxius ZIP Name[ca@valencia]=Connector per arxius ZIP -Name[cs]=Modul pro ZIP archív +Name[cs]=Modul pro ZIP archiv Name[da]=ZIP arkiv-plugin Name[de]=ZIP-Archiv-Modul +Name[el]=πρόσθετο αρχειοθήκης ZIP Name[en_GB]=ZIP archive plugin Name[es]=Complemento de archivo comprimido ZIP Name[et]=ZIP-arhiivi plugin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.5.2/ark/plugins/libarchive/libarchivehandler.cpp new/kdeutils-4.5.3/ark/plugins/libarchive/libarchivehandler.cpp --- old/kdeutils-4.5.2/ark/plugins/libarchive/libarchivehandler.cpp 2010-08-27 10:13:21.000000000 +0200 +++ new/kdeutils-4.5.3/ark/plugins/libarchive/libarchivehandler.cpp 2010-10-28 19:35:24.000000000 +0200 @@ -30,6 +30,8 @@ #include "kerfuffle/kerfuffle_export.h" #include "kerfuffle/queries.h" +#include <unistd.h> + #include <archive.h> #include <archive_entry.h> @@ -446,6 +448,7 @@ success = writeFile(selectedFile, arch_writer.data()); if (!success) { + QFile::remove(tempFilename); return false; } @@ -461,6 +464,7 @@ arch_writer.data()); if (!success) { + QFile::remove(tempFilename); return false; } } @@ -487,6 +491,7 @@ copyData(arch_reader.data(), arch_writer.data(), false); else { kDebug() << "Writing header failed with error code " << header_response; + QFile::remove(tempFilename); return false; } @@ -727,10 +732,29 @@ struct archive_entry *entry = archive_entry_new(); - KDE_stat(QFile::encodeName(relativeName).constData(), &st); + KDE_lstat(QFile::encodeName(relativeName).constData(), &st); archive_entry_copy_stat(entry, &st); archive_entry_copy_pathname(entry, QFile::encodeName(relativeName).constData()); + // #253059: besides calling lstat(), we also need to call readlink() manually + // as we are not using archive_read_disk_entry_from_file() on the 4.5 + // branch. The code should be much cleaner on 4.6+. + if (S_ISLNK(st.st_mode)) { + char linkbuffer[PATH_MAX+1]; + const ssize_t linklen = readlink(QFile::encodeName(fileName).constData(), + linkbuffer, PATH_MAX); + + if (linklen < 0) { + kError() << "readlink() failed."; + archive_entry_free(entry); + + return false; + } + + linkbuffer[linklen] = 0; + archive_entry_set_symlink(entry, linkbuffer); + } + kDebug() << "Writing new entry " << archive_entry_pathname(entry); if ((header_response = archive_write_header(arch_writer, entry)) == ARCHIVE_OK) { //if the whole archive is extracted and the total filesize is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.5.2/kdf/kcmdf.desktop new/kdeutils-4.5.3/kdf/kcmdf.desktop --- old/kdeutils-4.5.2/kdf/kcmdf.desktop 2010-07-23 23:15:46.000000000 +0200 +++ new/kdeutils-4.5.3/kdf/kcmdf.desktop 2010-10-28 19:35:23.000000000 +0200 @@ -16,8 +16,8 @@ Name[af]=Stoorplek Toestelle Name[ar]=أجهزة تخزين Name[bg]=Съхраняващи устройства -Name[ca]=Dispositius d'emmagatzemament -Name[ca@valencia]=Dispositius d'emmagatzemament +Name[ca]=Dispositius d'emmagatzematge +Name[ca@valencia]=Dispositius d'emmagatzematge Name[cs]=Úložná zařízení Name[cy]=Dyfeisiau Storio Name[da]=Lagringsenheder diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.5.2/kremotecontrol/kcmremotecontrol/editactioncontainer.cpp new/kdeutils-4.5.3/kremotecontrol/kcmremotecontrol/editactioncontainer.cpp --- old/kdeutils-4.5.2/kremotecontrol/kcmremotecontrol/editactioncontainer.cpp 2010-04-07 17:18:35.000000000 +0200 +++ new/kdeutils-4.5.3/kremotecontrol/kcmremotecontrol/editactioncontainer.cpp 2010-10-28 19:35:24.000000000 +0200 @@ -81,20 +81,25 @@ void EditActionContainer::checkForComplete() { if(ui.cbButton->currentIndex() < 0){ enableButtonOk(false); + enableButton(Try, false); return; } switch(m_action->type()){ case Action::DBusAction:{ EditDBusAction *dbusActionEditor = dynamic_cast<EditDBusAction*>(m_innerWidget); if(dbusActionEditor){ - enableButtonOk(dbusActionEditor->checkForComplete()); + bool complete = dbusActionEditor->checkForComplete(); + enableButtonOk(complete); + enableButton(Try, complete); return; } } case Action::ProfileAction:{ EditProfileAction *profileActionEditor = dynamic_cast<EditProfileAction*>(m_innerWidget); if(profileActionEditor){ - enableButtonOk(profileActionEditor->checkForComplete()); + bool complete = profileActionEditor->checkForComplete(); + enableButtonOk(complete); + enableButton(Try, complete); return; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.5.2/superkaramba/src/python/misc.cpp new/kdeutils-4.5.3/superkaramba/src/python/misc.cpp --- old/kdeutils-4.5.2/superkaramba/src/python/misc.cpp 2009-12-01 01:35:46.000000000 +0100 +++ new/kdeutils-4.5.3/superkaramba/src/python/misc.cpp 2010-10-28 19:35:24.000000000 +0200 @@ -637,7 +637,7 @@ #include <sys/ioctl.h> #include <net/if.h> #include <arpa/inet.h> -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__DragonFly__) #include <netinet/in.h> #endif #ifdef __OpenBSD__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.5.2/superkaramba/src/sensors/mem.cpp new/kdeutils-4.5.3/superkaramba/src/sensors/mem.cpp --- old/kdeutils-4.5.2/superkaramba/src/sensors/mem.cpp 2009-12-01 01:35:46.000000000 +0100 +++ new/kdeutils-4.5.3/superkaramba/src/sensors/mem.cpp 2010-10-28 19:35:24.000000000 +0200 @@ -13,7 +13,7 @@ #include <QFile> #include <QTextStream> -#ifdef Q_OS_FREEBSD +#if defined(Q_OS_FREEBSD) || defined(__DragonFly__) #include <sys/time.h> #include <sys/param.h> #include <sys/sysctl.h> @@ -31,14 +31,14 @@ #include <sys/swap.h> #endif -#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD) +#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD) || defined(__DragonFly__) /* define pagetok in terms of pageshift */ #define pagetok(size) ((size) << pageshift) #endif MemSensor::MemSensor(int msec) : Sensor(msec) { -#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD) +#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD) || defined(__DragonFly__) /* get the page size with "getpagesize" and calculate pageshift from it */ int pagesize = getpagesize(); pageshift = 0; @@ -49,7 +49,7 @@ /* we only need the amount of log(2)1024 for our conversion */ pageshift -= 10; -# if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018) +# if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018) && !defined(__DragonFly__) connect(&ksp, SIGNAL(receivedStdout(K3Process *, char *, int)), this, SLOT(receivedStdout(K3Process *, char *, int))); connect(&ksp, SIGNAL(processExited(K3Process *)), @@ -60,7 +60,7 @@ MaxSet = false; readValues(); -# elif defined Q_OS_FREEBSD +# elif defined Q_OS_FREEBSD || defined(__DragonFly__) kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, "kvm_open"); # endif #else @@ -71,7 +71,7 @@ MemSensor::~MemSensor() {} -#ifdef Q_OS_FREEBSD +#if defined(Q_OS_FREEBSD) || defined(__DragonFly__) void MemSensor::receivedStdout(K3Process *, char *buffer, int len) { buffer[len] = 0; @@ -84,7 +84,7 @@ void MemSensor::processExited(K3Process *) { -#ifdef Q_OS_FREEBSD +#if defined(Q_OS_FREEBSD) || defined(__DragonFly__) QStringList stringList = sensorResult.split('\n'); sensorResult.clear(); QStringList itemsList = stringList[1].split(' '); @@ -96,7 +96,7 @@ int MemSensor::getMemTotal() { -#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD) +#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD) || defined(__DragonFly__) static int mem = 0; size_t size = sizeof(mem); @@ -111,7 +111,7 @@ int MemSensor::getMemFree() { -#ifdef Q_OS_FREEBSD +#if defined(Q_OS_FREEBSD) || defined(__DragonFly__) static int mem = 0; size_t size = sizeof(mem); @@ -135,7 +135,7 @@ int MemSensor::getBuffers() { -#ifdef Q_OS_FREEBSD +#if defined(Q_OS_FREEBSD) || defined(__DragonFly__) static int mem = 0; size_t size = sizeof(mem); @@ -156,7 +156,7 @@ int MemSensor::getCached() { -#ifdef Q_OS_FREEBSD +#if defined(Q_OS_FREEBSD) || defined(__DragonFly__) static int mem = 0; size_t size = sizeof(mem); @@ -176,8 +176,8 @@ int MemSensor::getSwapTotal() { -#ifdef Q_OS_FREEBSD -# if __FreeBSD_version < 500018 +#if defined(Q_OS_FREEBSD) || defined(__DragonFly__) +# if defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018 return(swapTotal); # else int n = -1; @@ -218,8 +218,8 @@ int MemSensor::getSwapFree() { -#ifdef Q_OS_FREEBSD -# if __FreeBSD_version < 500018 +#if defined(Q_OS_FREEBSD) || defined(__DragonFly__) +# if defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018 return(swapTotal - swapUsed); # else int n = -1; @@ -263,8 +263,8 @@ void MemSensor::readValues() { -#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD) -# if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018) +#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD) || defined(__DragonFly__) +# if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018) && !defined(__DragonFly__) ksp.clearArguments(); ksp << "swapinfo"; ksp.start(K3Process::NotifyOnExit, K3ProcIO::Stdout); @@ -298,7 +298,7 @@ QObject *it; foreach(it, *objList) { sp = qobject_cast<SensorParams*>(it); -#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018) +#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018) && !defined(__DragonFly__) if ((!MaxSet) && (totalSwap > 0)) { setMaxValue(sp); bool set = true; @@ -332,7 +332,7 @@ meter->setValue(format); } -#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018) +#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018) && !defined(__DragonFly__) if (set) MaxSet = true; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.5.2/superkaramba/src/sensors/mem.h new/kdeutils-4.5.3/superkaramba/src/sensors/mem.h --- old/kdeutils-4.5.2/superkaramba/src/sensors/mem.h 2008-01-05 00:53:34.000000000 +0100 +++ new/kdeutils-4.5.3/superkaramba/src/sensors/mem.h 2010-10-28 19:35:24.000000000 +0200 @@ -12,7 +12,7 @@ #include <K3Process> -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__DragonFly__) #include <k3procio.h> #include <kvm.h> #include <osreldate.h> @@ -43,7 +43,7 @@ private: QString meminfo; void readValues(); -#if defined __FreeBSD__ || defined(Q_OS_NETBSD) +#if defined __FreeBSD__ || defined(Q_OS_NETBSD) || defined(__DragonFly__) int pageshift; /* log base 2 of the pagesize */ QString sensorResult; int swapTotal; @@ -52,7 +52,7 @@ K3ShellProcess ksp; bool MaxSet; -# elif defined __FreeBSD__ +# elif defined __FreeBSD__ || defined(__DragonFly__) kvm_t *kd; kvm_swap swapinfo; # endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de