RPM Packaging: cleanup tdepim

pull/3/head
François Andriot 10 years ago
parent f8537dae53
commit f3eb081fb5

@ -1,153 +0,0 @@
# Default version for this component
%if "%{?version}" == ""
%define version 3.5.12
%define release 6
%endif
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
%define _docdir %{_prefix}/share/doc
%endif
# TDE 3.5.12 specific building variables
BuildRequires: autoconf automake libtool m4
%define tde_docdir %{_docdir}
%define tde_libdir %{_libdir}/kde3
Name: trinity-kdepim
Version: %{?version}
Release: %{?release}%{?dist}%{?_variant}
License: GPL
Group: Applications/Productivity
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
Summary: PIM (Personal Information Manager) applications
Prefix: %{_prefix}
Source0: kdepim-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# TDE official patches from SVN, unmodified
# Attempt to fix a kdepim FTBFS based on a missing stdc header #include
Patch0: http://www.trinitydesktop.org/patches/r1228885.diff
BuildRequires: tqtinterface
BuildRequires: trinity-arts
BuildRequires: trinity-kdelibs
BuildRequires: gpgme-devel
BuildRequires: libgpg-error-devel
BuildRequires: flex
BuildRequires: libical-devel
BuildRequires: gnokii-devel
%if 0%{?fedora} >= 15
BuildRequires: flex-static
%endif
Requires: trinity-kdelibs
%description
PIM (Personal Information Manager) applications.
%package devel
Requires: %{name}
Summary: %{name} - Development files
Group: Development/Libraries
%description devel
Development files for %{name}.
%prep
%setup -q -n kdepim
%patch0 -p1
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}"
%configure \
--disable-rpath \
--enable-new-ldflags \
--disable-dependency-tracking \
--disable-debug --disable-warnings --enable-final \
--with-extra-includes=%{_includedir}/tqt
# Do NOT use %{?_smp_mflags} for this package, or it will fail to build !
%__make
%install
export PATH="%{_bindir}:${PATH}"
%__rm -rf %{?buildroot}
%__make install DESTDIR=%{?buildroot}
%clean
%__rm -rf %{?buildroot}
%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_datadir}/applications/kde/*.desktop
%{_datadir}/applnk/.hidden/*
%{_datadir}/applnk/*/*
%{_datadir}/apps/*
%{_datadir}/autostart/*.desktop
%{_datadir}/config/*
%{_datadir}/icons/*
%{_datadir}/services/*
%{_datadir}/mimelnk/application/*
%{_datadir}/config.kcfg/*
%{_libdir}/lib*.so.*
%{tde_libdir}/*.so
%{tde_libdir}/*.so.*
%{tde_libdir}/plugins/designer/*.so
%{_datadir}/servicetypes/*
%{_libdir}/kconf_update_bin/*
%{_libdir}/libakregatorprivate.so
%{_libdir}/libkmailprivate.so
%{tde_docdir}/HTML/en/*
%files devel
%defattr(-,root,root,-)
%{_libdir}/*.la
%{_libdir}/*.so
%{_includedir}/*
%{tde_libdir}/*.la
%{tde_libdir}/plugins/designer/*.la
%exclude %{_libdir}/libakregatorprivate.so
%exclude %{_libdir}/libkmailprivate.so
%changelog
* Sun Sep 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
- Add RHEL5 support
* Mon Sep 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
- Import to GIT
* Tue Aug 23 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
- Correct (again) macro to install under "/opt", if desired
- Add missing BuildRequires
- Add 'patch0' to allow compilation with GCC >= 4.5
* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
- Correct macro to install under "/opt", if desired
* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
- Rebuilt
* Fri Dec 17 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
- Add macro _kde3_prefix to define custom installation prefix (ex: /opt/kde3)
- Add '--with-extra-includes=%{_includedir}/tqt'
* Wed Dec 15 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
- Initial version

@ -1,19 +0,0 @@
commit 82d4a938ce57d8611e1ef2e26924bb4367483b0c
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1341027705 -0500
Disable unneccesary fsync() in cached IMAP handler
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index 72f1113..e7009a2 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -478,7 +478,7 @@ int KMFolderCachedImap::writeUidCache()
str << lastUid() << endl;
uidcache.flush();
if ( uidcache.status() == IO_Ok ) {
- fsync( uidcache.handle() ); /* this is probably overkill */
+ // fsync( uidcache.handle() ); /* this is probably overkill */
uidcache.close();
if ( uidcache.status() == IO_Ok )
return 0;

@ -1,21 +0,0 @@
commit 2d5f15c865de75f3147bd849ef81d3ed034f8104
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1335654338 -0500
Reverse patch from GIT hash 33e649c9.
This resolves bug report 406.
Thanks to Slavek Banko.
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 227f48c..cb9db70 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -4351,8 +4351,6 @@ void KMComposeWin::slotContinueDoSend( bool sentOk )
}
(*it)->cleanupHeader();
sentOk = kmkernel->msgSender()->send((*it), mSendMethod);
- if (sentOk)
- kmkernel->acctMgr()->checkMail(true);
}
if (!sentOk)

