packages (DEVEL): kde4-kdepimlibs/kde4-kdepimlibs-branch.diff, kde4-kdepiml...

arekm arekm at pld-linux.org
Wed Feb 17 21:30:45 CET 2010 

Author: arekm                        Date: Wed Feb 17 20:30:45 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- rel 4; branch diff updated

---- Files affected:
packages/kde4-kdepimlibs:
   kde4-kdepimlibs-branch.diff (1.1.2.4 -> 1.1.2.5) , kde4-kdepimlibs.spec (1.90.2.29 -> 1.90.2.30) 

---- Diffs:

================================================================
Index: packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff
diff -u packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff:1.1.2.4 packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff:1.1.2.5
--- packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff:1.1.2.4	Fri Feb 12 08:34:32 2010
+++ packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff	Wed Feb 17 21:30:40 2010
@@ -1,7 +1,7 @@
 Index: kxmlrpcclient/query.cpp
 ===================================================================
---- kxmlrpcclient/query.cpp	(.../tags/KDE/4.4.0/kdepimlibs)	(wersja 1089014)
-+++ kxmlrpcclient/query.cpp	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1089014)
+--- kxmlrpcclient/query.cpp	(.../tags/KDE/4.4.0/kdepimlibs)	(wersja 1091895)
++++ kxmlrpcclient/query.cpp	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1091895)
 @@ -227,7 +227,7 @@
          QString markup;
          markup += "<value><array><data>";
@@ -13,8 +13,8 @@
          return markup;
 Index: kpimutils/tests/testlinklocator.cpp
 ===================================================================
---- kpimutils/tests/testlinklocator.cpp	(.../tags/KDE/4.4.0/kdepimlibs)	(wersja 1089014)
-+++ kpimutils/tests/testlinklocator.cpp	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1089014)
+--- kpimutils/tests/testlinklocator.cpp	(.../tags/KDE/4.4.0/kdepimlibs)	(wersja 1091895)
++++ kpimutils/tests/testlinklocator.cpp	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1091895)
 @@ -298,6 +298,10 @@
    // Bug reported by dfaure, the <hostname> would get lost
    QTest::newRow( "" ) << "KUrl url(\"http://strange<hostname>/\");" << (0x08 | 0x02)
@@ -28,8 +28,8 @@
  void LinkLocatorTest::testHtmlConvert()
 Index: kpimutils/linklocator.cpp
 ===================================================================
---- kpimutils/linklocator.cpp	(.../tags/KDE/4.4.0/kdepimlibs)	(wersja 1089014)
-+++ kpimutils/linklocator.cpp	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1089014)
+--- kpimutils/linklocator.cpp	(.../tags/KDE/4.4.0/kdepimlibs)	(wersja 1091895)
++++ kpimutils/linklocator.cpp	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1091895)
 @@ -372,7 +372,6 @@
              hyperlink = str;
            }
@@ -40,8 +40,8 @@
            continue;
 Index: CMakeLists.txt
 ===================================================================
---- CMakeLists.txt	(.../tags/KDE/4.4.0/kdepimlibs)	(wersja 1089014)
-+++ CMakeLists.txt	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1089014)
+--- CMakeLists.txt	(.../tags/KDE/4.4.0/kdepimlibs)	(wersja 1091895)
++++ CMakeLists.txt	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1091895)
 @@ -49,7 +49,7 @@
  if (NOT KDEPIM_ONLY_KLEO)
    #FindAkonadi.cmake is only there for compatibility reasons, but we don't want to use that.
@@ -53,8 +53,8 @@
    macro_log_feature(SASL2_FOUND "cyrus-sasl" "Cyrus SASL API" "http://asg.web.cmu.edu/sasl/sasl-library.html" TRUE "" "Required to support authentication of logins in the IMAP and Sieve kioslaves.")
 Index: mailtransport/transport.h
 ===================================================================
