diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2013-04-02 12:58:50 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-04-02 12:58:50 +0000 |
| commit | b94416bd12ef90ac4e0c8f1fbcb5667939656e9b (patch) | |
| tree | f05a5d9a1e4a7439c0f3912cb82d10c826b43015 /kde-base | |
| parent | Bump test-framework-hunit to 0.3.0 (diff) | |
| download | gentoo-2-b94416bd12ef90ac4e0c8f1fbcb5667939656e9b.tar.gz gentoo-2-b94416bd12ef90ac4e0c8f1fbcb5667939656e9b.tar.bz2 gentoo-2-b94416bd12ef90ac4e0c8f1fbcb5667939656e9b.zip | |
Remove unused patches.
(Portage version: 2.1.11.59/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 675D0D2C)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdelibs/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix.patch | 18 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.8.95-udisks2-includes.patch | 48 |
3 files changed, 6 insertions, 67 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index aaeca4510939..c59c08380215 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdelibs # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.904 2013/04/01 16:03:19 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.905 2013/04/02 12:58:50 kensington Exp $ + + 02 Apr 2013; Michael Palimaka <kensington@gentoo.org> + -files/dist/01_gentoo_set_xdg_menu_prefix.patch, + -files/kdelibs-4.8.95-udisks2-includes.patch: + Remove unused patches. 01 Apr 2013; Agostino Sarubbo <ago@gentoo.org> -kdelibs-4.10.0.ebuild, -kdelibs-4.9.5.ebuild: diff --git a/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix.patch b/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix.patch deleted file mode 100644 index 005b06094f05..000000000000 --- a/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix.patch +++ /dev/null @@ -1,18 +0,0 @@ -Set XDG_MENU_PREFIX to kde4- if not set. This fixes "empty-applications-menu" when running -KDE4 applications outside of KDE4 environment. - -Index: kded/vfolder_menu.cpp -=================================================================== ---- kded/vfolder_menu.cpp (revision 1014368) -+++ kded/vfolder_menu.cpp (working copy) -@@ -770,7 +770,9 @@ - QString result; - - QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX")); -- if (!xdgMenuPrefix.isEmpty()) -+ if (xdgMenuPrefix.isEmpty()) -+ xdgMenuPrefix = "@REPLACE_MENU_PREFIX@"; -+ - { - QFileInfo fileInfo(fileName); - diff --git a/kde-base/kdelibs/files/kdelibs-4.8.95-udisks2-includes.patch b/kde-base/kdelibs/files/kdelibs-4.8.95-udisks2-includes.patch deleted file mode 100644 index d8ece11ac2a9..000000000000 --- a/kde-base/kdelibs/files/kdelibs-4.8.95-udisks2-includes.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -ruN kdelibs-4.8.95.orig/solid/solid/backends/udisks2/udisksopticaldisc.cpp kdelibs-4.8.95/solid/solid/backends/udisks2/udisksopticaldisc.cpp ---- kdelibs-4.8.95.orig/solid/solid/backends/udisks2/udisksopticaldisc.cpp 2012-06-28 00:14:38.443073422 +0200 -+++ kdelibs-4.8.95/solid/solid/backends/udisks2/udisksopticaldisc.cpp 2012-06-28 00:18:20.459086056 +0200 -@@ -27,7 +27,7 @@ - #include <QtCore/QFile> - #include <QtDBus/QDBusConnection> - --#include "../shared/udevqtclient.h" -+#include "../shared/udevqt.h" - - #include "udisks2.h" - #include "udisksopticaldisc.h" -diff -ruN kdelibs-4.8.95.orig/solid/solid/backends/udisks2/udisksopticaldisc.h kdelibs-4.8.95/solid/solid/backends/udisks2/udisksopticaldisc.h ---- kdelibs-4.8.95.orig/solid/solid/backends/udisks2/udisksopticaldisc.h 2012-06-28 00:14:38.444073422 +0200 -+++ kdelibs-4.8.95/solid/solid/backends/udisks2/udisksopticaldisc.h 2012-06-28 00:15:14.569076596 +0200 -@@ -24,7 +24,7 @@ - - #include <solid/ifaces/opticaldisc.h> - --#include "../shared/udevqtdevice.h" -+#include "../shared/udevqt.h" - - #include "udisksstoragevolume.h" - #include "udisksdevice.h" -diff -ruN kdelibs-4.8.95.orig/solid/solid/backends/udisks2/udisksstoragedrive.cpp kdelibs-4.8.95/solid/solid/backends/udisks2/udisksstoragedrive.cpp ---- kdelibs-4.8.95.orig/solid/solid/backends/udisks2/udisksstoragedrive.cpp 2012-06-28 00:14:38.445073422 +0200 -+++ kdelibs-4.8.95/solid/solid/backends/udisks2/udisksstoragedrive.cpp 2012-06-28 00:18:02.424084839 +0200 -@@ -21,7 +21,7 @@ - - #include "udisksstoragedrive.h" - --#include "../shared/udevqtclient.h" -+#include "../shared/udevqt.h" - - #include <QtCore/QDebug> - #include <QtCore/QFile> -diff -ruN kdelibs-4.8.95.orig/solid/solid/backends/udisks2/udisksstoragedrive.h kdelibs-4.8.95/solid/solid/backends/udisks2/udisksstoragedrive.h ---- kdelibs-4.8.95.orig/solid/solid/backends/udisks2/udisksstoragedrive.h 2012-06-28 00:14:38.445073422 +0200 -+++ kdelibs-4.8.95/solid/solid/backends/udisks2/udisksstoragedrive.h 2012-06-28 00:15:14.569076596 +0200 -@@ -24,7 +24,7 @@ - - #include <ifaces/storagedrive.h> - --#include "../shared/udevqtdevice.h" -+#include "../shared/udevqt.h" - - #include "udisksblock.h" - |