Hello community,

here is the log from the commit of package kdeutils3 for openSUSE:Factory
checked in at Tue Oct 4 18:13:03 CEST 2011.



--------
New Changes file:

--- /dev/null   2010-08-26 16:28:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdeutils3/kdeutils3.changes    2011-09-24 
18:03:26.000000000 +0200
@@ -0,0 +1,948 @@
+-------------------------------------------------------------------
+Sat Sep 24 16:00:32 UTC 2011 - [email protected]
+
+- add patch from Trinity which replaces the old MPL-1.0 licensed headers with 
+  newer ones, licensed under both MPL-1.1 and GPL-2.0, taken directly from 
+  the Linux kernel source
+
+-------------------------------------------------------------------
+Sun Aug 15 06:48:05 UTC 2010 - [email protected]
+
+- fixed Ark opening/extracting rar archives with encrypted header (kde#35371)
+- replaced %run_ldconfig macro with /sbin/ldconfig
+- corrected devel package rpm-group
+
+-------------------------------------------------------------------
+Mon Jun 22 07:07:27 CEST 2009 - [email protected]
+
+- remove ancient unversionized obsolete (kgpg)
+
+-------------------------------------------------------------------
+Wed Aug 20 18:31:16 CEST 2008 - [email protected]
+
+- update to KDE 3.5.10
+  * translation update, desktop files validate
+
+-------------------------------------------------------------------
+Fri Apr 25 17:07:27 CEST 2008 - [email protected]
+
+- 3_5_BRANCH.diff update:
+  * fix disk space display in superkaramba 
+
+-------------------------------------------------------------------
+Wed Feb 27 20:02:40 CET 2008 - [email protected]
+
+- remove tpctl dependency
+
+-------------------------------------------------------------------
+Mon Feb 18 17:33:55 CET 2008 - [email protected]
+
+- update to 3.5.9
+
+-------------------------------------------------------------------
+Thu Jan  3 10:26:42 CET 2008 - [email protected]
+
+- update 3_5_BRANCH.diff to include gmp workarounds
+
+-------------------------------------------------------------------
+Tue Nov 27 15:15:24 CET 2007 - [email protected]
+
+- fix Ark decoding problems (#337117)
+
+-------------------------------------------------------------------
+Tue Oct  9 16:02:45 CEST 2007 - [email protected]
+
+- update to 3.5.8: bug fixes in KFloppy and klaptopdaemon
+
+-------------------------------------------------------------------
+Fri Sep 21 12:16:26 CEST 2007 - [email protected]
+
+- add application/zip as mime-type to ark.desktop (#253418)
+
+-------------------------------------------------------------------
+Sat Aug  4 19:27:41 CEST 2007 - [email protected]
+
+- add 3_5_BRANCH.diff
+
+-------------------------------------------------------------------
+Thu Jun 21 14:25:27 CEST 2007 - [email protected]
+
+- fix invalid .desktop files
+
+-------------------------------------------------------------------
+Fri Jun  1 08:20:57 CEST 2007 - [email protected]
+
+- move kde_post_install
+
+-------------------------------------------------------------------
+Mon May 14 23:37:42 CEST 2007 - [email protected]
+
+- update to 3.5.7:
+   * Superkaramba: Allow themes to receive mouse wheel events on meters.
+   * Bugfixes in ark, klaptopdaemon and kmilo
+
+-------------------------------------------------------------------
+Fri Jan 19 11:31:17 CET 2007 - [email protected]
+
+- update to 3.5.6 release:
+   * ark: improved 7zip support
+   * klaptopdaemon: show battery level percentage over systray icon 
+   * several bugfixes in kcalc, some in kmilo and superkamraba
+
+-------------------------------------------------------------------
+Thu Jan 18 13:46:17 CET 2007 - [email protected]
+
+- fix kmilo volume annoyance (#234196)
+
+-------------------------------------------------------------------
+Mon Jan  8 23:16:25 CET 2007 - [email protected]
+
+- fix Superkaramba session management on 10.2
+
+-------------------------------------------------------------------
+Thu Nov  9 00:55:25 CET 2006 - [email protected]
+
+- add default keyservers when starting without existing
+    GnuPG options file with keyserver setting (#211856)
+
+-------------------------------------------------------------------
+Wed Nov  8 16:59:37 CET 2006 - [email protected]
+
+- remove historic "Provides:" (#218798)
+
+-------------------------------------------------------------------
+Tue Oct 31 16:41:08 CET 2006 - [email protected]
+
+- add 3_5_BRANCH.diff (Improved 7zip support)
+
+-------------------------------------------------------------------
+Tue Oct  3 10:46:49 CEST 2006 - [email protected]
+
+- update to 3.5.5 release tarball
+
+-------------------------------------------------------------------
+Wed Aug 23 15:19:09 CEST 2006 - [email protected]
+
+- add 3_5_BRANCH.diff: changes to klaptopdaemon, kwallet and kmilo
+
+-------------------------------------------------------------------
+Mon Jul 24 07:48:17 CEST 2006 - [email protected]
+
+- update to KDE 3.5.4:
+   * single bug fixes in KGpg, KWallet, Superkaramba and KCalc
+
+-------------------------------------------------------------------
+Tue Jul 11 01:21:46 CEST 2006 - [email protected]
+
+- update to 3_5_BRANCH to partially fix net-snmp detection 
+
+-------------------------------------------------------------------
+Fri May 26 17:15:26 CEST 2006 - [email protected]
+
+- new KDE 3.5.3 tarball (fix in Asus laptop support)
+
+-------------------------------------------------------------------
+Wed May 24 10:34:18 CEST 2006 - [email protected]
+
+- update to KDE 3.5.3
+   * fixes to KGpg, Ark, kcalc and khexedit
+
+-------------------------------------------------------------------
+Mon May 15 14:49:50 CEST 2006 - [email protected]
+
+- update to KDE 3.5.2 and 3_5_BRANCH.diff
+   * kcalc: fix numerous bug related to precision in hex-mode
+   * several fixes within ark and superkaramba
+   * kjots
+      - Make non-Unicode books display and save correctly.
+      - Corrected possible data corruption when switching to/from
+        Unicode mode.
+      - Added keyboard shortcuts for deleting pages/books. 
+
+-------------------------------------------------------------------
+Sun May  7 14:01:57 CEST 2006 - [email protected]
+
+- Fix wallet closing outside full session (#163294)
+
+-------------------------------------------------------------------
+Mon Apr 17 09:29:50 CEST 2006 - [email protected]
+
+- move documentation of apps in subpackage to subpackage (#166995)
+
+-------------------------------------------------------------------
+Thu Mar  9 14:30:03 CET 2006 - [email protected]
+
+- move superkaramba to kdeutils3-extra subpackage
+
+-------------------------------------------------------------------
+Sun Feb  5 01:57:27 CET 2006 - [email protected]
+
+- remove km_tpctl from BuildRequires
+
+-------------------------------------------------------------------
+Mon Jan 30 13:10:42 CET 2006 - [email protected]
+
+- update to 3.5 branch
+
+-------------------------------------------------------------------
+Wed Jan 25 21:33:13 CET 2006 - [email protected]
+
+- converted neededforbuild to BuildRequires
+
+-------------------------------------------------------------------
+Mon Jan 23 08:55:03 CET 2006 - [email protected]
+
+- update to 3.5.1
+
+-------------------------------------------------------------------
++++ 751 more lines (skipped)
++++ between /dev/null
++++ and /mounts/work_src_done/STABLE/kdeutils3/kdeutils3.changes

calling whatdependson for head-i586


New:
----
  3_5_BRANCH.diff
  FIXME.diff
  ark-decoding.diff
  ark-rar_encrypted.patch
  disable-nonsense-security-check.diff
  kdeutils-3.5.10.tar.bz2
  kdeutils3.changes
  kdeutils3.spec
  klaptop.diff
  ppc.dif
  trinity-r1254856-replace-linux-headers.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdeutils3.spec ++++++
#
# spec file for package kdeutils3 (Version 3.5.10)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#


Name:           kdeutils3
BuildRequires:  gmp-devel
BuildRequires:  kdebase3-devel
BuildRequires:  net-snmp-devel
BuildRequires:  pcsc-lite
BuildRequires:  python-devel
%if 0%{?suse_version} < 1210
BuildRequires:  unsermake
%endif
%ifarch ppc
BuildRequires:  pbbuttonsd
%endif
Version:        3.5.10
Release:        1
License:        GPL-2.0+
Summary:        KDE Utility Programs
Url:            http://www.kde.org
Group:          Productivity/File utilities
Source0:        kdeutils-%{version}.tar.bz2
# PATCH-MISSING-TAG -- See 
http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch0:         3_5_BRANCH.diff
# PATCH-MISSING-TAG -- See 
http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch2:         klaptop.diff
# PATCH-MISSING-TAG -- See 
http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch5:         disable-nonsense-security-check.diff
# PATCH-MISSING-TAG -- See 
http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch11:        ppc.dif
# PATCH-MISSING-TAG -- See 
http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch13:        FIXME.diff
# PATCH-MISSING-TAG -- See 
http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch14:        ark-decoding.diff
# PATCH-FIX-UPSTREAM ark-rar_encrypted.patch ark-rar_encrypted.patch kde#35371 
[email protected]
# -- fixes open/extract rar archives with encrypted header
Patch15:        ark-rar_encrypted.patch
# This patch replaces the old MPL-licensed headers with newer ones, licensed 
under GPL-2.0
# The files are taken directly from the Linux kernel sources
Patch16:        trinity-r1254856-replace-linux-headers.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-build

%description
A couple of utility programs for KDE.

* ark           - archiver tool

* kcalc         - calculator tool

* kdepasswd     - tool that changes the user login password

* kdf           - tool that shows free space on disk

* kfloppy       - floppy formatter

* kgpg          - gpg key manager

* kwalletmanager - manager for showing and modifying passwords of
kwallet

%package devel
License:        GPL-2.0+
Summary:        Include Files and Libraries mandatory for Development
Group:          Development/Libraries/KDE

%description devel
This package contains all necessary include files and libraries needed
to develop applications that require these.

%package extra
License:        GPL-2.0+
Summary:        KDE Utility Programs
Group:          System/GUI/KDE
# usesubdirs khexedit kedit ktimer kcharselect charselectapplet kregexpeditor 
kjots
Provides:       kdeutils3:/opt/kde3/bin/kedit

%description extra
Small applications not used by most people.

kcharselect - browse characters

kedit       - the old KDE text editor

khexedit    - hex editor

kjots       - an application for notes

ktimer      - a timing application

SuperKaramba - a tool that allows one to easily use interactive
eye-candy

%package laptop
License:        GPL-2.0+
Summary:        KDE utility programs for laptop users
Group:          Hardware/Mobile

%description laptop
Support for various types of hardware input devices that exist, such as
those on keyboards. It contains:

* kmilo     - tool that enables special keys on some keyboards

%prep
%setup -q -n kdeutils-%{version}
%patch0
%patch2
%patch5
%ifarch ppc ppc64
%patch11
%endif
%patch13
%patch14
%patch15
pushd klaptopdaemon/linux
%patch16
popd

%ifarch s390 s390x
rm -rf kfloppy doc/kfloppy
%endif
rm -rf klaptopdaemon
. /etc/opt/kde3/common_options
update_admin

%build
. /etc/opt/kde3/common_options
DO_NOT_COMPILE=kdessh
%if 0%{?suse_version} >= 1140
sed -i 's/2.6/2.7/g' ./configure
%endif
./configure $configkde
make %{?_smp_mflags}

%install
. /etc/opt/kde3/common_options
make DESTDIR=%{buildroot} $INSTALL_TARGET
# remove unwanted files
%suse_update_desktop_file KEdit       Utility TextEditor
%suse_update_desktop_file superkaramba Utility DesktopUtility
%suse_update_desktop_file KCharSelect Utility Accessibility
%suse_update_desktop_file khexedit    Utility Editor
%suse_update_desktop_file Kjots       Utility TimeUtility
%suse_update_desktop_file ktimer      Utility TimeUtility
%suse_update_desktop_file kwikdisk    System  Applet
%suse_update_desktop_file kdf         System  Filesystem
%suse_update_desktop_file ark         System  Archiving
%suse_update_desktop_file kcalc       Utility Calculator
%suse_update_desktop_file kgpg        Utility Security
%suse_update_desktop_file irkick      Applet
%suse_update_desktop_file kwalletmanager Applet
%suse_update_desktop_file kregexpeditor  Utility Editor
%suse_update_desktop_file kcmdf
%suse_update_desktop_file kcmlirc
%suse_update_desktop_file kwalletconfig
%suse_update_desktop_file thinkpad
%suse_update_desktop_file kvaio
%ifnarch s390 s390x
%suse_update_desktop_file KFloppy     System  Filesystem
%endif
kde_post_install

%clean
rm -rf %{buildroot}

%post extra -p /sbin/ldconfig

%postun extra -p /sbin/ldconfig

%post laptop -p /sbin/ldconfig

%postun laptop -p /sbin/ldconfig

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%dir /opt/kde3/share/icons/*/*/mimetypes
%dir /opt/kde3/share/icons/hicolor/16x16
%dir /opt/kde3/share/icons/hicolor/16x16/apps
%dir /opt/kde3/share/icons/hicolor/16x16/devices
%dir /opt/kde3/share/icons/hicolor/32x32
%dir /opt/kde3/share/icons/hicolor/32x32/apps
%dir /opt/kde3/share/icons/*/scalable/apps
%dir /opt/kde3/share/config.kcfg
/opt/kde3/bin/ark
/opt/kde3/bin/irkick
/opt/kde3/bin/kcalc
/opt/kde3/bin/kd*
/opt/kde3/bin/kgpg
/opt/kde3/bin/kw*
/opt/kde3/%{_lib}/kde3/ark.*
/opt/kde3/%{_lib}/kde3/irkick.*
/opt/kde3/%{_lib}/kde3/kcalc.*
%exclude /opt/kde3/%{_lib}/kde3/kcm_kvaio*
/opt/kde3/%{_lib}/kde3/kcm_k*
/opt/kde3/%{_lib}/kde3/ksim_*
/opt/kde3/%{_lib}/kde3/libarkpart.*
/opt/kde3/%{_lib}/libkdeinit_ark.*
/opt/kde3/%{_lib}/libkdeinit_irkick.*
/opt/kde3/%{_lib}/libkdeinit_kcalc.*
/opt/kde3/%{_lib}/libksimcore.*
/opt/kde3/share/applications/kde/ark.desktop
/opt/kde3/share/applications/kde/irkick.desktop
/opt/kde3/share/applications/kde/kc*
/opt/kde3/share/applications/kde/kd*
/opt/kde3/share/applications/kde/kgpg.desktop
#/opt/kde3/share/applications/kde/ksim.desktop
/opt/kde3/share/applications/kde/kw*
/opt/kde3/share/apps/ark
/opt/kde3/share/apps/irkick
/opt/kde3/share/apps/kcalc
/opt/kde3/share/apps/kconf_update/kcalcrc.upd
/opt/kde3/share/apps/kdf
/opt/kde3/share/apps/kgpg
/opt/kde3/share/apps/kicker/extensions/ksim.desktop
/opt/kde3/share/apps/konqueror
/opt/kde3/share/apps/ksim
/opt/kde3/share/apps/kwalletmanager
/opt/kde3/share/apps/profiles
/opt/kde3/share/apps/remotes
/opt/kde3/share/autostart/*
%config /opt/kde3/share/config/*rc
%doc %lang(en) /opt/kde3/share/doc/HTML/en/ark
%doc %lang(en) /opt/kde3/share/doc/HTML/en/kcalc
%doc %lang(en) /opt/kde3/share/doc/HTML/en/kdf
%doc %lang(en) /opt/kde3/share/doc/HTML/en/kgpg
%doc %lang(en) /opt/kde3/share/doc/HTML/en/kinfocenter/blockdevices
%doc %lang(en) /opt/kde3/share/doc/HTML/en/ksim
%doc %lang(en) /opt/kde3/share/doc/HTML/en/kwallet
%doc %lang(en) /opt/kde3/share/doc/HTML/en/irkick
%doc %lang(en) /opt/kde3/share/doc/HTML/en/kcmlirc
/opt/kde3/share/icons/*/*/*/ark.*
/opt/kde3/share/icons/*/*/*/irkick.*
/opt/kde3/share/icons/*/*/*/kcalc.*
/opt/kde3/share/icons/*/*/*/kcmdf.*
/opt/kde3/share/icons/*/*/*/kdf.*
/opt/kde3/share/icons/*/*/*/kgpg.*
/opt/kde3/share/icons/*/*/*/ksim_cpu.*
/opt/kde3/share/icons/*/*/*/ksim.*
/opt/kde3/share/icons/*/*/*/ktimer.*
/opt/kde3/share/icons/*/*/*/kwalletmanager.*
/opt/kde3/share/icons/*/*/*/kwikdisk.*
/opt/kde3/share/services/ark_part.desktop
/opt/kde3/share/services/kwallet*
/opt/kde3/share/config.kcfg/ark.kcfg
%ifnarch s390 s390x
/opt/kde3/share/icons/*/*/*/kfloppy.*
/opt/kde3/share/applications/kde/KFloppy.desktop
/opt/kde3/bin/kfloppy
%doc %lang(en) /opt/kde3/share/doc/HTML/en/kfloppy
%endif
%if 0%{?suse_version} < 1210
%{_mandir}/man1/ark*
%endif

%files extra
%defattr(-,root,root)
/opt/kde3/bin/kcharselect
/opt/kde3/bin/kedit
/opt/kde3/bin/khexedit
/opt/kde3/bin/kjots
/opt/kde3/bin/kregexpeditor
/opt/kde3/bin/ktimer
/opt/kde3/bin/superkaramba
/opt/kde3/%{_lib}/kde3/kcharselect_panelapplet.*
/opt/kde3/%{_lib}/kde3/kedit.*
/opt/kde3/%{_lib}/kde3/libkregexpeditorgui.*
/opt/kde3/%{_lib}/kde3/libkhexedit2part.*
/opt/kde3/%{_lib}/libkdeinit_kedit.*
/opt/kde3/%{_lib}/libkregexpeditorcommon.*
/opt/kde3/%{_lib}/libkhexeditcommon.*
/opt/kde3/share/applications/kde/KCharSelect.desktop
/opt/kde3/share/applications/kde/KEdit.desktop
/opt/kde3/share/applications/kde/khexedit.desktop
/opt/kde3/share/applications/kde/Kjots.desktop
/opt/kde3/share/applications/kde/kregexpeditor.desktop
/opt/kde3/share/applications/kde/ktimer.desktop
/opt/kde3/share/applications/kde/superkaramba.desktop
/opt/kde3/share/apps/kedit
/opt/kde3/share/apps/khexedit*
/opt/kde3/share/apps/kicker/applets/kcharselectapplet.desktop
/opt/kde3/share/apps/kjots
/opt/kde3/share/apps/kregexpeditor
/opt/kde3/share/apps/superkaramba
/opt/kde3/share/config.kcfg/kedit.kcfg
/opt/kde3/share/apps/kconf_update/kcharselect.upd
/opt/kde3/%{_lib}/kde3/libkbyteseditwidget.*
/opt/kde3/share/config.kcfg/kcalc.kcfg
/opt/kde3/share/config.kcfg/kgpg.kcfg
/opt/kde3/share/config.kcfg/kjots.kcfg
/opt/kde3/share/icons/*/*/*/kcharselect.png
/opt/kde3/share/icons/*/*/*/kedit.png
/opt/kde3/share/icons/*/*/*/khexedit.png
/opt/kde3/share/icons/*/*/*/kjots.png
/opt/kde3/share/icons/*/*/*/kregexpeditor.*
/opt/kde3/share/icons/*/*/*/superkaramba.*
/opt/kde3/share/icons/*/*/*/superkaramba_theme.*
/opt/kde3/share/mimelnk/application/x-superkaramba.desktop
/opt/kde3/share/services/kregexpeditorgui.desktop
/opt/kde3/share/services/kbyteseditwidget.desktop
/opt/kde3/share/services/khexedit2part.desktop
/opt/kde3/share/apps/kcharselect
%doc %lang(en) /opt/kde3/share/doc/HTML/en/kedit
%doc %lang(en) /opt/kde3/share/doc/HTML/en/khexedit
%doc %lang(en) /opt/kde3/share/doc/HTML/en/kcharselect
%doc %lang(en) /opt/kde3/share/doc/HTML/en/superkaramba
%doc %lang(en) /opt/kde3/share/doc/HTML/en/kjots
%doc %lang(en) /opt/kde3/share/doc/HTML/en/KRegExpEditor
%doc %lang(en) /opt/kde3/share/doc/HTML/en/ktimer

%files laptop
%defattr(-,root,root)
/opt/kde3/%{_lib}/libkmilo.*
/opt/kde3/%{_lib}/kde3/kmilo*
/opt/kde3/%{_lib}/kde3/kded_kmilo*
/opt/kde3/%{_lib}/kde3/kcm_kvaio*
/opt/kde3/%{_lib}/kde3/kcm_thinkpad.*
/opt/kde3/share/applications/kde/kvaio.desktop
/opt/kde3/share/applications/kde/thinkpad.desktop
/opt/kde3/share/services/kded/kmilod.desktop
/opt/kde3/share/services/kmilo
/opt/kde3/share/servicetypes/kmilo
%doc %lang(en) /opt/kde3/share/doc/HTML/en/kcontrol/kcmlowbat*
%doc %lang(en) /opt/kde3/share/doc/HTML/en/kcontrol/laptop
%doc %lang(en) /opt/kde3/share/doc/HTML/en/kcontrol/powerctrl

%files devel
%defattr(-,root,root)
/opt/kde3/include/kmultiformlistbox*
/opt/kde3/include/ksim
/opt/kde3/include/kwidgetstreamer.h

%changelog
++++++ 3_5_BRANCH.diff ++++++
package: kdeutils-3.5.10.tar.bz2
kdemod: kdeutils
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
+current HEAD:
+svn di between //tags/KDE/3.5.10/kdeutils and //branches/KDE/3.5/kdeutils

Eigenschaftsänderungen: .
___________________________________________________________________
Gelöscht: svn:mergeinfo
Hinzugefügt: svn:externals
   + admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin


++++++ FIXME.diff ++++++
Index: kwallet/kwalletmanager.desktop
===================================================================
--- kwallet/kwalletmanager.desktop.orig
+++ kwallet/kwalletmanager.desktop
@@ -61,3 +61,4 @@ Terminal=false
 X-KDE-StartupNotify=false
 Categories=Qt;KDE;Settings;
 DocPath=kwallet/index.html
+OnlyShowIn=KDE;
++++++ ark-decoding.diff ++++++
--- ark/tar.cpp.orig    2006-11-20 19:35:44.000000000 +0900
+++ ark/tar.cpp 2006-11-20 19:38:13.000000000 +0900
@@ -622,7 +622,7 @@
       for ( QStringList::Iterator it = m_fileList->begin();
             it != m_fileList->end(); ++it )
         {
-            *kp << QString(m_dotslash ? "./" : "")+(*it);
+            *kp << QString(m_dotslash ? "./" : "") + 
QFile::decodeName((*it).latin1());
         }
     }
 
++++++ ark-rar_encrypted.patch ++++++
Index: ark/arch.cpp
===================================================================
--- ark/arch.cpp.orig   2008-02-13 12:38:15.000000000 +0300
+++ ark/arch.cpp        2010-08-15 10:14:01.000000000 +0400
@@ -100,6 +100,31 @@ void Arch::verifyUncompressUtilityIsAvai
 
 void Arch::slotOpenExited( KProcess* _kp )
 {
+ bool success = ( _kp->normalExit() && ( _kp->exitStatus() == 0 ) );
+
+  if( !success )
+  {
+    if ( passwordRequired() )
+    {
+        QString msg;
+        if ( !m_password.isEmpty() )
+            msg = i18n("The password was incorrect. ");
+        if (KPasswordDialog::getPassword( m_password, msg+i18n("You must enter 
a password to open the file:") ) == KPasswordDialog::Accepted )
+        {
+            delete _kp;
+            _kp = m_currentProcess = 0;
+            clearShellOutput();
+            open(); // try to open the file again with a password
+            return;
+        }
+        m_password = "";
+        emit sigOpen( this, false, QString::null, 0 );
+        delete _kp;
+        _kp = m_currentProcess = 0;
+        return;
+    }
+  }
+
   int exitStatus = 100; // arbitrary bad exit status
 
   if ( _kp->normalExit() )
Index: ark/rar.cpp
===================================================================
--- ark/rar.cpp.orig    2008-02-13 12:38:15.000000000 +0300
+++ ark/rar.cpp 2010-08-15 10:14:01.000000000 +0400
@@ -119,7 +119,14 @@ void RarArch::open()
   m_finished = false;
 
   KProcess *kp = m_currentProcess = new KProcess;
-  *kp << m_unarchiver_program << "v" << "-c-" << m_filename;
+  *kp << m_unarchiver_program << "v" << "-c-";
+
+  if ( !m_password.isEmpty() )
+    *kp << "-p" + m_password;
+  else
+    *kp << "-p-";
+
+  *kp << m_filename;
 
   connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
            SLOT( slotReceivedTOC(KProcess*, char*, int) ) );
++++++ disable-nonsense-security-check.diff ++++++
Index: klaptopdaemon/acpi.cpp
===================================================================
--- klaptopdaemon/acpi.cpp.orig
+++ klaptopdaemon/acpi.cpp
@@ -164,6 +164,7 @@ void AcpiConfig::setupHelper()
 {
        unsigned long len, crc;
        QString helper = KStandardDirs::findExe("klaptop_acpi_helper");
+#if 0
        checkcrc(QFile::encodeName(helper), len, crc);
        if (len != file_len || crc != file_crc) {
                QString str(i18n("The %1 application does not seem to have "
@@ -173,7 +174,7 @@ void AcpiConfig::setupHelper()
                if (rc != KMessageBox::Continue) 
                        return;
        }
-
+#endif
        QString kdesu = KStandardDirs::findExe("kdesu");
        if (!kdesu.isEmpty()) {
                int rc = KMessageBox::warningContinueCancel(0,
Index: klaptopdaemon/apm.cpp
===================================================================
--- klaptopdaemon/apm.cpp.orig
+++ klaptopdaemon/apm.cpp
@@ -186,6 +186,7 @@ void ApmConfig::setupHelper2()      // we use
 {
        unsigned long len, crc;
        QString helper = KStandardDirs::findExe("klaptop_acpi_helper");
+#if 0
        checkcrc(helper.latin1(), len, crc);
        if (len != file_len || crc != file_crc) {
                QString str(i18n("The %1 application does not seem to have "
@@ -195,7 +196,7 @@ void ApmConfig::setupHelper2()      // we use
                if (rc != KMessageBox::Continue) 
                        return;
        }
-
+#endif
        QString kdesu = KStandardDirs::findExe("kdesu");
        if (!kdesu.isEmpty()) {
                int rc = KMessageBox::warningContinueCancel(0,
++++++ klaptop.diff ++++++
Index: klaptopdaemon/applnk/klaptopdaemon.desktop
===================================================================
--- klaptopdaemon/applnk/klaptopdaemon.desktop.orig
+++ klaptopdaemon/applnk/klaptopdaemon.desktop
@@ -6,7 +6,7 @@ X-KDE-ModuleType=Library
 X-KDE-Library=klaptopdaemon
 X-KDE-FactoryName=klaptopdaemon
 X-KDE-Kded-autoload=false
-X-KDE-Kded-load-on-demand=true
+X-KDE-Kded-load-on-demand=false
 
 Icon=laptop_battery
 DocPath=kcontrol/battery-monitor.html
++++++ ppc.dif ++++++
--- klaptopdaemon/portable.cpp
+++ klaptopdaemon/portable.cpp  2005/02/04 16:29:45
@@ -866,6 +866,7 @@
 //
 int laptop_portable::has_suspend()
 {
+return(0);
        if (::has_acpi()) 
                return ::acpi_sleep_access_ok() && ::has_acpi_sleep(3);
        if (::has_pmu()) 
@@ -901,6 +902,8 @@
 //
 int laptop_portable::has_hibernation()
 {
+       return 1;
+
        if (::has_pmu()) 
                return 0;
        if (::has_software_suspend(1))  // must be before acpi
@@ -2487,7 +2490,7 @@
 {
 
        struct stat s;
-        if (stat("/usr/sbin/apm", &s))
+        if (stat("/sbin/snooze", &s))
                return(0);
        return(1);
 }
@@ -2501,7 +2504,7 @@
 {
 
        struct stat s;
-        if (stat("/usr/sbin/apm", &s))
+        if (stat("/sbin/snooze", &s))
                return(0);
        return(1);
 }
@@ -2583,8 +2586,8 @@
 void laptop_portable::invoke_standby()
 {
        KProcess proc;
-       proc << "/usr/sbin/apm";
-       proc << "-S";
+       proc << "/sbin/snooze";
+//     proc << "-S";
        proc.start(KProcess::Block);    // helper runs fast and we want to see 
the result
 }
 
@@ -2596,8 +2599,8 @@
 void laptop_portable::invoke_suspend()
 {
        KProcess proc;
-       proc << "/usr/sbin/apm";
-       proc << "-z";
+       proc << "/sbin/snooze";
+//     proc << "-z";
        proc.start(KProcess::Block);    // helper runs fast and we want to see 
the result
 }
 
++++++ trinity-r1254856-replace-linux-headers.diff ++++++
++++ 1485 lines (skipped)

continue with "q"...



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to