make this build with newer qt4 versions (QAssistantClient was removed)

3 files changed, 80 insertions, 1 deletions

diff --git a/graphics/scidavis/distinfo b/graphics/scidavis/distinfo
index 491111b2737..84a92d588b4 100644
--- a/graphics/scidavis/distinfo
+++ b/graphics/scidavis/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2010/09/07 16:45:18 drochner Exp $
+$NetBSD: distinfo,v 1.3 2011/11/27 13:24:58 drochner Exp $
 
 SHA1 (scidavis-0.2.4.tar.bz2) = f8e0eeac08f0e06fe12cb55bb6b008c3963cb3de
 RMD160 (scidavis-0.2.4.tar.bz2) = a265a8fea2e26ca26e0ba08dd3069389bb5f4735
 Size (scidavis-0.2.4.tar.bz2) = 1426695 bytes
 SHA1 (patch-aa) = c128147db8ce84d73f6168ce3c16e5ba0e431ef3
+SHA1 (patch-ab) = 99a01dee5b4ebde3263db7baf1def32597d81491
+SHA1 (patch-ac) = 6b1d52a5e8520ba2ade662b452fae4167791d5a8
diff --git a/graphics/scidavis/patches/patch-ab b/graphics/scidavis/patches/patch-ab
new file mode 100644
index 00000000000..995e9587f1d
--- /dev/null
+++ b/graphics/scidavis/patches/patch-ab
@@ -0,0 +1,24 @@
+$NetBSD: patch-ab,v 1.1 2011/11/27 13:24:58 drochner Exp $
+
+--- scidavis/src/ApplicationWindow.h.orig	2011-11-27 12:09:52.000000000 +0000
++++ scidavis/src/ApplicationWindow.h
+@@ -61,7 +61,9 @@ class QToolButton;
+ class QShortcut;
+ class QMenu;
+ class QToolBar;
++#if 0
+ class QAssistantClient;
++#endif
+ class QStatusBar;
+ class QSignalMapper;
+ 
+@@ -125,7 +127,9 @@ public:
+ 
+ 	enum ShowWindowsPolicy{HideAll, ActiveFolder, SubFolders};
+ 
++#if 0
+ 	QAssistantClient *assistant;
++#endif
+ 	QTranslator *appTranslator, *qtTranslator;
+ 	QDockWidget *logWindow, *explorerWindow;
+ 	QTextEdit *results;
diff --git a/graphics/scidavis/patches/patch-ac b/graphics/scidavis/patches/patch-ac
new file mode 100644
index 00000000000..055951ea0b9
--- /dev/null
+++ b/graphics/scidavis/patches/patch-ac
@@ -0,0 +1,53 @@
+$NetBSD: patch-ac,v 1.1 2011/11/27 13:24:58 drochner Exp $
+
+--- scidavis/src/ApplicationWindow.cpp.orig	2011-11-27 12:07:35.000000000 +0000
++++ scidavis/src/ApplicationWindow.cpp
+@@ -135,7 +135,9 @@
+ #include <QVarLengthArray>
+ #include <QList>
+ #include <QUrl>
++#if 0
+ #include <QAssistantClient>
++#endif
+ #include <QStatusBar>
+ #include <QToolButton>
+ #include <QSignalMapper>
+@@ -277,7 +279,9 @@ void ApplicationWindow::init()
+ 	createLanguagesList();
+ 	insertTranslatedStrings();
+ 
++#if 0
+ 	assistant = new QAssistantClient( QString(), this );
++#endif
+ 
+ 	actionNextWindow = new QAction(QIcon(QPixmap(":/next.xpm")), tr("&Next","next window"), this);
+ 	actionNextWindow->setShortcut( tr("F5","next window shortcut") );
+@@ -8198,6 +8202,7 @@ void ApplicationWindow::showStandAloneHe
+ 		exit(0);
+ 	}
+ 
++#if 0
+ 	QFileInfo fi(helpPath);
+ 	QString profilePath = QString(fi.dirPath(true)+"/scidavis.adp");
+ 	if (!QFile(profilePath).exists())
+@@ -8214,10 +8219,12 @@ void ApplicationWindow::showStandAloneHe
+ 	assist->setArguments( cmdLst );
+ 	assist->showPage(helpPath);
+ 	connect(assist, SIGNAL(assistantClosed()), qApp, SLOT(quit()) );
++#endif
+ }
+ 
+ void ApplicationWindow::showHelp()
+ {
++#if 0
+ 	QFile helpFile(helpFilePath);
+ 	if (!helpFile.exists())
+ 	{
+@@ -8243,6 +8250,7 @@ void ApplicationWindow::showHelp()
+ 	QStringList cmdLst = QStringList() << "-profile" << profilePath;
+ 	assistant->setArguments( cmdLst );
+ 	assistant->showPage(helpFilePath);
++#endif
+ }
+ 
+ void ApplicationWindow::showPlotWizard()