diff options
author | 2012-01-17 12:12:21 +0000 | |
---|---|---|
committer | 2012-01-17 12:12:21 +0000 | |
commit | 7e197cc5bf913a5eab97e6296bceaa476164b022 (patch) | |
tree | 680c1b1a641c0e2f0682eaea2fa9ce2f9ba2edec | |
parent | Remove kdeenablefinal patch. Build feature is gone. (diff) | |
download | historical-7e197cc5bf913a5eab97e6296bceaa476164b022.tar.gz historical-7e197cc5bf913a5eab97e6296bceaa476164b022.tar.bz2 historical-7e197cc5bf913a5eab97e6296bceaa476164b022.zip |
Remove kdeenablefinal patch. Build feature is gone.
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
11 files changed, 24 insertions, 92 deletions
diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog index e1f04f9f881e..07b1c5601ecd 100644 --- a/kde-base/kdepim-runtime/ChangeLog +++ b/kde-base/kdepim-runtime/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kdepim-runtime # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.62 2012/01/16 22:22:37 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.63 2012/01/17 12:12:21 johu Exp $ + + 17 Jan 2012; Johannes Huber <johu@gentoo.org> + -files/kdepim-runtime-4.4.10-enablefinal-1.patch, + -files/kdepim-runtime-4.4.10-enablefinal-2.patch, + kdepim-runtime-4.4.11.1.ebuild: + Remove kdeenablefinal patch. Build feature is gone. 16 Jan 2012; Agostino Sarubbo <ago@gentoo.org> kdepim-runtime-4.7.4.ebuild: Stable for amd64, wrt bug #396359 diff --git a/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-1.patch b/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-1.patch deleted file mode 100644 index cfdaf21a69d7..000000000000 --- a/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-1.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- libkdepim-copy/calendardiffalgo.cpp.orig 2011-01-01 19:19:25.798000269 +0100 -+++ libkdepim-copy/calendardiffalgo.cpp 2011-01-01 19:14:15.918000268 +0100 -@@ -26,7 +26,6 @@ - - using namespace KPIM; - --#ifndef KDE_USE_FINAL - static bool compareString( const QString &left, const QString &right ) - { - if ( left.isEmpty() && right.isEmpty() ) -@@ -34,7 +33,6 @@ - else - return left == right; - } --#endif - - static QString toString( KCal::Attendee *attendee ) - { diff --git a/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-2.patch b/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-2.patch deleted file mode 100644 index 67425fe7c3a4..000000000000 --- a/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-2.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- resources/kolabproxy/distributionlist.cpp.orig 2011-01-01 19:18:41.274000269 +0100 -+++ resources/kolabproxy/distributionlist.cpp 2011-01-01 19:16:44.378000268 +0100 -@@ -39,8 +39,6 @@ - - using namespace Kolab; - --static const char* s_unhandledTagAppName = "KOLABUNHANDLED"; // no hyphens in appnames! -- - // saving (contactgroup->xml) - DistributionList::DistributionList( const KABC::ContactGroup* contactGroup ) - { -@@ -149,7 +147,7 @@ - // Unhandled tag - save for later storage - //kDebug() <<"Saving unhandled tag" << e.tagName(); - Custom c; -- c.app = s_unhandledTagAppName; -+ c.app = "KOLABUNHANDLED"; - c.name = e.tagName(); - c.value = e.text(); - mCustomList.append( c ); diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1.ebuild index 82b591c7084d..d412ff414090 100644 --- a/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1.ebuild +++ b/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1.ebuild,v 1.6 2011/07/31 20:28:37 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1.ebuild,v 1.7 2012/01/17 12:12:21 johu Exp $ EAPI=4 @@ -37,5 +37,3 @@ RDEPEND="${COMMON_DEPEND} " add_blocker akonadi '<4.3.90' - -PATCHES=( "${FILESDIR}/${PN}"-4.4.10-enablefinal-{1,2}.patch ) diff --git a/kde-base/liboxygenstyle/ChangeLog b/kde-base/liboxygenstyle/ChangeLog index 4ff22b033c9d..0d7a82b94edc 100644 --- a/kde-base/liboxygenstyle/ChangeLog +++ b/kde-base/liboxygenstyle/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/liboxygenstyle # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/ChangeLog,v 1.39 2012/01/16 23:36:55 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/ChangeLog,v 1.40 2012/01/17 12:09:49 johu Exp $ + + 17 Jan 2012; Johannes Huber <johu@gentoo.org> + -files/liboxygenstyle-4.7.4-enablefinal.patch, liboxygenstyle-4.7.4.ebuild: + Remove kdeenablefinal patch. Build feature is gone. 16 Jan 2012; Agostino Sarubbo <ago@gentoo.org> liboxygenstyle-4.7.4.ebuild: Stable for amd64, wrt bug #396359 diff --git a/kde-base/liboxygenstyle/files/liboxygenstyle-4.7.4-enablefinal.patch b/kde-base/liboxygenstyle/files/liboxygenstyle-4.7.4-enablefinal.patch deleted file mode 100644 index 369924858e20..000000000000 --- a/kde-base/liboxygenstyle/files/liboxygenstyle-4.7.4-enablefinal.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -U2 -rxi kde-workspace-4.7.3.orig/libs/oxygen/oxygenhelper.cpp kde-workspace-4.7.3/libs/oxygen/oxygenhelper.cpp ---- kde-workspace-4.7.3.orig/libs/oxygen/oxygenhelper.cpp 2011-10-28 09:42:34.000000000 +0200 -+++ kde-workspace-4.7.3/libs/oxygen/oxygenhelper.cpp 2011-12-25 13:39:03.487455177 +0100 -@@ -37,4 +37,5 @@ - #include <X11/Xlib.h> - #include <X11/Xatom.h> -+#include <fixx11h.h> - #endif - diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild index e77be4e0f1b6..089d9ac2435c 100644 --- a/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild +++ b/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild,v 1.4 2012/01/16 23:36:55 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild,v 1.5 2012/01/17 12:09:49 johu Exp $ EAPI=4 @@ -11,5 +11,3 @@ inherit kde4-meta DESCRIPTION="Library to support the Oxygen style in KDE" KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="debug" - -PATCHES=( "${FILESDIR}/${PN}-4.7.4-enablefinal.patch" ) diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog index a744807c5508..953e34d66f11 100644 --- a/kde-base/systemsettings/ChangeLog +++ b/kde-base/systemsettings/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/systemsettings # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.130 2012/01/16 23:55:13 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.131 2012/01/17 12:06:26 johu Exp $ + + 17 Jan 2012; Johannes Huber <johu@gentoo.org> + -files/systemsettings-4.7.3-enablefinal.patch, systemsettings-4.7.3-r1.ebuild, + systemsettings-4.7.4.ebuild: + Remove kdeenablefinal patch. Build feature is gone. 16 Jan 2012; Agostino Sarubbo <ago@gentoo.org> systemsettings-4.7.4.ebuild: Stable for amd64, wrt bug #396359 diff --git a/kde-base/systemsettings/files/systemsettings-4.7.3-enablefinal.patch b/kde-base/systemsettings/files/systemsettings-4.7.3-enablefinal.patch deleted file mode 100644 index c57f1978e10d..000000000000 --- a/kde-base/systemsettings/files/systemsettings-4.7.3-enablefinal.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -U2 -rxi kde-workspace-4.7.3.orig/kcontrol/keyboard/keyboard_config.cpp kde-workspace-4.7.3/kcontrol/keyboard/keyboard_config.cpp ---- kde-workspace-4.7.3.orig/kcontrol/keyboard/keyboard_config.cpp 2011-05-20 22:32:06.000000000 +0200 -+++ kde-workspace-4.7.3/kcontrol/keyboard/keyboard_config.cpp 2011-12-25 12:46:50.529622540 +0100 -@@ -25,5 +25,5 @@ - - static const char* SWITCHING_POLICIES[] = {"Global", "Desktop", "WinClass", "Window", NULL }; --static const char* LIST_SEPARATOR = ","; -+#define LIST_SEPARATOR "," - //static const char* DEFAULT_LAYOUT = "us"; - static const char* DEFAULT_MODEL = "pc104"; -@@ -183,2 +183,4 @@ - return layouts.mid(layoutLoopCount, layouts.size()); - } -+ -+#undef LIST_SEPARATOR -diff -U2 -rxi kde-workspace-4.7.3.orig/kcontrol/keyboard/layout_memory_persister.cpp kde-workspace-4.7.3/kcontrol/keyboard/layout_memory_persister.cpp ---- kde-workspace-4.7.3.orig/kcontrol/keyboard/layout_memory_persister.cpp 2011-05-20 22:32:06.000000000 +0200 -+++ kde-workspace-4.7.3/kcontrol/keyboard/layout_memory_persister.cpp 2011-12-25 12:46:05.173189572 +0100 -@@ -42,5 +42,5 @@ - static const char* LAYOUTS_ATTRIBUTE = "layouts"; - --static const char* LIST_SEPARATOR = ","; -+#define LIST_SEPARATOR "," - - static const char* REL_SESSION_FILE_PATH = "/session/keyboard/layout_memory.xml"; -@@ -259,2 +259,4 @@ - return !windowMode; - } -+ -+#undef LIST_SEPARATOR diff --git a/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild b/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild index f655fbefec5b..034bd2de110c 100644 --- a/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild +++ b/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild,v 1.3 2011/12/25 13:44:59 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild,v 1.4 2012/01/17 12:06:26 johu Exp $ EAPI=4 @@ -60,7 +60,6 @@ add_blocker kdeaccessibility-colorschemes '<4.6.50' PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" "${FILESDIR}/${P}-fix-keyboard-layout-switch.patch" - "${FILESDIR}/${P}-enablefinal.patch" ) src_unpack() { diff --git a/kde-base/systemsettings/systemsettings-4.7.4.ebuild b/kde-base/systemsettings/systemsettings-4.7.4.ebuild index e818e5697681..b9af1fe2e165 100644 --- a/kde-base/systemsettings/systemsettings-4.7.4.ebuild +++ b/kde-base/systemsettings/systemsettings-4.7.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.4.ebuild,v 1.4 2012/01/16 23:55:13 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.4.ebuild,v 1.5 2012/01/17 12:06:26 johu Exp $ EAPI=4 @@ -59,7 +59,6 @@ add_blocker kdeaccessibility-colorschemes '<4.6.50' PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" - "${FILESDIR}/${PN}-4.7.3-enablefinal.patch" ) src_unpack() { |