Browse Source

Benjamin Schieder:


			
			
				rocklinux
			
			
		
Benjamin Schieder 19 years ago
parent
commit
84f9e6c7ba
7 changed files with 2330 additions and 0 deletions
  1. +617
    -0
      package/blindcoder/ksimus/gcc34.patch.ksimus
  2. +545
    -0
      package/blindcoder/ksimus/gcc34.patch.ksimus-boolean
  3. +316
    -0
      package/blindcoder/ksimus/gcc34.patch.ksimus-datarecorder
  4. +738
    -0
      package/blindcoder/ksimus/gcc34.patch.ksimus-floatingpoint
  5. +24
    -0
      package/blindcoder/ksimus/ksimus.conf
  6. +63
    -0
      package/blindcoder/ksimus/ksimus.desc
  7. +27
    -0
      package/blindcoder/ksimus/preconfig.in

+ 617
- 0
package/blindcoder/ksimus/gcc34.patch.ksimus

@ -0,0 +1,617 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/blindcoder/ksimus/gcc34.patch.ksimus
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
Courtesy of debian.
Make ksimus compile with gcc34
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/boolean/boolean1out.cpp ./ksimus/boolean/boolean1out.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/boolean/boolean1out.cpp 2002-12-22 00:30:04.000000000 +0100
+++ ./ksimus/boolean/boolean1out.cpp 2004-08-13 09:09:22.352099113 +0200
@@ -97,12 +97,12 @@
bool Boolean1Out::getResetState() const
{
return m_flags & FLAGS_RESET_TRUE;
-};
+}
bool Boolean1Out::getResetStateInit() const
{
return m_flags & FLAGS_RESET_INIT_TRUE;
-};
+}
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/boolean/booleanled.cpp ./ksimus/boolean/booleanled.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/boolean/booleanled.cpp 2002-10-27 00:55:28.000000000 +0200
+++ ./ksimus/boolean/booleanled.cpp 2004-08-13 09:09:44.947664065 +0200
@@ -422,7 +422,7 @@
{
return m_color;
}
-};
+}
void BooleanLedColorPropertyWidget::slotRed()
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/component.cpp ./ksimus/component.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/component.cpp 2003-02-16 17:32:38.000000000 +0100
+++ ./ksimus/component.cpp 2004-08-13 09:19:33.145244441 +0200
@@ -522,7 +522,7 @@
return getDefaultName();
}
return m_name;
-};
+}
void Component::setName(const QString & newName)
{
@@ -537,14 +537,14 @@
m_name = newName.simplifyWhiteSpace();
}
emit signalSetName(getName());
-};
+}
QString Component::getDefaultName() const
{
return QString::fromLatin1("%1 %2")
.arg(getInfo()->getName())
.arg(getSerialNumber());
-};
+}
bool Component::hasDefaultName() const
{
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/compview.cpp ./ksimus/compview.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/compview.cpp 2003-02-16 17:33:46.000000000 +0100
+++ ./ksimus/compview.cpp 2004-08-13 09:19:15.721893193 +0200
@@ -278,14 +278,14 @@
eViewType CompView::getViewType() const
{
return m_p->viewType;
-};
+}
/** Change the type of view
@see enum eViewType */
void CompView::setViewType(eViewType newType)
{
m_p->viewType = newType;
-};
+}
/** Manage the mouse pressed event if required */
@@ -689,7 +689,7 @@
module->getUserView()->setViewChanged(true);
}
}
-};
+}
/** Creates a new Widget */
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/items/componentlayout.cpp ./ksimus/items/componentlayout.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/items/componentlayout.cpp 2002-12-29 15:55:06.000000000 +0100
+++ ./ksimus/items/componentlayout.cpp 2004-08-13 09:16:38.996719041 +0200
@@ -303,7 +303,7 @@
{
return m_parent.layout;
}
-};
+}
ComponentLayout * CompLayoutBase::getBaseLayout() const
{
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/items/connectorbase.cpp ./ksimus/items/connectorbase.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/items/connectorbase.cpp 2003-05-20 00:02:22.000000000 +0200
+++ ./ksimus/items/connectorbase.cpp 2004-08-13 09:17:58.931567097 +0200
@@ -889,7 +889,7 @@
const QPoint & pos, ConnOrientationType orient, const ConnectorInfo * ci)
: ConnectorBase (comp,name,i18nName,pos,orient,CD_INPUT,ci)
{
-};
+}
/** Checks the connector
* eg. if input is connected.
@@ -918,7 +918,7 @@
const QPoint & pos, ConnOrientationType orient, const ConnectorInfo * ci)
: ConnectorBase (comp,name,i18nName,pos,orient,CD_OUTPUT,ci)
{
-};
+}
//**************************************************************************
// *** class ConnectorTristateBase ***
@@ -930,7 +930,7 @@
: ConnectorBase (comp,name,i18nName,pos,orient,CD_TRISTATE,ci),
m_outActive(false)
{
-};
+}
void ConnectorTristateBase::reset()
{
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/items/connectorbooltristate.cpp ./ksimus/items/connectorbooltristate.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/items/connectorbooltristate.cpp 2003-02-28 00:06:19.000000000 +0100
+++ ./ksimus/items/connectorbooltristate.cpp 2004-08-13 09:12:31.345367769 +0200
@@ -139,7 +139,7 @@
{
return m_outData.getTristate();
}
-};
+}
/** Return the current wire state */
KSimBoolTristate ConnectorBoolTristate::getInput() const
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/items/externalconnector.cpp ./ksimus/items/externalconnector.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/items/externalconnector.cpp 2002-11-24 02:59:45.000000000 +0100
+++ ./ksimus/items/externalconnector.cpp 2004-08-13 09:16:52.830615969 +0200
@@ -406,13 +406,13 @@
void ExternalConnector::setPixmapOrientation(ConnOrientationType orientation)
{
m_pixmapOrient = orientation;
-};
+}
/** Sets the orientation of the connector in user view mode. */
void ExternalConnector::setUserViewOrientation(ConnOrientationType orientation)
{
m_userViewOrient = orientation;
-};
+}
//##########################################################################################
//##########################################################################################
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/items/watchitembase.cpp ./ksimus/items/watchitembase.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/items/watchitembase.cpp 2002-09-27 21:28:56.000000000 +0200
+++ ./ksimus/items/watchitembase.cpp 2004-08-13 09:16:25.370790497 +0200
@@ -162,7 +162,7 @@
{
m_breakEnabled = ena;
showBreakCount(getBreaksActual());
-};
+}
QString WatchItemBase::getWatchName() const
{
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/items/watchitembooltristate.cpp ./ksimus/items/watchitembooltristate.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/items/watchitembooltristate.cpp 2003-02-28 00:06:19.000000000 +0100
+++ ./ksimus/items/watchitembooltristate.cpp 2004-08-13 09:12:11.278418409 +0200
@@ -171,7 +171,7 @@
void WatchItemBoolTristateBase::ActivePropertyWidget::setMaxValue(unsigned int maxValue)
{
m_spin->setMaxValue(maxValue);
-};
+}
WatchItemBoolTristateBase::ActiveProperty WatchItemBoolTristateBase::ActivePropertyWidget::value() const
{
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/items/wireproperty.cpp ./ksimus/items/wireproperty.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/items/wireproperty.cpp 2003-02-28 00:06:19.000000000 +0100
+++ ./ksimus/items/wireproperty.cpp 2004-08-13 09:17:39.531516353 +0200
@@ -339,7 +339,7 @@
: WirePropertyInvalidBase(wire, getWirePropertyInvalidDifferentOutputsInfo())
{
logWarning(getErrorMsg());
-};
+}
/*WirePropertyInvalidDifferentOutputs::~WirePropertyInvalidDifferentOutputs()
{
@@ -398,7 +398,7 @@
: WirePropertyInvalidBase(wire, getWirePropertyInvalidDifferentOutputsInfo())
{
logWarning(getErrorMsg());
-};
+}
/*WirePropertyInvalidIncompatibleInputs::~WirePropertyInvalidIncompatibleInputs()
{
@@ -457,7 +457,7 @@
: WirePropertyInvalidBase(wire, getWirePropertyInvalidDifferentInputsNoOutputInfo())
{
logWarning(getErrorMsg());
-};
+}
/*WirePropertyInvalidDifferentInputsNoOutput::~WirePropertyInvalidDifferentInputsNoOutput()
{
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/items/wirepropertybooltristate.h ./ksimus/items/wirepropertybooltristate.h
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/items/wirepropertybooltristate.h 2003-02-28 00:06:19.000000000 +0100
+++ ./ksimus/items/wirepropertybooltristate.h 2004-08-13 09:11:50.406591409 +0200
@@ -73,27 +73,27 @@
{
m_trueCount = trueCount;
m_falseCount = falseCount;
-};
+}
inline void WireStateBoolTristate::setTrue(unsigned int trueCount)
{
m_trueCount = trueCount;
-};
+}
inline void WireStateBoolTristate::setFalse(unsigned int falseCount)
{
m_falseCount = falseCount;
-};
+}
inline unsigned int WireStateBoolTristate::getTrue() const
{
return m_trueCount;
-};
+}
inline unsigned int WireStateBoolTristate::getFalse() const
{
return m_falseCount;
-};
+}
inline bool WireStateBoolTristate::isTrue() const
{
@@ -108,12 +108,12 @@
inline bool WireStateBoolTristate::isActive() const
{
return (getTrue() != 0) || (getFalse() != 0);
-};
+}
inline bool WireStateBoolTristate::isInactive() const
{
return (getTrue() == 0) && (getFalse() == 0);
-};
+}
inline void WireStateBoolTristate::setTristate(KSimBoolTristate state)
{
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/ksimdata.cpp ./ksimus/ksimdata.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/ksimdata.cpp 2003-02-16 17:34:32.000000000 +0100
+++ ./ksimus/ksimdata.cpp 2004-08-13 09:18:18.327618449 +0200
@@ -70,7 +70,7 @@
//#########################################################################################
-EnumDict<KSimData::eVersionType>::tData EnumDict<KSimData::eVersionType>::data[]
+template <> EnumDict<KSimData::eVersionType>::tData EnumDict<KSimData::eVersionType>::data[]
= { {"error", KSimData::versionError},
{"as is", KSimData::versionAsIs},
{"unknown", KSimData::versionUnknown},
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/ksimeditor.cpp ./ksimus/ksimeditor.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/ksimeditor.cpp 2003-05-20 00:03:24.000000000 +0200
+++ ./ksimus/ksimeditor.cpp 2004-08-13 09:18:55.533962225 +0200
@@ -119,7 +119,7 @@
CHECK_PTR(m_wireCursor);
setNow(arrowCursor);
-};
+}
void KSimEditor::Cursor::set(KSimCursorType newCursor)
{
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/ksimus.cpp ./ksimus/ksimus.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/ksimus.cpp 2003-05-01 18:11:55.000000000 +0200
+++ ./ksimus/ksimus.cpp 2004-08-13 09:20:15.383823201 +0200
@@ -75,7 +75,7 @@
//################################################################################
-EnumDict<eAppViewType>::tData EnumDict<eAppViewType>::data[]
+template <> EnumDict<eAppViewType>::tData EnumDict<eAppViewType>::data[]
= { {"Sheet View", APP_SHEET_VIEW},
{"User View", APP_USER_VIEW},
{"Module View", APP_MODULE_VIEW},
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/ksimusdoc.cpp ./ksimus/ksimusdoc.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/ksimusdoc.cpp 2002-12-23 15:23:33.000000000 +0100
+++ ./ksimus/ksimusdoc.cpp 2004-08-13 09:19:59.394253985 +0200
@@ -127,7 +127,7 @@
KSimusApp * KSimusDoc::getApp() const
{
return (KSimusApp*)parent();
-};
+}
void KSimusDoc::addView(KSimusView *view)
{
@@ -541,13 +541,13 @@
m_modified=_m;
getApp()->slotSaveAllowed(_m);
}
-};
+}
/** returns if the document is modified or not. Use this to determine if your document needs saving by the user on closing.*/
bool KSimusDoc::isModified() const
{
return m_modified;
-};
+}
void KSimusDoc::deleteContents()
{
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/lib/componentinfo.cpp ./ksimus/lib/componentinfo.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/lib/componentinfo.cpp 2002-08-05 23:43:32.000000000 +0200
+++ ./ksimus/lib/componentinfo.cpp 2004-08-13 09:11:07.939047457 +0200
@@ -32,7 +32,7 @@
//##########################################################
-EnumDict<ViewAttribute>::tData EnumDict<ViewAttribute>::data[]
+template <> EnumDict<ViewAttribute>::tData EnumDict<ViewAttribute>::data[]
= { {"VA_SHEETVIEW", VA_SHEETVIEW},
{"VA_USERVIEW", VA_USERVIEW},
{"VA_SHEET_AND_USER", VA_SHEET_AND_USER},
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/lib/packageinfo.cpp ./ksimus/lib/packageinfo.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/lib/packageinfo.cpp 2002-09-27 21:31:01.000000000 +0200
+++ ./ksimus/lib/packageinfo.cpp 2004-08-13 09:10:35.295010105 +0200
@@ -61,26 +61,26 @@
const char * PackageInfo::getPackageVersion() const
{
return m_packageVersion;
-};
+}
const ComponentInfoList & PackageInfo::getComponentList() const
{
return m_componentList;
-};
+}
const ConnectorInfoList & PackageInfo::getConnectorList() const
{
return m_connectorList;
-};
+}
const WirePropertyInfoList & PackageInfo::getWirePropertyList() const
{
return m_wirePropertyList;
-};
+}
const ImplicitConverterInfoList & PackageInfo::getImplicitConverterList() const
{
return m_implicitConverterList;
-};
+}
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/library.cpp ./ksimus/library.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/library.cpp 2003-02-28 00:06:18.000000000 +0100
+++ ./ksimus/library.cpp 2004-08-13 09:18:39.690370817 +0200
@@ -617,10 +617,10 @@
const QStringList & Library::getInfoMessages() const
{
return m_p->m_infoMessages;
-};
+}
const QStringList & Library::getErrorMessages() const
{
return m_p->m_errorMessages;
-};
+}
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/module/moduledata.cpp ./ksimus/module/moduledata.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/module/moduledata.cpp 2002-12-29 15:58:37.000000000 +0100
+++ ./ksimus/module/moduledata.cpp 2004-08-13 09:07:17.260115985 +0200
@@ -68,7 +68,7 @@
static const char * sPixmapStore = "Pixmap Store";
static const char * sPixmapData = "Pixmap Data";
-EnumDict<ModuleViewType>::tData EnumDict<ModuleViewType>::data[]
+template <> EnumDict<ModuleViewType>::tData EnumDict<ModuleViewType>::data[]
= { {"Generic", MV_GENERIC},
{"User View", MV_USERVIEW},
{"Pixmap", MV_PIXMAP},
@@ -82,7 +82,7 @@
}
-EnumDict<ModulePixmapStoreType>::tData EnumDict<ModulePixmapStoreType>::data[]
+template <> EnumDict<ModulePixmapStoreType>::tData EnumDict<ModulePixmapStoreType>::data[]
= { {"Absolute", MPS_ABSOLTUE},
{"Relative Module", MPS_RELATIVE_MODULE},
{"Internal", MPS_INTERNAL},
@@ -148,7 +148,7 @@
const QSize & ModuleData::getGenericSize() const
{
return m_genericSize;
-};
+}
PointList * ModuleData::getGenericConnPos()
{
@@ -159,12 +159,12 @@
m_connPosGeneric->setAutoDelete(true);
}
return m_connPosGeneric;
-};
+}
const QSize & ModuleData::getPixmapSize() const
{
return m_pixmapSize;
-};
+}
PointList * ModuleData::getPixmapConnPos()
{
@@ -175,7 +175,7 @@
m_connPosPixmap->setAutoDelete(true);
}
return m_connPosPixmap;
-};
+}
OrientList * ModuleData::getPixmapConnOrient()
{
@@ -186,7 +186,7 @@
m_connOrientPixmap->setAutoDelete(true);
}
return m_connOrientPixmap;
-};
+}
/** returns a pointer to the pixmap
Creates an empty pixmap, if not exist */
@@ -280,7 +280,7 @@
m_connPosUserView->setAutoDelete(true);
}
return m_connPosUserView;
-};
+}
OrientList * ModuleData::getUserViewConnOrient()
{
@@ -291,7 +291,7 @@
m_connOrientUserView->setAutoDelete(true);
}
return m_connOrientUserView;
-};
+}
/** Search externals in compList */
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/tools/enumdict.h ./ksimus/tools/enumdict.h
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/tools/enumdict.h 2001-11-24 02:11:32.000000000 +0100
+++ ./ksimus/tools/enumdict.h 2004-08-13 09:01:10.623853169 +0200
@@ -136,7 +136,7 @@
const T * EnumDict<T>::find(const char * name) const
{
return (const T *)EnumBaseDict::find(name);
-};
+}
template<class T>
T EnumDict<T>::find(const char * name, T defaultValue) const
{
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/tools/ksimbaseuint.cpp ./ksimus/tools/ksimbaseuint.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/tools/ksimbaseuint.cpp 2002-08-05 23:44:00.000000000 +0200
+++ ./ksimus/tools/ksimbaseuint.cpp 2004-08-13 09:02:07.652183545 +0200
@@ -39,13 +39,13 @@
m_base(Decimal)
{
setText(text);
-};
+}
void KSimBaseUInt::setText(const QString & str, bool * ok)
{
m_value = convert(str, &m_base, ok);
-};
+}
QString KSimBaseUInt::text() const
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/tools/ksimbooltristate.cpp ./ksimus/tools/ksimbooltristate.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/tools/ksimbooltristate.cpp 2003-02-28 00:06:19.000000000 +0100
+++ ./ksimus/tools/ksimbooltristate.cpp 2004-08-13 09:00:57.443856833 +0200
@@ -32,7 +32,7 @@
//#########################################################################################
-EnumDict<eKSimBoolTristate>::tData EnumDict<eKSimBoolTristate>::data[]
+template <> EnumDict<eKSimBoolTristate>::tData EnumDict<eKSimBoolTristate>::data[]
= { {"False", KSIMBOOLTRISTATE_FALSE},
{"True", KSIMBOOLTRISTATE_TRUE},
{"Inactive", KSIMBOOLTRISTATE_INACTIVE},
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/tools/ksimdoubleedit.cpp ./ksimus/tools/ksimdoubleedit.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/tools/ksimdoubleedit.cpp 2002-02-04 23:47:31.000000000 +0100
+++ ./ksimus/tools/ksimdoubleedit.cpp 2004-08-13 09:04:37.611386281 +0200
@@ -47,12 +47,12 @@
KSimDoubleEditValidator::KSimDoubleEditValidator(KSimDoubleEdit * parent, const char *name)
: QDoubleValidator(-HUGE_VAL, HUGE_VAL, 10, parent, name)
-{};
+{}
KSimDoubleEditValidator::KSimDoubleEditValidator(double bottom, double top, int decimals,
KSimDoubleEdit * parent, const char *name )
: QDoubleValidator(bottom, top, decimals, parent, name)
-{};
+{}
void KSimDoubleEditValidator::fixup(QString & input) const
{
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/tools/ksimfilename.cpp ./ksimus/tools/ksimfilename.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/tools/ksimfilename.cpp 2002-09-27 21:33:15.000000000 +0200
+++ ./ksimus/tools/ksimfilename.cpp 2004-08-13 09:01:49.026015153 +0200
@@ -46,7 +46,7 @@
static EnumDict<KSimFilename::ePathType> pathTypeDict;
-EnumDict<KSimFilename::ePathType>::tData EnumDict<KSimFilename::ePathType>::data[]
+template <> EnumDict<KSimFilename::ePathType>::tData EnumDict<KSimFilename::ePathType>::data[]
= { {"Absolute", KSimFilename::PATH_ABSOLUTE},
{"Relative Document", KSimFilename::PATH_RELATIVE_DOCUMENT},
{"Relative Module", KSimFilename::PATH_RELATIVE_MODULE},
@@ -539,27 +539,27 @@
const KSimFilename & KSimFilenameWidget::getFileInfo() const
{
return m_p->m_filename;
-};
+}
KSimFilename & KSimFilenameWidget::getFileInfo()
{
return m_p->m_filename;
-};
+}
KSimLineEdit * KSimFilenameWidget::getFilenameEdit()
{
return m_p->m_filenameEdit;
-};
+}
QPushButton * KSimFilenameWidget::getFilenameDialogButton()
{
return m_p->m_filenameDialogButton;
-};
+}
QComboBox * KSimFilenameWidget::getPathTypeBox()
{
return m_p->m_pathTypeBox;
-};
+}
QString KSimFilenameWidget::getFileFilter() const
{
diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/tools/ksimtimebase.cpp ./ksimus/tools/ksimtimebase.cpp
--- ../tmp-orig/ksimus-0.3.6-2/ksimus/tools/ksimtimebase.cpp 2002-08-05 23:44:00.000000000 +0200
+++ ./ksimus/tools/ksimtimebase.cpp 2004-08-13 09:02:49.535816265 +0200
@@ -31,7 +31,7 @@
#include "ksimtimeserver.h"
#include "enumdict.h"
-EnumDict<eTimeUnit>::tData EnumDict<eTimeUnit>::data[]
+template <> EnumDict<eTimeUnit>::tData EnumDict<eTimeUnit>::data[]
= { {"Ticks", unit_ticks},
{"1/10ns", unit_tenth_nsec},
{"1/10nsec", unit_tenth_nsec},

+ 545
- 0
package/blindcoder/ksimus/gcc34.patch.ksimus-boolean

@ -0,0 +1,545 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/blindcoder/ksimus/gcc34.patch.ksimus-boolean
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
Courtesy of debian.
Make ksimus compile with gcc34
--- ksimus-boolean-0.3.6.orig/admin/acinclude.m4.in
+++ ksimus-boolean-0.3.6/admin/acinclude.m4.in
@@ -2965,7 +2965,7 @@
kdelibsuff=$enableval)
if test "$kdelibsuff" = "none"; then
if test -d /lib64 ; then
- kdelibsuff=64
+ kdelibsuff=
else
kdelibsuff=
fi
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/delay.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/delay.h
@@ -142,6 +142,6 @@
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/convertbool2booltristate.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/convertbool2booltristate.cpp
@@ -174,5 +174,5 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/dflipflop.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/dflipflop.cpp
@@ -189,4 +189,4 @@
//###############################################################
-}; //namespace
+} //namespace
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/implicitconverterbooltristate2bool.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/implicitconverterbooltristate2bool.cpp
@@ -79,5 +79,5 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/convertbooltristate2bool.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/convertbooltristate2bool.cpp
@@ -159,5 +159,5 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/booltristate1out.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/booltristate1out.h
@@ -369,6 +369,6 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/booleanconstant.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/booleanconstant.cpp
@@ -191,5 +191,5 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/multiplexer.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/multiplexer.h
@@ -208,6 +208,6 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/boolean7segment.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/boolean7segment.h
@@ -128,6 +128,6 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/monoflop.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/monoflop.h
@@ -145,6 +145,6 @@
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/flipflopbase.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/flipflopbase.cpp
@@ -181,4 +181,4 @@
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/booleanconstant.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/booleanconstant.h
@@ -70,6 +70,6 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/inverter.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/inverter.h
@@ -81,6 +81,6 @@
};
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/jkflipflop.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/jkflipflop.cpp
@@ -373,5 +373,5 @@
//###############################################################
-}; //namespace
+} //namespace
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/booleanxor.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/booleanxor.cpp
@@ -74,7 +74,7 @@
BooleanXorView::BooleanXorView(BooleanXor * comp, eViewType viewType)
: BooleanXIn1OutView(comp, viewType)
-{};
+{}
void BooleanXorView::draw(QPainter * p)
{
@@ -123,5 +123,5 @@
}
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/implicitconverterbooltristate2bool.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/implicitconverterbooltristate2bool.h
@@ -53,6 +53,6 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/booleancounter.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/booleancounter.cpp
@@ -618,5 +618,5 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/boolean2in1out.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/boolean2in1out.h
@@ -83,6 +83,6 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/flipflopbase.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/flipflopbase.h
@@ -135,5 +135,5 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/demultiplexer.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/demultiplexer.h
@@ -198,6 +198,6 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/boolean.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/boolean.cpp
@@ -205,7 +205,7 @@
KInstance * instance = 0;
const PackageInfo * packageInfo = 0;
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/booleanor.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/booleanor.h
@@ -63,6 +63,6 @@
virtual void draw(QPainter * p);
};
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/monoflop.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/monoflop.cpp
@@ -332,4 +332,4 @@
//##########################################################################################
-}; //namespace
+} //namespace
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/extconnbooltristate.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/extconnbooltristate.cpp
@@ -113,7 +113,7 @@
KSimBoolTristate ExtConnBoolTristateBase::getResetState() const
{
return m_resetState;
-};
+}
ComponentPropertyBaseWidget * ExtConnBoolTristateBase::createGeneralProperty(QWidget *parent)
@@ -275,5 +275,5 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/convertbooltristate2bool.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/convertbooltristate2bool.h
@@ -81,6 +81,6 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/delay.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/delay.cpp
@@ -323,4 +323,4 @@
//##########################################################################################
-}; //namespace
+} //namespace
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/booleanxor.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/booleanxor.h
@@ -62,6 +62,6 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/booleanor.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/booleanor.cpp
@@ -128,4 +128,4 @@
setState(result);
}
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/booltristateand.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/booltristateand.cpp
@@ -109,5 +109,5 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/booltristate1out.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/booltristate1out.cpp
@@ -88,12 +88,12 @@
KSimBoolTristate BoolTristate1Out::getResetState() const
{
return m_resetState;
-};
+}
KSimBoolTristate BoolTristate1Out::getResetStateInit() const
{
return m_resetStateInit;
-};
+}
@@ -402,5 +402,5 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/booltristateor.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/booltristateor.h
@@ -75,6 +75,6 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/multidlatch.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/multidlatch.cpp
@@ -254,7 +254,7 @@
bool MultiDLatch::getResetValue() const
{
return m_resetValue;
-};
+}
void MultiDLatch::setChannelCount(int count)
{
@@ -421,4 +421,4 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/jkflipflop.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/jkflipflop.h
@@ -169,6 +169,6 @@
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/multiplexer.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/multiplexer.cpp
@@ -451,4 +451,4 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/booltristateand.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/booltristateand.h
@@ -75,6 +75,6 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/booltristatexor.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/booltristatexor.h
@@ -75,6 +75,6 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/convertbool2booltristate.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/convertbool2booltristate.h
@@ -96,6 +96,6 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/boolean2in1out.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/boolean2in1out.cpp
@@ -101,5 +101,5 @@
setState(false);
}
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/rsflipflop.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/rsflipflop.h
@@ -75,7 +75,7 @@
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/boolean7segment.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/boolean7segment.cpp
@@ -255,5 +255,5 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/dflipflop.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/dflipflop.h
@@ -96,6 +96,6 @@
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/extconnbooltristate.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/extconnbooltristate.h
@@ -144,6 +144,6 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/multidlatch.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/multidlatch.h
@@ -214,6 +214,6 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/rsflipflop.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/rsflipflop.cpp
@@ -149,6 +149,6 @@
//###############################################################
-}; //namespace
+} //namespace
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/demultiplexer.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/demultiplexer.cpp
@@ -440,4 +440,4 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/boolean.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/boolean.h
@@ -68,7 +68,7 @@
extern const PackageInfo * packageInfo;
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
/** The init function. PACKAGE_INIT_FUNCTION is a macro which expands to the real function name. */
extern "C" const PackageInfo * KSIMUS_PACKAGE_INIT_FUNCTION(KLocale * ksimusLocale);
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/booleancounter.h
+++ ksimus-boolean-0.3.6/ksimus-boolean/booleancounter.h
@@ -205,6 +205,6 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/inverter.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/inverter.cpp
@@ -142,4 +142,4 @@
CompView::draw(p);
}
-}; //namespace
+} //namespace
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/booltristatexor.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/booltristatexor.cpp
@@ -108,5 +108,5 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
--- ksimus-boolean-0.3.6.orig/ksimus-boolean/booltristateor.cpp
+++ ksimus-boolean-0.3.6/ksimus-boolean/booltristateor.cpp
@@ -109,5 +109,5 @@
//###############################################################
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean

