Update to KDE SC 4.11.5

bug fixes

3 files changed, 5 insertions, 63 deletions

diff --git a/misc/rocs/Makefile b/misc/rocs/Makefile
index d0909d5bbf5..2d38aba645d 100644
--- a/misc/rocs/Makefile
+++ b/misc/rocs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2014/01/01 11:52:26 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2014/02/01 02:20:51 markd Exp $
 
 DISTNAME=	rocs-${_KDE_VERSION}
-PKGREVISION=	4
 CATEGORIES=	misc
 COMMENT=	KDE graph theory IDE
 
diff --git a/misc/rocs/distinfo b/misc/rocs/distinfo
index f45fa401ba6..bbebaa1604f 100644
--- a/misc/rocs/distinfo
+++ b/misc/rocs/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.8 2013/11/29 12:52:21 joerg Exp $
+$NetBSD: distinfo,v 1.9 2014/02/01 02:20:51 markd Exp $
 
-SHA1 (rocs-4.11.3.tar.xz) = b1693d7bf589666334e08fa2258d7e4c90d44283
-RMD160 (rocs-4.11.3.tar.xz) = c5322ed2c860074ca2c5716b629ce590faa956c5
-Size (rocs-4.11.3.tar.xz) = 1161016 bytes
+SHA1 (rocs-4.11.5.tar.xz) = d4aab2792407fe4bae86baae06abcb752710977f
+RMD160 (rocs-4.11.5.tar.xz) = 12918607f05a043e63eefc6f8dcda775f35060ea
+Size (rocs-4.11.5.tar.xz) = 1144868 bytes
 SHA1 (patch-RocsCore_LoadSave_Plugins_CMakeLists.txt) = ae4d15f9aa8fc2f19715db544a15ddbc2f0d98fb
-SHA1 (patch-RocsCore_Modifiers_ValueModifier.cpp) = 15ddb95b3a6149980f85c6665116a23d9a8db484
diff --git a/misc/rocs/patches/patch-RocsCore_Modifiers_ValueModifier.cpp b/misc/rocs/patches/patch-RocsCore_Modifiers_ValueModifier.cpp
deleted file mode 100644
index 27bc8ea4794..00000000000
--- a/misc/rocs/patches/patch-RocsCore_Modifiers_ValueModifier.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-RocsCore_Modifiers_ValueModifier.cpp,v 1.1 2013/11/29 12:52:21 joerg Exp $
-
---- RocsCore/Modifiers/ValueModifier.cpp.orig	2013-11-27 12:51:22.000000000 +0000
-+++ RocsCore/Modifiers/ValueModifier.cpp
-@@ -44,8 +44,8 @@ void ValueModifier::enumerate(const QLis
-         list[i]->setProperty(property.toLatin1(), baseString + QString::number(start++));
-     }
- }
--template void ValueModifier::enumerate<DataPtr>(const QList<DataPtr> &list, const QString &property, int start, const QString &baseString, bool overrideValues);
--template void ValueModifier::enumerate<PointerPtr>(const QList<PointerPtr> &list, const QString &property, int start, const QString &baseString, bool overrideValues);
-+template ROCSLIB_EXPORT void ValueModifier::enumerate<DataPtr>(const QList<DataPtr> &list, const QString &property, int start, const QString &baseString, bool overrideValues);
-+template ROCSLIB_EXPORT void ValueModifier::enumerate<PointerPtr>(const QList<PointerPtr> &list, const QString &property, int start, const QString &baseString, bool overrideValues);
- 
- 
- template<typename T>
-@@ -81,8 +81,8 @@ void ValueModifier::enumerateAlpha(const
-         }
-     }
- }
--template void ValueModifier::enumerateAlpha<DataPtr>(const QList<DataPtr> &list, const QString &property, const QString &start, bool overrideValues);
--template void ValueModifier::enumerateAlpha<PointerPtr>(const QList<PointerPtr> &list, const QString &property, const QString &start, bool overrideValues);
-+template ROCSLIB_EXPORT void ValueModifier::enumerateAlpha<DataPtr>(const QList<DataPtr> &list, const QString &property, const QString &start, bool overrideValues);
-+template ROCSLIB_EXPORT void ValueModifier::enumerateAlpha<PointerPtr>(const QList<PointerPtr> &list, const QString &property, const QString &start, bool overrideValues);
- 
- 
- template<typename T>
-@@ -105,8 +105,8 @@ void ValueModifier::assignRandomIntegers
-         list[i]->setProperty(property.toLatin1(), QString::number(die()));
-     }
- }
--template void ValueModifier::assignRandomIntegers<DataPtr>(const QList<DataPtr> &list, const QString &property, int lowerLimit, int upperLimit, int seed, bool overrideValues);
--template void ValueModifier::assignRandomIntegers<PointerPtr>(const QList<PointerPtr> &list, const QString &property, int lowerLimit, int upperLimit, int seed, bool overrideValues);
-+template ROCSLIB_EXPORT void ValueModifier::assignRandomIntegers<DataPtr>(const QList<DataPtr> &list, const QString &property, int lowerLimit, int upperLimit, int seed, bool overrideValues);
-+template ROCSLIB_EXPORT void ValueModifier::assignRandomIntegers<PointerPtr>(const QList<PointerPtr> &list, const QString &property, int lowerLimit, int upperLimit, int seed, bool overrideValues);
- 
- 
- template<typename T>
-@@ -129,8 +129,8 @@ void ValueModifier::assignRandomReals(co
-         list[i]->setProperty(property.toLatin1(), QString::number(die()));
-     }
- }
--template void ValueModifier::assignRandomReals<DataPtr>(const QList<DataPtr> &list, const QString &property, qreal lowerLimit, qreal upperLimit, int seed, bool overrideValues);
--template void ValueModifier::assignRandomReals<PointerPtr>(const QList<PointerPtr> &list, const QString &property, qreal lowerLimit, qreal upperLimit, int seed, bool overrideValues);
-+template ROCSLIB_EXPORT void ValueModifier::assignRandomReals<DataPtr>(const QList<DataPtr> &list, const QString &property, qreal lowerLimit, qreal upperLimit, int seed, bool overrideValues);
-+template ROCSLIB_EXPORT void ValueModifier::assignRandomReals<PointerPtr>(const QList<PointerPtr> &list, const QString &property, qreal lowerLimit, qreal upperLimit, int seed, bool overrideValues);
- 
- template<typename T>
- void ValueModifier::assignConstantValue(const QList<T> &list, const QString &property, const QString &constant, bool overrideValues)
-@@ -142,5 +142,5 @@ void ValueModifier::assignConstantValue(
-         list[i]->setProperty(property.toLatin1(), constant);
-     }
- }
--template void ValueModifier::assignConstantValue<DataPtr>(const QList<DataPtr> &list, const QString &property, const QString &constant, bool overrideValues = true);
--template void ValueModifier::assignConstantValue<PointerPtr>(const QList<PointerPtr> &list, const QString &property, const QString &constant, bool overrideValues = true);
-+template ROCSLIB_EXPORT void ValueModifier::assignConstantValue<DataPtr>(const QList<DataPtr> &list, const QString &property, const QString &constant, bool overrideValues = true);
-+template ROCSLIB_EXPORT void ValueModifier::assignConstantValue<PointerPtr>(const QList<PointerPtr> &list, const QString &property, const QString &constant, bool overrideValues = true);