---- mailtransport/transport.h	(.../tags/KDE/4.4.0/kdepimlibs)	(wersja 1089014)
-+++ mailtransport/transport.h	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1089014)
+--- mailtransport/transport.h	(.../tags/KDE/4.4.0/kdepimlibs)	(wersja 1091895)
++++ mailtransport/transport.h	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1091895)
 @@ -34,6 +34,12 @@
    Represents the settings of a specific mail transport.
  
@@ -70,8 +70,8 @@
  // Currently it has the config stuff as private members, which means it is
 Index: mailtransport/addtransportdialog.cpp
 ===================================================================
---- mailtransport/addtransportdialog.cpp	(.../tags/KDE/4.4.0/kdepimlibs)	(wersja 1089014)
-+++ mailtransport/addtransportdialog.cpp	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1089014)
+--- mailtransport/addtransportdialog.cpp	(.../tags/KDE/4.4.0/kdepimlibs)	(wersja 1091895)
++++ mailtransport/addtransportdialog.cpp	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1091895)
 @@ -102,6 +102,8 @@
        this, SLOT(typeListClicked()) );
    connect( d->ui.typeListView, SIGNAL(itemSelectionChanged()),
@@ -83,8 +83,8 @@
  AddTransportDialog::~AddTransportDialog()
 Index: akonadi/agentbase.cpp
 ===================================================================
---- akonadi/agentbase.cpp	(.../tags/KDE/4.4.0/kdepimlibs)	(wersja 1089014)
-+++ akonadi/agentbase.cpp	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1089014)
+--- akonadi/agentbase.cpp	(.../tags/KDE/4.4.0/kdepimlibs)	(wersja 1091895)
++++ akonadi/agentbase.cpp	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1091895)
 @@ -231,6 +231,10 @@
    KGlobal::ref();
    KGlobal::setAllowQuit( true );
@@ -105,3 +105,18 @@
  }
  
  AgentBase::AgentBase( AgentBasePrivate* d, const QString &id ) :
+Index: akonadi/entitycache_p.h
+===================================================================
+--- akonadi/entitycache_p.h	(.../tags/KDE/4.4.0/kdepimlibs)	(wersja 1091895)
++++ akonadi/entitycache_p.h	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1091895)
+@@ -171,10 +171,6 @@
+ 
+     void fetchResult( KJob* job )
+     {
+-      if ( job->error() ) {
+-        kWarning() << "Fetch failed:" << job->errorString();
+-        return;
+-      }
+       typename T::Id id = job->property( "EntityCacheNode" ).template value<typename T::Id>();
+       EntityCacheNode<T> *node = cacheNodeForId( id );
+       if ( !node )

================================================================
Index: packages/kde4-kdepimlibs/kde4-kdepimlibs.spec
diff -u packages/kde4-kdepimlibs/kde4-kdepimlibs.spec:1.90.2.29 packages/kde4-kdepimlibs/kde4-kdepimlibs.spec:1.90.2.30
--- packages/kde4-kdepimlibs/kde4-kdepimlibs.spec:1.90.2.29	Fri Feb 12 08:34:32 2010
+++ packages/kde4-kdepimlibs/kde4-kdepimlibs.spec	Wed Feb 17 21:30:40 2010
@@ -10,7 +10,7 @@
 Summary(pl.UTF-8):	Biblioteki zarządzania informacjami osobistymi (PIM) dla KDE
 Name:		kde4-kdepimlibs
 Version:	4.4.0
-Release:	3
+Release:	4
 License:	GPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
@@ -296,6 +296,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.90.2.30  2010/02/17 20:30:40  arekm
+- rel 4; branch diff updated
+
 Revision 1.90.2.29  2010/02/12 07:34:32  arekm
 - rel 3; branch diff updated
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff?r1=1.1.2.4&r2=1.1.2.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepimlibs/kde4-kdepimlibs.spec?r1=1.90.2.29&r2=1.90.2.30&f=u

More information about the pld-cvs-commit mailing list