+ 316
- 0
package/blindcoder/ksimus/gcc34.patch.ksimus-datarecorder

@ -0,0 +1,316 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/blindcoder/ksimus/gcc34.patch.ksimus-datarecorder
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
Courtesy of debian.
Make ksimus compile with gcc34
--- ksimus-datarecorder-0.3.6.orig/po/de.po
+++ ksimus-datarecorder-0.3.6/po/de.po
@@ -89,7 +89,7 @@
#: textrec.cpp:632
msgid "Directory %1 not exists"
-msgstr "Verzeichnis %1 exisitiert nicht"
+msgstr "Verzeichnis %1 existiert nicht"
#: textrec.cpp:676
msgid "File open failed (Filename %1)"
@@ -141,7 +141,7 @@
"If checked an exisiting file will not be deleted before a new simulations is "
"started."
msgstr ""
-"Wenn das Feld markiert ist wird die Datei gelöscht bevor eine neue "
+"Wenn das Feld markiert ist, wird eine existierende Datei nicht gelöscht, bevor eine neue "
"Simulation gestartet wird."
#: textrec.cpp:939
--- ksimus-datarecorder-0.3.6.orig/admin/acinclude.m4.in
+++ ksimus-datarecorder-0.3.6/admin/acinclude.m4.in
@@ -2965,7 +2965,7 @@
kdelibsuff=$enableval)
if test "$kdelibsuff" = "none"; then
if test -d /lib64 ; then
- kdelibsuff=64
+ kdelibsuff=
else
kdelibsuff=
fi
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/channelpositionwidget.cpp
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/channelpositionwidget.cpp
@@ -190,6 +190,6 @@
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/datarecorderchannelbase.cpp
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/datarecorderchannelbase.cpp
@@ -52,7 +52,7 @@
static EnumDict<eChannelType> channelTypeDict;
-EnumDict<eChannelType>::tData EnumDict<eChannelType>::data[]
+template <> EnumDict<eChannelType>::tData EnumDict<eChannelType>::data[]
= { {"Unknown", KSimLibDataRecorder::CT_Unknown},
{"Boolean", KSimLibDataRecorder::CT_Boolean},
{"Floating Point", KSimLibDataRecorder::CT_Float},
@@ -206,7 +206,7 @@
{
m_serialNumber = no;
getConnector()->setWireName(QString("Input %1").arg(no));
-};
+}
//#############################################################################
//#############################################################################
@@ -246,7 +246,7 @@
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/datarecorderdataview.h
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/datarecorderdataview.h
@@ -222,7 +222,7 @@
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
#endif
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/datarecorderchannelboolean.cpp
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/datarecorderchannelboolean.cpp
@@ -262,5 +262,5 @@
return m_propertyWidget;
}
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/textrec.cpp
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/textrec.cpp
@@ -1031,5 +1031,5 @@
}
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/zoomwidget.cpp
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/zoomwidget.cpp
@@ -395,6 +395,6 @@
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/zoomwidget.h
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/zoomwidget.h
@@ -137,7 +137,7 @@
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
#endif
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/datarecorder.cpp
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/datarecorder.cpp
@@ -174,7 +174,7 @@
KInstance * instance = 0;
const PackageInfo * packageInfo = 0;
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
@@ -754,4 +754,4 @@
}
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/channelpositionwidget.h
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/channelpositionwidget.h
@@ -103,6 +103,6 @@
};
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
#endif
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/datarecorderchannelfloat.cpp
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/datarecorderchannelfloat.cpp
@@ -257,5 +257,5 @@
return m_propertyWidget;
}
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/datarecorderwidget.cpp
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/datarecorderwidget.cpp
@@ -263,5 +263,5 @@
}
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/datarecorderchannelbase.h
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/datarecorderchannelbase.h
@@ -180,7 +180,7 @@
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
#endif
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/datarecorderwidget.h
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/datarecorderwidget.h
@@ -121,6 +121,6 @@
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
#endif
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/textrec.h
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/textrec.h
@@ -352,7 +352,7 @@
//###############################################################
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
#endif
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/widgetcontrolbutton.h
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/widgetcontrolbutton.h
@@ -98,6 +98,6 @@
};
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
#endif
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/datarecorderdataview.cpp
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/datarecorderdataview.cpp
@@ -140,7 +140,7 @@
CHECK_PTR(m_divGrid);
VIEW_DEBUG_VAR("",m_snapHorizontal);
-};
+}
DataRecorderDataView::~DataRecorderDataView()
{
@@ -583,7 +583,7 @@
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/datarecorderview.h
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/datarecorderview.h
@@ -73,6 +73,6 @@
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
#endif
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/datarecorder.h
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/datarecorder.h
@@ -86,7 +86,7 @@
const ComponentInfo * getDataRecorderInfo();
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
/** The init function. KSIMUS_PACKAGE_INIT_FUNCTION is a macro which expands to the real function name. */
extern "C" const PackageInfo * KSIMUS_PACKAGE_INIT_FUNCTION(KLocale * ksimusLocale);
@@ -178,6 +178,6 @@
void slotAddFloatChannel();
};
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
#endif
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/widgetcontrolbutton.cpp
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/widgetcontrolbutton.cpp
@@ -187,5 +187,5 @@
}
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/datarecorderchannelboolean.h
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/datarecorderchannelboolean.h
@@ -82,6 +82,6 @@
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
#endif
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/datarecorderview.cpp
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/datarecorderview.cpp
@@ -90,5 +90,5 @@
onlinePopup->popup(QCursor::pos());
}
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
--- ksimus-datarecorder-0.3.6.orig/ksimus-datarecorder/datarecorderchannelfloat.h
+++ ksimus-datarecorder-0.3.6/ksimus-datarecorder/datarecorderchannelfloat.h
@@ -87,6 +87,6 @@
-}; //namespace KSimLibDataRecorder
+} //namespace KSimLibDataRecorder
#endif

+ 738
- 0
package/blindcoder/ksimus/gcc34.patch.ksimus-floatingpoint

@ -0,0 +1,738 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/blindcoder/ksimus/gcc34.patch.ksimus-floatingpoint
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
Courtesy of debian.
Make ksimus compile with gcc34
--- ksimus-floatingpoint-0.3.6.orig/configure
+++ ksimus-floatingpoint-0.3.6/configure
@@ -5384,12 +5384,10 @@
enableval="$enable_libsuffix"
kdelibsuff=$enableval
fi;
+ # TODO: add an auto case that compiles a little C app to check
+ # where the glibc is
if test "$kdelibsuff" = "none"; then
- if test -d /lib64 ; then
- kdelibsuff=64
- else
- kdelibsuff=
- fi
+ kdelibsuff=
fi
if test -z "$kdelibsuff"; then
echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/libksimus_floatingpoint_la_closure.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/libksimus_floatingpoint_la_closure.cpp
@@ -0,0 +1 @@
+int main() {return 0;}
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatmultiplier.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatmultiplier.cpp
@@ -130,5 +130,5 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatlatch.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatlatch.h
@@ -214,6 +214,6 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/simpleconditional.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/simpleconditional.cpp
@@ -339,5 +339,5 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatremainder.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatremainder.cpp
@@ -102,5 +102,5 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/float2in1out.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/float2in1out.h
@@ -116,5 +116,5 @@
};
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatlatch.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatlatch.cpp
@@ -254,7 +254,7 @@
double FloatLatch::getResetValue() const
{
return m_resetValue;
-};
+}
void FloatLatch::setChannelCount(int count)
{
@@ -422,4 +422,4 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/extconnfloatin.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/extconnfloatin.cpp
@@ -200,4 +200,4 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatconstinput.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatconstinput.h
@@ -164,7 +164,7 @@
//#######################################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/extconnfloatout.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/extconnfloatout.cpp
@@ -98,4 +98,4 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/dataselector.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/dataselector.h
@@ -207,6 +207,6 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatcos.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatcos.cpp
@@ -284,5 +284,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatconstinput.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatconstinput.cpp
@@ -268,4 +268,4 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/ksimusfloatingpoint.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/ksimusfloatingpoint.cpp
@@ -224,7 +224,7 @@
KInstance * instance = 0;
const PackageInfo * packageInfo = 0;
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/convertfloatbool.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/convertfloatbool.cpp
@@ -351,5 +351,5 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/convertfloatbool.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/convertfloatbool.h
@@ -176,5 +176,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/float1in1out.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/float1in1out.cpp
@@ -83,5 +83,5 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatinputslider.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatinputslider.cpp
@@ -367,6 +367,6 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatlineinput.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatlineinput.cpp
@@ -444,5 +444,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatmultiplier.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatmultiplier.h
@@ -79,5 +79,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/waveformgenerator.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/waveformgenerator.h
@@ -179,5 +179,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/ksimusfloatingpoint.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/ksimusfloatingpoint.h
@@ -68,7 +68,7 @@
extern const PackageInfo * packageInfo;
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
/** The init function. KSIMUS_PACKAGE_INIT_FUNCTION is a macro which expands to the real function name. */
extern "C" const PackageInfo * KSIMUS_PACKAGE_INIT_FUNCTION(KLocale * ksimusLocale);
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatstyle1out.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatstyle1out.cpp
@@ -67,12 +67,12 @@
void FloatStyle1Out::setValue(double newValue)
{
getOutputConnector()->setOutput(newValue);
-};
+}
double FloatStyle1Out::getValue() const
{
return getOutputConnector()->getOutput();
-};
+}
void FloatStyle1Out::setResetValue(double resetValue)
{
@@ -82,7 +82,7 @@
double FloatStyle1Out::getResetValue() const
{
return m_resetValue;
-};
+}
void FloatStyle1Out::reset()
@@ -210,6 +210,6 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/float1out.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/float1out.h
@@ -176,6 +176,6 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/convertboolfloat.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/convertboolfloat.cpp
@@ -295,5 +295,5 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatinputslider.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatinputslider.h
@@ -196,5 +196,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatxin1out.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatxin1out.cpp
@@ -84,5 +84,5 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatremainder.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatremainder.h
@@ -70,5 +70,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatstylerange1out.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatstylerange1out.h
@@ -189,5 +189,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatsubtractor.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatsubtractor.h
@@ -71,5 +71,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatdivider.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatdivider.cpp
@@ -101,5 +101,5 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatdivider.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatdivider.h
@@ -70,5 +70,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floattan.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floattan.h
@@ -208,5 +208,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatsin.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatsin.h
@@ -170,5 +170,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/random.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/random.h
@@ -159,6 +159,6 @@
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatmin.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatmin.h
@@ -72,5 +72,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatlog.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatlog.h
@@ -105,5 +105,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatmax.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatmax.h
@@ -72,5 +72,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/float2in1out.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/float2in1out.cpp
@@ -86,5 +86,5 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatexp.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatexp.h
@@ -141,5 +141,5 @@
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatcos.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatcos.h
@@ -175,5 +175,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatadd.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatadd.h
@@ -78,5 +78,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatabs.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatabs.h
@@ -72,5 +72,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/delay.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/delay.cpp
@@ -317,4 +317,4 @@
//##########################################################################################
-}; //namespace
+} //namespace
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatadd.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatadd.cpp
@@ -129,5 +129,5 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatabs.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatabs.cpp
@@ -100,5 +100,5 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatstylerange1out.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatstylerange1out.cpp
@@ -238,4 +238,4 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/float1out.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/float1out.cpp
@@ -67,12 +67,12 @@
void Float1Out::setValue(double newValue)
{
getOutputConnector()->setOutput(newValue);
-};
+}
double Float1Out::getValue() const
{
return getOutputConnector()->getOutput();
-};
+}
void Float1Out::setResetValue(double resetValue)
{
@@ -82,7 +82,7 @@
double Float1Out::getResetValue() const
{
return m_resetValue;
-};
+}
void Float1Out::reset()
@@ -216,6 +216,6 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/waveformgenerator.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/waveformgenerator.cpp
@@ -74,7 +74,7 @@
static EnumDict<eWaveType> waveTypeDict;
-EnumDict<eWaveType>::tData EnumDict<eWaveType>::data[]
+template <> EnumDict<eWaveType>::tData EnumDict<eWaveType>::data[]
= { {"Sinusoidal", KSimLibFloatingPoint::eSinusoidal},
{"Square", KSimLibFloatingPoint::eSquare},
{"Sawtooth", KSimLibFloatingPoint::eSawtooth},
@@ -432,7 +432,7 @@
getComponentLayout()->setMinSize(4,3);
getComponentLayout()->updateLayout();
}
-};
+}
WaveformGeneratorView::~WaveformGeneratorView()
{
@@ -681,5 +681,5 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/float1in1out.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/float1in1out.h
@@ -112,5 +112,5 @@
};
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatexp.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatexp.cpp
@@ -224,5 +224,5 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/dataselector.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/dataselector.cpp
@@ -452,4 +452,4 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatlineinput.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatlineinput.h
@@ -206,5 +206,5 @@
//#######################################################################
//#######################################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatmin.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatmin.cpp
@@ -112,5 +112,5 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatstyle1out.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatstyle1out.h
@@ -174,6 +174,6 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/convertboolfloat.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/convertboolfloat.h
@@ -153,5 +153,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/extconnfloatin.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/extconnfloatin.h
@@ -108,5 +108,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/extconnfloatout.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/extconnfloatout.h
@@ -47,5 +47,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatlineoutput.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatlineoutput.h
@@ -125,5 +125,5 @@
//#######################################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatsubtractor.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatsubtractor.cpp
@@ -103,5 +103,5 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatlog.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatlog.cpp
@@ -162,5 +162,5 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floattan.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floattan.cpp
@@ -348,5 +348,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatmax.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatmax.cpp
@@ -112,5 +112,5 @@
//###############################################################
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatlineoutput.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatlineoutput.cpp
@@ -192,5 +192,5 @@
//##########################################################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatsin.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatsin.cpp
@@ -281,5 +281,5 @@
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/simpleconditional.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/simpleconditional.h
@@ -160,5 +160,5 @@
//###############################################################
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/random.cpp
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/random.cpp
@@ -337,4 +337,4 @@
//##########################################################################################
-}; //namespace
+} //namespace
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/floatxin1out.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/floatxin1out.h
@@ -113,5 +113,5 @@
};
-}; //namespace KSimLibFloatingPoint
+} //namespace KSimLibFloatingPoint
#endif
--- ksimus-floatingpoint-0.3.6.orig/ksimus-floatingpoint/delay.h
+++ ksimus-floatingpoint-0.3.6/ksimus-floatingpoint/delay.h
@@ -141,6 +141,6 @@
-}; //namespace KSimLibBoolean
+} //namespace KSimLibBoolean
#endif

+ 24
- 0
package/blindcoder/ksimus/ksimus.conf

@ -0,0 +1,24 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/blindcoder/ksimus/ksimus.conf
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
. $base/package/kde/kde-3.conf

+ 63
- 0
package/blindcoder/ksimus/ksimus.desc

@ -0,0 +1,63 @@
[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
[COPY]
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY] Please add additional copyright information _after_ the line containing
[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
[COPY]
[COPY] ROCK Linux: rock-src/package/blindcoder/ksimus/ksimus.desc
[COPY] ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
[COPY]
[COPY] This program is free software; you can redistribute it and/or modify
[COPY] it under the terms of the GNU General Public License as published by
[COPY] the Free Software Foundation; either version 2 of the License, or
[COPY] (at your option) any later version. A copy of the GNU General Public
[COPY] License can be found at Documentation/COPYING.
[COPY]
[COPY] Many people helped and are helping developing ROCK Linux. Please
[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
[COPY] file for details.
[COPY]
[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
[I] A KDE tool for simulation and visualization of technical processes.
[T] KSimus is a KDE tool for simulation, automation,
[T] and visualization of technical processes. It is also
[T] useful for education and experiments in the scope
[T] of logical and automatic control circuits. The main
[T] feature of KSimus is the use of component libraries
[T] (packages) which makes extending KSimus easy for
[T] developers.
[U] http://ksimus.berlios.de/
[A] radie <rasmus@diekenbrock.de>
[M] Benjamin Schieder <blindcoder@scavenger.homeip.net>
[C] extra/scientific
[L] GPL
[S] Alpha
[P] X -----5---9 800.000
#if xpkg == ksimus
[V] 0.3.6-2
[D] 1618033211 ksimus-0.3.6-2.tar.gz !ftp://ftp.berlios.de/pub/ksimus/kde3/ksimus-3-0.3.6-2.tar.gz
#endif
#if xpkg == ksimus-boolean
[I] Boolean elements for ksimus
[V] 0.3.6
[D] 950631678 ksimus-boolean-0.3.6.tar.gz !ftp://ftp.berlios.de/pub/ksimus/kde3/ksimus-boolean-3-0.3.6.tar.gz
#endif
#if xpkg == ksimus-datarecorder
[I] Elements used for data recording for ksimus
[V] 0.3.6
[D] 2755102397 ksimus-datarecorder-0.3.6.tar.gz !ftp://ftp.berlios.de/pub/ksimus/kde3/ksimus-datarecorder-3-0.3.6.tar.gz
#endif
#if xpkg == ksimus-floatingpoint
[I] Floating Point elements for ksimus
[V] 0.3.6
[D] 722637016 ksimus-floatingpoint-0.3.6.tar.gz !ftp://ftp.berlios.de/pub/ksimus/kde3/ksimus-floatingpoint-3-0.3.6.tar.gz
#endif

+ 27
- 0
package/blindcoder/ksimus/preconfig.in

@ -0,0 +1,27 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/blindcoder/ksimus/preconfig.in
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
if pkgcheck ksimus X ; then
pkgfork ksimus ksimus-boolean
pkgfork ksimus ksimus-datarecorder
pkgfork ksimus ksimus-floatingpoint
fi

Loading…
Cancel
Save