[packages/kdepim/dev-trinity: 2/6] updated patches
glen
glen at pld-linux.org
Sat Jun 7 11:32:47 CEST 2014
commit eada0fd7298a5cfce09b1a7ba71ee872473e21d1
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Fri Jun 6 23:32:20 2014 +0300
updated patches
gcc45.patch | 80 --------------
kde-ac260-lt.patch | 12 ---
kde-am.patch | 11 --
kde-common-PLD.patch | 174 ------------------------------
kdepim-3.5.10-gcc_4.4-2.patch | 24 -----
kdepim-inotify.patch | 50 ---------
kdepim-kmail-templatesconfiguration.patch | 10 --
kdepim-kmail_toolbars.patch | 76 ++++++-------
kdepim.spec | 20 ----
9 files changed, 38 insertions(+), 419 deletions(-)
---
diff --git a/kdepim.spec b/kdepim.spec
index 77b3bac..9eb1f7b 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -24,19 +24,12 @@ Group: X11/Applications
Source0: http://ftp.fau.de/trinity/releases/%{version}/%{name}-trinity-%{version}.tar.xz
# Source0-md5: 58b046176655b4a3c6a6b3d56d3e2f69
Patch100: %{name}-branch.diff
-Patch0: kde-common-PLD.patch
Patch1: %{name}-kmail_toolbars.patch
Patch2: %{name}-kmail-vcardviewer.patch
-Patch3: kde-ac260-lt.patch
Patch4: %{name}-kmail-toolbar.patch
Patch5: %{name}-kmail-pld-linux.patch
Patch6: %{name}-kmail-gpgme_passphrase_cb.patch
-Patch7: %{name}-kmail-templatesconfiguration.patch
Patch8: %{name}-sparc64.patch
-Patch9: %{name}-inotify.patch
-Patch10: kde-am.patch
-Patch11: %{name}-3.5.10-gcc_4.4-2.patch
-Patch12: gcc45.patch
BuildRequires: autoconf
BuildRequires: autoconf < 2.64
BuildRequires: automake
@@ -558,28 +551,15 @@ libksieve, libmimelib.
%prep
%setup -q -n %{name}-trinity-%{version}
-%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Office;Calendar;/' \
korganizer/korganizer.desktop
-%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Office;PDA;/' \
- kpilot/kpilot/kpilotdaemon.desktop
-%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Office;PDA;/' \
- kpilot/kpilot/kpilot.desktop
-%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Office;PDA;/' \
- kpilot/conduits/docconduit/kpalmdoc.desktop
%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Office;ContactManagement;/' \
kaddressbook/kaddressbook.desktop
%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Office;X-PIM;/' \
diff --git a/gcc45.patch b/gcc45.patch
deleted file mode 100644
index cd70b5e..0000000
--- a/gcc45.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- kdepim-3.5.10/konsolekalendar/main.cpp~ 2008-02-13 11:39:54.000000000 +0200
-+++ kdepim-3.5.10/konsolekalendar/main.cpp 2010-07-08 23:23:01.418447242 +0300
-@@ -799,13 +799,13 @@
- if ( !args->isSet( "time" ) && !args->isSet( "epoch-start" ) &&
- !args->isSet( "end-time" ) && !args->isSet( "epoch-end" ) ) {
- // set default start date/time
-- startdatetime = QDateTime::QDateTime( startdate, starttime );
-+ startdatetime = QDateTime( startdate, starttime );
- kdDebug() << "main | datetimestamp | "
- << "setting startdatetime from "
- << "default startdate (today) and starttime"
- << endl;
- // set default end date/time
-- enddatetime = QDateTime::QDateTime( enddate, endtime );
-+ enddatetime = QDateTime( enddate, endtime );
- kdDebug() << "main | datetimestamp | "
- << "setting enddatetime from "
- << "default enddate (today) and endtime"
-@@ -814,13 +814,13 @@
-
- // Set startdatetime, enddatetime if still necessary
- if ( startdatetime.isNull() ) {
-- startdatetime = QDateTime::QDateTime( startdate, starttime );
-+ startdatetime = QDateTime( startdate, starttime );
- kdDebug() << "main | datetimestamp | "
- << "setting startdatetime from startdate and starttime"
- << endl;
- }
- if ( enddatetime.isNull() ) {
-- enddatetime = QDateTime::QDateTime( enddate, endtime );
-+ enddatetime = QDateTime( enddate, endtime );
- kdDebug() << "main | datetimestamp | "
- << "setting enddatetime from enddate and endtime"
- << endl;
---- kdepim-3.5.10/kontact/plugins/korganizer/summarywidget.cpp~ 2010-07-09 07:07:04.411706749 +0300
-+++ kdepim-3.5.10/kontact/plugins/korganizer/summarywidget.cpp 2010-07-09 07:07:06.365662692 +0300
-@@ -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" )
---- kdepim-3.5.10/kontact/plugins/specialdates/sdsummarywidget.h~ 2006-01-19 18:56:12.000000000 +0200
-+++ kdepim-3.5.10/kontact/plugins/specialdates/sdsummarywidget.h 2010-07-09 07:16:38.055608345 +0300
-@@ -78,7 +78,7 @@
- bool mShowHolidays;
- bool mShowSpecialsFromCal;
-
-- KHolidays::KHolidays *mHolidays;
-+ KHolidays *mHolidays;
- };
-
- #endif
---- kdepim-3.5.10/kontact/plugins/specialdates/sdsummarywidget.cpp~ 2006-10-01 20:30:38.000000000 +0300
-+++ kdepim-3.5.10/kontact/plugins/specialdates/sdsummarywidget.cpp 2010-07-09 07:17:02.894986721 +0300
-@@ -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 --git a/kde-ac260-lt.patch b/kde-ac260-lt.patch
deleted file mode 100644
index acbbc6c..0000000
--- a/kde-ac260-lt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN arts-1.5.4.org/admin/libtool.m4.in arts-1.5.4/admin/libtool.m4.in
---- arts-1.5.4.org/admin/libtool.m4.in 2006-07-24 09:06:24.000000000 +0200
-+++ arts-1.5.4/admin/libtool.m4.in 2006-09-09 12:45:13.172062500 +0200
-@@ -3542,7 +3542,7 @@
- # The `*' in the case matches for architectures that use `case' in
- # $output_verbose_cmd can trigger glob expansion during the loop
- # eval without this substitution.
-- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-
- for p in `eval $output_verbose_link_cmd`; do
- case $p in
diff --git a/kde-am.patch b/kde-am.patch
deleted file mode 100644
index 5a23f3a..0000000
--- a/kde-am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdelibs-3.5.10/admin/cvs.sh~ 2008-08-19 23:28:39.000000000 +0300
-+++ kdelibs-3.5.10/admin/cvs.sh 2009-05-19 13:34:47.966210297 +0300
-@@ -68,7 +68,7 @@
- echo "*** KDE requires automake $required_automake_version"
- exit 1
- ;;
-- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
-+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11*)
- echo "*** $AUTOMAKE_STRING found."
- UNSERMAKE=no
- ;;
diff --git a/kde-common-PLD.patch b/kde-common-PLD.patch
deleted file mode 100644
index 21a7c91..0000000
--- a/kde-common-PLD.patch
+++ /dev/null
@@ -1,174 +0,0 @@
---- kdelibs-3.5.3.or/admin/acinclude.m4.in 2006-05-23 13:02:06.000000000 +0000
-+++ kdelibs-3.5.3/admin/acinclude.m4.in 2006-07-01 14:55:49.345359250 +0000
-@@ -428,7 +428,7 @@
- if test "$1" = "default"; then
-
- if test -z "$kde_htmldir"; then
-- kde_htmldir='\${datadir}/doc/HTML'
-+ kde_htmldir='/usr/share/doc/kde/HTML'
- fi
- if test -z "$kde_appsdir"; then
- kde_appsdir='\${datadir}/applnk'
-@@ -2977,41 +2977,6 @@
-
- AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER],
- [
-- AC_MSG_CHECKING([whether $CC is blacklisted])
--
-- dnl In theory we have tu run this test against $CC and $CXX
-- dnl in C and in C++ mode, because its perfectly legal for
-- dnl the user to mix compiler versions, since C has a defined
-- dnl ABI.
-- dnl
-- dnl For now, we assume the user is not on crack.
--
-- AC_TRY_COMPILE([
--#ifdef __GNUC__
--#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
--choke me
--#endif
--#endif
--], ,
-- kde_bad_compiler=no,
-- kde_bad_compiler=yes
--)
--
-- AC_MSG_RESULT($kde_bad_compiler)
--
--if test "$kde_bad_compiler" = "yes"; then
-- AC_MSG_ERROR([
--
--This particular compiler version is blacklisted because it
--is known to miscompile KDE. Please use a newer version, or
--if that is not yet available, choose an older version.
--
--Please do not report a bug or bother us reporting this
--configure error. We know about it, and we introduced
--it by intention to avoid untraceable bugs or crashes in KDE.
--
--])
--fi
-
- ])
-
-@@ -3153,8 +3118,6 @@
-
- AC_PROG_CXX
-
-- KDE_CHECK_FOR_BAD_COMPILER
--
- if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
- if test "$kde_use_debug_code" != "no"; then
- if test "$CXX" = "KCC"; then
-@@ -4579,9 +4542,9 @@
- LIBPYTHON=-lpython$version
- fi
-
--AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
-+AC_FIND_FILE(python$version/copy.pyc, "/usr/share" , python_moddir)
- python_moddir=$python_moddir/python$version
--if test ! -r $python_moddir/copy.py; then
-+if test ! -r $python_moddir/copy.pyc; then
- python_moddir=no
- fi
-
-@@ -4728,32 +4691,11 @@
- [
- AC_MSG_CHECKING([for utmp file])
-
-- AC_CACHE_VAL(kde_cv_utmp_file,
-- [
-- kde_cv_utmp_file=no
-+ AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx])
-
-- for ac_file in \
-- \
-- /var/run/utmp \
-- /var/adm/utmp \
-- /etc/utmp \
-- ; \
-- do
-- if test -r "$ac_file"; then
-- kde_cv_utmp_file=$ac_file
-- break
-- fi
-- done
-- ])
--
-- if test "$kde_cv_utmp_file" != "no"; then
-- AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
-- $1
-- AC_MSG_RESULT($kde_cv_utmp_file)
-- else
-- $2
-- AC_MSG_RESULT([non found])
-- fi
-+ AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
-+ $1
-+ AC_MSG_RESULT(We are using $kde_cv_utmp_file in PLD instead.)
- ])
-
-
-@@ -5536,7 +5478,7 @@
- kde_qtdir="$with_qt_dir"
- fi
-
--AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
-+AC_FIND_FILE(qsql.html, [ /usr/share/doc/qt-doc/html ], QTDOCDIR)
- AC_MSG_RESULT($QTDOCDIR)
-
- AC_SUBST(QTDOCDIR)
---- gwenview-1.4.0/admin/am_edit 2006-09-25 00:04:55.213036950 +0300
-+++ kdelibs-3.5.5/admin/am_edit 2006-10-03 11:40:08.052152886 +0300
-@@ -499,6 +499,15 @@
- }
- }
-
-+ $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CXXLD\)';
-+ if ($MakefileData =~ m/$lookup/) {
-+ substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
-+ }
-+ $lookup = '(LINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CCLD\)';
-+ if ($MakefileData =~ m/$lookup/) {
-+ substituteLine($lookup, "$1 \"\$\(CCLD\)\"");
-+ }
-+
- $MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g;
-
- $lookup = '(.*)cp -pr \$\$/\$\$file \$\(distdir\)/\$\$file(.*)';
-@@ -578,6 +587,14 @@
- local @kde_options = split(/[\034\s]+/, $kde_options_str);
- if (grep(/^foreign$/, @kde_options)) {
- push(@foreignfiles, $makefileDir . "/");
-+
-+ # always do this. don't care if it's foreign file. we *need* CXXLD quoted for libtool argument.
-+ $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link) \$\(CXXLD\)';
-+ if ($MakefileData =~ m/$lookup/) {
-+ substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
-+ updateMakefile ();
-+ }
-+
- return 0; # don't touch me
- }
- for $opt (@kde_options) {
-
---- x/admin/acinclude.m4.in.orig 2008-10-08 10:18:48.844247699 +0200
-+++ x/admin/acinclude.m4.in 2008-10-08 10:21:26.884232831 +0200
-@@ -4612,7 +4612,8 @@
-
- AC_DEFUN([KDE_CHECK_PYTHON],
- [
-- KDE_CHECK_PYTHON_INTERN("2.5",
-+ KDE_CHECK_PYTHON_INTERN("2.6",
-+ [KDE_CHECK_PYTHON_INTERN("2.5",
- [KDE_CHECK_PYTHON_INTERN("2.4",
- [KDE_CHECK_PYTHON_INTERN("2.3",
- [KDE_CHECK_PYTHON_INTERN("2.2",
-@@ -4624,6 +4625,7 @@
- ])
- ])
- ])
-+ ])
- ])
-
- AC_DEFUN([KDE_CHECK_STL],
diff --git a/kdepim-3.5.10-gcc_4.4-2.patch b/kdepim-3.5.10-gcc_4.4-2.patch
deleted file mode 100644
index 99eb62b..0000000
--- a/kdepim-3.5.10-gcc_4.4-2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Submitted By: Michael (rabenkind at selfservix dot org)
-Date: 2009-07-15
-Initial Package Version: 3.5.10
-Origin: http://forum.kde.org.pl/viewtopic.php?id=2981
-Upstream Status: Unknown
-Description: Fix compilation with gcc-4.4
-
---- kdepim-3.5.10/indexlib/memvector.tcc~ 2008-02-13 11:39:38.000000000 +0200
-+++ kdepim-3.5.10/indexlib/memvector.tcc 2010-02-15 16:23:19.290375795 +0200
-@@ -30,10 +30,11 @@
- void memvector<T>::resize( size_type n_s ) {
- if ( size() >= n_s ) return;
-
-- data_->resize( n_s * byte_io::byte_lenght<value_type>() + byte_io::byte_lenght<unsigned>() );
-+ using namespace byte_io;
-+ data_->resize( n_s * byte_lenght<value_type>() + byte_lenght<unsigned>() ); if ( size() >= n_s ) return;
- iterator p_end = end();
-- byte_io::write<unsigned>( data_->rw_base( 0 ), n_s );
-- while ( operator !=<unsigned, unsigned>(p_end, end()) ) {
-+ write<unsigned>( data_->rw_base( 0 ), n_s );
-+ while ( p_end != end() ) {
- *p_end = value_type();
- ++p_end;
-
diff --git a/kdepim-inotify.patch b/kdepim-inotify.patch
deleted file mode 100644
index 6abdfb3..0000000
--- a/kdepim-inotify.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- kdepim-3.5.10/./kmail/editorwatcher.cpp.org 2008-11-12 21:46:00.811830289 +0100
-+++ kdepim-3.5.10/./kmail/editorwatcher.cpp 2008-11-12 21:46:38.522258848 +0100
-@@ -37,25 +37,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/syscall.h>
--#include <linux/types.h>
--// Linux kernel headers are documented to not compile
--#define _S390_BITOPS_H
--#include <linux/inotify.h>
--
--static inline int inotify_init (void)
--{
-- return syscall (__NR_inotify_init);
--}
--
--static inline int inotify_add_watch (int fd, const char *name, __u32 mask)
--{
-- return syscall (__NR_inotify_add_watch, fd, name, mask);
--}
--
--static inline int inotify_rm_watch (int fd, __u32 wd)
--{
-- return syscall (__NR_inotify_rm_watch, fd, wd);
--}
-+#include <sys/inotify.h>
- #endif
-
- using namespace KMail;
---- kdepim-3.5.10/libkdenetwork/libgpgme-copy/assuan/funopen.c 2007-05-14 09:54:40.000000000 +0200
-+++ kdepim-3.5.10-p/libkdenetwork/libgpgme-copy/assuan/funopen.c 2009-02-27 03:34:44.000000000 +0100
-@@ -18,6 +18,7 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
- */
-+#define HAVE_FOPENCOOKIE
-
- #ifdef HAVE_CONFIG_H
- #include <config.h>
-diff -Naur kdepim-3.5.10/libkdenetwork/libgpgme-copy/gpgme/funopen.c kdepim-3.5.10-p/libkdenetwork/libgpgme-copy/gpgme/funopen.c
---- kdepim-3.5.10/libkdenetwork/libgpgme-copy/gpgme/funopen.c 2007-05-14 09:54:40.000000000 +0200
-+++ kdepim-3.5.10-p/libkdenetwork/libgpgme-copy/gpgme/funopen.c 2009-02-27 03:34:44.000000000 +0100
-@@ -17,6 +17,7 @@
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA. */
-+#define HAVE_FOPENCOOKIE
-
- #ifdef HAVE_CONFIG_H
- #include <config.h>
diff --git a/kdepim-kmail-templatesconfiguration.patch b/kdepim-kmail-templatesconfiguration.patch
deleted file mode 100644
index 8d0407e..0000000
--- a/kdepim-kmail-templatesconfiguration.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdepim-3.5.8/kmail/templatesconfiguration.cpp~ 2007-01-15 13:28:46.000000000 +0200
-+++ kdepim-3.5.8/kmail/templatesconfiguration.cpp 2007-10-17 12:50:25.008102324 +0300
-@@ -541,6 +541,7 @@
- "Date: %ODATE\n"
- "From: %OFROMADDR\n"
- "To: %OTOADDR\n"
-+ "Cc: %OCCADDR\n"
- "\n"
- "%TEXT\n"
- "-------------------------------------------------------\n"
diff --git a/kdepim-kmail_toolbars.patch b/kdepim-kmail_toolbars.patch
index e2511ff..fc0a1d6 100644
--- a/kdepim-kmail_toolbars.patch
+++ b/kdepim-kmail_toolbars.patch
@@ -1,58 +1,58 @@
---- kdepim-3.5.4/kmail/kmcomposewin.cpp.orig 2006-07-22 10:14:16.000000000 +0200
-+++ kdepim-3.5.4/kmail/kmcomposewin.cpp 2006-10-01 15:08:38.000000000 +0200
-@@ -1220,7 +1220,7 @@
- (void) new KAction (i18n("Cl&ean Spaces"), 0, this, SLOT(slotCleanSpace()),
+--- kdepim-trinity-3.5.13.2/kmail/kmcomposewin.cpp~ 2012-09-26 18:45:42.000000000 +0300
++++ kdepim-trinity-3.5.13.2/kmail/kmcomposewin.cpp 2014-06-06 23:20:27.869971174 +0300
+@@ -1362,7 +1362,7 @@
+ (void) new KAction (i18n("Cl&ean Spaces"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanSpace()),
actionCollection(), "clean_spaces");
-- mFixedFontAction = new KToggleAction( i18n("Use Fi&xed Font"), 0, this,
-+ mFixedFontAction = new KToggleAction( i18n("Use Fi&xed Font"), "text", 0, this,
- SLOT(slotUpdateFont()), actionCollection(), "toggle_fixedfont" );
+- mFixedFontAction = new KToggleAction( i18n("Use Fi&xed Font"), 0, TQT_TQOBJECT(this),
++ mFixedFontAction = new KToggleAction( i18n("Use Fi&xed Font"), "text", 0, TQT_TQOBJECT(this),
+ TQT_SLOT(slotUpdateFont()), actionCollection(), "toggle_fixedfont" );
mFixedFontAction->setChecked( GlobalSettings::self()->useFixedFont() );
---- kdepim-3.5.4/kmail/kmmainwidget.cpp.orig 2006-07-22 10:14:16.000000000 +0200
-+++ kdepim-3.5.4/kmail/kmmainwidget.cpp 2006-10-01 15:20:48.000000000 +0200
-@@ -2394,7 +2394,7 @@
- mFindInMessageAction = new KAction( i18n("&Find in Message..."), "find", KStdAccel::shortcut(KStdAccel::Find), this,
- SLOT(slotFind()), actionCollection(), "find_in_messages" );
+--- kdepim-trinity-3.5.13.2/kmail/kmmainwidget.cpp~ 2014-06-06 23:22:04.000000000 +0300
++++ kdepim-trinity-3.5.13.2/kmail/kmmainwidget.cpp 2014-06-06 23:22:06.301032422 +0300
+@@ -2773,7 +2773,7 @@
+ mFindInMessageAction = new KAction( i18n("&Find in Message..."), "find", KStdAccel::shortcut(KStdAccel::Find), TQT_TQOBJECT(this),
+ TQT_SLOT(slotFind()), actionCollection(), "find_in_messages" );
-- (void) new KAction( i18n("Select &All Messages"), KStdAccel::selectAll(), this,
-+ (void) new KAction( i18n("Select &All Messages"), "ok", KStdAccel::selectAll(), this,
- SLOT(slotMarkAll()), actionCollection(), "mark_all_messages" );
+- (void) new KAction( i18n("Select &All Messages"), KStdAccel::selectAll(), TQT_TQOBJECT(this),
++ (void) new KAction( i18n("Select &All Messages"), "ok", KStdAccel::selectAll(), TQT_TQOBJECT(this),
+ TQT_SLOT(slotMarkAll()), actionCollection(), "mark_all_messages" );
//----- Folder Menu
-@@ -2434,13 +2434,13 @@
- mRemoveFolderAction = new KAction( "foo", "editdelete", 0, this,
- SLOT(slotRemoveFolder()), actionCollection(), "delete_folder" );
+@@ -2817,13 +2817,13 @@
+ TQT_SLOT( slotArchiveFolder() ), actionCollection(),
+ "archive_folder" );
-- mPreferHtmlAction = new KToggleAction( i18n("Prefer &HTML to Plain Text"), 0, this,
-+ mPreferHtmlAction = new KToggleAction( i18n("Prefer &HTML to Plain Text"), "html", 0, this,
- SLOT(slotOverrideHtml()), actionCollection(), "prefer_html" );
+- mPreferHtmlAction = new KToggleAction( i18n("Prefer &HTML to Plain Text"), 0, TQT_TQOBJECT(this),
++ mPreferHtmlAction = new KToggleAction( i18n("Prefer &HTML to Plain Text"), "html", 0, TQT_TQOBJECT(this),
+ TQT_SLOT(slotOverrideHtml()), actionCollection(), "prefer_html" );
- mPreferHtmlLoadExtAction = new KToggleAction( i18n("Load E&xternal References"), 0, this,
- SLOT(slotOverrideHtmlLoadExt()), actionCollection(), "prefer_html_external_refs" );
+ mPreferHtmlLoadExtAction = new KToggleAction( i18n("Load E&xternal References"), 0, TQT_TQOBJECT(this),
+ TQT_SLOT(slotOverrideHtmlLoadExt()), actionCollection(), "prefer_html_external_refs" );
-- mThreadMessagesAction = new KToggleAction( i18n("&Thread Messages"), 0, this,
-+ mThreadMessagesAction = new KToggleAction( i18n("&Thread Messages"), "view_tree", 0, this,
- SLOT(slotOverrideThread()), actionCollection(), "thread_messages" );
+- mThreadMessagesAction = new KToggleAction( i18n("&Thread Messages"), 0, TQT_TQOBJECT(this),
++ mThreadMessagesAction = new KToggleAction( i18n("&Thread Messages"), "view_tree", 0, TQT_TQOBJECT(this),
+ TQT_SLOT(slotOverrideThread()), actionCollection(), "thread_messages" );
- mThreadBySubjectAction = new KToggleAction( i18n("Thread Messages also by &Subject"), 0, this,
-@@ -2696,7 +2696,7 @@
- SLOT(slotCollapseAllThreads()),
+ mThreadBySubjectAction = new KToggleAction( i18n("Thread Messages also by &Subject"), 0, TQT_TQOBJECT(this),
+@@ -3053,7 +3053,7 @@
+ TQT_SLOT(slotCollapseAllThreads()),
actionCollection(), "collapse_all_threads" );
-- mViewSourceAction = new KAction( i18n("&View Source"), Key_V, this,
-+ mViewSourceAction = new KAction( i18n("&View Source"), "source", Key_V, this,
- SLOT(slotShowMsgSrc()), actionCollection(),
+- mViewSourceAction = new KAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this),
++ mViewSourceAction = new KAction( i18n("&View Source"), "source", Key_V, TQT_TQOBJECT(this),
+ TQT_SLOT(slotShowMsgSrc()), actionCollection(),
"view_source" );
---- kdepim-3.5.4/kmail/kmreaderwin.cpp.orig 2006-05-22 20:10:53.000000000 +0200
-+++ kdepim-3.5.4/kmail/kmreaderwin.cpp 2006-10-01 15:19:19.000000000 +0200
-@@ -665,7 +665,7 @@
- mUrlSaveAsAction = new KAction( i18n("Save Link As..."), 0, this,
- SLOT(slotUrlSave()), ac, "saveas_url" );
+--- kdepim-trinity-3.5.13.2/kmail/kmreaderwin.cpp~ 2012-09-26 18:45:42.000000000 +0300
++++ kdepim-trinity-3.5.13.2/kmail/kmreaderwin.cpp 2014-06-06 23:23:02.023519306 +0300
+@@ -611,7 +611,7 @@
+ mUrlSaveAsAction = new KAction( i18n("Save Link As..."), 0, TQT_TQOBJECT(this),
+ TQT_SLOT(slotUrlSave()), ac, "saveas_url" );
- mToggleFixFontAction = new KToggleAction( i18n("Use Fi&xed Font"),
+ mToggleFixFontAction = new KToggleAction( i18n("Use Fi&xed Font"), "text",
- Key_X, this, SLOT(slotToggleFixedFont()),
+ Key_X, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFixedFont()),
ac, "toggle_fixedfont" );
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kdepim.git/commitdiff/a10a667f6bb703e6c33c11d3685a779e01f933bd
More information about the pld-cvs-commit
mailing list