Mailinglist Archive: opensuse-commit (1423 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package kdepim3 for openSUSE:Factory checked 
in at 2012-05-07 22:47:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdepim3 (Old)
 and      /work/SRC/openSUSE:Factory/.kdepim3.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kdepim3", Maintainer is "kde-maintainers@xxxxxxx"

Changes:
--------
--- /work/SRC/openSUSE:Factory/kdepim3/kdepim3.changes  2012-03-09 
21:24:06.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdepim3.new/kdepim3.changes     2012-05-07 
22:47:41.000000000 +0200
@@ -1,0 +2,11 @@
+Fri Apr 27 20:27:01 UTC 2012 - anixx@xxxxxxxxxxxx
+
+- add a patch for IMAP from Pardus
+- merge three patches into one
+
+-------------------------------------------------------------------
+Wed Apr 25 20:53:04 UTC 2012 - dimstar@xxxxxxxxxxxx
+
+- Add kdepim3-gcc47.patch: Fix build with gcc 4.7.
+
+-------------------------------------------------------------------

Old:
----
  kdepim-gcc-fix-call1.patch
  kdepim-gcc-fix-call2.patch

New:
----
  kdepim3-gcc47.patch
  kdepim3-pardus-unbreak-imap.patch

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

Other differences:
------------------
++++++ kdepim3.spec ++++++
--- /var/tmp/diff_new_pack.J2Pr0B/_old  2012-05-07 22:47:43.000000000 +0200
+++ /var/tmp/diff_new_pack.J2Pr0B/_new  2012-05-07 22:47:43.000000000 +0200
@@ -28,20 +28,22 @@
 BuildRequires:  hal-devel
 %endif
 BuildRequires:  gnokii-devel
-BuildRequires:  libopensync-devel
-BuildRequires:  pilot-link-devel
 BuildRequires:  gpg2
 BuildRequires:  gpgme-devel
+BuildRequires:  libopensync-devel
+BuildRequires:  pilot-link-devel
 Summary:        Personal Information Manager Software for KDE
 License:        GPL-2.0
 Group:          System/GUI/KDE
 Version:        3.5.10
 Release:        0
 Url:            http://www.kde.org/
-Requires:       suse_help_viewer
 Requires:       libkcal2
-Provides:       kdenetwork3-mail kdepim3-organizer
-Obsoletes:      kdenetwork3-mail kdepim3-organizer
+Requires:       suse_help_viewer
+Provides:       kdenetwork3-mail
+Provides:       kdepim3-organizer
+Obsoletes:      kdenetwork3-mail
+Obsoletes:      kdepim3-organizer
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        kdepim-%{version}.tar.bz2
 Source5:        groupwarewizard.desktop
@@ -66,12 +68,12 @@
 Patch126:       kdepim-gcc44-fix.patch
 Patch127:       kdepim-gcc-fix-call.patch
 Patch128:       kdepim-trinity-fix-include.diff
-Patch129:       kdepim-gcc-fix-call1.patch
-Patch130:       kdepim-gcc-fix-call2.patch
 Patch131:       kdepim-trinity-editorwatcher-crash-fix.patch
 Patch132:       kdepim-pardus-kmail-imapfetchmaxsize.patch
 Patch134:       
kdepim-gentoo-kioslaves-3.5.10-kio_imap4_fix_infinite_loop.patch
 Patch135:       kdepim-gentoo-composer_crash_fix.diff
+Patch136:       kdepim3-pardus-unbreak-imap.patch
+Patch137:       kdepim3-gcc47.patch
 Provides:       cryptplug
 Obsoletes:      cryptplug
 # authentification plugins can be useful
@@ -169,7 +171,10 @@
 Summary:        Personal Information Manager software for KDE
 License:        GPL-2.0
 Group:          System/GUI/KDE
-Requires:       %name = %version libktnef-devel libkmime-devel libkcal-devel
+Requires:       %name = %version
+Requires:       libkcal-devel
+Requires:       libkmime-devel
+Requires:       libktnef-devel
 
 %description devel
 This package contains tools for address and date organization.
@@ -259,12 +264,12 @@
 %patch126 -p1
 %patch127 -p1
 %patch128 -p1
-%patch129 -p1
-%patch130 -p1
 %patch131 -p3
 %patch132 -p1
 %patch134 -p1
 %patch135 -p1
+%patch136
+%patch137 -p1
 . /etc/opt/kde3/common_options
 update_admin
 

++++++ kdepim-gcc-fix-call.patch ++++++
--- /var/tmp/diff_new_pack.J2Pr0B/_old  2012-05-07 22:47:43.000000000 +0200
+++ /var/tmp/diff_new_pack.J2Pr0B/_new  2012-05-07 22:47:43.000000000 +0200
@@ -33,3 +33,53 @@
      kdDebug() << "main | datetimestamp | "
                << "setting enddatetime from enddate and endtime"
                << endl;
+diff -wruN kdepim-3.5.10.orig/kontact/plugins/korganizer/summarywidget.cpp 
kdepim-3.5.10/kontact/plugins/korganizer/summarywidget.cpp
+--- kdepim-3.5.10.orig/kontact/plugins/korganizer/summarywidget.cpp    
2008-02-13 12:39:52.000000000 +0300
++++ kdepim-3.5.10/kontact/plugins/korganizer/summarywidget.cpp 2011-12-01 
12:56:20.748463914 +0400
+@@ -167,7 +167,7 @@
+       QString datestr;
+ 
+       // Modify event date for printing
+-      QDate sD = QDate::QDate( dt.year(), dt.month(), dt.day() );
++      QDate sD = QDate( dt.year(), dt.month(), dt.day() );
+       if ( ( sD.month() == currentDate.month() ) &&
+            ( sD.day()   == currentDate.day() ) ) {
+         datestr = i18n( "Today" );
+@@ -227,10 +227,10 @@
+         QTime sET = ev->dtEnd().time();
+         if ( ev->isMultiDay() ) {
+           if ( ev->dtStart().date() < dt ) {
+-            sST = QTime::QTime( 0, 0 );
++            sST = QTime( 0, 0 );
+           }
+           if ( ev->dtEnd().date() > dt ) {
+-            sET = QTime::QTime( 23, 59 );
++            sET = QTime( 23, 59 );
+           }
+         }
+         datestr = i18n( "Time from - to", "%1 - %2" )
+diff -wruN kdepim-3.5.10.orig/kontact/plugins/specialdates/sdsummarywidget.cpp 
kdepim-3.5.10/kontact/plugins/specialdates/sdsummarywidget.cpp
+--- kdepim-3.5.10.orig/kontact/plugins/specialdates/sdsummarywidget.cpp        
2006-10-01 21:30:38.000000000 +0400
++++ kdepim-3.5.10/kontact/plugins/specialdates/sdsummarywidget.cpp     
2011-12-01 13:56:04.764590871 +0400
+@@ -438,7 +438,7 @@
+ 
+       //Muck with the year -- change to the year 'daysTo' days away
+       int year = currentDate.addDays( (*addrIt).daysTo ).year();
+-      QDate sD = QDate::QDate( year,
++      QDate sD = QDate( year,
+                            (*addrIt).date.month(), (*addrIt).date.day() );
+ 
+       if ( (*addrIt).daysTo == 0 ) {
+diff -wruN kdepim-3.5.10.orig/kontact/plugins/specialdates/sdsummarywidget.h 
kdepim-3.5.10/kontact/plugins/specialdates/sdsummarywidget.h
+--- kdepim-3.5.10.orig/kontact/plugins/specialdates/sdsummarywidget.h  
2006-01-19 19:56:12.000000000 +0300
++++ kdepim-3.5.10/kontact/plugins/specialdates/sdsummarywidget.h       
2011-12-01 13:56:36.671354360 +0400
+@@ -78,7 +78,7 @@
+     bool mShowHolidays;
+     bool mShowSpecialsFromCal;
+ 
+-    KHolidays::KHolidays *mHolidays;
++    KHolidays *mHolidays;
+ };
+ 
+ #endif
+ 
\ No newline at end of file

++++++ kdepim-gcc-fix-call1.patch -> kdepim3-gcc47.patch ++++++
--- /work/SRC/openSUSE:Factory/kdepim3/kdepim-gcc-fix-call1.patch       
2011-12-02 13:21:39.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdepim3.new/kdepim3-gcc47.patch 2012-05-07 
22:47:41.000000000 +0200
@@ -1,25 +1,46 @@
-diff -wruN kdepim-3.5.10.orig/kontact/plugins/korganizer/summarywidget.cpp 
kdepim-3.5.10/kontact/plugins/korganizer/summarywidget.cpp
---- kdepim-3.5.10.orig/kontact/plugins/korganizer/summarywidget.cpp    
2008-02-13 12:39:52.000000000 +0300
-+++ kdepim-3.5.10/kontact/plugins/korganizer/summarywidget.cpp 2011-12-01 
12:56:20.748463914 +0400
-@@ -167,7 +167,7 @@
-       QString datestr;
+Index: kdepim-3.5.10/kmail/kmsystemtray.cpp
+===================================================================
+--- kdepim-3.5.10.orig/kmail/kmsystemtray.cpp
++++ kdepim-3.5.10/kmail/kmsystemtray.cpp
+@@ -474,9 +474,9 @@ void KMSystemTray::updateNewMessages()
+   /** The number of unread messages in that folder */
+   int unread = fldr->countUnread();
  
-       // Modify event date for printing
--      QDate sD = QDate::QDate( dt.year(), dt.month(), dt.day() );
-+      QDate sD = QDate( dt.year(), dt.month(), dt.day() );
-       if ( ( sD.month() == currentDate.month() ) &&
-            ( sD.day()   == currentDate.day() ) ) {
-         datestr = i18n( "Today" );
-@@ -227,10 +227,10 @@
-         QTime sET = ev->dtEnd().time();
-         if ( ev->isMultiDay() ) {
-           if ( ev->dtStart().date() < dt ) {
--            sST = QTime::QTime( 0, 0 );
-+            sST = QTime( 0, 0 );
-           }
-           if ( ev->dtEnd().date() > dt ) {
--            sET = QTime::QTime( 23, 59 );
-+            sET = QTime( 23, 59 );
-           }
-         }
-         datestr = i18n( "Time from - to", "%1 - %2" )
+-  QMap<QGuardedPtr<KMFolder>, int>::Iterator it =
++  QMap<QGuardedPtr<KMFolder>, int>::Iterator unread_it =
+       mFoldersWithUnread.find(fldr);
+-  bool unmapped = (it == mFoldersWithUnread.end());
++  bool unmapped = (unread_it == mFoldersWithUnread.end());
+ 
+   /** If the folder is not mapped yet, increment count by numUnread
+       in folder */
+Index: kdepim-3.5.10/libkcal/listbase.h
+===================================================================
+--- kdepim-3.5.10.orig/libkcal/listbase.h
++++ kdepim-3.5.10/libkcal/listbase.h
+@@ -67,7 +67,7 @@ class ListBase : public QValueList<T *>
+ 
+     bool removeRef( T *t )
+     {
+-      QValueListIterator<T *> it = find( t );
++      QValueListIterator<T *> it = this->find( t );
+       if ( it == QValueList<T*>::end() ) {
+         return false;
+       } else {
+Index: kdepim-3.5.10/korganizer/korgac/alarmdialog.cpp
+===================================================================
+--- kdepim-3.5.10.orig/korganizer/korgac/alarmdialog.cpp
++++ kdepim-3.5.10/korganizer/korgac/alarmdialog.cpp
+@@ -324,9 +324,9 @@ void AlarmDialog::eventNotification()
+     found = true;
+     item->mNotified = true;
+     Alarm::List alarms = item->mIncidence->alarms();
+-    Alarm::List::ConstIterator it;
+-    for ( it = alarms.begin(); it != alarms.end(); ++it ) {
+-      Alarm *alarm = *it;
++    Alarm::List::ConstIterator it2;
++    for ( it2 = alarms.begin(); it2 != alarms.end(); ++it2 ) {
++      Alarm *alarm = *it2;
+       // FIXME: Check whether this should be done for all multiple alarms
+       if (alarm->type() == Alarm::Procedure) {
+         // FIXME: Add a message box asking whether the procedure should 
really be executed

++++++ kdepim3-pardus-unbreak-imap.patch ++++++
Index: kmail/folderstorage.h
===================================================================
--- kmail/folderstorage.h       (revision 768418)
+++ kmail/folderstorage.h       (working copy)
@@ -430,9 +430,6 @@
       emmitted first. */
   void expunged( KMFolder* );
 
-  /** Emitted when the folder was closed and ticket owners have to reopen */
-  void closed( KMFolder* );
-  
   /** Emitted when the serial numbers of this folder were invalidated. */
   void invalidated( KMFolder * );
 
Index: kmail/kmheaders.h
===================================================================
--- kmail/kmheaders.h   (revision 768418)
+++ kmail/kmheaders.h   (working copy)
@@ -229,8 +229,6 @@
   void msgChanged();
   /** For when the folder has been cleared */
   void folderCleared();
-  /** For when the folder has been cleared */
-  void folderClosed();
   /** For when the message with the given message id has been added to a 
folder */
   void msgAdded(int);
   /** For when the message with the given id has been removed for a folder */
Index: kmail/kmheaders.cpp
===================================================================
--- kmail/kmheaders.cpp (revision 768418)
+++ kmail/kmheaders.cpp (working copy)
@@ -687,8 +687,6 @@
                  this, SLOT(folderCleared()));
       disconnect(mFolder, SIGNAL(expunged( KMFolder* )),
                  this, SLOT(folderCleared()));
-      disconnect(mFolder, SIGNAL(closed()),
-                 this, SLOT(folderClosed()));
       disconnect( mFolder, SIGNAL( statusMsg( const QString& ) ),
                   BroadcastStatus::instance(), SLOT( setStatusMsg( const 
QString& ) ) );
       disconnect(mFolder, SIGNAL(viewConfigChanged()), this, SLOT(reset()));
@@ -720,8 +718,6 @@
               this, SLOT(folderCleared()));
       connect(mFolder, SIGNAL(expunged( KMFolder* )),
                  this, SLOT(folderCleared()));
-      connect(mFolder, SIGNAL(closed()),
-                 this, SLOT(folderClosed()));
       connect(mFolder, SIGNAL(statusMsg(const QString&)),
               BroadcastStatus::instance(), SLOT( setStatusMsg( const QString& 
) ) );
       connect(mFolder, SIGNAL(numUnreadMsgsChanged(KMFolder*)),
@@ -2623,13 +2619,6 @@
     emit selected(0);
 }
 
-
-void KMHeaders::folderClosed()
-{
-    mFolder->open( "kmheaders" );
-    folderCleared();
-}
-
 bool KMHeaders::writeSortOrder()
 {
   QString sortFile = KMAIL_SORT_FILE(mFolder);
Index: kmail/folderstorage.cpp
===================================================================
--- kmail/folderstorage.cpp     (revision 768418)
+++ kmail/folderstorage.cpp     (working copy)
@@ -85,8 +85,6 @@
 
   mHasChildren = HasNoChildren;
   mContentsType = KMail::ContentsTypeMail;
- 
-  connect(this, SIGNAL(closed(KMFolder*)), mFolder, SIGNAL(closed()));  
 }
 
 //-----------------------------------------------------------------------------
@@ -654,7 +652,7 @@
   QString oldLoc, oldIndexLoc, oldIdsLoc, newLoc, newIndexLoc, newIdsLoc;
   QString oldSubDirLoc, newSubDirLoc;
   QString oldName;
-  int rc=0;
+  int rc=0, openCount=mOpenCount;
   KMFolderDir *oldParent;
 
   assert(!newName.isEmpty());
@@ -724,6 +722,11 @@
     }
   }
 
+  if (openCount > 0)
+  {
+    open("rename");
+    mOpenCount = openCount;
+  }
   writeConfig();
 
   // delete the old entry as we get two entries with the same ID otherwise
@@ -733,7 +736,6 @@
   emit locationChanged( oldLoc, newLoc );
   emit nameChanged();
   kmkernel->folderMgr()->contentsChanged();
-  emit closed(folder()); // let the ticket owners regain
   return rc;
 }
 
@@ -761,7 +763,6 @@
   KConfig* config = KMKernel::config();
   config->deleteGroup( "Folder-" + folder()->idString() );
 
-  emit closed(folder());
   emit removed(folder(), (rc ? false : true));
 }
 
@@ -769,6 +770,8 @@
 //-----------------------------------------------------------------------------
 int FolderStorage::expunge()
 {
+  int openCount = mOpenCount;
+
   assert(!folder()->name().isEmpty());
 
   clearIndex( true, mExportsSernums );   // delete and remove from dict, if 
needed
@@ -786,6 +789,12 @@
   mDirty = false;
   needsCompact = false; //we're cleared and truncated no need to compact
 
+  if (openCount > 0)
+  {
+    open("expunge");
+    mOpenCount = openCount;
+  }
+
   mUnreadMsgs = 0;
   mTotalMsgs = 0;
   mSize = 0;
Index: kmail/kmfolder.h
===================================================================
--- kmail/kmfolder.h    (revision 768418)
+++ kmail/kmfolder.h    (working copy)
@@ -537,10 +537,6 @@
     folder changed. */
   void changed();
 
-  /** Emitted when the folder is closed for real - ticket holders should
-   * discard any messages */
-  void closed();
-
   /** Emitted when the contents of a folder have been cleared
      (new search in a search folder, for example) */
   void cleared();
Index: kmail/kmfoldermbox.cpp
===================================================================
--- kmail/kmfoldermbox.cpp      (revision 768418)
+++ kmail/kmfoldermbox.cpp      (working copy)
@@ -1223,11 +1223,17 @@
 {
   // This is called only when the user explicitely requests compaction,
   // so we don't check needsCompact.
+  int openCount = mOpenCount;
 
   KMail::MboxCompactionJob* job = new KMail::MboxCompactionJob( folder(), true 
/*immediate*/ );
   int rc = job->executeNow( silent );
   // Note that job autodeletes itself.
 
+  if (openCount > 0)
+  {
+    open("mboxcompact");
+    mOpenCount = openCount;
+  }
   // If this is the current folder, the changed signal will ultimately call
   // KMHeaders::setFolderInfoStatus which will override the message, so 
save/restore it
   QString statusMsg = BroadcastStatus::instance()->statusMsg();
Index: kmail/kmfolder.cpp
===================================================================
--- kmail/kmfolder.cpp  (revision 768418)
+++ kmail/kmfolder.cpp  (working copy)
@@ -483,7 +483,6 @@
 
 void KMFolder::close( const char *owner, bool force )
 {
-  // do not emit closed() in here - as this would regain too early
   mStorage->close( owner, force );
 }
 
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx