* [gentoo-commits] proj/kde:master commit in: kde-base/kmail/, kde-base/kmail/files/
@ 2011-04-17 11:14 Tomas Chvatal
0 siblings, 0 replies; 4+ messages in thread
From: Tomas Chvatal @ 2011-04-17 11:14 UTC (permalink / raw
To: gentoo-commits
commit: f808bae6e4e16b3842aa6a84d75f07059022fc29
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 11:14:16 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 11:14:21 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f808bae6
[kde-base/kmail] Add patch to fix from/to encodings in kmail.
---
kde-base/kmail/files/4.5.95-encodings.patch | 87 ++++++++++++++++++++
...{kmail-4.5.95.ebuild => kmail-4.5.95-r1.ebuild} | 4 +
2 files changed, 91 insertions(+), 0 deletions(-)
diff --git a/kde-base/kmail/files/4.5.95-encodings.patch b/kde-base/kmail/files/4.5.95-encodings.patch
new file mode 100644
index 0000000..343aee2
--- /dev/null
+++ b/kde-base/kmail/files/4.5.95-encodings.patch
@@ -0,0 +1,87 @@
+From: Thomas McGuire <mcguire@kde.org>
+Date: Sat, 16 Apr 2011 19:24:01 +0000
+Subject: Handle mailto URLs with non-ASCII names correctly.
+X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&a=commitdiff&h=115954932f961a1d9ef5f1c3a1230a750ecb4750
+---
+Handle mailto URLs with non-ASCII names correctly.
+
+The problem was the conversion from QUrl to QString, which made it
+impossible to re-parse the URL later.
+Avoid this conversion.
+
+BUG: 270560
+---
+
+
+--- a/messageviewer/mailwebview.h
++++ b/messageviewer/mailwebview.h
+@@ -100,7 +100,7 @@ Q_SIGNALS:
+ /// Emitted when the user right-clicks somewhere
+ /// @param url if an URL was under the cursor, this parameter contains it. Otherwise empty
+ /// @param point position where the click happened, in local coordinates
+- void popupMenu( const QString &url, const QPoint &point );
++ void popupMenu( const QUrl &url, const QPoint &point );
+
+ void linkHovered( const QString & link, const QString & title=QString(), const QString & textContent=QString() );
+ #ifdef KDEPIM_NO_WEBKIT
+
+--- a/messageviewer/mailwebview_webkit.cpp
++++ b/messageviewer/mailwebview_webkit.cpp
+@@ -73,7 +73,7 @@ bool MailWebView::event( QEvent *event )
+ #ifdef Q_OS_WINCE
+ if ( !hit.linkUrl().isEmpty() )
+ #endif
+- emit popupMenu( hit.linkUrl().toString(), mapToGlobal( contextMenuEvent->pos() ) );
++ emit popupMenu( hit.linkUrl(), mapToGlobal( contextMenuEvent->pos() ) );
+ event->accept();
+ return true;
+ }
+
+--- a/messageviewer/viewer_p.cpp
++++ b/messageviewer/viewer_p.cpp
+@@ -943,8 +943,8 @@ void ViewerPrivate::initHtmlWidget()
+ this, SLOT(slotUrlOn(QString,QString,QString)) );
+ connect( mViewer, SIGNAL(linkClicked(QUrl)),
+ this, SLOT(slotUrlOpen(QUrl)), Qt::QueuedConnection );
+- connect( mViewer, SIGNAL(popupMenu(QString,QPoint) ),
+- SLOT(slotUrlPopup(QString,QPoint)) );
++ connect( mViewer, SIGNAL(popupMenu(QUrl,QPoint) ),
++ SLOT(slotUrlPopup(QUrl,QPoint)) );
+ }
+
+ bool ViewerPrivate::eventFilter( QObject *, QEvent *e )
+@@ -1772,7 +1772,11 @@ void ViewerPrivate::slotUrlOn(const QStr
+ {
+ Q_UNUSED(title)
+ Q_UNUSED(textContent)
+- const KUrl url(link);
++
++ // The "link" we get here is not URL-encoded, and therefore there is no way the KUrl or QUrl could
++ // parse it correctly. To workaround that, we use QWebFrame::hitTestContent() on the mouse position
++ // to get the URL before WebKit managed to mangle it.
++ KUrl url( mViewer->linkOrImageUrlAt( QCursor::pos() ) );
+ if ( url.protocol() == "kmail" || url.protocol() == "x-kmail" || url.protocol() == "attachment" ||
+ ( url.protocol().isEmpty() && url.path().isEmpty() ) ) {
+ mViewer->setAcceptDrops( false );
+@@ -1799,7 +1803,7 @@ void ViewerPrivate::slotUrlOn(const QStr
+ emit showStatusBarMessage( msg );
+ }
+
+-void ViewerPrivate::slotUrlPopup(const QString &aUrl, const QPoint& aPos)
++void ViewerPrivate::slotUrlPopup(const QUrl &aUrl, const QPoint& aPos)
+ {
+ const KUrl url( aUrl );
+ mClickedUrl = url;
+
+--- a/messageviewer/viewer_p.h
++++ b/messageviewer/viewer_p.h
+@@ -465,7 +465,7 @@ public slots:
+ void slotUrlOn(const QString & link, const QString & title, const QString & textContent);
+
+ /** The user presses the right mouse button on an URL. */
+- void slotUrlPopup(const QString &, const QPoint& mousePos);
++ void slotUrlPopup(const QUrl &, const QPoint& mousePos);
+
+ /** The user selected "Find" from the menu. */
+ void slotFind();
+
diff --git a/kde-base/kmail/kmail-4.5.95.ebuild b/kde-base/kmail/kmail-4.5.95-r1.ebuild
similarity index 96%
rename from kde-base/kmail/kmail-4.5.95.ebuild
rename to kde-base/kmail/kmail-4.5.95-r1.ebuild
index a4c8679..f829b49 100644
--- a/kde-base/kmail/kmail-4.5.95.ebuild
+++ b/kde-base/kmail/kmail-4.5.95-r1.ebuild
@@ -54,6 +54,10 @@ KMEXTRA="
KMLOADLIBS="kdepim-common-libs"
+PATCHES=(
+ "${FILESDIR}/${PV}-encodings.patch"
+)
+
src_configure() {
# Bug 308903
use ppc64 && append-flags -mminimal-toc
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kmail/, kde-base/kmail/files/
@ 2011-04-17 11:15 Tomas Chvatal
0 siblings, 0 replies; 4+ messages in thread
From: Tomas Chvatal @ 2011-04-17 11:15 UTC (permalink / raw
To: gentoo-commits
commit: 676b5ab3d79bfd5de33778188132f372ae0f60f0
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 11:15:00 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 11:15:00 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=676b5ab3
Revert "[kde-base/kmail] Add patch to fix from/to encodings in kmail."
This reverts commit f808bae6e4e16b3842aa6a84d75f07059022fc29.
---
kde-base/kmail/files/4.5.95-encodings.patch | 87 --------------------
...{kmail-4.5.95-r1.ebuild => kmail-4.5.95.ebuild} | 4 -
2 files changed, 0 insertions(+), 91 deletions(-)
diff --git a/kde-base/kmail/files/4.5.95-encodings.patch b/kde-base/kmail/files/4.5.95-encodings.patch
deleted file mode 100644
index 343aee2..0000000
--- a/kde-base/kmail/files/4.5.95-encodings.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From: Thomas McGuire <mcguire@kde.org>
-Date: Sat, 16 Apr 2011 19:24:01 +0000
-Subject: Handle mailto URLs with non-ASCII names correctly.
-X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&a=commitdiff&h=115954932f961a1d9ef5f1c3a1230a750ecb4750
----
-Handle mailto URLs with non-ASCII names correctly.
-
-The problem was the conversion from QUrl to QString, which made it
-impossible to re-parse the URL later.
-Avoid this conversion.
-
-BUG: 270560
----
-
-
---- a/messageviewer/mailwebview.h
-+++ b/messageviewer/mailwebview.h
-@@ -100,7 +100,7 @@ Q_SIGNALS:
- /// Emitted when the user right-clicks somewhere
- /// @param url if an URL was under the cursor, this parameter contains it. Otherwise empty
- /// @param point position where the click happened, in local coordinates
-- void popupMenu( const QString &url, const QPoint &point );
-+ void popupMenu( const QUrl &url, const QPoint &point );
-
- void linkHovered( const QString & link, const QString & title=QString(), const QString & textContent=QString() );
- #ifdef KDEPIM_NO_WEBKIT
-
---- a/messageviewer/mailwebview_webkit.cpp
-+++ b/messageviewer/mailwebview_webkit.cpp
-@@ -73,7 +73,7 @@ bool MailWebView::event( QEvent *event )
- #ifdef Q_OS_WINCE
- if ( !hit.linkUrl().isEmpty() )
- #endif
-- emit popupMenu( hit.linkUrl().toString(), mapToGlobal( contextMenuEvent->pos() ) );
-+ emit popupMenu( hit.linkUrl(), mapToGlobal( contextMenuEvent->pos() ) );
- event->accept();
- return true;
- }
-
---- a/messageviewer/viewer_p.cpp
-+++ b/messageviewer/viewer_p.cpp
-@@ -943,8 +943,8 @@ void ViewerPrivate::initHtmlWidget()
- this, SLOT(slotUrlOn(QString,QString,QString)) );
- connect( mViewer, SIGNAL(linkClicked(QUrl)),
- this, SLOT(slotUrlOpen(QUrl)), Qt::QueuedConnection );
-- connect( mViewer, SIGNAL(popupMenu(QString,QPoint) ),
-- SLOT(slotUrlPopup(QString,QPoint)) );
-+ connect( mViewer, SIGNAL(popupMenu(QUrl,QPoint) ),
-+ SLOT(slotUrlPopup(QUrl,QPoint)) );
- }
-
- bool ViewerPrivate::eventFilter( QObject *, QEvent *e )
-@@ -1772,7 +1772,11 @@ void ViewerPrivate::slotUrlOn(const QStr
- {
- Q_UNUSED(title)
- Q_UNUSED(textContent)
-- const KUrl url(link);
-+
-+ // The "link" we get here is not URL-encoded, and therefore there is no way the KUrl or QUrl could
-+ // parse it correctly. To workaround that, we use QWebFrame::hitTestContent() on the mouse position
-+ // to get the URL before WebKit managed to mangle it.
-+ KUrl url( mViewer->linkOrImageUrlAt( QCursor::pos() ) );
- if ( url.protocol() == "kmail" || url.protocol() == "x-kmail" || url.protocol() == "attachment" ||
- ( url.protocol().isEmpty() && url.path().isEmpty() ) ) {
- mViewer->setAcceptDrops( false );
-@@ -1799,7 +1803,7 @@ void ViewerPrivate::slotUrlOn(const QStr
- emit showStatusBarMessage( msg );
- }
-
--void ViewerPrivate::slotUrlPopup(const QString &aUrl, const QPoint& aPos)
-+void ViewerPrivate::slotUrlPopup(const QUrl &aUrl, const QPoint& aPos)
- {
- const KUrl url( aUrl );
- mClickedUrl = url;
-
---- a/messageviewer/viewer_p.h
-+++ b/messageviewer/viewer_p.h
-@@ -465,7 +465,7 @@ public slots:
- void slotUrlOn(const QString & link, const QString & title, const QString & textContent);
-
- /** The user presses the right mouse button on an URL. */
-- void slotUrlPopup(const QString &, const QPoint& mousePos);
-+ void slotUrlPopup(const QUrl &, const QPoint& mousePos);
-
- /** The user selected "Find" from the menu. */
- void slotFind();
-
diff --git a/kde-base/kmail/kmail-4.5.95-r1.ebuild b/kde-base/kmail/kmail-4.5.95.ebuild
similarity index 96%
rename from kde-base/kmail/kmail-4.5.95-r1.ebuild
rename to kde-base/kmail/kmail-4.5.95.ebuild
index f829b49..a4c8679 100644
--- a/kde-base/kmail/kmail-4.5.95-r1.ebuild
+++ b/kde-base/kmail/kmail-4.5.95.ebuild
@@ -54,10 +54,6 @@ KMEXTRA="
KMLOADLIBS="kdepim-common-libs"
-PATCHES=(
- "${FILESDIR}/${PV}-encodings.patch"
-)
-
src_configure() {
# Bug 308903
use ppc64 && append-flags -mminimal-toc
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kmail/, kde-base/kmail/files/
@ 2013-02-02 23:08 Andreas Hüttel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Hüttel @ 2013-02-02 23:08 UTC (permalink / raw
To: gentoo-commits
commit: af2bba9350a8cbec5b32a37b5b78573d87099184
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat Feb 2 23:08:38 2013 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb 2 23:08:38 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=af2bba93
[kde-base/kmail] fix one issue, find anoterh
Package-Manager: portage-2.2.0_alpha161
---
kde-base/kmail/files/kmail-4.4.11.1-separate.patch | 12 ++++++++++++
kde-base/kmail/kmail-4.4.11.1-r100.ebuild | 1 +
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/kde-base/kmail/files/kmail-4.4.11.1-separate.patch b/kde-base/kmail/files/kmail-4.4.11.1-separate.patch
new file mode 100644
index 0000000..6e019cf
--- /dev/null
+++ b/kde-base/kmail/files/kmail-4.4.11.1-separate.patch
@@ -0,0 +1,12 @@
+diff -ruN kdepim-4.4.11.1.orig/messageviewer/CMakeLists.txt kdepim-4.4.11.1/messageviewer/CMakeLists.txt
+--- kdepim-4.4.11.1.orig/messageviewer/CMakeLists.txt 2011-04-20 22:03:31.000000000 +0200
++++ kdepim-4.4.11.1/messageviewer/CMakeLists.txt 2013-02-02 23:58:57.000000000 +0100
+@@ -54,7 +54,7 @@
+ kde4_add_library(messageviewer SHARED ${libmessageviewer_SRCS})
+
+
+-target_link_libraries(messageviewer messagecore kdepim kpgp kleo
++target_link_libraries(messageviewer messagecore kdepim kpgp kleo akonadi-contact
+ ${KDEPIMLIBS_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_LIBS}
+ ${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDEPIMLIBS_KABC_LIBS}
+ ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KTNEF_LIBRARY}
diff --git a/kde-base/kmail/kmail-4.4.11.1-r100.ebuild b/kde-base/kmail/kmail-4.4.11.1-r100.ebuild
index 5352824..75af16d 100644
--- a/kde-base/kmail/kmail-4.4.11.1-r100.ebuild
+++ b/kde-base/kmail/kmail-4.4.11.1-r100.ebuild
@@ -52,6 +52,7 @@ KMEXTRA="
PATCHES=(
"${FILESDIR}/${PN}-4.4.9-nodbus.patch"
"${FILESDIR}/4.4/"000{2,4,5}-*.patch
+ "${FILESDIR}/${P}-separate.patch"
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kmail/, kde-base/kmail/files/
@ 2015-03-16 19:49 Johannes Huber
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber @ 2015-03-16 19:49 UTC (permalink / raw
To: gentoo-commits
commit: 7dbb0c38ac35c30694b0017964f307e22acc2add
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Mar 15 18:56:31 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 19:49:18 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7dbb0c38
[kde-base/kmail] Revision bump adds upstream patch
Fixes upstream bug #345071
Package-Manager: portage-2.2.14
kde-base/kmail/files/kmail-4.14.6-fix-crash.patch | 21 +++++++++++++++++++++
.../{kmail-4.14.6.ebuild => kmail-4.14.6-r1.ebuild} | 2 ++
2 files changed, 23 insertions(+)
diff --git a/kde-base/kmail/files/kmail-4.14.6-fix-crash.patch b/kde-base/kmail/files/kmail-4.14.6-fix-crash.patch
new file mode 100644
index 0000000..308d98d
--- /dev/null
+++ b/kde-base/kmail/files/kmail-4.14.6-fix-crash.patch
@@ -0,0 +1,21 @@
+commit b6196bc1fd489a5be69731ca9a19d8a95f721570
+Author: Montel Laurent <montel@kde.org>
+Date: Thu Mar 12 07:48:15 2015 +0100
+
+ Fix Bug 345071 - KMail crashed while I was reading an email
+
+ BUG: 345071
+ FIXED-IN: 4.16.7
+
+diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
+index 2228aef..92ba8c5 100644
+--- a/kmail/kmmainwidget.cpp
++++ b/kmail/kmmainwidget.cpp
+@@ -4498,5 +4498,6 @@ void KMMainWidget::populateMessageListStatusFilterCombo()
+
+ void KMMainWidget::slotCollectionRemoved(const Akonadi::Collection &col)
+ {
+- mFavoritesModel->removeCollection(col);
++ if (mFavoritesModel)
++ mFavoritesModel->removeCollection(col);
+ }
diff --git a/kde-base/kmail/kmail-4.14.6.ebuild b/kde-base/kmail/kmail-4.14.6-r1.ebuild
similarity index 98%
rename from kde-base/kmail/kmail-4.14.6.ebuild
rename to kde-base/kmail/kmail-4.14.6-r1.ebuild
index 44034e2..1647f4c 100644
--- a/kde-base/kmail/kmail-4.14.6.ebuild
+++ b/kde-base/kmail/kmail-4.14.6-r1.ebuild
@@ -27,6 +27,8 @@ RDEPEND="
RESTRICT="test"
# bug 393147
+PATCHES=( "${FILESDIR}/${P}-fix-crash.patch" )
+
KMEXTRACTONLY="
agents/folderarchiveagent.desktop
agents/sendlateragent/
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-03-16 19:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-17 11:14 [gentoo-commits] proj/kde:master commit in: kde-base/kmail/, kde-base/kmail/files/ Tomas Chvatal
-- strict thread matches above, loose matches on Subject: below --
2011-04-17 11:15 Tomas Chvatal
2013-02-02 23:08 Andreas Hüttel
2015-03-16 19:49 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox