1 |
commit: 32f088bc94e656bccb0f73f365fc29f366c90cfb |
2 |
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de> |
3 |
AuthorDate: Thu Jul 5 19:45:49 2012 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 6 20:55:22 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=32f088bc |
7 |
|
8 |
[kde-base/kdelibs] Fix crash bug 424355 |
9 |
|
10 |
(Portage version: 2.2.0_alpha115/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit) |
11 |
|
12 |
--- |
13 |
.../kdelibs/files/kdelibs-4.8.4-kiopointer.patch | 21 ++++++++++++++++++++ |
14 |
kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild | 1 + |
15 |
2 files changed, 22 insertions(+), 0 deletions(-) |
16 |
|
17 |
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.4-kiopointer.patch b/kde-base/kdelibs/files/kdelibs-4.8.4-kiopointer.patch |
18 |
new file mode 100644 |
19 |
index 0000000..a01b221 |
20 |
--- /dev/null |
21 |
+++ b/kde-base/kdelibs/files/kdelibs-4.8.4-kiopointer.patch |
22 |
@@ -0,0 +1,21 @@ |
23 |
+--- a/kio/kio/accessmanager.cpp |
24 |
++++ b/kio/kio/accessmanager.cpp |
25 |
+@@ -37,7 +37,7 @@ |
26 |
+ #include <klocalizedstring.h> |
27 |
+ |
28 |
+ #include <QtCore/QUrl> |
29 |
+-#include <QtCore/QWeakPointer> |
30 |
++#include <QtCore/QPointer> |
31 |
+ #include <QtGui/QWidget> |
32 |
+ #include <QtDBus/QDBusInterface> |
33 |
+ #include <QtDBus/QDBusConnection> |
34 |
+@@ -87,7 +87,7 @@ |
35 |
+ bool emitReadyReadOnMetaDataChange; |
36 |
+ KIO::MetaData requestMetaData; |
37 |
+ KIO::MetaData sessionMetaData; |
38 |
+- QWidget* window; |
39 |
++ QPointer<QWidget> window; |
40 |
+ }; |
41 |
+ |
42 |
+ namespace Integration { |
43 |
+ |
44 |
|
45 |
diff --git a/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild |
46 |
index 89d0593..51d0d80 100644 |
47 |
--- a/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild |
48 |
+++ b/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild |
49 |
@@ -129,6 +129,7 @@ PATCHES=( |
50 |
"${FILESDIR}/${PN}-4.8.1-norpath.patch" |
51 |
"${FILESDIR}/${PN}-4.8.2-calculator_key.patch" |
52 |
"${FILESDIR}/${PN}-4.8.4-bytecode.patch" |
53 |
+ "${FILESDIR}/${PN}-4.8.4-kiopointer.patch" |
54 |
) |
55 |
|
56 |
pkg_pretend() { |