@ -1,20 +0,0 @@
commit 84f29704e3fadcf1afb22da208e1dbb87feb7718
Author: Serghei Amelian <serghei.amelian@gmail.com>
Date: 1333065429 +0300
[kmail] fixed composer crash
diff --git a/kmail/mailcomposerIface.h b/kmail/mailcomposerIface.h
index 2858657..4cba7f3 100644
--- a/kmail/mailcomposerIface.h
+++ b/kmail/mailcomposerIface.h
@@ -13,6 +13,9 @@
class MailComposerIface : virtual public DCOPObject
{
K_DCOP
+
+ public: MailComposerIface() : DCOPObject("MailComposerIface") {}
+
k_dcop:
/**
Send message.

@ -1,64 +0,0 @@
diff -uNrb tdepim.orig/kmail/kmsystemtray.cpp tdepim/kmail/kmsystemtray.cpp
--- tdepim.orig/kmail/kmsystemtray.cpp 2012-02-08 20:40:02.000000000 -0600
+++ tdepim/kmail/kmsystemtray.cpp 2012-04-18 17:27:51.347213673 -0500
@@ -482,9 +482,9 @@
/** The number of unread messages in that folder */
int unread = fldr->countUnread();
- TQMap<TQGuardedPtr<KMFolder>, int>::Iterator it =
+ TQMap<TQGuardedPtr<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 */
diff -uNrb tdepim.orig/korganizer/korgac/alarmdialog.cpp tdepim/korganizer/korgac/alarmdialog.cpp
--- tdepim.orig/korganizer/korgac/alarmdialog.cpp 2012-02-08 20:40:02.000000000 -0600
+++ tdepim/korganizer/korgac/alarmdialog.cpp 2012-04-18 17:32:28.668760481 -0500
@@ -498,9 +498,9 @@
found = true;
item->mNotified = true;
Alarm::List alarms = incidence->alarms();
- Alarm::List::ConstIterator it;
- for ( it = alarms.begin(); it != alarms.end(); ++it ) {
- Alarm *alarm = *it;
+ Alarm::List::ConstIterator c_it;
+ for ( c_it = alarms.begin(); c_it != alarms.end(); ++c_it ) {
+ Alarm *alarm = *c_it;
// 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
diff -uNrb tdepim.orig/kresources/caldav/resource.cpp tdepim/kresources/caldav/resource.cpp
--- tdepim.orig/kresources/caldav/resource.cpp 2012-03-11 12:15:18.000000000 -0500
+++ tdepim/kresources/caldav/resource.cpp 2012-04-18 17:55:16.219084894 -0500
@@ -15,6 +15,7 @@
========================================================================*/
#include <string.h>
+#include <unistd.h>
#include <tqurl.h>
#include <tqmessagebox.h>
diff -uNrb tdepim.orig/kresources/carddav/resource.cpp tdepim/kresources/carddav/resource.cpp
--- tdepim.orig/kresources/carddav/resource.cpp 2012-03-11 12:15:18.000000000 -0500
+++ tdepim/kresources/carddav/resource.cpp 2012-04-18 17:55:54.555564703 -0500
@@ -14,6 +14,7 @@
========================================================================*/
#include <string.h>
+#include <unistd.h>
#include <tqurl.h>
#include <tqmessagebox.h>
--- kdepim/libkcal/listbase.h.gcc47 2012-04-25 23:32:57.483879335 +0200
+++ kdepim/libkcal/listbase.h 2012-04-25 23:33:27.608192801 +0200
@@ -67,7 +67,7 @@
bool removeRef( T *t )
{
- TQValueListIterator<T *> it = find( t );
+ TQValueListIterator<T *> it = this->find( t );
if ( it == TQValueList<T*>::end() ) {
return false;
} else {

@ -1,219 +0,0 @@
--- kdepim/akregator/src/CMakeLists.txt.ORI 2012-08-02 23:49:19.725396251 +0200
+++ kdepim/akregator/src/CMakeLists.txt 2012-08-02 23:49:26.428291587 +0200
@@ -39,7 +39,7 @@
install( FILES
plugin.h articleinterceptor.h akregator_export.h storage.h
feedstorage.h storagefactory.h storagefactoryregistry.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/akregator )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/akregator )
##### other data ################################
--- kdepim/libksieve/ksieve/CMakeLists.txt.ORI 2012-08-02 22:02:44.380776017 +0000
+++ kdepim/libksieve/ksieve/CMakeLists.txt 2012-08-02 22:03:27.102148170 +0000
@@ -11,4 +11,4 @@
install( FILES
error.h lexer.h parser.h scriptbuilder.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/ksieve )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/ksieve )
--- kdepim/libemailfunctions/CMakeLists.txt.ORI 2012-08-02 22:02:44.381775953 +0000
+++ kdepim/libemailfunctions/CMakeLists.txt 2012-08-02 22:03:27.103148111 +0000
@@ -25,7 +25,7 @@
##### header files ################################
if( BUILD_LIBKDEPIM )
- install( FILES idmapper.h DESTINATION ${INCLUDE_INSTALL_DIR}/kde/libemailfunctions )
+ install( FILES idmapper.h DESTINATION ${INCLUDE_INSTALL_DIR}/libemailfunctions )
endif()
--- kdepim/libkdenetwork/qgpgme/CMakeLists.txt.ORI 2012-08-02 22:02:44.381775953 +0000
+++ kdepim/libkdenetwork/qgpgme/CMakeLists.txt 2012-08-02 22:03:27.104148051 +0000
@@ -27,7 +27,7 @@
install( FILES
eventloopinteractor.h dataprovider.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/qgpgme )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/qgpgme )
##### qgpgme (shared) ###########################
--- kdepim/libkdenetwork/gpgmepp/CMakeLists.txt.ORI 2012-08-02 22:02:44.382775890 +0000
+++ kdepim/libkdenetwork/gpgmepp/CMakeLists.txt 2012-08-02 22:03:27.105147991 +0000
@@ -35,7 +35,7 @@
keygenerationresult.h importresult.h decryptionresult.h
verificationresult.h signingresult.h encryptionresult.h
engineinfo.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/gpgme++ )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/gpgme++ )
##### gpgme++ (shared) ##########################
--- kdepim/kontact/interfaces/CMakeLists.txt.ORI 2012-08-02 22:02:44.383775827 +0000
+++ kdepim/kontact/interfaces/CMakeLists.txt 2012-08-02 22:03:27.106147931 +0000
@@ -26,7 +26,7 @@
install( FILES
core.h plugin.h summary.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kontact )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/kontact )
##### other data ################################
--- kdepim/libkcal/CMakeLists.txt.ORI 2012-08-02 22:02:44.384775764 +0000
+++ kdepim/libkcal/CMakeLists.txt 2012-08-02 22:03:27.107147871 +0000
@@ -49,7 +49,7 @@
resourcelocaldirconfig.h resourcelocaldir.h resourcelocal.h
scheduler.h libkcal_export.h todo.h vcaldrag.h vcalformat.h
attachmenthandler.h ${CMAKE_CURRENT_BINARY_DIR}/htmlexportsettings.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/libkcal )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/libkcal )
##### other data ################################
--- kdepim/kresources/egroupware/CMakeLists.txt.ORI 2012-08-02 22:02:44.385775701 +0000
+++ kdepim/kresources/egroupware/CMakeLists.txt 2012-08-02 22:03:27.108147811 +0000
@@ -28,7 +28,7 @@
install( FILES
kabc_resourcexmlrpc.h kcal_resourcexmlrpc.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kabc )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/kabc )
##### other data ################################
--- kdepim/indexlib/CMakeLists.txt.ORI 2012-08-02 22:02:44.386775637 +0000
+++ kdepim/indexlib/CMakeLists.txt 2012-08-02 22:03:27.109147752 +0000
@@ -26,7 +26,7 @@
install( FILES
create.h index.h lockfile.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/index )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/index )
##### other data ################################
--- kdepim/kaddressbook/interfaces/CMakeLists.txt.ORI 2012-08-02 22:02:44.386775637 +0000
+++ kdepim/kaddressbook/interfaces/CMakeLists.txt 2012-08-02 22:03:27.110147693 +0000
@@ -28,7 +28,7 @@
install( FILES
configurewidget.h contacteditorwidget.h core.h
extensionwidget.h xxport.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kaddressbook )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/kaddressbook )
##### other data ################################
--- kdepim/mimelib/mimelib/CMakeLists.txt.ORI 2012-08-02 22:02:44.387775573 +0000
+++ kdepim/mimelib/mimelib/CMakeLists.txt 2012-08-02 22:03:27.111147634 +0000
@@ -16,4 +16,4 @@
mboxlist.h mechansm.h mediatyp.h message.h mimepp.h
msgcmp.h msgid.h nntp.h param.h pop.h protocol.h
string.h text.h token.h utility.h uuencode.h binhex.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/mimelib )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/mimelib )
--- kdepim/certmanager/lib/kleo/CMakeLists.txt.ORI 2012-08-02 22:02:44.388775510 +0000
+++ kdepim/certmanager/lib/kleo/CMakeLists.txt 2012-08-02 22:03:27.112147575 +0000
@@ -34,7 +34,7 @@
verifyopaquejob.h decryptverifyjob.h signencryptjob.h
refreshkeysjob.h multideletejob.h hierarchicalkeylistjob.h
keyfilter.h keyfiltermanager.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kleo )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo )
##### kleopatra_core (static) ###################
--- kdepim/korganizer/interfaces/calendar/CMakeLists.txt.ORI 2012-08-02 22:02:44.390775383 +0000
+++ kdepim/korganizer/interfaces/calendar/CMakeLists.txt 2012-08-02 22:03:27.114147455 +0000
@@ -11,7 +11,7 @@
install( FILES
plugin.h calendardecoration.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/calendar )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/calendar )
install( FILES
calendarplugin.desktop calendardecoration.desktop
--- kdepim/korganizer/interfaces/korganizer/CMakeLists.txt.ORI 2012-08-02 22:02:44.391775319 +0000
+++ kdepim/korganizer/interfaces/korganizer/CMakeLists.txt 2012-08-02 22:03:27.114147455 +0000
@@ -11,7 +11,7 @@
install( FILES
part.h baseview.h calendarviewbase.h mainwindow.h corehelper.h printplugin.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/korganizer )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/korganizer )
install( FILES
korganizerpart.desktop korgprintplugin.desktop
--- kdepim/kmail/interfaces/CMakeLists.txt.ORI 2012-08-02 22:02:44.392775255 +0000
+++ kdepim/kmail/interfaces/CMakeLists.txt 2012-08-02 22:03:27.116147335 +0000
@@ -12,4 +12,4 @@
install( FILES
observer.h observable.h htmlwriter.h bodypart.h
bodypartformatter.h bodyparturlhandler.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kmail/interfaces )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/kmail/interfaces )
--- kdepim/kgantt/kgantt/CMakeLists.txt.ORI 2012-08-02 22:02:44.393775192 +0000
+++ kdepim/kgantt/kgantt/CMakeLists.txt 2012-08-02 22:03:27.117147275 +0000
@@ -26,7 +26,7 @@
install( FILES
KGantt.h KGanttItem.h KGanttRelation.h xQGanttBarView.h xQGanttBarViewPort.h
xQGanttListView.h xQGanttListViewPort.h KGanttBarConfig.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kgantt )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/kgantt )
##### kgantt (shared) ###########################
--- kdepim/libkpimexchange/core/CMakeLists.txt.ORI 2012-08-02 22:02:44.394775129 +0000
+++ kdepim/libkpimexchange/core/CMakeLists.txt 2012-08-02 22:03:27.118147215 +0000
@@ -30,7 +30,7 @@
install( FILES
exchangeclient.h exchangeaccount.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kdepim )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/kdepim )
##### kpimexchange (shared) #####################
--- kdepim/ktnef/ktnef/CMakeLists.txt.ORI 2012-08-02 22:02:44.395775066 +0000
+++ kdepim/ktnef/ktnef/CMakeLists.txt 2012-08-02 22:03:27.119147156 +0000
@@ -13,4 +13,4 @@
ktnefparser.h ktnefattach.h ktnefproperty.h
ktnefpropertyset.h ktnefmessage.h ktnefwriter.h
ktnefdefs.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/ktnef )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/ktnef )
--- ./knotes/CMakeLists.txt.ORI 2012-08-02 22:07:47.777059775 +0000
+++ ./knotes/CMakeLists.txt 2012-08-02 22:08:42.414825054 +0000
@@ -34,7 +34,7 @@
##### headers ###################################
-install( FILES KNotesIface.h KNotesAppIface.h DESTINATION ${INCLUDE_INSTALL_DIR}/kde )
+install( FILES KNotesIface.h KNotesAppIface.h DESTINATION ${INCLUDE_INSTALL_DIR} )
##### other data ################################
--- ./kmail/CMakeLists.txt.ORI 2012-08-02 22:07:47.777059775 +0000
+++ ./kmail/CMakeLists.txt 2012-08-02 22:08:42.415825014 +0000
@@ -65,7 +65,7 @@
install( FILES
kmailIface.h kmailpartIface.h kmailicalIface.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde )
+ DESTINATION ${INCLUDE_INSTALL_DIR} )
##### other data ################################
--- ./libkdepim/CMakeLists.txt.ORI 2012-08-02 22:07:47.778059734 +0000
+++ ./libkdepim/CMakeLists.txt 2012-08-02 22:08:42.416824973 +0000
@@ -40,7 +40,7 @@
install( FILES
kdepimmacros.h kpimprefs.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde )
+ DESTINATION ${INCLUDE_INSTALL_DIR} )
##### other data ################################

@ -1,19 +0,0 @@
commit 228ad1c6df4be49fde421520e25fb9645ee922e7
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1339265402 -0500
Update kalarmd icon reference, which does not exist, to kalarm.
diff --git a/kalarm/kalarmd/kalarmd.autostart.desktop b/kalarm/kalarmd/kalarmd.autostart.desktop
index 7342be1..c9a72db 100644
--- a/kalarm/kalarmd/kalarmd.autostart.desktop
+++ b/kalarm/kalarmd/kalarmd.autostart.desktop
@@ -46,7 +46,7 @@ Name[uk]=Демон KAlarm
Name[zh_CN]=KAlarm 进程
Name[zh_TW]=KAlarm 守護程式
Exec=kalarmd --autostart
-Icon=kalarmd
+Icon=kalarm
Type=Application
Comment=KAlarm alarm daemon autostart at login
Comment[af]=Begin KAlarm bediener outomaties tydens aanteken

@ -1,61 +0,0 @@
--- kdepim/libkmime/kmime_util.cpp.addquotes 2012-05-28 22:58:31.257167175 +0200
+++ kdepim/libkmime/kmime_util.cpp 2012-05-29 20:02:19.679233274 +0200
@@ -436,49 +436,26 @@
void removeQuots(TQCString &str)
{
- bool inQuote=false;
-
- for (int i=0; i < (int)str.length(); i++) {
- if (str[i] == '"') {
- str.remove(i,1);
- i--;
- inQuote = !inQuote;
- } else {
- if (inQuote && (str[i] == '\\'))
- str.remove(i,1);
- }
- }
+ str.replace(TQRegExp("\\\""), "\"");
+ str.replace(TQRegExp("\\\\"), "\\");
}
void removeQuots(TQString &str)
{
- bool inQuote=false;
-
- for (int i=0; i < (int)str.length(); i++) {
- if (str[i] == '"') {
- str.remove(i,1);
- i--;
- inQuote = !inQuote;
- } else {
- if (inQuote && (str[i] == '\\'))
- str.remove(i,1);
- }
- }
+ str.replace(TQRegExp("\\\""), "\"");
+ str.replace(TQRegExp("\\\\"), "\\");
}
void addQuotes(TQCString &str, bool forceQuotes)
{
bool needsQuotes=false;
- for (unsigned int i=0; i < str.length(); i++) {
- if (strchr("()<>@,.;:[]=\\\"",str[i])!=0)
- needsQuotes = true;
- if (str[i]=='\\' || str[i]=='\"') {
- str.insert(i, '\\');
- i++;
- }
- }
+ if ( TQString( str ) .contains( TQRegExp( TQString( "\"|\\\\|=|\\]|\\[|:|;|,|\\.|,|@|<|>|\\)|\\(" ) ) ) )
+ needsQuotes = true;
+
+ str.replace(TQRegExp("\\"), "\\\\");
+ str.replace(TQRegExp("\""), "\\\"");
if (needsQuotes || forceQuotes) {
str.insert(0,'\"');

@ -1,17 +0,0 @@
--- kdepim/kioslaves/imap4/imapparser.cc.ORI 2012-05-27 23:40:50.101207608 +0200
+++ kdepim/kioslaves/imap4/imapparser.cc 2012-05-27 23:43:23.264547024 +0200
@@ -277,11 +277,11 @@
}
cmd = sendCommand (new imapCommand ("AUTHENTICATE", firstCommand.latin1()));
- while ( true )
+ int pl = 0;
+ while ( pl != -1 && !cmd->isComplete () )
{
//read the next line
- while (parseLoop() == 0) ;
- if ( cmd->isComplete() ) break;
+ while ((pl = parseLoop()) == 0) ;
if (!continuation.isEmpty())
{

@ -1,21 +0,0 @@
commit 533f494f46d65be366aee3e9973b674320e46bc8
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1336698215 -0500
Fix knotes not appearing on the desktop when a session is restored.
Thanks to Slavek Banko.
This resolves bug report 987.
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index 182aee8..08c24b8 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -765,7 +765,7 @@ void KNote::slotClose()
m_editor->clearFocus();
m_config->setHideNote( true );
m_config->setPosition( pos() );
- m_config->writeConfig();
+
// just hide the note so it's still available from the dock window
hide();
}

@ -1,20 +0,0 @@
commit c48253af15badc7a81db7ea2f22465405a897110
Author: Slávek Banko <slavek.banko@axis.cz>
Date: 1337752740 +0200
Fix knotes to not close notes during saving session.
This closes Bug 987
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index 08c24b8..e68c8ca 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -1267,6 +1267,8 @@ void KNote::resizeEvent( TQResizeEvent *qre )
void KNote::closeEvent( TQCloseEvent *event )
{
+ if(kapp->sessionSaving())
+ return;
event->ignore(); //We don't want to close (and delete the widget). Just hide it
slotClose();
}

@ -1,71 +0,0 @@
commit 80bc593eb31b3162fd870ee64eceb0ec90fac15c
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1327531088 -0600
Fix linear alphabet string errors
diff --git a/NewsLog.txt b/NewsLog.txt
index bc32c09..cc5cdc4 100644
--- a/NewsLog.txt
+++ b/NewsLog.txt
@@ -1960,7 +1960,7 @@ Bugfixes
deleted without ever having been initialised. Also init some other vars ASAP. (700035)
- kolab/issue1712 Update revision when adding new attendees.(663228)
- kolab/issue1672 Make sure to open the folder when saving a single message as well.(664661)
- - Fix lack of double-quotes around folder name, making GEQUOTAROOT fail on folders with a space in the
+ - Fix lack of double-quotes around folder name, making GETQUOTAROOT fail on folders with a space in the
name.(665276)
- Port the ability to add and remove subfolders from korganizer's resource view from proko2. (665274)
- kolab/issue1721 Don't exit when the popup menu is canceled.(665679)
diff --git a/kioslaves/imap4/rfcdecoder.cc b/kioslaves/imap4/rfcdecoder.cc
index f91e9f8..08b641b 100644
--- a/kioslaves/imap4/rfcdecoder.cc
+++ b/kioslaves/imap4/rfcdecoder.cc
@@ -37,7 +37,7 @@
// adapted to QT-Toolkit by Sven Carstens <s.carstens@gmx.de> 2000
static unsigned char base64chars[] =
- "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+,";
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+,";
#define UNDEFINED 64
#define MAXLINE 76
diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp
index d4c8943..03a14e9 100644
--- a/libkmime/kmime_util.cpp
+++ b/libkmime/kmime_util.cpp
@@ -337,7 +337,7 @@ TQCString encodeRFC2047String(const TQString &src, const char *charset,
TQCString uniqueString()
{
- static char chars[] = "0123456789abcdefghijklmnopqrstuvxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ";
+ static char chars[] = "0123456789abcdefghijklmnopqrstuvxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
time_t now;
TQCString ret;
char p[11];
diff --git a/mimelib/dw_cte.cpp b/mimelib/dw_cte.cpp
index 127a29a..4498597 100644
--- a/mimelib/dw_cte.cpp
+++ b/mimelib/dw_cte.cpp
@@ -353,7 +353,7 @@ static int to_cr(const char* srcBuf, size_t srcLen, char* destBuf,
}
-static char base64tab[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
+static char base64tab[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz0123456789+/";
static char base64idx[128] = {
diff --git a/mimelib/mediatyp.cpp b/mimelib/mediatyp.cpp
index 87ee345..7c766fe 100644
--- a/mimelib/mediatyp.cpp
+++ b/mimelib/mediatyp.cpp
@@ -231,7 +231,7 @@ void DwMediaType::SetBoundary(const DwString& aStr)
void DwMediaType::CreateBoundary(unsigned aLevel)
{
// Create a random printable string and set it as the boundary parameter
- static const char c[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ static const char c[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
const int cLen = 64;
char buf[80];
strcpy(buf, "Boundary-");

@ -1,33 +0,0 @@
--- kdepim/kioslaves/imap4/imapparser.cc.segv 2012-05-29 20:22:52.187840588 +0200
+++ kdepim/kioslaves/imap4/imapparser.cc 2012-05-29 20:29:30.723545443 +0200
@@ -1354,10 +1354,10 @@
label = parseOneWordC (inWords);
}
- if (inWords[0] == ')')
+ if (!inWords.isEmpty () && inWords[0] == ')')
inWords.pos++;
}
- if (inWords[0] == ']')
+ if (!inWords.isEmpty () && inWords[0] == ']')
inWords.pos++;
skipWS (inWords);
@@ -1479,6 +1479,7 @@
{
TQCString word = parseLiteralC(inWords, false, true);
+ if(!word.isEmpty()) {
switch (word[0])
{
case 'E':
@@ -1602,6 +1603,9 @@
parseLiteralC(inWords);
break;
}
+ } else {
+ parseLiteralC(inWords);
+ }
}
}

@ -1,20 +0,0 @@
commit 40c435e566bcfddd3fd69b55efec786b1162a8be
Author: Slávek Banko <slavek.banko@axis.cz>
Date: 1337997785 +0200
Fix KMail counting of unread messages in the system tray icon
Thanks to Francois Andriot
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index 001453a..d36bd3e 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -493,7 +493,7 @@ void KMSystemTray::updateNewMessages()
* our last known version, and adjust mCount with that difference */
else
{
- int diff = unread - it.data();
+ int diff = unread - unread_it.data();
mCount += diff;
}

@ -1,44 +0,0 @@
--- kdepim-3.5.13.1/kioslaves/imap4/imapparser.cc.segv 2012-09-08 12:06:42.000000000 +0200
+++ kdepim-3.5.13.1/kioslaves/imap4/imapparser.cc 2012-09-26 12:05:13.897737893 +0200
@@ -345,6 +345,7 @@
parseOneWordC(result); // *
TQByteArray what = parseLiteral (result); // see whats coming next
+ if(!what.isEmpty ()) {
switch (what[0])
{
//the status responses
@@ -482,6 +483,7 @@
if (valid)
{
what = parseLiteral (result);
+ if(!what.isEmpty ()) {
switch (what[0])
{
case 'E':
@@ -520,10 +522,12 @@
default:
break;
}
+ }
}
}
break;
} //switch
+ }
} //func
@@ -1915,9 +1919,10 @@
if (!inWords.isEmpty() && inWords[0] == '{')
{
TQCString retVal;
- ulong runLen = inWords.find ('}', 1);
- if (runLen > 0)
+ long srunLen = inWords.find ('}', 1); // Can return -1, so use a signed long
+ if (srunLen > 0)
{
+ ulong runLen = (ulong)srunLen;
bool proper;
ulong runLenSave = runLen + 1;
TQCString tmpstr(runLen);

@ -1,15 +0,0 @@
--- kdepim-3.5.13.1/kioslaves/imap4/imapparser.h~ 2012-09-26 14:43:52.932265697 +0200
+++ kdepim-3.5.13.1/kioslaves/imap4/imapparser.h 2012-09-26 14:45:33.190317168 +0200
@@ -94,7 +94,11 @@
}
uint length()
{
- return data.size() - pos;
+ if( pos < data.size() ) {
+ return data.size() - pos;
+ } else {
+ return 0;
+ }
}
void fromString(const TQString &s)
{

@ -1,41 +0,0 @@
--- kdepim-3.5.13.1/libkmime/kmime_util.cpp.quotes 2012-09-08 12:06:45.000000000 +0200
+++ kdepim-3.5.13.1/libkmime/kmime_util.cpp 2012-09-25 18:49:54.806551812 +0200
@@ -436,29 +436,25 @@
void removeQuots(TQCString &str)
{
- str.replace(TQRegExp("\\\""), "\"");
- str.replace(TQRegExp("\\\\"), "\\");
+ // Removes any quote or backslash caracter
+ str.replace(TQRegExp("[\\\"]"), "");
}
void removeQuots(TQString &str)
{
- str.replace(TQRegExp("\\\""), "\"");
- str.replace(TQRegExp("\\\\"), "\\");
+ // Removes any quote or backslash caracter
+ str.replace(TQRegExp("[\\\"]"), "");
}
void addQuotes(TQCString &str, bool forceQuotes)
{
- bool needsQuotes=false;
- if ( TQString( str ) .contains( TQRegExp( TQString( "\"|\\\\|=|\\]|\\[|:|;|,|\\.|,|@|<|>|\\)|\\(" ) ) ) )
- needsQuotes = true;
-
- str.replace(TQRegExp("\\"), "\\\\");
- str.replace(TQRegExp("\""), "\\\"");
-
- if (needsQuotes || forceQuotes) {
- str.insert(0,'\"');
+ if ( forceQuotes || TQString(str).contains( TQRegExp( TQString( "\"|\\\\|=|\\]|\\[|:|;|,|\\.|,|@|<|>|\\)|\\(" ) ) ) ) {
+ // Adds a backslash in front of any existing quote or backslash caracter
+ str.replace(TQRegExp("([\\\"])"), "\\\\1");
+ // Adds quote at beginning and end of thestring
+ str.insert(0,'"');
str.append("\"");
}
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -1,251 +0,0 @@
--- trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/CMakeLists.txt.ORI 2013-05-25 17:07:04.113241481 +0200
+++ trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/CMakeLists.txt 2013-05-25 17:09:01.115862006 +0200
@@ -178,7 +178,7 @@
localsubscriptiondialog.cpp editorwatcher.cpp favoritefolderview.cpp
foldertreebase.cpp snippetdlgbase.ui snippetwidget.cpp snippetconfig.cpp
snippetdlg.cpp snippetitem.cpp snippetsettings.cpp snippetsettingsbase.ui
- messageactions.cpp korghelper.cpp foldersetselector.cpp stringutil.cpp
+ messageactions.cpp korghelper.cpp kmnetworkmonitor.cpp foldersetselector.cpp stringutil.cpp
treebase.cpp backupjob.cpp importjob.cpp folderutil.cpp archivefolderdialog.cpp
importarchivedialog.cpp ${CMAKE_SOURCE_DIR}/korganizer/kcalendariface.stub
${CMAKE_SOURCE_DIR}/korganizer/korganizeriface.stub )
@@ -192,7 +192,7 @@
SOURCES ${${target}_SRCS}
LINK
emailfunctions-static kmime-shared kpgp-shared kdepim-shared kpimidentities-shared
- mimelib-shared ksieve-shared khtml-shared ${INDEX_LIBRARY}
+ mimelib-shared ksieve-shared khtml-shared kdedbus-shared ${INDEX_LIBRARY}
DESTINATION ${LIB_INSTALL_DIR}
)
--- trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/kmkernel.cpp.ORI 2013-05-25 17:10:26.899117831 +0200
+++ trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/kmkernel.cpp 2013-05-25 17:12:30.471605868 +0200
@@ -72,6 +72,7 @@
#include <kwallet.h>
using KWallet::Wallet;
#include "actionscheduler.h"
+#include "kmnetworkmonitor.h"
#include <qutf7codec.h>
#include <tqvbox.h>
@@ -169,6 +170,9 @@
connectDCOPSignal( 0, 0, "kmailSelectFolder(TQString)",
"selectFolder(TQString)", false );
+
+ networkMonitor = new KMNetworkMonitor(this, "KMNetworkMonitor");
+ connect(networkMonitor, TQT_SIGNAL(stateChanged(bool)), TQT_SLOT(slotNetworkStateChanged(bool)));
}
KMKernel::~KMKernel ()
@@ -2056,6 +2060,15 @@
mPutJobs.remove(it);
}
+void KMKernel::slotNetworkStateChanged(bool state)
+{
+ if(state) {
+ resumeNetworkJobs();
+ } else {
+ stopNetworkJobs();
+ }
+}
+
void KMKernel::slotRequestConfigSync() {
// ### FIXME: delay as promised in the kdoc of this function ;-)
KMKernel::config()->sync();
--- trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/kmkernel.h.ORI 2013-05-25 17:13:53.309922294 +0200
+++ trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/kmkernel.h 2013-05-25 17:15:29.587965912 +0200
@@ -28,6 +28,8 @@
class Wallet;
}
+class KMNetworkMonitor;
+
/** The KMail namespace contains classes used for KMail.
* This is to keep them out of the way from all the other
* un-namespaced classes in libs and the rest of PIM.
@@ -434,6 +436,7 @@
protected slots:
void slotDataReq(KIO::Job*,TQByteArray&);
void slotResult(KIO::Job*);
+ void slotNetworkStateChanged(bool);
signals:
void configChanged();
@@ -517,6 +520,8 @@
KPIM::ThreadWeaver::WeaverThreadLogger *the_weaverLogger;
KWallet::Wallet *mWallet;
+
+ KMNetworkMonitor *networkMonitor;
// variables used by dcopAddMessage()
TQStringList mAddMessageMsgIds;
--- /dev/null 2013-05-25 09:16:59.792134055 +0200
+++ trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/kmnetworkmonitor.h 2013-05-25 17:20:02.351394952 +0200
@@ -0,0 +1,45 @@
+/*
+ This file is part of the KDE3 Fork Project
+ Copyright (c) 2013 Serghei Amelian <serghei.amelian@gmail.com>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License version 2 as published by the Free Software Foundation.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+#ifndef _KMNETWORKMONITOR_H_
+#define _KMNETWORKMONITOR_H_
+
+#include <tqobject.h>
+
+class KMNetworkMonitorPrivate;
+
+
+class KMNetworkMonitor : public TQObject {
+
+ TQ_OBJECT
+
+ friend class KMNetworkMonitorPrivate;
+
+public:
+ KMNetworkMonitor(TQObject *parent = 0, const char *name = 0);
+ ~KMNetworkMonitor();
+
+signals:
+ void stateChanged(bool);
+
+private:
+ KMNetworkMonitorPrivate *d;
+};
+
+
+#endif
--- /dev/null 2013-05-25 09:16:59.792134055 +0200
+++ trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/kmnetworkmonitor.cpp 2013-05-25 17:21:55.565054211 +0200
@@ -0,0 +1,116 @@
+/*
+ This file is part of the KDE3 Fork Project
+ Copyright (c) 2013 Serghei Amelian <serghei.amelian@gmail.com>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License version 2 as published by the Free Software Foundation.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#include <TQTime.h>
+
+#include <dbus/TQDBusConnection.h>
+#include <dbus/qdbuserror.h>
+#include <dbus/TQDBusMessage.h>
+#include <dbus/qdbusproxy.h>
+
+#include <kdebug.h>
+
+#include "kmnetworkmonitor.h"
+
+
+class KMNetworkMonitorPrivate : public TQDBusProxy {
+
+ TQ_OBJECT
+
+public:
+ KMNetworkMonitorPrivate(KMNetworkMonitor *parent)
+ : TQDBusProxy(parent, "KMNetworkMonitorPrivate"), lastStatus(-1)
+ {
+ setService("org.freedesktop.NetworkManager");
+ setPath("/org/freedesktop/NetworkManager");
+ setInterface("org.freedesktop.NetworkManager");
+
+ TQTime::singleShot(0, this, TQT_SLOT(initialize()));
+ }
+
+protected slots:
+ void initialize()
+ {
+ // connect to DBUS
+ TQDBusConnection dbus = TQDBusConnection::systemBus();
+ if(!dbus.isConnected()) {
+ kdDebug() << "Unable to connect to DBus: " << dbus.lastError().message() << endl;
+ return;
+ }
+ setConnection(dbus);
+
+ // check for current status
+ int rc = sendWithAsyncReply("state", TQValueList<TQDBusData>());
+ if(0 == rc) {
+ kdDebug() << "Unable to send \"state\" command to DBus" << endl;
+ return;
+ }
+ }
+
+ void handleDBusSignal(const TQDBusMessage &message)
+ {
+ // the message is for us
+ if(path() == message.path() && interface() == message.interface() && "StateChanged" == message.member())
+ handleMessage(message);
+ }
+
+ void handleAsyncReply(const TQDBusMessage &message)
+ {
+ handleMessage(message);
+ }
+
+ void handleMessage(const TQDBusMessage &message)
+ {
+ bool ok;
+ TQ_UINT32 state = message[0].toUInt32(&ok);
+
+ if(!ok) {
+ kdDebug() << "KMNetworkMonitor: received unexpected type for state (" << message[0].typeName() << ")" << endl;
+ return;
+ }
+
+ int currStatus = (50 < state ? 1 : 0);
+
+ if(lastStatus != currStatus) {
+ emit static_cast<KMNetworkMonitor*>(parent())->stateChanged(1 == currStatus);
+ lastStatus = currStatus;
+ }
+ }
+
+private:
+ // -1 = unitialized, 0 = offline, 1 = online
+ int lastStatus;
+};
+
+
+KMNetworkMonitor::KMNetworkMonitor(TQObject *parent, const char *name)
+ : TQObject(parent, name)
+{
+ d = new KMNetworkMonitorPrivate(this);
+}
+
+
+KMNetworkMonitor::~KMNetworkMonitor()
+{
+ delete d;
+}
+
+
+#include "kmnetworkmonitor.moc"
+#include "kmnetworkmonitor.cpp.moc"
Loading…
Cancel
Save