diff --git a/koffice-2.1.91-kde#235345.patch b/koffice-2.1.91-kde#235345.patch deleted file mode 100644 index adce21f..0000000 --- a/koffice-2.1.91-kde#235345.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up koffice-2.1.91/libs/flake/KoToolBase_p.h.kdebug235345-2 koffice-2.1.91/libs/flake/KoToolBase_p.h ---- koffice-2.1.91/libs/flake/KoToolBase_p.h.kdebug235345-2 2010-04-23 05:12:32.000000000 -0500 -+++ koffice-2.1.91/libs/flake/KoToolBase_p.h 2010-05-12 09:44:38.774150294 -0500 -@@ -1,5 +1,6 @@ - /* This file is part of the KDE project - * Copyright (C) 2006-2010 Thomas Zander -+ * Copyright (C) 2010 KO GmbH - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -@@ -42,7 +43,14 @@ public: - - ~KoToolBasePrivate() - { -- qDeleteAll(optionWidgets); -+ foreach(QWidget *optionWidget, optionWidgets) { -+ // Only delete the option widget if it hasn't got a parent; if it has, -+ // the parent will delete it. -+ if (optionWidget->parent() == 0) { -+ delete optionWidget; -+ } -+ } -+ optionWidgets.clear(); - } - - QMap optionWidgets; ///< the optionwidgets associated witth this tool diff --git a/koffice-2.2.0-kspread_kutils.patch b/koffice-2.2.0-kspread_kutils.patch new file mode 100644 index 0000000..2e4c5d1 --- /dev/null +++ b/koffice-2.2.0-kspread_kutils.patch @@ -0,0 +1,12 @@ +diff -up koffice-2.2.0/kspread/CMakeLists.txt.kutils koffice-2.2.0/kspread/CMakeLists.txt +--- koffice-2.2.0/kspread/CMakeLists.txt.kutils 2010-05-23 01:20:50.000000000 -0500 ++++ koffice-2.2.0/kspread/CMakeLists.txt 2010-05-25 07:41:58.461302746 -0500 +@@ -221,7 +221,7 @@ target_link_libraries(kspreadcommon + komain + ${QT_QTSQL_LIBRARY} + ${KDE4_KNOTIFYCONFIG_LIBS} +- kutils ++ ${KDE4_KUTILS_LIBS} + # ${KDE4_KDE3SUPPORT_LIBS} + ) +