summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2013-01-08 12:50:27 +0000
committerMichael Palimaka <kensington@gentoo.org>2013-01-08 12:50:27 +0000
commit7ee33d597c04a3214100f23b5f79581c21e5ecc8 (patch)
treeab2e8676f71d5abcba25420aecc8a091d360e48f /kde-base
parentRemove unused patches. (diff)
downloadgentoo-2-7ee33d597c04a3214100f23b5f79581c21e5ecc8.tar.gz
gentoo-2-7ee33d597c04a3214100f23b5f79581c21e5ecc8.tar.bz2
gentoo-2-7ee33d597c04a3214100f23b5f79581c21e5ecc8.zip
Remove unused patches.
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/okular/ChangeLog7
-rw-r--r--kde-base/okular/files/okular-4.9.0-close-url.patch27
-rw-r--r--kde-base/okular/files/okular-4.9.0-memory-corruption-warning.patch28
3 files changed, 6 insertions, 56 deletions
diff --git a/kde-base/okular/ChangeLog b/kde-base/okular/ChangeLog
index de9a44c5a6f6..d8526f88854d 100644
--- a/kde-base/okular/ChangeLog
+++ b/kde-base/okular/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for kde-base/okular
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.166 2013/01/05 20:19:12 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.167 2013/01/08 12:50:27 kensington Exp $
+
+ 08 Jan 2013; Michael Palimaka <kensington@gentoo.org>
+ -files/okular-4.9.0-close-url.patch,
+ -files/okular-4.9.0-memory-corruption-warning.patch:
+ Remove unused patches.
*okular-4.9.5 (05 Jan 2013)
diff --git a/kde-base/okular/files/okular-4.9.0-close-url.patch b/kde-base/okular/files/okular-4.9.0-close-url.patch
deleted file mode 100644
index 385ec26b3626..000000000000
--- a/kde-base/okular/files/okular-4.9.0-close-url.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit aa042bd0f416edfb0eedcac6be6ba90b1c1c161c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Aug 18 18:36:30 2012 +0200
-
- Close the url on shell destruction
-
- Otherwise we end up in a busy loop on part deletion if there are pending requests
- Should not happen but if this fixes it don't see the need to lose time investigating
- why given the number of todo things
-
-diff --git a/shell/shell.cpp b/shell/shell.cpp
-index df40f7d..8b99ce4 100644
---- a/shell/shell.cpp
-+++ b/shell/shell.cpp
-@@ -119,7 +119,11 @@ void Shell::delayedOpen()
-
- Shell::~Shell()
- {
-- if ( m_part ) writeSettings();
-+ if ( m_part )
-+ {
-+ writeSettings();
-+ m_part->closeUrl();
-+ }
- m_part = 0; // It is deleted by the KPart/QObject machinery
- if ( m_args )
- m_args->clear();
diff --git a/kde-base/okular/files/okular-4.9.0-memory-corruption-warning.patch b/kde-base/okular/files/okular-4.9.0-memory-corruption-warning.patch
deleted file mode 100644
index f41f569edc66..000000000000
--- a/kde-base/okular/files/okular-4.9.0-memory-corruption-warning.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 035c32996ea45aa682db1d18460606ef12c5e6b3
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Aug 12 13:50:41 2012 +0200
-
- Do not delete the Part on the Shell destructor
-
- The machinery in KParts/QObject is already doing it and this way we don't get the
- KXMLGUIClient::~KXMLGUIClient: 0x15637528 deleted without having been removed from the factory first. This will leak standalone popupmenus and could lead to crashes.
- warning
-
- I'm not sure if calling this a kdelibs bug yet or not though :D
-
- BUGS: 261538
- FIXED-IN: 4.9.1
-
-diff --git a/shell/shell.cpp b/shell/shell.cpp
-index 8b42a27..df40f7d 100644
---- a/shell/shell.cpp
-+++ b/shell/shell.cpp
-@@ -120,7 +120,7 @@ void Shell::delayedOpen()
- Shell::~Shell()
- {
- if ( m_part ) writeSettings();
-- delete m_part;
-+ m_part = 0; // It is deleted by the KPart/QObject machinery
- if ( m_args )
- m_args->clear();
- }