diff options
58 files changed, 114 insertions, 1488 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 655d0f285648..b17c199aaa42 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for kde-base/kdelibs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.866 2012/09/03 13:29:24 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.867 2012/09/03 14:10:23 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> + -files/kdelibs-4.5.90-mimetypes.patch, -files/kdelibs-4.6.3-bytecode.patch, + -files/kdelibs-4.7.4-klocale.patch, -files/kdelibs-4.7.4-xinelib12x.patch, + -files/kdelibs-4.8.0-xinelib12x.patch, + -files/kdelibs-4.8.1-nepomuk-kmail.patch, + -files/kdelibs-4.8.1-sonnet-highlighter.patch, + -files/kdelibs-4.8.4-power.patch, -files/kdelibs-4.8.4-sopranorevert1.patch, + -files/kdelibs-4.8.4-sopranorevert2.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -kdelibs-4.7.4.ebuild, -kdelibs-4.7.4-r12.ebuild: diff --git a/kde-base/kdelibs/files/kdelibs-4.5.90-mimetypes.patch b/kde-base/kdelibs/files/kdelibs-4.5.90-mimetypes.patch deleted file mode 100644 index 508812306a8f..000000000000 --- a/kde-base/kdelibs/files/kdelibs-4.5.90-mimetypes.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -ur kdelibs-4.5.90.orig/mimetypes/kde.xml kdelibs-4.5.90/mimetypes/kde.xml ---- kdelibs-4.5.90.orig/mimetypes/kde.xml 2010-12-22 10:56:01.000000000 +0100 -+++ kdelibs-4.5.90/mimetypes/kde.xml 2010-12-23 11:31:53.000000000 +0100 -@@ -178,34 +178,6 @@ - <glob pattern="*.abc"/> - </mime-type> - -- <!-- all/ fake mime types --> -- <mime-type type="all/all"> -- <comment>all files and folders</comment> -- </mime-type> -- <mime-type type="all/allfiles"> -- <comment>all files</comment> -- </mime-type> -- -- <!-- uri/ fake mime types --> -- <mime-type type="uri/mms"> -- <comment>mms: URIs</comment> -- </mime-type> -- <mime-type type="uri/mmst"> -- <comment>mmst: URIs</comment> -- </mime-type> -- <mime-type type="uri/mmsu"> -- <comment>mmsu: URIs</comment> -- </mime-type> -- <mime-type type="uri/pnm"> -- <comment>pnm: URIs</comment> -- </mime-type> -- <mime-type type="uri/rtspt"> -- <comment>rtspt: URIs</comment> -- </mime-type> -- <mime-type type="uri/rtspu"> -- <comment>rtspu: URIs</comment> -- </mime-type> -- - <mime-type type="application/vnd.kde.fontspackage"> - <sub-class-of type="application/zip"/> - <comment>fonts package</comment> -@@ -346,12 +318,6 @@ - <glob pattern="*.icq"/> - </mime-type> - -- <mime-type type="interface/x-winamp-skin"> -- <sub-class-of type="application/zip"/> -- <comment>compressed Winamp skin</comment> -- <glob pattern="*.wsz"/> -- </mime-type> -- - <mime-type type="video/x-ms-wmp"> <!-- fdo #19671, rejected because "not a file type, only a plugin type" --> - <comment>Microsoft Media Format</comment> - <sub-class-of type="video/x-ms-wmv"/>
\ No newline at end of file diff --git a/kde-base/kdelibs/files/kdelibs-4.6.3-bytecode.patch b/kde-base/kdelibs/files/kdelibs-4.6.3-bytecode.patch deleted file mode 100644 index 736e2ae782b7..000000000000 --- a/kde-base/kdelibs/files/kdelibs-4.6.3-bytecode.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -ruN kdelibs-4.6.3.orig/cmake/modules/PythonMacros.cmake kdelibs-4.6.3/cmake/modules/PythonMacros.cmake ---- kdelibs-4.6.3.orig/cmake/modules/PythonMacros.cmake 2011-04-01 15:55:50.000000000 +0200 -+++ kdelibs-4.6.3/cmake/modules/PythonMacros.cmake 2011-06-21 22:30:18.957765437 +0200 -@@ -23,40 +23,42 @@ - # Install the source file. - INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR}) - -- # Byte compile and install the .pyc file. -- GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE) -- GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME) -- GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE) -- GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH) -- -- if(WIN32) -- string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}") -- endif(WIN32) -- -- SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename}) -- SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc) -- -- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}) -- -- SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}") -- -- GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE) -- IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself. -- ADD_CUSTOM_COMMAND( -- TARGET compile_python_files -- COMMAND ${CMAKE_COMMAND} -E echo ${message} -- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} -- DEPENDS ${_absfilename} -- ) -- ELSE(_abs_bin_py STREQUAL ${_absfilename}) -- ADD_CUSTOM_COMMAND( -- TARGET compile_python_files -- COMMAND ${CMAKE_COMMAND} -E echo ${message} -- COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py} -- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} -- DEPENDS ${_absfilename} -- ) -- ENDIF(_abs_bin_py STREQUAL ${_absfilename}) -+ # Byte compile and install the .pyc file. -+ IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "") -+ GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE) -+ GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME) -+ GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE) -+ GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH) -+ -+ if(WIN32) -+ string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}") -+ endif(WIN32) -+ -+ SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename}) -+ SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc) -+ -+ FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}) -+ -+ SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}") -+ -+ GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE) -+ IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself. -+ ADD_CUSTOM_COMMAND( -+ TARGET compile_python_files -+ COMMAND ${CMAKE_COMMAND} -E echo ${message} -+ COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} -+ DEPENDS ${_absfilename} -+ ) -+ ELSE(_abs_bin_py STREQUAL ${_absfilename}) -+ ADD_CUSTOM_COMMAND( -+ TARGET compile_python_files -+ COMMAND ${CMAKE_COMMAND} -E echo ${message} -+ COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py} -+ COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} -+ DEPENDS ${_absfilename} -+ ) -+ ENDIF(_abs_bin_py STREQUAL ${_absfilename}) - -- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR}) -+ INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR}) -+ ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "") - ENDMACRO(PYTHON_INSTALL) diff --git a/kde-base/kdelibs/files/kdelibs-4.7.4-klocale.patch b/kde-base/kdelibs/files/kdelibs-4.7.4-klocale.patch deleted file mode 100644 index 4045279bedda..000000000000 --- a/kde-base/kdelibs/files/kdelibs-4.7.4-klocale.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 2993b24bc21a340695ad35b4f014a684f4d0c651 Mon Sep 17 00:00:00 2001 -From: John Layt <jlayt@kde.org> -Date: Sat, 17 Dec 2011 16:27:51 +0000 -Subject: [PATCH] KLocale: Fix readNumber() and readMoney() for lenient group parsing - -Restore the old pre-4.7 behaviour of accepting as valid any numbers -that do not contain any group separators but strictly enforce group -rules when the number contains 1 or more group separators. - -Distro's will really want to backport this fix to all versions of 4.7 -as previously number entry for all KDE apps would have been seriously -broken. - -I'm amazed I wasn't beaten up for this earlier! - -BUG: 288963 -FIXED-IN: 4.7.5 -CCMAIL: kde-packager@kde.org ---- - kdecore/localization/klocale_kde.cpp | 10 ++++++++-- - kdecore/tests/klocaletest.cpp | 34 +++++++++++++++++++++++++++++----- - 2 files changed, 37 insertions(+), 7 deletions(-) - -diff --git a/kdecore/localization/klocale_kde.cpp b/kdecore/localization/klocale_kde.cpp -index 6cf85f9..6690f4a 100644 ---- a/kdecore/localization/klocale_kde.cpp -+++ b/kdecore/localization/klocale_kde.cpp -@@ -1894,7 +1894,10 @@ double KLocalePrivate::readNumber(const QString &_str, bool * ok) const - - // Remove group separators - bool groupOk = true; -- str = parseDigitGroup(str, thousandsSeparator(), decimalSymbol(), numericDigitGrouping(), &groupOk); -+ if(str.contains(thousandsSeparator())) { -+ str = parseDigitGroup(str, thousandsSeparator(), decimalSymbol(), -+ numericDigitGrouping(), &groupOk); -+ } - - if (!groupOk) { - if (ok) { -@@ -2013,7 +2016,10 @@ double KLocalePrivate::readMoney(const QString &_str, bool *ok) const - - // Remove group separators - bool groupOk = true; -- str = parseDigitGroup(str, monetaryThousandsSeparator(), monetaryDecimalSymbol(), monetaryDigitGrouping(), &groupOk); -+ if(str.contains(monetaryThousandsSeparator())) { -+ str = parseDigitGroup(str, monetaryThousandsSeparator(), monetaryDecimalSymbol(), -+ monetaryDigitGrouping(), &groupOk); -+ } - - if (!groupOk) { - if (ok) { -diff --git a/kdecore/tests/klocaletest.cpp b/kdecore/tests/klocaletest.cpp -index 97a3bce..f80de85 100644 ---- a/kdecore/tests/klocaletest.cpp -+++ b/kdecore/tests/klocaletest.cpp -@@ -180,9 +180,13 @@ KLocaleTest::readNumber() - QVERIFY(!ok); - QCOMPARE(locale.readNumber(QString("123,456,789.01"), &ok), 0.0); - QVERIFY(!ok); -- QCOMPARE(locale.readNumber(QString("123456789"), &ok), 0.0); -+ QCOMPARE(locale.readNumber(QString("123456789"), &ok), 123456789.0); -+ QVERIFY(ok); -+ QCOMPARE(locale.readNumber(QString("123456789.01"), &ok), 123456789.01); -+ QVERIFY(ok); -+ QCOMPARE(locale.readNumber(QString("123456,789"), &ok), 0.0); - QVERIFY(!ok); -- QCOMPARE(locale.readNumber(QString("123456789.01"), &ok), 0.0); -+ QCOMPARE(locale.readNumber(QString("123456,789.01"), &ok), 0.0); - QVERIFY(!ok); - - //Test it parses correctly with an empty separator. -@@ -204,6 +208,14 @@ KLocaleTest::readNumber() - QVERIFY(ok); - QCOMPARE(locale.readNumber(QString("123 456 789.01"), &ok), 123456789.01); - QVERIFY(ok); -+ QCOMPARE(locale.readNumber(QString("123456789"), &ok), 123456789.0); -+ QVERIFY(ok); -+ QCOMPARE(locale.readNumber(QString("123456789.01"), &ok), 123456789.01); -+ QVERIFY(ok); -+ QCOMPARE(locale.readNumber(QString("123456 789"), &ok), 0.0); -+ QVERIFY(!ok); -+ QCOMPARE(locale.readNumber(QString("123456 789.01"), &ok), 0.0); -+ QVERIFY(!ok); - QCOMPARE(locale.readNumber(QString("123,456,789"), &ok), 0.0); - QVERIFY(!ok); - QCOMPARE(locale.readNumber(QString("123,456,789.01"), &ok), 0.0); -@@ -479,6 +491,10 @@ void KLocaleTest::readMoney() - QVERIFY(ok); - QCOMPARE(locale.readMoney("$ 987,654,321.12", &ok), 987654321.12); - QVERIFY(ok); -+ QCOMPARE(locale.readMoney("$ 987654321.12", &ok), 987654321.12); -+ QVERIFY(ok); -+ QCOMPARE(locale.readMoney("$ 987654,321.12", &ok), 0.0); -+ QVERIFY(!ok); - - QCOMPARE(locale.readMoney( "$ -1.12", &ok), -1.12); - QVERIFY(ok); -@@ -498,6 +514,10 @@ void KLocaleTest::readMoney() - QVERIFY(ok); - QCOMPARE(locale.readMoney("$ -987,654,321.12", &ok), -987654321.12); - QVERIFY(ok); -+ QCOMPARE(locale.readMoney("$ -987654321.12", &ok), -987654321.12); -+ QVERIFY(ok); -+ QCOMPARE(locale.readMoney("$ -987654,321.12", &ok), 0.0); -+ QVERIFY(!ok); - - // Test incomplete formats - QCOMPARE(locale.readMoney( "$ 1", &ok), 1.00); -@@ -521,17 +541,21 @@ void KLocaleTest::readMoney() - - // Test Grouping - locale.d->setMonetaryDigitGrouping(QList<int>()); -- QCOMPARE(locale.readMoney( "$ 987654321.12", &ok), 987654321.12); -+ QCOMPARE(locale.readMoney("$ 987654321.12", &ok), 987654321.12); - QVERIFY(ok); - QCOMPARE(locale.readMoney("$ -987654321.12", &ok), -987654321.12); - QVERIFY(ok); - locale.d->setMonetaryDigitGrouping(QList<int>() << 3 << 2); -- QCOMPARE(locale.readMoney( "$ 98,76,54,321.12", &ok), 987654321.12); -+ QCOMPARE(locale.readMoney("$ 98,76,54,321.12", &ok), 987654321.12); - QVERIFY(ok); - QCOMPARE(locale.readMoney("$ -98,76,54,321.12", &ok), -987654321.12); - QVERIFY(ok); -+ QCOMPARE(locale.readMoney("$ 987654321.12", &ok), 987654321.12); -+ QVERIFY(ok); -+ QCOMPARE(locale.readMoney("$ -987654321.12", &ok), -987654321.12); -+ QVERIFY(ok); - locale.d->setMonetaryDigitGrouping(QList<int>() << 3 << -1); -- QCOMPARE(locale.readMoney( "$ 987654,321.12", &ok), 987654321.12); -+ QCOMPARE(locale.readMoney("$ 987654,321.12", &ok), 987654321.12); - QVERIFY(ok); - QCOMPARE(locale.readMoney("$ -987654,321.12", &ok), -987654321.12); - QVERIFY(ok); --- -1.7.3.4 - diff --git a/kde-base/kdelibs/files/kdelibs-4.7.4-xinelib12x.patch b/kde-base/kdelibs/files/kdelibs-4.7.4-xinelib12x.patch deleted file mode 100644 index bdcd39a6c974..000000000000 --- a/kde-base/kdelibs/files/kdelibs-4.7.4-xinelib12x.patch +++ /dev/null @@ -1,32 +0,0 @@ -From de5da56d10a47ff8fdf55c0818e9e776dcfa01f9 Mon Sep 17 00:00:00 2001 -From: Johannes Huber <johu@gentoo.org> -Date: Thu, 5 Jan 2012 10:06:05 +0100 -Subject: [PATCH] Fix FindXine.cmake module with >=xine-lib-1.2. - ---- - cmake/modules/FindXine.cmake | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake -index 37c58c6..d71969a 100644 ---- a/cmake/modules/FindXine.cmake -+++ b/cmake/modules/FindXine.cmake -@@ -36,13 +36,13 @@ find_library(XINE_LIBRARY NAMES xine - ${PC_LIBXINE_LIBRARY_DIRS} - ) - --find_program(XINECONFIG_EXECUTABLE NAMES xine-config -+find_program(XINECONFIG_EXECUTABLE NAMES pkg-config - HINTS - ${PC_LIBXINE_PREFIX}/bin - ) - - if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE) -- exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) -+ exec_program(${XINECONFIG_EXECUTABLE} ARGS --modversion libxine RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) - if("${XINE_VERSION}" VERSION_GREATER "1.1.0") #if (... VERSION_GREATER) is new since cmake 2.6.2 - set(XINE_VERSION_OK TRUE) - string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION}) --- -1.7.8.2 - diff --git a/kde-base/kdelibs/files/kdelibs-4.8.0-xinelib12x.patch b/kde-base/kdelibs/files/kdelibs-4.8.0-xinelib12x.patch deleted file mode 100644 index 68da6a75d92d..000000000000 --- a/kde-base/kdelibs/files/kdelibs-4.8.0-xinelib12x.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit 568222416da483e81513cd5e28634a829e1aea23 -Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> -Date: Wed Jan 25 20:49:04 2012 -0200 - - FindXine: Make version detection work with xine >= 1.2.0. - - Starting with the recently released version 1.2.0, xine has its version - number macros in xine/version.h instead of xine.h itself. - - Account for this case by checking if xine/version.h exists and falling - back to xine.h if it doesn't when reading the version numbers. - - Reviewed-by: Alexander Neundorf - -diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake -index 0319b7d..7dd08be 100644 ---- a/cmake/modules/FindXine.cmake -+++ b/cmake/modules/FindXine.cmake -@@ -47,7 +47,13 @@ FIND_PROGRAM(XINECONFIG_EXECUTABLE NAMES xine-config - - # Get the version number from xine.h and store it in the cache: - IF(XINE_INCLUDE_DIR AND NOT XINE_VERSION) -- FILE(READ ${XINE_INCLUDE_DIR}/xine.h XINE_VERSION_CONTENT) -+ IF(EXISTS ${XINE_INCLUDE_DIR}/xine/version.h) # xine 1.2.0+ -+ SET(XINE_VERSION_FILE ${XINE_INCLUDE_DIR}/xine/version.h) -+ ELSE(EXISTS ${XINE_INCLUDE_DIR}/xine/version.h) -+ SET(XINE_VERSION_FILE ${XINE_INCLUDE_DIR}/xine.h) -+ ENDIF(EXISTS ${XINE_INCLUDE_DIR}/xine/version.h) -+ -+ FILE(READ ${XINE_VERSION_FILE} XINE_VERSION_CONTENT) - STRING(REGEX MATCH "#define *XINE_MAJOR_VERSION *([0-9]+)" _dummy "${XINE_VERSION_CONTENT}") - SET(XINE_VERSION_MAJOR "${CMAKE_MATCH_1}") - diff --git a/kde-base/kdelibs/files/kdelibs-4.8.1-nepomuk-kmail.patch b/kde-base/kdelibs/files/kdelibs-4.8.1-nepomuk-kmail.patch deleted file mode 100644 index 145472d17d7b..000000000000 --- a/kde-base/kdelibs/files/kdelibs-4.8.1-nepomuk-kmail.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/nepomuk/core/resourcedata.cpp b/nepomuk/core/resourcedata.cpp -index abe55ea..e65e66e 100644 ---- a/nepomuk/core/resourcedata.cpp -+++ b/nepomuk/core/resourcedata.cpp -@@ -175,7 +175,7 @@ void Nepomuk::ResourceData::resetAll( bool isDelete ) - if( !m_uri.isEmpty() ) { - m_rm->m_initializedData.remove( m_uri ); - if( m_rm->m_watcher && m_addedToWatcher ) { -- m_rm->m_watcher->removeResource(Resource::fromResourceUri(m_uri)); -+ QMetaObject::invokeMethod(m_rm->m_watcher, "removeResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Resource::fromResourceUri(m_uri))); - m_addedToWatcher = false; - } - } -@@ -394,15 +394,16 @@ bool Nepomuk::ResourceData::load() - - if(!m_rm->m_watcher) { - m_rm->m_watcher = new ResourceWatcher(m_rm->m_manager); -+ m_rm->m_watcher->moveToThread(m_rm->m_manager->thread()); - QObject::connect( m_rm->m_watcher, SIGNAL(propertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)), - m_rm->m_manager, SLOT(slotPropertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) ); - QObject::connect( m_rm->m_watcher, SIGNAL(propertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)), - m_rm->m_manager, SLOT(slotPropertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) ); - m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) ); -- m_rm->m_watcher->start(); -+ QMetaObject::invokeMethod(m_rm->m_watcher, "start", Qt::AutoConnection); - } - else { -- m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) ); -+ QMetaObject::invokeMethod(m_rm->m_watcher, "addResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Nepomuk::Resource::fromResourceUri(m_uri)) ); - } - m_addedToWatcher = true; - -diff --git a/nepomuk/core/resourcewatcher.h b/nepomuk/core/resourcewatcher.h -index 06b9622..92b12f5 100644 ---- a/nepomuk/core/resourcewatcher.h -+++ b/nepomuk/core/resourcewatcher.h -@@ -93,6 +93,7 @@ namespace Nepomuk { - */ - virtual ~ResourceWatcher(); - -+ public Q_SLOTS: - /** - * \brief Add a type to be watched. - * -@@ -204,7 +205,6 @@ namespace Nepomuk { - */ - QList<Types::Property> properties() const; - -- public Q_SLOTS: - /** - * \brief Start the signalling of changes. - * diff --git a/kde-base/kdelibs/files/kdelibs-4.8.1-sonnet-highlighter.patch b/kde-base/kdelibs/files/kdelibs-4.8.1-sonnet-highlighter.patch deleted file mode 100644 index 92a1f45c61cb..000000000000 --- a/kde-base/kdelibs/files/kdelibs-4.8.1-sonnet-highlighter.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit 20f73c2150bcd2220fe3604c2ec251b4026a3891 -Author: Montel Laurent <montel@kde.org> -Date: Mon Mar 19 12:30:49 2012 +0100 - - Fix Bug 295615 - kmail crashes trying to edit subject/message body with - - some dictionary languages set in identity properties - - Patch from Matt Whitlock from https://bugs.gentoo.org/show_bug.cgi?id=407709 - it's right timer can be uninitialize when we change language => it will - crash - - FIXED-IN: 4.8.2 - BUG: 295615 - -diff --git a/kdeui/sonnet/highlighter.cpp b/kdeui/sonnet/highlighter.cpp -index 05f7ed1..b10310a 100644 ---- a/kdeui/sonnet/highlighter.cpp -+++ b/kdeui/sonnet/highlighter.cpp -@@ -108,6 +108,10 @@ Highlighter::Highlighter(QTextEdit *textEdit, - - d->dict = new Sonnet::Speller(); - d->spellCheckerFound = d->dict->isValid(); -+ d->rehighlightRequest = new QTimer(this); -+ connect( d->rehighlightRequest, SIGNAL(timeout()), -+ this, SLOT(slotRehighlight())); -+ - if(!d->spellCheckerFound) - return; - -@@ -121,9 +125,6 @@ Highlighter::Highlighter(QTextEdit *textEdit, - for ( QStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) { - d->dict->addToSession( *it ); - } -- d->rehighlightRequest = new QTimer(this); -- connect( d->rehighlightRequest, SIGNAL(timeout()), -- this, SLOT(slotRehighlight())); - d->completeRehighlightRequired = true; - d->rehighlightRequest->setInterval(0); - d->rehighlightRequest->setSingleShot(true); diff --git a/kde-base/kdelibs/files/kdelibs-4.8.4-power.patch b/kde-base/kdelibs/files/kdelibs-4.8.4-power.patch deleted file mode 100644 index 61ea0aa5d7f5..000000000000 --- a/kde-base/kdelibs/files/kdelibs-4.8.4-power.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5926264d13900efec70aaac434b7b67f9d8e6837 Mon Sep 17 00:00:00 2001 -From: Lukas Tinkl <lukas@kde.org> -Date: Tue, 19 Jun 2012 18:27:04 +0200 -Subject: [PATCH 5/5] correctly report power saving status - ---- - solid/solid/powermanagement.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/solid/solid/powermanagement.cpp b/solid/solid/powermanagement.cpp -index 8dc8535..faadea4 100644 ---- a/solid/solid/powermanagement.cpp -+++ b/solid/solid/powermanagement.cpp -@@ -73,7 +73,7 @@ Solid::PowerManagement::Notifier::Notifier() - - bool Solid::PowerManagement::appShouldConserveResources() - { -- return globalPowerManager->powerSaveStatus; -+ return globalPowerManager->managerIface.GetPowerSaveStatus(); - } - - QSet<Solid::PowerManagement::SleepState> Solid::PowerManagement::supportedSleepStates() --- -1.7.9.2 - diff --git a/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert1.patch b/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert1.patch deleted file mode 100644 index 59c3174710af..000000000000 --- a/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert1.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 76e0376d7582cfe5b898c56bf3779ca2279dace8 Mon Sep 17 00:00:00 2001 -From: Vishesh Handa <me@vhanda.in> -Date: Thu, 14 Jun 2012 02:55:32 +0530 -Subject: [PATCH 1/5] Revert "Disconnect before re-connecting. Soprano does - not do that for us." - -This reverts commit 3708be2d09700b21f934c2129218e1c7ea44efdf. - -This is being done so that KDE 4.8.x works with Soprano 2.7.6 ---- - nepomuk/core/nepomukmainmodel.cpp | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/nepomuk/core/nepomukmainmodel.cpp b/nepomuk/core/nepomukmainmodel.cpp -index 8dc0b1f..ff742d7 100644 ---- a/nepomuk/core/nepomukmainmodel.cpp -+++ b/nepomuk/core/nepomukmainmodel.cpp -@@ -97,7 +97,6 @@ public: - if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) { - delete localSocketModel; - localSocketModel = 0; -- localSocketClient.disconnect(); - QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" ); - kDebug() << "Connecting to local socket" << socketName; - if ( localSocketClient.connect( socketName ) ) { --- -1.7.9.2 - diff --git a/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert2.patch b/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert2.patch deleted file mode 100644 index 206e654fe53a..000000000000 --- a/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert2.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bde5aad1e9f7bfb6f8d5c60197797de4a315158d Mon Sep 17 00:00:00 2001 -From: Vishesh Handa <me@vhanda.in> -Date: Thu, 14 Jun 2012 02:56:31 +0530 -Subject: [PATCH 2/5] Revert "Always rec-connect if forced (ie. when Nepomuk - server restarts)" - -This reverts commit a43824a200ed76cef48a90bd3aee8547698b7c91. - -This is done so that 4.8.x works with Soprano 2.7.6 ---- - nepomuk/core/nepomukmainmodel.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/nepomuk/core/nepomukmainmodel.cpp b/nepomuk/core/nepomukmainmodel.cpp -index ff742d7..be23b38 100644 ---- a/nepomuk/core/nepomukmainmodel.cpp -+++ b/nepomuk/core/nepomukmainmodel.cpp -@@ -94,7 +94,7 @@ public: - - // we may get disconnected from the server but we don't want to try - // to connect every time the model is requested -- if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) { -+ if ( !m_socketConnectFailed && !localSocketClient.isConnected() ) { - delete localSocketModel; - localSocketModel = 0; - QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" ); --- -1.7.9.2 - diff --git a/kde-base/kmix/ChangeLog b/kde-base/kmix/ChangeLog index 81451028a104..b504d83459b8 100644 --- a/kde-base/kmix/ChangeLog +++ b/kde-base/kmix/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kmix # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.227 2012/09/03 13:29:21 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.228 2012/09/03 14:11:54 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> -files/kmix-4.8.3-oss4.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -kmix-4.7.4.ebuild: Remove KDE SC 4.7.4 diff --git a/kde-base/kmix/files/kmix-4.8.3-oss4.patch b/kde-base/kmix/files/kmix-4.8.3-oss4.patch deleted file mode 100644 index da5e7ccf54dd..000000000000 --- a/kde-base/kmix/files/kmix-4.8.3-oss4.patch +++ /dev/null @@ -1,112 +0,0 @@ ---- kmix/backends/mixer_oss4.cpp.org 2012-05-13 07:52:08.206663114 +0200 -+++ kmix/backends/mixer_oss4.cpp 2012-05-13 09:08:36.277009292 +0200 -@@ -335,10 +335,13 @@ - Volume vol (ext.maxvalue, ext.minvalue, false, isCapture); - vol.addVolumeChannels(chMask); - -- MixDevice* md = new MixDevice(_mixer, -+ MixDevice* md_ptr = new MixDevice(_mixer, - QString::number(i), - name, - cType); -+ -+ shared_ptr<MixDevice> md = md_ptr->addToPool(); -+ m_mixDevices.append(md); - - if(isCapture) - { -@@ -360,8 +363,6 @@ - m_recommendedMaster = md; - masterChosen = true; - } -- -- m_mixDevices.append(md->addToPool()); - } - else if ( ext.type == MIXT_HEXVALUE ) - { -@@ -369,10 +370,13 @@ - Volume vol (ext.maxvalue, ext.minvalue, false, isCapture); - vol.addVolumeChannels(chMask); - -- MixDevice* md = new MixDevice(_mixer, -+ MixDevice* md_ptr = new MixDevice(_mixer, - QString::number(i), - name, - cType); -+ -+ shared_ptr<MixDevice> md = md_ptr->addToPool(); -+ m_mixDevices.append(md); - - if(isCapture) - { -@@ -388,8 +392,6 @@ - m_recommendedMaster = md; - masterChosen = true; - } -- -- m_mixDevices.append(md->addToPool()); - } - else if ( ext.type == MIXT_ONOFF - #ifdef MIXT_MUTE -@@ -406,11 +408,15 @@ - vol.setSwitchType (Volume::SpecialSwitch); - } - -- MixDevice* md = new MixDevice(_mixer, -+ MixDevice* md_ptr = new MixDevice(_mixer, - QString::number(i), - name, - cType); -- if(isCapture) -+ -+ shared_ptr<MixDevice> md = md_ptr->addToPool(); -+ m_mixDevices.append(md); -+ -+ if(isCapture) - { - md->addCaptureVolume(vol); - } -@@ -418,8 +424,6 @@ - { - md->addPlaybackVolume(vol); - } -- -- m_mixDevices.append(md->addToPool()); - } - else if ( ext.type == MIXT_ENUM ) - { -@@ -431,9 +435,9 @@ - { - Volume vol(ext.maxvalue, ext.minvalue, - false, isCapture); -- vol.addVolumeChannel(VolumeChannel(Volume::MLEFT)); -+ vol.addVolumeChannel(VolumeChannel(Volume::LEFT)); - -- MixDevice* md = new MixDevice (_mixer, -+ MixDevice* md_ptr = new MixDevice (_mixer, - QString::number(i), - name, - cType); -@@ -451,9 +455,10 @@ - } - enumValuesRef.append( new QString(thisElement) ); - } -- md->addEnums(enumValuesRef); -- -- m_mixDevices.append(md->addToPool()); -+ md_ptr->addEnums(enumValuesRef); -+ -+ shared_ptr<MixDevice> md = md_ptr->addToPool(); -+ m_mixDevices.append(md); - } - } - -@@ -477,7 +482,7 @@ - m_isOpen = false; - int l_i_ret = ::close(m_fd); - m_mixDevices.clear(); -- m_recommendedMaster = NULL; -+ m_recommendedMaster.reset(); - return l_i_ret; - } - diff --git a/kde-base/konsole/ChangeLog b/kde-base/konsole/ChangeLog index 94bbddaa50c2..78149c6b9e70 100644 --- a/kde-base/konsole/ChangeLog +++ b/kde-base/konsole/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/konsole # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.242 2012/09/03 13:29:28 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.243 2012/09/03 14:14:01 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> + -files/konsole-4.6.4-imagesize.patch, -files/konsole-4.7.4-ypos.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -konsole-4.7.4-r1.ebuild: Remove KDE SC 4.7.4 @@ -960,4 +964,3 @@ +konsole-3.4.0_beta1.ebuild: Adding the split ebuilds to portage. For KDE 3.4, we've created separate ebuilds for all the KDE apps. - diff --git a/kde-base/konsole/files/konsole-4.6.4-imagesize.patch b/kde-base/konsole/files/konsole-4.6.4-imagesize.patch deleted file mode 100644 index 03fb8c97913c..000000000000 --- a/kde-base/konsole/files/konsole-4.6.4-imagesize.patch +++ /dev/null @@ -1,70 +0,0 @@ -Make sure the imageSizeChanged signal is emitted at least once. - -Without this patch, the shell or other app might have a wrong idea as to the -size of the terminal, because the size has never explicitely been set. - -This patch uses a boolean flag, to make sure the signal gets emitted at -least once. An alternative would be to change the default screen sizes. -One could either choose 24x80 as the default screen size, as this is what -most apps expect, or 1x1, as this is almost certainly different from any -screen size actually used. The first approach relies on defaults which need -not be fixed, and should therefore be avoided. Both approaches force a -resize of the screens created in the constructor, which is some overhead I'd -like to avoid. Neither one bool of data nor the added control structures -seems expensive enough to discourage this approach. - -https://bugs.kde.org/show_bug.cgi?id=176902 -https://bugs.gentoo.org/show_bug.cgi?id=357945 -https://bugzilla.redhat.com/show_bug.cgi?id=477359 - -2011-04-06 Patch by Martin von Gagern -based on ideas from Kurt V. Hindenburg and Jonathan Wakely - -Index: konsole-4.6.1/konsole/src/Emulation.cpp -=================================================================== ---- konsole-4.6.1.orig/konsole/src/Emulation.cpp -+++ konsole-4.6.1/konsole/src/Emulation.cpp -@@ -55,7 +55,8 @@ Emulation::Emulation() : - _codec(0), - _decoder(0), - _keyTranslator(0), -- _usesMouse(false) -+ _usesMouse(false), -+ _imageSizeSet(false) - { - // create screens with a default size - _screen[0] = new Screen(40,80); -@@ -344,12 +345,20 @@ void Emulation::setImageSize(int lines, - QSize newSize(columns,lines); - - if (newSize == screenSize[0] && newSize == screenSize[1]) -- return; -+ { -+ if (!_imageSizeSet) -+ { -+ emit imageSizeChanged(lines,columns); -+ _imageSizeSet = true; -+ } -+ return; -+ } - - _screen[0]->resizeImage(lines,columns); - _screen[1]->resizeImage(lines,columns); - - emit imageSizeChanged(lines,columns); -+ _imageSizeSet = true; - - bufferedUpdate(); - } -Index: konsole-4.6.1/konsole/src/Emulation.h -=================================================================== ---- konsole-4.6.1.orig/konsole/src/Emulation.h -+++ konsole-4.6.1/konsole/src/Emulation.h -@@ -462,6 +462,7 @@ private: - bool _usesMouse; - QTimer _bulkTimer1; - QTimer _bulkTimer2; -+ bool _imageSizeSet; - - }; - diff --git a/kde-base/konsole/files/konsole-4.7.4-ypos.patch b/kde-base/konsole/files/konsole-4.7.4-ypos.patch deleted file mode 100644 index e9bdd4c71e5e..000000000000 --- a/kde-base/konsole/files/konsole-4.7.4-ypos.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp ---- a/src/TerminalDisplay.cpp 2011-10-28 10:44:03.000000000 +0300 -+++ b/src/TerminalDisplay.cpp 2011-12-28 02:32:02.686667954 +0200 -@@ -718,7 +718,7 @@ - if (_bidiEnabled) - painter.drawText(rect,0,text); - else -- painter.drawText(rect,0,LTR_OVERRIDE_CHAR+text); -+ painter.drawText(rect,Qt::AlignBottom,LTR_OVERRIDE_CHAR+text); - } - } - diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog index 5be037f5f0f2..3586d02e3921 100644 --- a/kde-base/kopete/ChangeLog +++ b/kde-base/kopete/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kopete # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.329 2012/09/03 13:29:31 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.330 2012/09/03 14:16:59 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> -files/kopete-4.8.3-gcc47.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -kopete-4.7.4.ebuild: Remove KDE SC 4.7.4 @@ -1376,4 +1379,3 @@ +kopete-3.4.0_beta1.ebuild: Adding the split ebuilds to portage. For KDE 3.4, we've created separate ebuilds for all the KDE apps. - diff --git a/kde-base/kopete/files/kopete-4.8.3-gcc47.patch b/kde-base/kopete/files/kopete-4.8.3-gcc47.patch deleted file mode 100644 index 81071b21da48..000000000000 --- a/kde-base/kopete/files/kopete-4.8.3-gcc47.patch +++ /dev/null @@ -1,65 +0,0 @@ -Index: kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc -=================================================================== ---- kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc (revision 1292761) -+++ kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc (revision 1292762) -@@ -31,6 +31,7 @@ - #include <netinet/in.h> - #include <arpa/inet.h> - #include <netdb.h> -+#include <unistd.h> - #endif - - #include <cstring> -Index: kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc -=================================================================== ---- kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc (revision 1292761) -+++ kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc (revision 1292762) -@@ -27,6 +27,12 @@ - - #include "talk/base/ssladapter.h" - -+#ifdef POSIX -+extern "C" { -+#include <unistd.h> -+} -+#endif -+ - #if !defined(SSL_USE_SCHANNEL) && !defined(SSL_USE_OPENSSL) - #ifdef WIN32 - #define SSL_USE_SCHANNEL 1 -Index: kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h -=================================================================== ---- kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h (revision 1292761) -+++ kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h (revision 1292762) -@@ -198,15 +198,6 @@ - } - - template<class CTYPE> --size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) { -- va_list args; -- va_start(args, format); -- size_t len = vsprintfn(buffer, buflen, format, args); -- va_end(args); -- return len; --} -- --template<class CTYPE> - size_t vsprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, - va_list args) { - int len = vsnprintf(buffer, buflen, format, args); -@@ -217,6 +208,15 @@ - return len; - } - -+template<class CTYPE> -+size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) { -+ va_list args; -+ va_start(args, format); -+ size_t len = vsprintfn(buffer, buflen, format, args); -+ va_end(args); -+ return len; -+} -+ - /////////////////////////////////////////////////////////////////////////////// - // Allow safe comparing and copying ascii (not UTF-8) with both wide and - // non-wide character strings. diff --git a/kde-base/korganizer/ChangeLog b/kde-base/korganizer/ChangeLog index 58fa20289bc9..4b27acaebd85 100644 --- a/kde-base/korganizer/ChangeLog +++ b/kde-base/korganizer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/korganizer # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.237 2012/09/03 13:29:44 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.238 2012/09/03 14:18:14 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> + -files/korganizer-4.5.64_missing_header.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -korganizer-4.7.4.ebuild: Remove KDE SC 4.7.4 @@ -980,4 +984,3 @@ +korganizer-3.4.0_beta1.ebuild: Adding the split ebuilds to portage. For KDE 3.4, we've created separate ebuilds for all the KDE apps. - diff --git a/kde-base/korganizer/files/korganizer-4.5.64_missing_header.patch b/kde-base/korganizer/files/korganizer-4.5.64_missing_header.patch deleted file mode 100644 index bf2cb622c3f2..000000000000 --- a/kde-base/korganizer/files/korganizer-4.5.64_missing_header.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- korganizer/CMakeLists.txt 2010-05-07 11:14:26.000000000 +0200 -+++ korganizer/CMakeLists.txt 2010-05-07 10:28:38.000000000 +0200 -@@ -167,6 +167,7 @@ - ) - - kde4_add_kcfg_files(korganizer_core_LIB_SRCS koprefs_base.kcfgc ) -+kde4_add_kcfg_files(korganizer_core_LIB_SRCS ../calendarsupport/kcalprefs_base.kcfgc ) - - kde4_add_library(korganizer_core SHARED ${korganizer_core_LIB_SRCS}) - diff --git a/kde-base/kscd/ChangeLog b/kde-base/kscd/ChangeLog index 9251311aa444..7cfdf9d57887 100644 --- a/kde-base/kscd/ChangeLog +++ b/kde-base/kscd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kscd # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.226 2012/09/03 13:29:49 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.227 2012/09/03 14:19:46 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> + -files/kscd-4.7.3-underlinking.patch, -files/kscd-4.7.4-fix-no-cd-crash.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -kscd-4.7.4-r1.ebuild: Remove KDE SC 4.7.4 @@ -863,4 +867,3 @@ +kscd-3.4.0_beta1.ebuild: Adding the split ebuilds to portage. For KDE 3.4, we've created separate ebuilds for all the KDE apps. - diff --git a/kde-base/kscd/files/kscd-4.7.3-underlinking.patch b/kde-base/kscd/files/kscd-4.7.3-underlinking.patch deleted file mode 100644 index 0b0baf5404a8..000000000000 --- a/kde-base/kscd/files/kscd-4.7.3-underlinking.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- kscd/tests/CMakeLists.txt -+++ kscd/tests/CMakeLists.txt -@@ -16,6 +16,7 @@ - - # libraries needed for HWControler tests - target_link_libraries(HWControler_test -+ ${KDE4_KDECORE_LIBS} - ${KDE4_SOLID_LIBS} - ${KDE4_PHONON_LIBS} - ${QT_QTTEST_LIBRARY} -@@ -26,6 +27,7 @@ - - # libraries needed for AudioCD tests - target_link_libraries(AudioCD_test -+ ${KDE4_KDECORE_LIBS} - ${KDE4_SOLID_LIBS} - ${KDE4_PHONON_LIBS} - ${QT_QTTEST_LIBRARY} diff --git a/kde-base/kscd/files/kscd-4.7.4-fix-no-cd-crash.patch b/kde-base/kscd/files/kscd-4.7.4-fix-no-cd-crash.patch deleted file mode 100644 index 789ff8f2cbe1..000000000000 --- a/kde-base/kscd/files/kscd-4.7.4-fix-no-cd-crash.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- kscd/kscd.cpp 2011-12-02 00:56:20.000000000 +0100 -+++ kscd/kscd.cpp 2011-12-30 22:26:26.793971589 +0100 -@@ -69,8 +69,10 @@ - - /** Music Brainz initialisation */ - m_MBManager = new MBManager(); -+ if (devices->getMedia()) -+ { - m_MBManager->discLookup(devices->getMedia()->currentSource().deviceName()); -- -+ } - setupActions(); - setupContextMenu(); - } diff --git a/kde-base/kscreensaver/ChangeLog b/kde-base/kscreensaver/ChangeLog index 76e7fea10f98..7b6887670702 100644 --- a/kde-base/kscreensaver/ChangeLog +++ b/kde-base/kscreensaver/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kscreensaver # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/ChangeLog,v 1.229 2012/09/03 13:29:51 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/ChangeLog,v 1.230 2012/09/03 14:20:56 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> + -files/kdebase-4.0.2-pam-optional.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -kscreensaver-4.7.4.ebuild: Remove KDE SC 4.7.4 @@ -970,4 +974,3 @@ +kscreensaver-3.4.0_beta1.ebuild: Adding the split ebuilds to portage. For KDE 3.4, we've created separate ebuilds for all the KDE apps. - diff --git a/kde-base/kscreensaver/files/kdebase-4.0.2-pam-optional.patch b/kde-base/kscreensaver/files/kdebase-4.0.2-pam-optional.patch deleted file mode 100644 index 6fb54f05c547..000000000000 --- a/kde-base/kscreensaver/files/kdebase-4.0.2-pam-optional.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/kdebase/workspace/cmake/modules/FindPAM.cmake b/kdebase/workspace/cmake/modules/FindPAM.cmake -index 3499836..cd1c2bb 100644 ---- a/kdebase/workspace/cmake/modules/FindPAM.cmake -+++ b/kdebase/workspace/cmake/modules/FindPAM.cmake -@@ -5,6 +5,8 @@ - # PAM_INCLUDE_DIR - the pam include directory - # PAM_LIBRARIES - libpam library - -+if (WITH_PAM) -+ - if (PAM_INCLUDE_DIR AND PAM_LIBRARY) - # Already in cache, be silent - set(PAM_FIND_QUIETLY TRUE) -@@ -72,3 +74,5 @@ else (PAM_FOUND) - endif (PAM_FOUND) - - mark_as_advanced(PAM_INCLUDE_DIR PAM_LIBRARY DL_LIBRARY PAM_MESSAGE_CONST) -+ -+endif (WITH_PAM) -diff --git a/kdebase/workspace/cmake/modules/UnixAuth.cmake b/kdebase/workspace/cmake/modules/UnixAuth.cmake -index ed8ab9e..ce3bcc2 100644 ---- a/kdebase/workspace/cmake/modules/UnixAuth.cmake -+++ b/kdebase/workspace/cmake/modules/UnixAuth.cmake -@@ -1,4 +1,4 @@ --find_package(PAM) -+macro_optional_find_package(PAM) - - set(UNIXAUTH_LIBRARIES) - set(UNIXAUTH_INCLUDE_DIRS) diff --git a/kde-base/ksnapshot/ChangeLog b/kde-base/ksnapshot/ChangeLog index b10f7d0346d9..ca278d693344 100644 --- a/kde-base/ksnapshot/ChangeLog +++ b/kde-base/ksnapshot/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/ksnapshot # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ChangeLog,v 1.219 2012/09/03 13:29:26 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ChangeLog,v 1.220 2012/09/03 14:22:02 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> -files/ksnapshot-4.7-kipi.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -ksnapshot-4.7.4.ebuild: Remove KDE SC 4.7.4 @@ -874,4 +877,3 @@ +ksnapshot-3.4.0_beta1.ebuild: Adding the split ebuilds to portage. For KDE 3.4, we've created separate ebuilds for all the KDE apps. - diff --git a/kde-base/ksnapshot/files/ksnapshot-4.7-kipi.patch b/kde-base/ksnapshot/files/ksnapshot-4.7-kipi.patch deleted file mode 100644 index 43044fef2b76..000000000000 --- a/kde-base/ksnapshot/files/ksnapshot-4.7-kipi.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 683c270..25be4b5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,11 +1,13 @@ - project(ksnapshot) - - find_package(KDE4 REQUIRED) --find_package(Kipi) - include(KDE4Defaults) - include(MacroLibrary) - include(MacroOptionalAddSubdirectory) - include(MacroBoolTo01) -+include(MacroOptionalFindPackage) -+ -+macro_optional_find_package(Kipi) - - add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS}) - include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) diff --git a/kde-base/ksplash/ChangeLog b/kde-base/ksplash/ChangeLog index f8f73c7ace7e..b6e55555c331 100644 --- a/kde-base/ksplash/ChangeLog +++ b/kde-base/ksplash/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/ksplash # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ChangeLog,v 1.138 2012/09/03 13:29:36 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ChangeLog,v 1.139 2012/09/03 14:23:50 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> + -files/ksplash-4.4.2-xinerama_cmake_automagic.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -ksplash-4.7.4.ebuild: Remove KDE SC 4.7.4 diff --git a/kde-base/ksplash/files/ksplash-4.4.2-xinerama_cmake_automagic.patch b/kde-base/ksplash/files/ksplash-4.4.2-xinerama_cmake_automagic.patch deleted file mode 100644 index 5596f415d848..000000000000 --- a/kde-base/ksplash/files/ksplash-4.4.2-xinerama_cmake_automagic.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -r -u kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake kdebase-workspace-4.4.2/ConfigureChecks.cmake ---- kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake 2009-11-21 10:44:36.000000000 +0100 -+++ kdebase-workspace-4.4.2/ConfigureChecks.cmake 2010-04-02 00:04:32.000000000 +0200 -@@ -71,7 +71,14 @@ - macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses - macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin - macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin -+ -+if(NOT WITH_X11_Xinerama) -+ set(X11_Xinerama_FOUND FALSE) -+ MESSAGE(STATUS "Disabling Xinerama as requested on commandline.") -+endif(NOT WITH_X11_Xinerama) -+ - macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA) -+ - macro_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin - macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kicker - macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kdesktop and kcontrol/lock diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog index abed467059d9..2fc1a12e702f 100644 --- a/kde-base/kwin/ChangeLog +++ b/kde-base/kwin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kwin # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.288 2012/09/03 13:29:34 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.289 2012/09/03 14:24:57 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> + -files/kwin-4.4.2-xinerama_cmake_automagic.patch, + -files/kwin-4.8.1-fix-opengl-disabled-build.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -kwin-4.7.4.ebuild: Remove KDE SC 4.7.4 @@ -1100,4 +1105,3 @@ +kwin-3.4.0_beta1.ebuild: Adding the split ebuilds to portage. For KDE 3.4, we've created separate ebuilds for all the KDE apps. - diff --git a/kde-base/kwin/files/kwin-4.4.2-xinerama_cmake_automagic.patch b/kde-base/kwin/files/kwin-4.4.2-xinerama_cmake_automagic.patch deleted file mode 100644 index 5596f415d848..000000000000 --- a/kde-base/kwin/files/kwin-4.4.2-xinerama_cmake_automagic.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -r -u kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake kdebase-workspace-4.4.2/ConfigureChecks.cmake ---- kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake 2009-11-21 10:44:36.000000000 +0100 -+++ kdebase-workspace-4.4.2/ConfigureChecks.cmake 2010-04-02 00:04:32.000000000 +0200 -@@ -71,7 +71,14 @@ - macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses - macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin - macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin -+ -+if(NOT WITH_X11_Xinerama) -+ set(X11_Xinerama_FOUND FALSE) -+ MESSAGE(STATUS "Disabling Xinerama as requested on commandline.") -+endif(NOT WITH_X11_Xinerama) -+ - macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA) -+ - macro_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin - macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kicker - macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kdesktop and kcontrol/lock diff --git a/kde-base/kwin/files/kwin-4.8.1-fix-opengl-disabled-build.patch b/kde-base/kwin/files/kwin-4.8.1-fix-opengl-disabled-build.patch deleted file mode 100644 index a44ee077a93c..000000000000 --- a/kde-base/kwin/files/kwin-4.8.1-fix-opengl-disabled-build.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 1554ba408633397066d31c3d565c217b5a385fb8 Mon Sep 17 00:00:00 2001 -From: Michael Palimaka <kensington@astralcloak.net> -Date: Sun, 15 Apr 2012 04:55:03 +1000 -Subject: [PATCH] Fix KWin build failure when OpenGL is disabled and OpenGLES - is enabled. - -Some old restructuring caused -DKWIN_HAVE_OPENGLES to no longer be -passed to the compiler, causing OpenGL-specific code to be built -while the libraries to link it were not available. - -REVIEW: 104558 ---- - kwin/effects/CMakeLists.txt | 4 ++-- - kwin/kcmkwin/kwincompositing/CMakeLists.txt | 8 ++++---- - kwin/kcmkwin/kwinscreenedges/CMakeLists.txt | 8 ++++---- - 3 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/kwin/effects/CMakeLists.txt b/kwin/effects/CMakeLists.txt -index a9eea1d..88c8b32 100644 ---- a/kwin/effects/CMakeLists.txt -+++ b/kwin/effects/CMakeLists.txt -@@ -113,9 +113,9 @@ if( NOT KWIN_MOBILE_EFFECTS ) - include( windowgeometry/CMakeLists.txt ) - include( zoom/CMakeLists.txt ) - -- if( NOT KWIN_HAVE_OPENGLES_COMPOSITING ) -+ if( NOT OPENGLES_FOUND ) - include( logout/CMakeLists.txt ) -- endif( NOT KWIN_HAVE_OPENGLES_COMPOSITING ) -+ endif( NOT OPENGLES_FOUND ) - endif( NOT KWIN_MOBILE_EFFECTS ) - - # OpenGL-specific effects -diff --git a/kwin/kcmkwin/kwincompositing/CMakeLists.txt b/kwin/kcmkwin/kwincompositing/CMakeLists.txt -index 2d420c0..decc6b7 100644 ---- a/kwin/kcmkwin/kwincompositing/CMakeLists.txt -+++ b/kwin/kcmkwin/kwincompositing/CMakeLists.txt -@@ -18,7 +18,7 @@ target_link_libraries(kcm_kwincompositing ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIB - install(TARGETS kcm_kwincompositing DESTINATION ${PLUGIN_INSTALL_DIR} ) - - # CompositingPrefs uses OpenGL --if(OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING) -+if(OPENGL_FOUND) - target_link_libraries(kcm_kwincompositing kwinglutils ${OPENGL_gl_LIBRARY}) - set_target_properties(kcm_kwincompositing PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL) - # -ldl used by OpenGL code -@@ -26,11 +26,11 @@ if(OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING) - if (DL_LIBRARY) - target_link_libraries(kcm_kwincompositing ${DL_LIBRARY}) - endif(DL_LIBRARY) --endif(OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING) --if(KWIN_HAVE_OPENGLES_COMPOSITING) -+endif(OPENGL_FOUND) -+if(OPENGLES_FOUND) - target_link_libraries(kcm_kwincompositing kwinglesutils ${OPENGLES_LIBRARIES}) - set_target_properties(kcm_kwincompositing PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGL -DKWIN_HAVE_OPENGLES") --endif(KWIN_HAVE_OPENGLES_COMPOSITING) -+endif(OPENGLES_FOUND) - if (X11_Xrender_FOUND) - target_link_libraries(kcm_kwincompositing ${X11_Xrender_LIB}) - endif (X11_Xrender_FOUND) -diff --git a/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt b/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt -index 2827350..cecff7c 100644 ---- a/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt -+++ b/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt -@@ -14,7 +14,7 @@ target_link_libraries( kcm_kwinscreenedges ${X11_LIBRARIES} kworkspace ${KDE4_PL - install( TARGETS kcm_kwinscreenedges DESTINATION ${PLUGIN_INSTALL_DIR} ) - - # CompositingPrefs uses OpenGL --if( OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING ) -+if( OPENGL_FOUND ) - target_link_libraries( kcm_kwinscreenedges kwinglutils ${OPENGL_gl_LIBRARY} ) - set_target_properties(kcm_kwinscreenedges PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL) - # -ldl used by OpenGL code -@@ -22,11 +22,11 @@ if( OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING ) - if( DL_LIBRARY ) - target_link_libraries( kcm_kwinscreenedges ${DL_LIBRARY} ) - endif( DL_LIBRARY ) --endif( OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING ) --if(KWIN_HAVE_OPENGLES_COMPOSITING) -+endif( OPENGL_FOUND ) -+if(OPENGLES_FOUND) - target_link_libraries(kcm_kwinscreenedges kwinglesutils ${OPENGLES_LIBRARIES}) - set_target_properties(kcm_kwinscreenedges PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGL -DKWIN_HAVE_OPENGLES") --endif(KWIN_HAVE_OPENGLES_COMPOSITING) -+endif(OPENGLES_FOUND) - if( X11_Xrender_FOUND ) - target_link_libraries( kcm_kwinscreenedges ${X11_Xrender_LIB} ) - endif( X11_Xrender_FOUND ) --- -1.7.10
\ No newline at end of file diff --git a/kde-base/libkonq/ChangeLog b/kde-base/libkonq/ChangeLog index ac8ffd97df0e..5806d8a04a9c 100644 --- a/kde-base/libkonq/ChangeLog +++ b/kde-base/libkonq/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/libkonq # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/ChangeLog,v 1.229 2012/09/03 13:29:30 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/ChangeLog,v 1.230 2012/09/03 14:27:15 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> + -files/libkonq-4.5.56-cmake.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -libkonq-4.7.4.ebuild: Remove KDE SC 4.7.4 @@ -864,4 +868,3 @@ +libkonq-3.4.0_beta1.ebuild: Adding the split ebuilds to portage. For KDE 3.4, we've created separate ebuilds for all the KDE apps. - diff --git a/kde-base/libkonq/files/libkonq-4.5.56-cmake.patch b/kde-base/libkonq/files/libkonq-4.5.56-cmake.patch deleted file mode 100644 index c079ed02c47e..000000000000 --- a/kde-base/libkonq/files/libkonq-4.5.56-cmake.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: lib/konq/CMakeLists.txt -=================================================================== ---- lib/konq/CMakeLists.txt (revision 1172114) -+++ lib/konq/CMakeLists.txt (working copy) -@@ -58,7 +58,9 @@ - konq_dndpopupmenuplugin.h - knewmenu.h - konq_menuactions.h -- # konq_copytomenu.h - anyone needs it? -+ konq_copytomenu.h -+ konq_popupmenuinformation.h -+ konq_statusbarmessagelabel.h - konq_operations.h - libkonq_export.h - konq_events.h diff --git a/kde-base/libksane/ChangeLog b/kde-base/libksane/ChangeLog index 9f85429507c7..4feebff6640d 100644 --- a/kde-base/libksane/ChangeLog +++ b/kde-base/libksane/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/libksane # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/libksane/ChangeLog,v 1.118 2012/09/03 13:29:44 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/libksane/ChangeLog,v 1.119 2012/09/03 14:28:10 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> + -files/libksane-4.8.1-scanner-polling.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -libksane-4.7.4.ebuild: Remove KDE SC 4.7.4 @@ -472,4 +476,3 @@ 02 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> +metadata.xml, +libksane-4.1.2.ebuild: Add kde-4.1.2 into the tree from the kde-testing overlay. - diff --git a/kde-base/libksane/files/libksane-4.8.1-scanner-polling.patch b/kde-base/libksane/files/libksane-4.8.1-scanner-polling.patch deleted file mode 100644 index e94a69921ade..000000000000 --- a/kde-base/libksane/files/libksane-4.8.1-scanner-polling.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 0a02ff4a4602f09bae25f3a8e9b971b32bbee2ca -Author: Kåre Särs <kare.sars@iki.fi> -Date: Wed Feb 15 21:24:14 2012 +0200 - - Apply Gregor Horst's patch to stop polling while a scan is ongoing - - BUG: 294073 - -diff --git a/libksane/ksane_widget_private.cpp b/libksane/ksane_widget_private.cpp -index 055976e..9872c40 100644 ---- a/libksane/ksane_widget_private.cpp -+++ b/libksane/ksane_widget_private.cpp -@@ -1023,11 +1023,15 @@ void KSaneWidgetPrivate::setBusy(bool busy) - m_warmingUp->show(); - m_activityFrame->hide(); - m_btnFrame->hide(); -+ m_optionPollTmr.stop(); - } - else { - m_warmingUp->hide(); - m_activityFrame->hide(); - m_btnFrame->show(); -+ if (m_pollList.size() > 0) { -+ m_optionPollTmr.start(); -+ } - } - - m_optsTabWidget->setDisabled(busy); diff --git a/kde-base/libkworkspace/ChangeLog b/kde-base/libkworkspace/ChangeLog index 277f4dc9085a..5251f4217b68 100644 --- a/kde-base/libkworkspace/ChangeLog +++ b/kde-base/libkworkspace/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/libkworkspace # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/ChangeLog,v 1.145 2012/09/03 13:29:48 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/ChangeLog,v 1.146 2012/09/03 14:29:02 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> + -files/libkworkspace-4.8.0-pam-optional.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -libkworkspace-4.7.4-r1.ebuild, -libkworkspace-4.7.4-r2.ebuild: @@ -651,4 +655,3 @@ 18 Jan 2008; Ingmar Vanhassel <ingmar@gentoo.org> +metadata.xml, +libkworkspace-4.0.0.ebuild: Added KDE 4.0.0's libkworkspace. - diff --git a/kde-base/libkworkspace/files/libkworkspace-4.8.0-pam-optional.patch b/kde-base/libkworkspace/files/libkworkspace-4.8.0-pam-optional.patch deleted file mode 100644 index cfd71edc3cb9..000000000000 --- a/kde-base/libkworkspace/files/libkworkspace-4.8.0-pam-optional.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit 619f589f523448fd5b47f3c59ec2994642312585 -Author: Theo Chatzimichos <tampakrap@gentoo.org> -Date: Fri Feb 3 15:51:10 2012 +0100 - - Fix optional PAM support, patch by Michael Palimaka <kde@scribeofthenile.com> - - REVIEW:103818 - -diff --git a/cmake/modules/UnixAuth.cmake b/cmake/modules/UnixAuth.cmake -index 904f0cb..0347251 100644 ---- a/cmake/modules/UnixAuth.cmake -+++ b/cmake/modules/UnixAuth.cmake -@@ -1,4 +1,4 @@ --find_package(PAM) -+macro_optional_find_package(PAM) - - include(CheckFunctionExists) - include(CheckLibraryExists) diff --git a/kde-base/lokalize/ChangeLog b/kde-base/lokalize/ChangeLog index 59ff829e542d..2410ec46710f 100644 --- a/kde-base/lokalize/ChangeLog +++ b/kde-base/lokalize/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/lokalize # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/ChangeLog,v 1.120 2012/09/03 13:29:12 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/ChangeLog,v 1.121 2012/09/03 14:30:21 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> + -files/lokalize-4.6.5-hunspell.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -lokalize-4.7.4.ebuild: Remove KDE SC 4.7.4 @@ -488,4 +492,3 @@ 02 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> +metadata.xml, +lokalize-4.1.2.ebuild: Add kde-4.1.2 into the tree from the kde-testing overlay. - diff --git a/kde-base/lokalize/files/lokalize-4.6.5-hunspell.patch b/kde-base/lokalize/files/lokalize-4.6.5-hunspell.patch deleted file mode 100644 index 46b4ff07f05c..000000000000 --- a/kde-base/lokalize/files/lokalize-4.6.5-hunspell.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN lokalize-4.6.5.orig/cmake/modules/FindHUNSPELL.cmake lokalize-4.6.5/cmake/modules/FindHUNSPELL.cmake ---- lokalize-4.6.5.orig/cmake/modules/FindHUNSPELL.cmake 2011-04-28 15:31:12.000000000 +0200 -+++ lokalize-4.6.5/cmake/modules/FindHUNSPELL.cmake 2011-08-07 20:45:32.175576267 +0200 -@@ -14,7 +14,7 @@ - - FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx ) - --FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.2 hunspell-1.3) -+FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.3 hunspell-1.2) - - # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE if - # all listed variables are TRUE diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog index 2cd2b635722a..52b985f54552 100644 --- a/kde-base/marble/ChangeLog +++ b/kde-base/marble/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/marble # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.155 2012/09/03 13:29:28 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.156 2012/09/03 14:31:26 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> + -files/marble-4.7-magic-r1.patch, -files/marble-4.8.0-lower-qt48.patch, + -files/marble-4.8.0-qt48.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -marble-4.7.4.ebuild: Remove KDE SC 4.7.4 diff --git a/kde-base/marble/files/marble-4.7-magic-r1.patch b/kde-base/marble/files/marble-4.7-magic-r1.patch deleted file mode 100644 index 2249884b5ca7..000000000000 --- a/kde-base/marble/files/marble-4.7-magic-r1.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -ruN marble-4.7.0.orig/CMakeLists.txt marble-4.7.0/CMakeLists.txt ---- marble-4.7.0.orig/CMakeLists.txt 2011-06-22 16:53:54.000000000 +0200 -+++ marble-4.7.0/CMakeLists.txt 2011-07-31 20:20:44.000000000 +0200 -@@ -38,7 +38,7 @@ - "Experimental Python binding support for the Marble library. To activate it pass -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE to cmake.") - endif() - --if(EXPERIMENTAL_PYTHON_BINDINGS) -+if(NOT QTONLY AND EXPERIMENTAL_PYTHON_BINDINGS) - macro_optional_find_package(PythonLibrary) - - macro_optional_find_package(SIP) -diff -ruN marble-4.7.0.orig/src/plugins/positionprovider/CMakeLists.txt marble-4.7.0/src/plugins/positionprovider/CMakeLists.txt ---- marble-4.7.0.orig/src/plugins/positionprovider/CMakeLists.txt 2011-07-07 16:05:38.000000000 +0200 -+++ marble-4.7.0/src/plugins/positionprovider/CMakeLists.txt 2011-07-31 20:16:08.000000000 +0200 -@@ -1,3 +1,7 @@ -+# we cannot use macro_optional_find_package here, because we want to be -+# able to build without kde support -+ -+IF(WITH_libgps) - FIND_PACKAGE(libgps) - IF(LIBGPS_FOUND) - MESSAGE( STATUS "Building with gpsd position provider") -@@ -5,12 +9,19 @@ - ELSE(LIBGPS_FOUND) - MESSAGE( STATUS "Not building with gpsd position provider") - ENDIF(LIBGPS_FOUND) -+ELSE(WITH_libgps) -+ SET(LIBGPS_FOUND 0) -+ENDIF(WITH_libgps) - -+IF(WITH_liblocation) - FIND_PACKAGE(liblocation) - IF(liblocation_FOUND) - MESSAGE( STATUS "Building with Maemo GPS support") - ADD_SUBDIRECTORY( maemo ) - ENDIF(liblocation_FOUND) -+ELSE(WITH_liblocation) -+ SET(liblocation_FOUND 0) -+ENDIF(WITH_liblocation) - - FIND_PACKAGE(QtLocation) - IF(QTLOCATION_FOUND) -@@ -19,4 +30,4 @@ - ENDIF(QTLOCATION_FOUND) - - # experimental implementation --# ADD_SUBDIRECTORY( geoclue ) -\ Kein Zeilenumbruch am Dateiende. -+# ADD_SUBDIRECTORY( geoclue ) diff --git a/kde-base/marble/files/marble-4.8.0-lower-qt48.patch b/kde-base/marble/files/marble-4.8.0-lower-qt48.patch deleted file mode 100644 index 9febadeccc4a..000000000000 --- a/kde-base/marble/files/marble-4.8.0-lower-qt48.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit b89ff577fcbd085fbd180f59aa669dded1818082 -Author: Bernhard Beschow <bbeschow@cs.tu-berlin.de> -Date: Wed Feb 8 18:14:59 2012 +0100 - - compile with Qt < 4.8 - - * take into account the comment in the API doc, which suggests to use QColor::rgb() - (cherry picked from commit 6eafb31f509c622e2672c31b73ebcb1b3dafb3e9) - -diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp -index d0deead..9319a89 100644 ---- a/src/lib/TextureColorizer.cpp -+++ b/src/lib/TextureColorizer.cpp -@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage *origimg, const ViewportParams *viewport - m_coastImage = QImage( viewport->size(), QImage::Format_RGB32 ); - - // update coast image -- m_coastImage.fill( QColor( 0, 0, 255, 0) ); -+ m_coastImage.fill( QColor( 0, 0, 255, 0).rgb() ); - - bool doClip = false; //assume false - switch( viewport->projection() ) { diff --git a/kde-base/marble/files/marble-4.8.0-qt48.patch b/kde-base/marble/files/marble-4.8.0-qt48.patch deleted file mode 100644 index 5e88fc4b4212..000000000000 --- a/kde-base/marble/files/marble-4.8.0-qt48.patch +++ /dev/null @@ -1,65 +0,0 @@ -commit 79c39f45468bace95169d1ba959884ce27087d1e -Author: Torsten Rahn <rahn@kde.org> -Date: Wed Feb 8 17:18:15 2012 +0100 - - Fixes for Marble with Qt 4.8: - - - Provide proper colors for Marble's Atlas, Temperature, - Precipitation and Venus/Mars Topography maps. - ( due to introduction of QImage::fill( QColor ) overload ) - - - Show proper icons for MarbleLegendBrowser - ( due to new interpretation of the "current directory" in - QTextBrowser ) - -diff --git a/src/lib/MarbleLegendBrowser.cpp b/src/lib/MarbleLegendBrowser.cpp -index 4a25095..ffa0a23 100644 ---- a/src/lib/MarbleLegendBrowser.cpp -+++ b/src/lib/MarbleLegendBrowser.cpp -@@ -130,26 +130,24 @@ void MarbleLegendBrowser::loadLegend() - t.start(); - - // Read the html string. -- QString finalHtml; -+ QString legendPath; - - // Check for a theme specific legend.html first - if ( d->m_marbleModel != 0 && d->m_marbleModel->mapTheme() != 0 ) - { - GeoSceneDocument *currentMapTheme = d->m_marbleModel->mapTheme(); - -- QString customLegendPath = MarbleDirs::path( "maps/" + -+ legendPath = MarbleDirs::path( "maps/" + - currentMapTheme->head()->target() + '/' + - currentMapTheme->head()->theme() + "/legend.html" ); -- if ( !customLegendPath.isEmpty() ) -- finalHtml = readHtml( QUrl::fromLocalFile( customLegendPath ) ); -- else -- finalHtml.clear(); - } -- -- if ( finalHtml.isEmpty() ) { -- finalHtml = readHtml( QUrl::fromLocalFile( MarbleDirs::path( "legend.html" ) ) ); -+ if ( legendPath.isEmpty() ) { -+ legendPath = MarbleDirs::path( "legend.html" ); - } - -+ QString finalHtml = readHtml( QUrl::fromLocalFile( legendPath ) ); -+ finalHtml.replace( QString( "./" ), legendPath.section( '/', 0, -2 ) + '/' ); -+ - // Generate some parts of the html from the MapTheme <Legend> tag. - const QString sectionsHtml = generateSectionsHtml(); - -diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp -index 4a4f8f3..d0deead 100644 ---- a/src/lib/TextureColorizer.cpp -+++ b/src/lib/TextureColorizer.cpp -@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage *origimg, const ViewportParams *viewport - m_coastImage = QImage( viewport->size(), QImage::Format_RGB32 ); - - // update coast image -- m_coastImage.fill( Qt::transparent ); -+ m_coastImage.fill( QColor( 0, 0, 255, 0) ); - - bool doClip = false; //assume false - switch( viewport->projection() ) { diff --git a/kde-base/nepomuk/ChangeLog b/kde-base/nepomuk/ChangeLog index 890272b8ea53..a4256c830250 100644 --- a/kde-base/nepomuk/ChangeLog +++ b/kde-base/nepomuk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/nepomuk # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/ChangeLog,v 1.140 2012/09/03 13:29:48 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/ChangeLog,v 1.141 2012/09/03 14:32:18 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> + -files/nepomuk-4.8.1-performance.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -nepomuk-4.7.4.ebuild: Remove KDE SC 4.7.4 diff --git a/kde-base/nepomuk/files/nepomuk-4.8.1-performance.patch b/kde-base/nepomuk/files/nepomuk-4.8.1-performance.patch deleted file mode 100644 index 06d01e7702db..000000000000 --- a/kde-base/nepomuk/files/nepomuk-4.8.1-performance.patch +++ /dev/null @@ -1,151 +0,0 @@ -commit 754275eda610dce1160286a76339353097d8764c -Author: Sebastian Trueg <trueg@kde.org> -Date: Fri Mar 9 17:17:48 2012 +0100 - - Backport from nepomuk-core: improved performance on res identification. - - BUG: 289932 - FIXED-IN: 4.8.2 - -diff --git a/nepomuk/services/backupsync/lib/resourceidentifier.cpp b/nepomuk/services/backupsync/lib/resourceidentifier.cpp -index c1a9919..894372c 100644 ---- a/nepomuk/services/backupsync/lib/resourceidentifier.cpp -+++ b/nepomuk/services/backupsync/lib/resourceidentifier.cpp -@@ -31,6 +31,7 @@ - #include <Soprano/Statement> - #include <Soprano/Graph> - #include <Soprano/Node> -+#include <Soprano/BindingSet> - #include <Soprano/StatementIterator> - #include <Soprano/QueryResultIterator> - #include <Soprano/Model> -@@ -176,19 +177,18 @@ bool Nepomuk::Sync::ResourceIdentifier::runIdentification(const KUrl& uri) - return false; - } - -- QString query; -- - QStringList identifyingProperties; - QHash<KUrl, Soprano::Node> identifyingPropertiesHash; - - QHash< KUrl, Soprano::Node >::const_iterator it = res.constBegin(); - QHash< KUrl, Soprano::Node >::const_iterator constEnd = res.constEnd(); -+ QList<Soprano::Node> requiredTypes; - for( ; it != constEnd; it++ ) { - const QUrl & prop = it.key(); - - // Special handling for rdf:type - if( prop == RDF::type() ) { -- query += QString::fromLatin1(" ?r a %1 . ").arg( it.value().toN3() ); -+ requiredTypes << it.value().uri(); - continue; - } - -@@ -219,6 +219,10 @@ bool Nepomuk::Sync::ResourceIdentifier::runIdentification(const KUrl& uri) - return false; - } - -+ -+ // construct the identification query -+ QString query = QLatin1String("select distinct ?r where { "); -+ - // - // Optimization: - // If there is only one identifying property using all that optional and filter stuff -@@ -235,7 +239,7 @@ bool Nepomuk::Sync::ResourceIdentifier::runIdentification(const KUrl& uri) - QString::number( numIdentifyingProperties++ ) ); - } - -- // Make sure atleast one of the identification properties has been matched -+ // Make sure at least one of the identification properties has been matched - // by adding filter( bound(?o1) || bound(?o2) ... ) - query += QString::fromLatin1("filter( "); - for( int i=0; i<numIdentifyingProperties-1; i++ ) { -@@ -247,43 +251,68 @@ bool Nepomuk::Sync::ResourceIdentifier::runIdentification(const KUrl& uri) - query += QString::fromLatin1("?r %1 %2 . ").arg(Soprano::Node::resourceToN3(identifyingPropertiesHash.constBegin().key()), - identifyingPropertiesHash.constBegin().value().toN3()); - } -- query += QLatin1String("}"); - -- // Construct the entire query -- QString queryBegin = QString::fromLatin1("select distinct ?r count(?p) as ?cnt " -- "where { ?r ?p ?o. filter( ?p in (%1) ).") -- .arg( identifyingProperties.join(",") ); -- -- query = queryBegin + query + QString::fromLatin1(" order by desc(?cnt)"); -+ // -+ // For performance reasons we add a limit even though this could mean that we -+ // miss a resource to identify since we check the types below. -+ // -+ query += QLatin1String("} LIMIT 100"); - -- kDebug() << query; - - // -- // Only store the results which have the maximum score -+ // Fetch a score for each result. -+ // We do this in a separate query for performance reasons. - // -- QSet<KUrl> results; -- int score = -1; -+ QMultiHash<int, KUrl> resultsScoreHash; -+ int maxScore = -1; - Soprano::QueryResultIterator qit = d->m_model->executeQuery( query, Soprano::Query::QueryLanguageSparql ); - while( qit.next() ) { -- //kDebug() << "RESULT: " << qit["r"] << " " << qit["cnt"]; -+ const Soprano::Node r(qit["r"]); -+ -+ // -+ // Check the type requirements. Experiments have shown this to mean a substantial -+ // performance boost as compared to doing it in the main query. -+ // -+ if(!requiredTypes.isEmpty() ) { -+ query = QLatin1String("ask where { "); -+ foreach(const Soprano::Node& type, requiredTypes) { -+ query += QString::fromLatin1("%1 a %2 . ").arg(r.toN3(), type.toN3()); -+ } -+ query += QLatin1String("}"); -+ if(!d->m_model->executeQuery(query, Soprano::Query::QueryLanguageSparql).boolValue()) { -+ continue; -+ } -+ } -+ -+ -+ const int score = d->m_model->executeQuery(QString::fromLatin1("select count(?p) as ?cnt where { " -+ "%1 ?p ?o. filter( ?p in (%2) ) . }") -+ .arg( r.toN3(), -+ identifyingProperties.join(",") ), -+ Soprano::Query::QueryLanguageSparql) -+ .allBindings().first()["cnt"].literal().toInt(); - -- int count = qit["cnt"].literal().toInt(); -- if( score == -1 ) { -- score = count; -+ if( maxScore < score ) { -+ maxScore = score; - } -- else if( count < score ) -- break; - -- results << qit["r"].uri(); -+ resultsScoreHash.insert(score, r.uri()); - } - -+ // -+ // Only get the results which have the maximum score -+ // -+ QSet<KUrl> results = QSet<KUrl>::fromList(resultsScoreHash.values(maxScore)); -+ -+ - //kDebug() << "Got " << results.size() << " results"; - if( results.empty() ) - return false; - - KUrl newUri; -- if( results.size() == 1 ) -+ if( results.size() == 1 ) { - newUri = *results.begin(); -+ } - else { - kDebug() << "DUPLICATE RESULTS!"; - newUri = duplicateMatch( res.uri(), results ); diff --git a/kde-base/okteta/ChangeLog b/kde-base/okteta/ChangeLog index a9edf86354aa..1146aa6c6f6d 100644 --- a/kde-base/okteta/ChangeLog +++ b/kde-base/okteta/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/okteta # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/ChangeLog,v 1.121 2012/09/03 13:29:52 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/ChangeLog,v 1.122 2012/09/03 14:34:04 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> -files/okteta-4.7.4-ppc.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -okteta-4.7.4.ebuild: Remove KDE SC 4.7.4 @@ -481,4 +484,3 @@ 02 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> +metadata.xml, +okteta-4.1.2.ebuild: Add kde-4.1.2 into the tree from the kde-testing overlay. - diff --git a/kde-base/okteta/files/okteta-4.7.4-ppc.patch b/kde-base/okteta/files/okteta-4.7.4-ppc.patch deleted file mode 100644 index cc6bc262ce2b..000000000000 --- a/kde-base/okteta/files/okteta-4.7.4-ppc.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- trunk/KDE/kdesdk/okteta/program/mainwindow.cpp 2011/10/09 21:40:06 1258089 -+++ trunk/KDE/kdesdk/okteta/program/mainwindow.cpp 2011/10/09 21:57:37 1258090 -@@ -43,8 +43,12 @@ - #include <bytetable/bytetabletool.h> - #include <bookmarks/bookmarkstoolview.h> - #include <bookmarks/bookmarkstool.h> -+ -+#ifndef NO_STRUCTURES_TOOL - #include <structures/structtoolview.h> - #include <structures/structtool.h> -+#endif -+ - // Kasten tools - #include <document/versionview/versionviewtoolview.h> - #include <document/versionview/versionviewtool.h> diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog index 79fefffbfd13..54f0a2731313 100644 --- a/kde-base/plasma-workspace/ChangeLog +++ b/kde-base/plasma-workspace/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/plasma-workspace # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.172 2012/09/03 13:29:29 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.173 2012/09/03 14:37:43 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> + -files/plasma-workspace-4.4.2-xinerama_cmake_automagic.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -plasma-workspace-4.7.4.ebuild: Remove KDE SC 4.7.4 diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.4.2-xinerama_cmake_automagic.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.4.2-xinerama_cmake_automagic.patch deleted file mode 100644 index 5596f415d848..000000000000 --- a/kde-base/plasma-workspace/files/plasma-workspace-4.4.2-xinerama_cmake_automagic.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -r -u kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake kdebase-workspace-4.4.2/ConfigureChecks.cmake ---- kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake 2009-11-21 10:44:36.000000000 +0100 -+++ kdebase-workspace-4.4.2/ConfigureChecks.cmake 2010-04-02 00:04:32.000000000 +0200 -@@ -71,7 +71,14 @@ - macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses - macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin - macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin -+ -+if(NOT WITH_X11_Xinerama) -+ set(X11_Xinerama_FOUND FALSE) -+ MESSAGE(STATUS "Disabling Xinerama as requested on commandline.") -+endif(NOT WITH_X11_Xinerama) -+ - macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA) -+ - macro_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin - macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kicker - macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kdesktop and kcontrol/lock diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog index b01d2ac194f1..02770d2bcef3 100644 --- a/kde-base/pykde4/ChangeLog +++ b/kde-base/pykde4/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/pykde4 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.173 2012/09/03 13:30:01 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.174 2012/09/03 14:39:38 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> + -files/pykde4-4.6.3-python-3.2.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -pykde4-4.7.4.ebuild: Remove KDE SC 4.7.4 diff --git a/kde-base/pykde4/files/pykde4-4.6.3-python-3.2.patch b/kde-base/pykde4/files/pykde4-4.6.3-python-3.2.patch deleted file mode 100644 index 62abdf0a1ba1..000000000000 --- a/kde-base/pykde4/files/pykde4-4.6.3-python-3.2.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- python/pykde4/sip/kio/kfileitem.sip -+++ python/pykde4/sip/kio/kfileitem.sip -@@ -236,7 +236,13 @@ - - len = sipCpp->count(); - -- if (PySlice_GetIndicesEx((PySliceObject *)a0, len, &start, &stop, &step, &slicelength) < 0) -+ if (PySlice_GetIndicesEx( -+#if PY_VERSION_HEX >= 0x03020000 -+ a0, -+#else -+ (PySliceObject *)a0, -+#endif -+ len, &start, &stop, &step, &slicelength) < 0) - sipIsErr = 1; - else - { diff --git a/kde-base/smokegen/ChangeLog b/kde-base/smokegen/ChangeLog index ca5f22665b45..990d4c5d6366 100644 --- a/kde-base/smokegen/ChangeLog +++ b/kde-base/smokegen/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/smokegen # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/smokegen/ChangeLog,v 1.37 2012/09/03 13:29:21 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/smokegen/ChangeLog,v 1.38 2012/09/03 14:40:39 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> + -files/smokegen-4.7.4-akonadicrash.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -smokegen-4.7.4-r1.ebuild: Remove KDE SC 4.7.4 @@ -147,4 +151,3 @@ 27 Jul 2011; Alexey Shvetsov <alexxy@gentoo.org> +smokegen-4.7.0.ebuild, +metadata.xml: Version bump KDE SC 4.7.0 - diff --git a/kde-base/smokegen/files/smokegen-4.7.4-akonadicrash.patch b/kde-base/smokegen/files/smokegen-4.7.4-akonadicrash.patch deleted file mode 100644 index 8d4300b00dee..000000000000 --- a/kde-base/smokegen/files/smokegen-4.7.4-akonadicrash.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 50f01c2d6b28110f8517a77960e456c1125bdb6e -Author: Arno Rehn <arno@arnorehn.de> -Date: Sat Dec 3 17:57:43 2011 +0100 - - fix a crash when generating the akonadi bindings - - BUG: 283677 - -diff --git a/type_compiler.cpp b/type_compiler.cpp -index 6ebf602..6e4ab70 100644 ---- a/type_compiler.cpp -+++ b/type_compiler.cpp -@@ -191,6 +191,8 @@ void TypeCompiler::visitParameterDeclaration(ParameterDeclarationAST* node) - - void TypeCompiler::visitPtrOperator(PtrOperatorAST* node) - { -+ if ( ! m_session->token_stream ) return; -+ if ( ! token_text(m_session->token_stream->kind(node->op)) ) return; - if (token_text(m_session->token_stream->kind(node->op))[0] == '*') { - QPair<bool, bool> cv = m_visitor->parseCv(node->cv); - pointerDepth.append(cv.first); diff --git a/kde-base/superkaramba/ChangeLog b/kde-base/superkaramba/ChangeLog index 817bae0af4b4..3174dda85144 100644 --- a/kde-base/superkaramba/ChangeLog +++ b/kde-base/superkaramba/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/superkaramba # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.211 2012/09/03 13:29:29 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.212 2012/09/03 14:41:55 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> + -files/superkaramba-as-needed.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -superkaramba-4.7.4.ebuild: Remove KDE SC 4.7.4 @@ -897,4 +901,3 @@ 07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +metadata.xml, +superkaramba-3.5_alpha1.ebuild: Added 3.5_alpha1 split ebuild. - diff --git a/kde-base/superkaramba/files/superkaramba-as-needed.patch b/kde-base/superkaramba/files/superkaramba-as-needed.patch deleted file mode 100644 index 85d6956048c7..000000000000 --- a/kde-base/superkaramba/files/superkaramba-as-needed.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- superkaramba-4.0.1/superkaramba/src/CMakeLists.txt 2008-02-07 18:45:04.000000000 +0100 -+++ superkaramba-4.0.1.new/superkaramba/src/CMakeLists.txt 2008-02-07 18:46:52.000000000 +0100 -@@ -82,6 +82,16 @@ - KDE4_ADD_LIBRARY(superkaramba SHARED ${superkaramba_LIB_SRCS}) - set_target_properties(superkaramba PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) - -+FIND_LIBRARY(LIBDL dl) -+IF(LIBDL) -+ LIST(APPEND PYTHON_LIBRARIES ${LIBDL}) -+ENDIF(LIBDL) -+ -+FIND_LIBRARY(LIBUTIL util) -+IF(LIBUTIL) -+ LIST(APPEND PYTHON_LIBRARIES ${LIBUTIL}) -+ENDIF(LIBUTIL) -+ - TARGET_LINK_LIBRARIES(superkaramba - ${KDE4_KIO_LIBS} - ${KDE4_KPTY_LIBS} diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog index 3a92c2003fc7..a8d02450f523 100644 --- a/kde-base/systemsettings/ChangeLog +++ b/kde-base/systemsettings/ChangeLog @@ -1,6 +1,10 @@ # 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.161 2012/09/03 13:29:39 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.162 2012/09/03 14:43:26 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> + -files/systemsettings-4.4.2-xinerama_cmake_automagic.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -systemsettings-4.7.4.ebuild: Remove KDE SC 4.7.4 diff --git a/kde-base/systemsettings/files/systemsettings-4.4.2-xinerama_cmake_automagic.patch b/kde-base/systemsettings/files/systemsettings-4.4.2-xinerama_cmake_automagic.patch deleted file mode 100644 index 5596f415d848..000000000000 --- a/kde-base/systemsettings/files/systemsettings-4.4.2-xinerama_cmake_automagic.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -r -u kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake kdebase-workspace-4.4.2/ConfigureChecks.cmake ---- kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake 2009-11-21 10:44:36.000000000 +0100 -+++ kdebase-workspace-4.4.2/ConfigureChecks.cmake 2010-04-02 00:04:32.000000000 +0200 -@@ -71,7 +71,14 @@ - macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses - macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin - macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin -+ -+if(NOT WITH_X11_Xinerama) -+ set(X11_Xinerama_FOUND FALSE) -+ MESSAGE(STATUS "Disabling Xinerama as requested on commandline.") -+endif(NOT WITH_X11_Xinerama) -+ - macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA) -+ - macro_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin - macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kicker - macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kdesktop and kcontrol/lock |