r38426 - in /packages/inventor/trunk: apps/demos/SceneViewer/ apps/demos/gview/ apps/demos/noodle/ apps/demos/qmorf/ apps/demos/revo/ apps/demos/textomatic/ apps/samples/widgets/ apps/tools/ivview/ debian/patches/ doc/ lib/database/include/Inventor/ libFL/ang/ libSoXt/src/ libSoXt/src/mtlEdit/
smr at users.alioth.debian.org
smr at users.alioth.debian.org
Mon Apr 25 08:28:11 UTC 2011
Author: smr
Date: Mon Apr 25 08:28:07 2011
New Revision: 38426
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38426
Log:
Move more patches to debian/patches.
Added:
packages/inventor/trunk/debian/patches/buildman.patch
packages/inventor/trunk/debian/patches/configurability.patch
packages/inventor/trunk/debian/patches/forward-declare.patch
Removed:
packages/inventor/trunk/apps/demos/SceneViewer/SceneViewer.RUNME
packages/inventor/trunk/apps/demos/SceneViewer/SoSceneViewer.c++
packages/inventor/trunk/apps/demos/gview/DisplayGraph.c++
packages/inventor/trunk/apps/demos/noodle/Interface.c++
packages/inventor/trunk/apps/demos/noodle/noodle.RUNME
packages/inventor/trunk/apps/demos/qmorf/qmorf.RUNME
packages/inventor/trunk/apps/demos/revo/revo.c++
packages/inventor/trunk/apps/demos/textomatic/textomatic.c++
packages/inventor/trunk/apps/samples/widgets/MyMtlPal.c++
packages/inventor/trunk/apps/samples/widgets/MyTextureEd.c++
packages/inventor/trunk/apps/tools/ivview/ivview.c++
packages/inventor/trunk/doc/GNUmakefile
packages/inventor/trunk/lib/database/include/Inventor/SoPath.h
packages/inventor/trunk/libFL/ang/fl.c
packages/inventor/trunk/libSoXt/src/SoXtClipboard.c++
packages/inventor/trunk/libSoXt/src/SoXtComponent.c++
packages/inventor/trunk/libSoXt/src/mtlEdit/SoXtMtlEdit.c++
packages/inventor/trunk/libSoXt/src/mtlEdit/SoXtMtlList.c++
Modified:
packages/inventor/trunk/debian/patches/series
Added: packages/inventor/trunk/debian/patches/buildman.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/patches/buildman.patch?rev=38426&op=file
==============================================================================
--- packages/inventor/trunk/debian/patches/buildman.patch (added)
+++ packages/inventor/trunk/debian/patches/buildman.patch Mon Apr 25 08:28:07 2011
@@ -1,0 +1,19 @@
+Description: Fix manpage build
+ Manpage building is enabled in debian/rules by setting
+ BUILDMAN.
+Author: Steve M. Robbins <smr at debian.org>
+
+--- inventor-2.1.5-10.orig/doc/GNUmakefile
++++ inventor-2.1.5-10/doc/GNUmakefile
+@@ -1,7 +1,11 @@
+ IVDEPTH = ..
+ include $(IVDEPTH)/make/ivcommondefs
+
++ifdef BUILDMAN
+ SUBDIRS = help man
++else
++SUBDIRS = help
++endif
+
+ all install:
+ $(SUBDIRS_MAKERULE)
Added: packages/inventor/trunk/debian/patches/configurability.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/patches/configurability.patch?rev=38426&op=file
==============================================================================
--- packages/inventor/trunk/debian/patches/configurability.patch (added)
+++ packages/inventor/trunk/debian/patches/configurability.patch Mon Apr 25 08:28:07 2011
@@ -1,0 +1,364 @@
+Description: Configuration changes to fit in Debian system
+ This patch mainly contains changes that
+ 1. adapt directory structure; or
+ 2. allow configuring external program, e.g. PDF reader
+Author: Steve M. Robbins <smr at debian.org>
+
+--- inventor-2.1.5-10.orig/apps/samples/widgets/MyTextureEd.c++
++++ inventor-2.1.5-10/apps/samples/widgets/MyTextureEd.c++
+@@ -228,7 +228,7 @@ struct PaletteStruct {
+
+
+ static char *customTextureDir = ".textures";
+-static char *defaultDir = IVPREFIX "/share/data/textures";
++static char *defaultDir = IVTEXTURESDIR;
+ static char *editorTitle = "Texture Editor";
+ static char *noFileNameStr = "<empty>";
+
+--- inventor-2.1.5-10.orig/apps/samples/widgets/MyMtlPal.c++
++++ inventor-2.1.5-10/apps/samples/widgets/MyMtlPal.c++
+@@ -193,7 +193,7 @@ static MenuStruct pulldownData[] = {
+ };
+
+ static char *editorTitle = "Material Palette";
+-static char *defaultDir = IVPREFIX "/share/data/materials";
++static char *defaultDir = IVMATERIALSDIR;
+
+
+ static char *geometryBuffer = "\
+--- inventor-2.1.5-10.orig/apps/demos/qmorf/qmorf.RUNME
++++ inventor-2.1.5-10/apps/demos/qmorf/qmorf.RUNME
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+ #Tag 0x00010510
+-/usr/demos/Inventor/qmorf /usr/share/data/models/CyberHeads/*.iv
++/usr/lib/inventor/qmorf /usr/share/inventor/data/models/CyberHeads/*.iv
+--- inventor-2.1.5-10.orig/apps/demos/qmorf/qmorf.c++
++++ inventor-2.1.5-10/apps/demos/qmorf/qmorf.c++
+@@ -413,8 +413,7 @@ parse_args(int argc, char **argv)
+ fprintf(stderr, "At least two files must be given, and "
+ "they must contain QuadMeshes (qmorf can\n");
+ fprintf(stderr, "only morph QuadMesh nodes).\n");
+- fprintf(stderr, "The directory "
+- IVPREFIX "/share/data/models/CyberHeads "
++ fprintf(stderr, "The directory " IVDATADIR "/CyberHeads "
+ "contains good data to morph.\n");
+
+ exit(7);
+@@ -436,24 +435,24 @@ quitCallback(Widget, XtPointer, XtPointe
+ void
+ showAboutDialog(Widget, XtPointer, XtPointer)
+ {
+- if (access(IVPREFIX "/demos/Inventor/qmorf.about", R_OK) != 0)
++ if (access(IVDEMOBINDIR"/qmorf.about", R_OK) != 0)
+ {
+ system("xmessage 'Sorry, could not find "
+- IVPREFIX "/demos/Inventor/qmorf.about' > /dev/null");
++ IVDEMOBINDIR"/qmorf.about' > /dev/null");
+ return;
+ }
+ char command[100];
+- sprintf(command, "which acroread > /dev/null");
++ sprintf(command, "which " PDFVIEWER " > /dev/null");
+
+ int err = system(command);
+ if (err)
+ {
+- system("xmessage 'You must install acroread"
++ system("xmessage 'You must install " PDFVIEWER
+ " for this function to work' > /dev/null");
+ return;
+ }
+
+- sprintf(command, "acroread " IVPREFIX "/demos/Inventor/qmorf.about &");
++ sprintf(command, PDFVIEWER " " IVDEMOBINDIR "/qmorf.about &");
+ system(command);
+ }
+
+--- inventor-2.1.5-10.orig/apps/demos/gview/gview.RUNME
++++ inventor-2.1.5-10/apps/demos/gview/gview.RUNME
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+ #Tag 0x00010510
+-/usr/demos/Inventor/gview /usr/demos/data/Inventor/windmill.iv
++/usr/lib/inventor/gview /usr/share/inventor/data/demos/windmill.iv
+--- inventor-2.1.5-10.orig/apps/demos/gview/DisplayGraph.c++
++++ inventor-2.1.5-10/apps/demos/gview/DisplayGraph.c++
+@@ -67,7 +67,7 @@ SoNode *DisplayGraph::otherIcon;
+ SbDict *DisplayGraph::iconDict;
+
+ #define ICON_FILE "gviewIcons.iv"
+-#define ICON_INST_DIR IVPREFIX "/demos/data/Inventor"
++#define ICON_INST_DIR IVDEMODATADIR
+ #define ICON_ENV_VAR "IV_GRAPH_DIR"
+
+ ////////////////////////////////////////////////////////////////////////
+--- inventor-2.1.5-10.orig/apps/demos/textomatic/textomatic.c++
++++ inventor-2.1.5-10/apps/demos/textomatic/textomatic.c++
+@@ -160,24 +160,24 @@ profileCallback(void *data, SoSensor *)
+ void
+ showAboutDialog(Widget, XtPointer, XtPointer)
+ {
+- if (access(IVPREFIX "/demos/Inventor/textomatic.about", R_OK) != 0)
++ if (access(IVDEMOBINDIR"/textomatic.about", R_OK) != 0)
+ {
+ system("xmessage 'Sorry, could not find "
+- IVPREFIX "/demos/Inventor/textomatic.about' > /dev/null");
++ IVDEMOBINDIR"/textomatic.about' > /dev/null");
+ return;
+ }
+
+ char command[100];
+- sprintf(command, "which acroread > /dev/null");
++ sprintf(command, "which " PDFVIEWER " > /dev/null");
+
+ int err = system(command);
+ if (err) {
+- system("xmessage 'You must install acroread"
++ system("xmessage 'You must install " PDFVIEWER
+ " for this function to work' > /dev/null");
+ return;
+ }
+
+- sprintf(command, "acroread " IVPREFIX "/demos/Inventor/textomatic.about &");
++ sprintf(command, PDFVIEWER " " IVDEMOBINDIR"/textomatic.about &");
+ system(command);
+ }
+
+--- inventor-2.1.5-10.orig/apps/demos/SceneViewer/SoSceneViewer.c++
++++ inventor-2.1.5-10/apps/demos/SceneViewer/SoSceneViewer.c++
+@@ -4734,26 +4734,26 @@ SoSceneViewer::showAboutDialog()
+ //
+ ////////////////////////////////////////////////////////////////////////
+ {
+- if (access(IVPREFIX "/demos/Inventor/SceneViewer.about", R_OK) != 0)
++ if (access(IVDEMOBINDIR "/SceneViewer.about", R_OK) != 0)
+ {
+ system("xmessage 'Sorry, could not find "
+- IVPREFIX "/demos/Inventor/SceneViewer.about' > /dev/null");
++ IVDEMOBINDIR "/SceneViewer.about' > /dev/null");
+ return;
+ }
+
+ char command[100];
+- sprintf(command, "which acroread > /dev/null");
++ sprintf(command, "which " PDFVIEWER " > /dev/null");
+
+ int err = system(command);
+ if (err)
+ {
+- system("xmessage 'You must install acroread"
++ system("xmessage 'You must install " PDFVIEWER
+ " for this function to work' > /dev/null");
+ return;
+ }
+
+- sprintf(command, "acroread "
+- IVPREFIX "/demos/Inventor/SceneViewer.about &");
++ sprintf(command, PDFVIEWER " "
++ IVDEMOBINDIR "/SceneViewer.about &");
+ system(command);
+ }
+
+--- inventor-2.1.5-10.orig/apps/demos/SceneViewer/SceneViewer.RUNME
++++ inventor-2.1.5-10/apps/demos/SceneViewer/SceneViewer.RUNME
+@@ -1,4 +1,4 @@
+ #!/bin/sh
+ #Tag 0x00010510
+-cd /usr/share/data/models
+-/usr/demos/Inventor/SceneViewer /usr/demos/data/Inventor/jackInTheBox.iv
++cd /usr/share/inventor/data/models
++/usr/lib/inventor/SceneViewer /usr/share/inventor/data/demos/jackInTheBox.iv
+--- inventor-2.1.5-10.orig/apps/demos/noodle/Interface.c++
++++ inventor-2.1.5-10/apps/demos/noodle/Interface.c++
+@@ -399,23 +399,23 @@ Interface::createOkayCancelDialog(Widget
+ void
+ Interface::showAboutDialog()
+ {
+- if (access(IVPREFIX "/demos/Inventor/noodle.about", R_OK) != 0) {
++ if (access(IVDEMOBINDIR"/noodle.about", R_OK) != 0) {
+ system("xmessage 'Sorry, could not find "
+- IVPREFIX "/demos/Inventor/noodle.about' > /dev/null");
++ IVDEMOBINDIR"/noodle.about' > /dev/null");
+ return;
+ }
+
+ char command[100];
+- sprintf(command, "which acroread > /dev/null");
++ sprintf(command, "which " PDFVIEWER " > /dev/null");
+
+ int err = system(command);
+ if (err) {
+- system("xmessage 'You must install acroread"
++ system("xmessage 'You must install " PDFVIEWER
+ " for this function to work' > /dev/null");
+ return;
+ }
+
+- sprintf(command, "acroread " IVPREFIX "/demos/Inventor/noodle.about &");
++ sprintf(command, PDFVIEWER " " IVDEMOBINDIR"/noodle.about &");
+ system(command);
+ }
+
+--- inventor-2.1.5-10.orig/apps/demos/noodle/noodle.RUNME
++++ inventor-2.1.5-10/apps/demos/noodle/noodle.RUNME
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+ #Tag 0x00010510
+-cd /usr/demos/data/Inventor; /usr/demos/Inventor/noodle
++cd /usr/share/inventor/data/demos; /usr/lib/inventor/noodle
+--- inventor-2.1.5-10.orig/apps/demos/revo/revo.c++
++++ inventor-2.1.5-10/apps/demos/revo/revo.c++
+@@ -78,25 +78,25 @@ extern void clearPoints();
+ void
+ showAboutDialog(Widget, XtPointer, XtPointer)
+ {
+- if (access(IVPREFIX "/demos/Inventor/revo.about", R_OK) != 0)
++ if (access(IVDEMOBINDIR "/revo.about", R_OK) != 0)
+ {
+ system("xmessage 'Sorry, could not find "
+- IVPREFIX "/demos/Inventor/revo.about' > /dev/null");
++ IVDEMOBINDIR "/revo.about' > /dev/null");
+ return;
+ }
+
+ char command[100];
+- sprintf(command, "which acroread >& /dev/null");
++ sprintf(command, "which " PDFVIEWER " >& /dev/null");
+
+ int err = system(command);
+ if (err)
+ {
+- system("xmessage 'You must install acroread"
++ system("xmessage 'You must install " PDFVIEWER
+ " for this function to work' > /dev/null");
+ return;
+ }
+
+- sprintf(command, "acroread " IVPREFIX "/demos/Inventor/revo.about &");
++ sprintf(command, PDFVIEWER " " IVDEMOBINDIR "/revo.about &");
+ system(command);
+ }
+
+--- inventor-2.1.5-10.orig/apps/tools/ivview/ivview.c++
++++ inventor-2.1.5-10/apps/tools/ivview/ivview.c++
+@@ -715,23 +715,23 @@ countUpdatesCB(void *, SoAction *action)
+ static void
+ showAboutDialog()
+ {
+- if (access(IVPREFIX "/share/help/ivview/ivview.about", R_OK) != 0) {
++ if (access(IVHELPDIR"/ivview/ivview.about", R_OK) != 0) {
+ system("xmessage 'Sorry, could not find "
+- IVPREFIX "/share/help/ivview/ivview.about' > /dev/null");
++ IVHELPDIR"/ivview/ivview.about' > /dev/null");
+ return;
+ }
+
+ char command[100];
+- sprintf(command, "which acroread > /dev/null");
++ sprintf(command, "which " PDFVIEWER " > /dev/null");
+
+ int err = system(command);
+ if (err) {
+- system("xmessage 'You must install acroread"
++ system("xmessage 'You must install " PDFVIEWER
+ " for this function to work' > /dev/null");
+ return;
+ }
+
+- sprintf(command, "acroread " IVPREFIX "/share/help/ivview/ivview.about &");
++ sprintf(command, PDFVIEWER " "IVHELPDIR"/ivview/ivview.about &");
+ system(command);
+ }
+
+--- inventor-2.1.5-10.orig/libSoXt/src/SoXtClipboard.c++
++++ inventor-2.1.5-10/libSoXt/src/SoXtClipboard.c++
+@@ -658,7 +658,7 @@ SoXtClipboard::convertData(
+ char conversionCmd[BUFSIZE];
+ const char *infile = tmpfile.getString();
+ const char *outfile = tmpfile2.getString();
+- sprintf(conversionCmd, IVPREFIX "/bin/ivdowngrade -v 2.0 %s %s", infile, outfile);
++ sprintf(conversionCmd, IVBINDIR "/ivdowngrade -v 2.0 %s %s", infile, outfile);
+
+ if (system(conversionCmd) == -1) {
+ #ifdef DEBUG
+--- inventor-2.1.5-10.orig/libSoXt/src/SoXtComponent.c++
++++ inventor-2.1.5-10/libSoXt/src/SoXtComponent.c++
+@@ -76,7 +76,7 @@
+
+ static char *helpDialogTitle = "Help Card Error Dialog";
+ static char *helpCardError = "Inventor Help Cards not installed.";
+-static char *helpPrgError = "acroread not installed on this system.";
++static char *helpPrgError = PDFVIEWER " not installed on this system.";
+ static char *thisClassName = "SoXtComponent";
+
+ // static members
+@@ -561,7 +561,7 @@ SoXtComponent::unregisterWidget(Widget w
+ // card given the file name. By default the file will be searched using:
+ // 1) current working directory
+ // 2) SO_HELP_DIR environment variable
+-// 3) $(IVPREFIX)/share/help/Inventor
++// 3) IVHELPDIR/Inventor
+ // 4) else bring a "No help card found message"
+ //
+ // Use: protected
+@@ -573,7 +573,7 @@ SoXtComponent::openHelpCard(const char *
+ {
+ char pgrCmd[100];
+ char cardPath[100];
+- strcpy(pgrCmd, "acroread ");
++ strcpy(pgrCmd, PDFVIEWER " ");
+
+ #if 0
+ // ??? make showcase come up single buffered on the Indigo. This should
+@@ -591,7 +591,7 @@ SoXtComponent::openHelpCard(const char *
+ #endif
+
+ char command[100];
+- sprintf(command, "which acroread > /dev/null");
++ sprintf(command, "which " PDFVIEWER " > /dev/null");
+ if (system(command) != 0) {
+ SoXt::createSimpleErrorDialog(_baseWidget, helpDialogTitle, helpPrgError);
+ return;
+@@ -622,7 +622,7 @@ SoXtComponent::openHelpCard(const char *
+ }
+
+ // else check for the default location
+- strcpy(cardPath, IVPREFIX "/share/help/Inventor/");
++ strcpy(cardPath, IVHELPDIR"/Inventor/");
+ strcat(cardPath, cardName);
+ if ( access(cardPath, R_OK) == 0 ) {
+ strcat(pgrCmd, cardPath);
+--- inventor-2.1.5-10.orig/libSoXt/src/mtlEdit/SoXtMtlList.c++
++++ inventor-2.1.5-10/libSoXt/src/mtlEdit/SoXtMtlList.c++
+@@ -264,7 +264,7 @@ SoXtMaterialList::constructorCommon(cons
+ setClassName("SoXtMaterialList");
+ if (dir != NULL)
+ materialDir = strdup(dir);
+- else materialDir = strdup(IVPREFIX "/share/data/materials");
++ else materialDir = strdup(IVMATERIALSDIR);
+
+ callbackList = new SoCallbackList;
+ curPalette = -1;
+--- inventor-2.1.5-10.orig/libSoXt/src/mtlEdit/SoXtMtlEdit.c++
++++ inventor-2.1.5-10/libSoXt/src/mtlEdit/SoXtMtlEdit.c++
+@@ -156,7 +156,7 @@ static char *deftitles[]={
+ "Material Emissive Color"
+ };
+
+-static char *mtlDir = IVPREFIX "/share/data/materials";
++static char *mtlDir = IVMATERIALSDIR;
+
+ static char *slider_labels[] = { (char *)NULL, (char *)NULL, (char *)NULL,
+ (char *)NULL, (char *)NULL, (char *)NULL
+--- inventor-2.1.5-10.orig/libFL/ang/fl.c
++++ inventor-2.1.5-10/libFL/ang/fl.c
+@@ -95,7 +95,7 @@ static FLfontImpl *fontImplTable[] = {
+ NULL
+ };
+
+-static char *fontPath = IVPREFIX "/share/data/fonts";
++static char *fontPath = IVFONTPATH;
+ int fl_debug = FALSE;
+
+ /*
Added: packages/inventor/trunk/debian/patches/forward-declare.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/patches/forward-declare.patch?rev=38426&op=file
==============================================================================
--- packages/inventor/trunk/debian/patches/forward-declare.patch (added)
+++ packages/inventor/trunk/debian/patches/forward-declare.patch Mon Apr 25 08:28:07 2011
@@ -1,0 +1,13 @@
+Description: Add missing forward declarations
+Author: Steve M. Robbins <smr at debian.org>
+
+--- inventor-2.1.5-10.orig/lib/database/include/Inventor/SoPath.h
++++ inventor-2.1.5-10/lib/database/include/Inventor/SoPath.h
+@@ -79,6 +79,7 @@
+
+ class SoPathList;
+ class SoWriteAction;
++class SoTempPath;
+
+ class SoPath : public SoBase {
+
Modified: packages/inventor/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/patches/series?rev=38426&op=diff
==============================================================================
--- packages/inventor/trunk/debian/patches/series (original)
+++ packages/inventor/trunk/debian/patches/series Mon Apr 25 08:28:07 2011
@@ -1,3 +1,5 @@
+configurability.patch
+buildman.patch
build-libinventor.patch
endianness.patch
ivman.patch
@@ -5,3 +7,4 @@
const-correctness.patch
socalcparse.patch
bison-workaround.patch
+forward-declare.patch
More information about the debian-science-commits
mailing list