diff options
14 files changed, 0 insertions, 508 deletions
diff --git a/dev-db/virtuoso-odbc/metadata.xml b/dev-db/virtuoso-odbc/metadata.xml deleted file mode 100644 index a968ff19bc5..00000000000 --- a/dev-db/virtuoso-odbc/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>kde</herd> - <maintainer> - <email>reavertm@gentoo.org</email> - <name>Maciej Mrozowski</name> - </maintainer> -</pkgmetadata> diff --git a/dev-db/virtuoso-server/files/virtuoso-opensource-6.1.4-gawk4.patch b/dev-db/virtuoso-server/files/virtuoso-opensource-6.1.4-gawk4.patch deleted file mode 100644 index 6291907f7b0..00000000000 --- a/dev-db/virtuoso-server/files/virtuoso-opensource-6.1.4-gawk4.patch +++ /dev/null @@ -1,86 +0,0 @@ -# HG changeset patch -# Parent 3c7b74d47ca39768baf9d91bba40141bf111bc21 -# User Nico R. <n-roeser@gmx.net> -# Date 1321439581 -3600 - -Fix problems with GNU awk 4.0. -Original patch taken from upstream CVS, and mechanism applied to all code parts -where ‘gsub’ is used. - - -diff --git a/binsrc/cached_resources/res_to_c.awk b/binsrc/cached_resources/res_to_c.awk ---- a/binsrc/cached_resources/res_to_c.awk -+++ b/binsrc/cached_resources/res_to_c.awk -@@ -30,7 +30,14 @@ - } - { - fun = $0 -- gsub ( /\\/, "\\\\", fun) -+ -+ q = "\\\\" -+ if (PROCINFO["version"] ~ /^4/) -+ gsub ( q, q q, fun) -+ else -+ gsub ( q, q, fun) -+ #WAS: gsub ( /\\/, "\\\\", fun) -+ - gsub ( /"/, "\\\"", fun) - gsub ( /\$/, "\\044", fun) - gsub ( /.*/, "\"&\\n\",", fun) -diff --git a/binsrc/hosting/perl/pl_to_c.awk b/binsrc/hosting/perl/pl_to_c.awk ---- a/binsrc/hosting/perl/pl_to_c.awk -+++ b/binsrc/hosting/perl/pl_to_c.awk -@@ -42,7 +42,14 @@ - } - - x = $0 -- gsub (/\\/, "\\\\", x) -+ -+ q = "\\\\" -+ if (PROCINFO["version"] ~ /^4/) -+ gsub ( q, q q, x) -+ else -+ gsub ( q, q, x) -+ #WAS: gsub (/\\/, "\\\\", x) -+ - gsub (/\"/, "\\\"", x) - print "\"" x "\\n\"" - } -diff --git a/binsrc/hosting/python/py_to_c.awk b/binsrc/hosting/python/py_to_c.awk ---- a/binsrc/hosting/python/py_to_c.awk -+++ b/binsrc/hosting/python/py_to_c.awk -@@ -48,7 +48,14 @@ - } - - x = $0 -- gsub (/\\/, "\\\\", x) -+ -+ q = "\\\\" -+ if (PROCINFO["version"] ~ /^4/) -+ gsub ( q, q q, x) -+ else -+ gsub ( q, q, x) -+ #WAS: gsub (/\\/, "\\\\", x) -+ - gsub (/\"/, "\\\"", x) - print "\"" x "\\n\"" - } -diff --git a/binsrc/ws/wsrm/xsd2sql.awk b/binsrc/ws/wsrm/xsd2sql.awk ---- a/binsrc/ws/wsrm/xsd2sql.awk -+++ b/binsrc/ws/wsrm/xsd2sql.awk -@@ -54,7 +54,14 @@ - print " ses := string_output ();" - } - str = $0 -- gsub ( /\\/, "\\\\", str) -+ -+ q = "\\\\" -+ if (PROCINFO["version"] ~ /^4/) -+ gsub ( q, q q, str) -+ else -+ gsub ( q, q, str) -+ #WAS: gsub ( /\\/, "\\\\", str) -+ - gsub ( /'/, "\\'", str) - - # diff --git a/dev-db/virtuoso-server/metadata.xml b/dev-db/virtuoso-server/metadata.xml deleted file mode 100644 index 761e62cc1a7..00000000000 --- a/dev-db/virtuoso-server/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>kde</herd> - <maintainer> - <email>reavertm@gentoo.org</email> - <name>Maciej Mrozowski</name> - </maintainer> - <longdescription> -OpenLink Virtuoso Open-Source Edition is a new generation of hybrid data server -product called a "Universal Server". It implements a wide range of industry -standard APIs and protocols, covering a broad range of functionality realms -that include: Object-Relational Data Managemtent, Virtualization of -Heterogeneous Data Sources (SQL, XML, RDF), Document Web Server (WebDAV/HTTP), -Data Web Server (RDF Linked Data Deployment), Web Services Platform, Discussion -Server, and many more. - </longdescription> -</pkgmetadata> diff --git a/kde-base/kalzium/files/kalzium-4.6.49.9999-nolib.patch b/kde-base/kalzium/files/kalzium-4.6.49.9999-nolib.patch deleted file mode 100644 index 833ccd6a2d8..00000000000 --- a/kde-base/kalzium/files/kalzium-4.6.49.9999-nolib.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -urN kalzium-4.6.49.9999.orig/CMakeLists.txt kalzium-4.6.49.9999/CMakeLists.txt ---- kalzium-4.6.49.9999.orig/CMakeLists.txt 2011-06-12 02:22:54.537552101 +0200 -+++ kalzium-4.6.49.9999/CMakeLists.txt 2011-06-12 02:23:12.484578827 +0200 -@@ -45,4 +45,4 @@ - add_subdirectory(src) - add_subdirectory(data) - add_subdirectory(plasmoid) --add_subdirectory(libscience) -+#add_subdirectory(libscience) diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.0-groupingdesktop-crash.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.0-groupingdesktop-crash.patch deleted file mode 100644 index 587295afc89..00000000000 --- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.0-groupingdesktop-crash.patch +++ /dev/null @@ -1,69 +0,0 @@ -commit 67b5c56e564f5052238bab38342a85e5f4af570b -Author: Christoph Feck <christoph@maxiom.de> -Date: Sat Jul 30 19:15:28 2011 +0200 - - Fix assignment operator and add copy constructor - - This fixes the crash in Grid Desktop and Grouping Desktop. - Thanks to Aaron Seigo for investigation and patch review. - - BUG: 278222 - FIXED-IN: 4.7.1 - -diff --git a/containments/groupingdesktop/lib/groupinfo.cpp b/containments/groupingdesktop/lib/groupinfo.cpp -index 2106cca..c945551 100644 ---- a/containments/groupingdesktop/lib/groupinfo.cpp -+++ b/containments/groupingdesktop/lib/groupinfo.cpp -@@ -43,6 +43,12 @@ GroupInfo::GroupInfo(const QString &name, const QString &prettyName) - d->prettyName = prettyName; - } - -+GroupInfo::GroupInfo(const GroupInfo &other) -+ : d(new GroupInfoPrivate()) -+{ -+ *d = *other.d; -+} -+ - GroupInfo::~GroupInfo() - { - delete d; -@@ -78,13 +84,12 @@ QString GroupInfo::icon() const - return d->icon; - } - --GroupInfo GroupInfo::operator=(const GroupInfo &gi) -+GroupInfo &GroupInfo::operator=(const GroupInfo &gi) - { -- GroupInfo g(gi.name(), gi.prettyName()); -- g.setFormFactors(gi.formFactors()); -- g.setIcon(gi.icon()); -- -- return g; -+ if (this != &gi) { -+ *d = *gi.d; -+ } -+ return *this; - } - - bool GroupInfo::operator==(const GroupInfo &gi) const -diff --git a/containments/groupingdesktop/lib/groupinfo.h b/containments/groupingdesktop/lib/groupinfo.h -index f8cc66f..320c800 100644 ---- a/containments/groupingdesktop/lib/groupinfo.h -+++ b/containments/groupingdesktop/lib/groupinfo.h -@@ -31,6 +31,7 @@ class GroupInfo - { - public: - explicit GroupInfo(const QString &name, const QString &prettyName = QString()); -+ GroupInfo(const GroupInfo &other); - ~GroupInfo(); - void setFormFactors(QSet<Plasma::FormFactor> formFactors); - void setIcon(const QString &icon); -@@ -40,7 +41,7 @@ class GroupInfo - QSet<Plasma::FormFactor> formFactors() const; - QString icon() const; - -- GroupInfo operator=(const GroupInfo &gi); -+ GroupInfo &operator=(const GroupInfo &gi); - bool operator==(const GroupInfo &gi) const; - bool operator<(const GroupInfo &gi) const; - diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-lancelot.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-lancelot.patch deleted file mode 100644 index 96a00c5ebd0..00000000000 --- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-lancelot.patch +++ /dev/null @@ -1,122 +0,0 @@ -commit 6967ee53518136651b4fd5d691293a3c866d7a47 -Author: Aaron Seigo <aseigo@kde.org> -Date: Tue Nov 22 21:10:45 2011 +0100 - - fix build - -diff --git a/libs/lancelot-datamodels/OpenDocuments.cpp b/libs/lancelot-datamodels/OpenDocuments.cpp -index 4b2bec5..b9f24ec 100644 ---- a/libs/lancelot-datamodels/OpenDocuments.cpp -+++ b/libs/lancelot-datamodels/OpenDocuments.cpp -@@ -66,41 +66,41 @@ OpenDocuments::~OpenDocuments() - delete d; - } - --void OpenDocuments::Private::connectTask(TaskPtr task) -+void OpenDocuments::Private::connectTask(::TaskManager::Task *task) - { - Q_ASSERT(task); - connect( -- task.constData(), SIGNAL(changed(::TaskManager::TaskChanges)), -+ task, SIGNAL(changed(::TaskManager::TaskChanges)), - this, SLOT(taskChanged()) - ); - } - - void OpenDocuments::load() - { -- foreach (TaskPtr task, TaskManager::TaskManager::self()->tasks()) { -+ foreach (TaskManager::Task *task, TaskManager::TaskManager::self()->tasks()) { - if (d->setDataForTask(task)) { - d->connectTask(task); - } - } - - connect( -- TaskManager::TaskManager::self(), SIGNAL(taskAdded(TaskPtr)), -- d, SLOT(taskAdded(TaskPtr)) -+ TaskManager::TaskManager::self(), SIGNAL(taskAdded(::TaskManager::Task*)), -+ d, SLOT(taskAdded(::TaskManager::Task*)) - ); - - connect( -- TaskManager::TaskManager::self(), SIGNAL(taskRemoved(TaskPtr)), -- d, SLOT(taskRemoved(TaskPtr)) -+ TaskManager::TaskManager::self(), SIGNAL(taskRemoved(::TaskManager::Task*)), -+ d, SLOT(taskRemoved(::TaskManager::Task*)) - ); - } - --void OpenDocuments::Private::taskAdded(TaskPtr task) -+void OpenDocuments::Private::taskAdded(::TaskManager::Task *task) - { - connectTask(task); - setDataForTask(task); - } - --void OpenDocuments::Private::taskRemoved(TaskPtr task) -+void OpenDocuments::Private::taskRemoved(::TaskManager::Task *task) - { - Q_ASSERT(task); - int index = indexOf(task->window()); -@@ -115,10 +115,10 @@ void OpenDocuments::Private::taskChanged() - TaskManager::Task* task = qobject_cast<TaskManager::Task*>(sender()); - Q_ASSERT(task); - -- setDataForTask(TaskPtr(task)); -+ setDataForTask(task); - } - --bool OpenDocuments::Private::setDataForTask(TaskPtr task) -+bool OpenDocuments::Private::setDataForTask(::TaskManager::Task *task) - { - Q_ASSERT(task); - -diff --git a/libs/lancelot-datamodels/OpenDocuments.h b/libs/lancelot-datamodels/OpenDocuments.h -index 00b0910..f9c5461 100644 ---- a/libs/lancelot-datamodels/OpenDocuments.h -+++ b/libs/lancelot-datamodels/OpenDocuments.h -@@ -26,8 +26,6 @@ - #include <taskmanager/taskmanager.h> - #include <QSet> - --using TaskManager::TaskPtr; -- - namespace Lancelot { - namespace Models { - -diff --git a/libs/lancelot-datamodels/OpenDocuments_p.h b/libs/lancelot-datamodels/OpenDocuments_p.h -index 5fdfe70..d2dc374 100644 ---- a/libs/lancelot-datamodels/OpenDocuments_p.h -+++ b/libs/lancelot-datamodels/OpenDocuments_p.h -@@ -24,8 +24,6 @@ - #include <taskmanager/taskmanager.h> - #include <QSet> - --using TaskManager::TaskPtr; -- - namespace Lancelot { - namespace Models { - -@@ -44,16 +42,16 @@ public: - - public Q_SLOTS: - void taskChanged(); -- void taskAdded(TaskPtr task); -- void taskRemoved(TaskPtr task); -+ void taskAdded(::TaskManager::Task *task); -+ void taskRemoved(::TaskManager::Task *task); - -- void connectTask(TaskPtr task); -- bool setDataForTask(TaskPtr task); -+ void connectTask(::TaskManager::Task *task); -+ bool setDataForTask(::TaskManager::Task *task); - - int indexOf(WId wid); - - public: -- QMap <WId, TaskPtr > tasks; -+ QMap <WId, TaskManager::Task *> tasks; - QList <SupportedTask> supportedTasks; - - private: diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-marble-wallpaper.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-marble-wallpaper.patch deleted file mode 100644 index c01f13122b1..00000000000 --- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-marble-wallpaper.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit e089568a73ec0fa9f8e9ec61c9853b1905d3a1d7 -Author: Ben Cooksley <bcooksley@kde.org> -Date: Mon Nov 28 08:14:54 2011 +1300 - - Fix build of Marble wallpaper - REVIEW: 103243 - -diff --git a/wallpapers/marble/marble.cpp b/wallpapers/marble/marble.cpp -index 3cecaae..988a8b6 100644 ---- a/wallpapers/marble/marble.cpp -+++ b/wallpapers/marble/marble.cpp -@@ -137,7 +137,6 @@ QWidget *MarbleWallpaper::createConfigurationInterface(QWidget *parent) - m_ui.showPlacemarks->setChecked(m_showPlacemarks); - - MapThemeManager themeManager; -- themeManager.updateMapThemeModel(); - // FIXME: Going manually through the model is ugly as hell, but plugging the - // model into the view didn't work for me - for (int i = 0; i < themeManager.mapThemeModel()->rowCount(); i++) { diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-remove-outdated-statements.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-remove-outdated-statements.patch deleted file mode 100644 index cc6958d3162..00000000000 --- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-remove-outdated-statements.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit b0c70d7fd866efb628036f43978bc791e0485f90 -Author: Aaron Seigo <aseigo@kde.org> -Date: Tue Nov 22 14:07:59 2011 +0100 - - remove outdated using statements - -diff --git a/applets/icontasks/taskitemlayout.h b/applets/icontasks/taskitemlayout.h -index 9ebf82f..64142e1 100644 ---- a/applets/icontasks/taskitemlayout.h -+++ b/applets/icontasks/taskitemlayout.h -@@ -32,9 +32,6 @@ class TaskGroupItem; - class AbstractTaskItem; - class LauncherSeparator; - --using TaskManager::StartupPtr; --using TaskManager::TaskPtr; -- - /** - * A Layout for the expanded group - */ -diff --git a/applets/icontasks/tasks.h b/applets/icontasks/tasks.h -index e7bab6b..bf8a665 100644 ---- a/applets/icontasks/tasks.h -+++ b/applets/icontasks/tasks.h -@@ -54,15 +54,6 @@ namespace TaskManager - class GroupManager; - } // namespace TaskManager - --using TaskManager::StartupPtr; --using TaskManager::TaskPtr; --using TaskManager::StartupPtr; --using TaskManager::GroupPtr; --using TaskManager::AbstractGroupableItem; --using TaskManager::TaskItem; --using TaskManager::TaskGroup; --using TaskManager::LauncherItem; -- - class TaskGroupItem; - class GroupManager; - diff --git a/kde-base/ksnapshot/files/ksnapshot-4.6.2-kipi.patch b/kde-base/ksnapshot/files/ksnapshot-4.6.2-kipi.patch deleted file mode 100644 index 02bc2fc367d..00000000000 --- a/kde-base/ksnapshot/files/ksnapshot-4.6.2-kipi.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ruN ksnapshot-4.6.2.orig/ksnapshot/CMakeLists.txt ksnapshot-4.6.2/ksnapshot/CMakeLists.txt ---- ksnapshot-4.6.2.orig/ksnapshot/CMakeLists.txt 2011-04-01 21:38:15.000000000 +0200 -+++ ksnapshot-4.6.2/ksnapshot/CMakeLists.txt 2011-04-10 22:02:39.035066966 +0200 -@@ -1,7 +1,7 @@ - project(ksnapshot) - - find_package(KDE4 REQUIRED) --find_package(Kipi) -+ - include(KDE4Defaults) - include(MacroLibrary) - include(MacroOptionalAddSubdirectory) -@@ -17,7 +17,6 @@ - if (KIPI_FOUND) - include_directories(${KIPI_INCLUDE_DIR}) - endif (KIPI_FOUND) --macro_log_feature(KIPI_FOUND "KIPI plugins" "KIPI plugins to export, print, etc" "http://www.kipi-plugins.org/" FALSE "" "Neeed to print, send by e-mail, export to Facebook, Picasa, etc") - - configure_file(config-ksnapshot.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksnapshot.h) - diff --git a/kde-base/kwin/files/kwin-fix-opengl.patch b/kde-base/kwin/files/kwin-fix-opengl.patch deleted file mode 100644 index 245aced289c..00000000000 --- a/kde-base/kwin/files/kwin-fix-opengl.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -urN kdebase-workspace-4.6.2/kwin/compositingprefs.cpp kdebase-workspace-4.6.2.new/kwin/compositingprefs.cpp ---- kdebase-workspace-4.6.2/kwin/compositingprefs.cpp 2011-02-25 23:10:02.000000000 +0100 -+++ kdebase-workspace-4.6.2.new/kwin/compositingprefs.cpp 2011-04-07 19:37:28.637388362 +0200 -@@ -241,6 +241,7 @@ - // See http://techbase.kde.org/Projects/KWin/HW for a list of some cards that are known to work. - void CompositingPrefs::applyDriverSpecificOptions() - { -+#ifdef KWIN_HAVE_OPENGL_COMPOSITING - // Always recommend - mRecommendCompositing = true; - -@@ -248,6 +249,7 @@ - mStrictBinding = !gl->supports( LooseBinding ); - if ( gl->driver() == Driver_Intel ) - mEnableVSync = false; -+#endif - } - - -diff -urN kdebase-workspace-4.6.2/kwin/effects/logout/logout.cpp kdebase-workspace-4.6.2.new/kwin/effects/logout/logout.cpp ---- kdebase-workspace-4.6.2/kwin/effects/logout/logout.cpp 2011-02-25 23:10:02.000000000 +0100 -+++ kdebase-workspace-4.6.2.new/kwin/effects/logout/logout.cpp 2011-04-07 19:50:58.355265494 +0200 -@@ -338,7 +338,9 @@ - - void LogoutEffect::windowDeleted( EffectWindow* w ) - { -+#ifdef KWIN_HAVE_OPENGL_COMPOSITING - windows.removeAll( w ); -+#endif - ignoredWindows.removeAll( w ); - if( w == logoutWindow ) - logoutWindow = NULL; -diff -urN kdebase-workspace-4.6.2/kwin/options.cpp kdebase-workspace-4.6.2.new/kwin/options.cpp ---- kdebase-workspace-4.6.2/kwin/options.cpp 2011-02-25 23:10:02.000000000 +0100 -+++ kdebase-workspace-4.6.2.new/kwin/options.cpp 2011-04-07 19:43:34.358816214 +0200 -@@ -57,6 +57,7 @@ - int rate = -1; - if( options->refreshRate > 0 ) // use manually configured refresh rate - rate = options->refreshRate; -+#ifdef KWIN_HAVE_OPENGL_COMPOSITING - else if ( GLPlatform::instance()->driver() == Driver_NVidia ) - { - QProcess nvidia_settings; -@@ -73,6 +74,7 @@ - rate = qRound(frate); - } - } -+#endif - #ifdef HAVE_XRANDR - else if( Extensions::randrAvailable() ) - { diff --git a/kde-base/marble/files/marble-4.6.2-magic.patch b/kde-base/marble/files/marble-4.6.2-magic.patch deleted file mode 100644 index dc907958edb..00000000000 --- a/kde-base/marble/files/marble-4.6.2-magic.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ruN marble-4.6.2.orig/marble/src/plugins/positionprovider/CMakeLists.txt marble-4.6.2/marble/src/plugins/positionprovider/CMakeLists.txt ---- marble-4.6.2.orig/marble/src/plugins/positionprovider/CMakeLists.txt 2011-01-19 23:06:11.000000000 +0100 -+++ marble-4.6.2/marble/src/plugins/positionprovider/CMakeLists.txt 2011-04-11 03:56:00.449066967 +0200 -@@ -1,4 +1,4 @@ --find_package(libgps) -+macro_optional_find_package(libgps) - if(LIBGPS_FOUND) - message( STATUS "Building with gpsd position provider") - add_subdirectory( gpsd ) -@@ -6,7 +6,7 @@ - message( STATUS "Not building with gpsd position provider") - endif(LIBGPS_FOUND) - --find_package(liblocation) -+macro_optional_find_package(liblocation) - if(liblocation_FOUND) - message( STATUS "Building with Maemo GPS support") - add_subdirectory( maemo ) diff --git a/kde-base/marble/files/marble-4.7-magic.patch b/kde-base/marble/files/marble-4.7-magic.patch deleted file mode 100644 index f9db1544e85..00000000000 --- a/kde-base/marble/files/marble-4.7-magic.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -urN marble-4.7.49.9999.orig/src/plugins/positionprovider/CMakeLists.txt marble-4.7.49.9999/src/plugins/positionprovider/CMakeLists.txt ---- marble-4.7.49.9999.orig/src/plugins/positionprovider/CMakeLists.txt 2011-07-04 12:42:13.869879320 +0200 -+++ marble-4.7.49.9999/src/plugins/positionprovider/CMakeLists.txt 2011-07-04 12:43:28.567021582 +0200 -@@ -1,4 +1,4 @@ --FIND_PACKAGE(libgps) -+macro_optional_find_package(libgps) - IF(LIBGPS_FOUND) - MESSAGE( STATUS "Building with gpsd position provider") - ADD_SUBDIRECTORY( gpsd ) -@@ -6,7 +6,7 @@ - MESSAGE( STATUS "Not building with gpsd position provider") - ENDIF(LIBGPS_FOUND) - --FIND_PACKAGE(liblocation) -+macro_optional_find_package(liblocation) - IF(liblocation_FOUND) - MESSAGE( STATUS "Building with Maemo GPS support") - ADD_SUBDIRECTORY( maemo ) -@@ -19,4 +19,4 @@ - ENDIF(QTLOCATION_FOUND) - - # experimental implementation --# ADD_SUBDIRECTORY( geoclue ) -\ Kein Zeilenumbruch am Dateiende. -+# ADD_SUBDIRECTORY( geoclue ) diff --git a/kde-base/pykde4/files/pykde4-4.6.4-pyqt475.patch b/kde-base/pykde4/files/pykde4-4.6.4-pyqt475.patch deleted file mode 100644 index 55f61f0c872..00000000000 --- a/kde-base/pykde4/files/pykde4-4.6.4-pyqt475.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ruN pykde4-4.6.4.orig/python/pykde4/tools/pykdeuic4/pykdeuic4.py pykde4-4.6.4/python/pykde4/tools/pykdeuic4/pykdeuic4.py ---- pykde4-4.6.4.orig/python/pykde4/tools/pykdeuic4/pykdeuic4.py 2011-06-02 12:03:32.000000000 +0200 -+++ pykde4-4.6.4/python/pykde4/tools/pykdeuic4/pykdeuic4.py 2011-06-21 21:59:16.310764723 +0200 -@@ -78,7 +78,7 @@ - indenter.indentwidth = indent - comp = compiler.UICompiler() - comp.factory._cwFilters.append(kdeFilter()) -- winfo = comp.compileUi(uifile, output) -+ winfo = comp.compileUi(uifile, output, None) - - if exe: - output.write(""" -@@ -111,7 +111,7 @@ - app = kdeui.KApplication() - mainWindow = MainWin(None, "main window") - mainWindow.show() -- app.connect (app, QtCore.SIGNAL ("lastWindowClosed ()"), app.quit) -+ app.lastWindowClosed.connect(app.quit) - app.exec_ () - """) - diff --git a/profiles/categories b/profiles/categories index 79989028e2d..d0dd9d613cf 100644 --- a/profiles/categories +++ b/profiles/categories @@ -1,4 +1,3 @@ -app-admin app-backup app-cdr app-editors |