r38424 - in /packages/inventor/trunk: debian/Patches/ debian/patches/ doc/man/ivman/ lib/ lib/database/include/ lib/database/src/sb/ lib/database/src/so/ lib/database/src/so/engines/ lib/interaction/src/draggers/ lib/interaction/src/nodekits/ lib/nodekits/src/nodekits/ lib/nodekits/src/upgraders/ libSoXt/src/
smr at users.alioth.debian.org
smr at users.alioth.debian.org
Mon Apr 25 08:02:11 UTC 2011
Author: smr
Date: Mon Apr 25 08:01:56 2011
New Revision: 38424
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38424
Log:
Switch to source format 3.0(quilt). Begin process of moving patches into debian/patches.
Added:
packages/inventor/trunk/debian/patches/
packages/inventor/trunk/debian/patches/build-libinventor.patch
packages/inventor/trunk/debian/patches/const-correctness.patch
packages/inventor/trunk/debian/patches/endianness.patch
packages/inventor/trunk/debian/patches/ivman.patch
packages/inventor/trunk/debian/patches/series
packages/inventor/trunk/debian/patches/socalcparse.patch
packages/inventor/trunk/debian/patches/use-tcsh.patch
Removed:
packages/inventor/trunk/debian/Patches/
packages/inventor/trunk/doc/man/ivman/
packages/inventor/trunk/lib/GNUmakefile
packages/inventor/trunk/lib/database/include/machine.h
packages/inventor/trunk/lib/database/src/sb/SbTime.c++
packages/inventor/trunk/lib/database/src/so/SoInput.c++
packages/inventor/trunk/lib/database/src/so/SoOutput.c++
packages/inventor/trunk/lib/database/src/so/SoType.c++
packages/inventor/trunk/lib/database/src/so/engines/SoCalcParse.y
packages/inventor/trunk/lib/interaction/src/draggers/SoDragger.c++
packages/inventor/trunk/lib/interaction/src/nodekits/SoInteractionKit.c++
packages/inventor/trunk/lib/nodekits/src/nodekits/SoNkCatalog.c++
packages/inventor/trunk/lib/nodekits/src/upgraders/SoV1NkCatalog.c++
packages/inventor/trunk/libSoXt/src/SoXtRsrc.c++
Added: packages/inventor/trunk/debian/patches/build-libinventor.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/patches/build-libinventor.patch?rev=38424&op=file
==============================================================================
--- packages/inventor/trunk/debian/patches/build-libinventor.patch (added)
+++ packages/inventor/trunk/debian/patches/build-libinventor.patch Mon Apr 25 08:01:56 2011
@@ -1,0 +1,28 @@
+Description: Build library with complete SOVERSION
+Author: Steve M. Robbins <smr at debian.org>
+
+--- inventor-2.1.5-10.orig/lib/GNUmakefile
++++ inventor-2.1.5-10/lib/GNUmakefile
+@@ -1,14 +1,18 @@
+ IVDEPTH = ..
+-include $(IVDEPTH)/make/ivcommondefs
+
+-LIBDSO = libInventor.so
++LIBMAJOR = 0
++LIBMINOR = 0.0
++LIBNAME = libInventor.so
++DSONAME = $(LIBNAME).$(LIBMAJOR)
++LIBDSO = $(LIBNAME).$(LIBMAJOR).$(LIBMINOR)
++
++include $(IVDEPTH)/make/ivcommondefs
+
+ LLDDSOOPTS += -L$(IVDEPTH)/libimage -L$(FLDIR)
+
+ LLDLIBS = \
+ -ljpeg -limage $(FLLIB) \
+- -lX11 -lm \
+- -lGLU -lGL
++ -lGLU -lGL -lX11 -ldl -lm
+
+ OBJECTS = \
+ ./database/src/sb/projectors/SbProjectors.o \
Added: packages/inventor/trunk/debian/patches/const-correctness.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/patches/const-correctness.patch?rev=38424&op=file
==============================================================================
--- packages/inventor/trunk/debian/patches/const-correctness.patch (added)
+++ packages/inventor/trunk/debian/patches/const-correctness.patch Mon Apr 25 08:01:56 2011
@@ -1,0 +1,27 @@
+Description: Fix some const correctness
+Author: Steve M. Robbins <smr at debian.org>
+
+--- inventor-2.1.5-10.orig/lib/interaction/src/nodekits/SoInteractionKit.c++
++++ inventor-2.1.5-10/lib/interaction/src/nodekits/SoInteractionKit.c++
+@@ -854,8 +854,8 @@ SoInteractionKit::setAnySurrogatePath( c
+ // (as in "childList[0].appearance")
+ // If so, get the string up to whichever came first.
+ // This will be the 'intermediary' we look for.
+- char *dotPtr = strchr( partName.getString(), '.' );
+- char *brackPtr = strchr( partName.getString(), '[' );
++ const char *dotPtr = strchr( partName.getString(), '.' );
++ const char *brackPtr = strchr( partName.getString(), '[' );
+
+ if ( dotPtr != NULL || brackPtr != NULL ) {
+ char *nameCopy = strdup( partName.getString() );
+--- inventor-2.1.5-10.orig/lib/database/src/so/SoInput.c++
++++ inventor-2.1.5-10/lib/database/src/so/SoInput.c++
+@@ -2810,7 +2810,7 @@ SoInput::addReference(const SbName &name
+
+ if (addToGlobalDict) {
+ // Look for the first '+':
+- char *firstPlus = strchr(n, '+');
++ const char *firstPlus = strchr(n, '+');
+
+ if (firstPlus == NULL) {
+ base->setName(name);
Added: packages/inventor/trunk/debian/patches/endianness.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/patches/endianness.patch?rev=38424&op=file
==============================================================================
--- packages/inventor/trunk/debian/patches/endianness.patch (added)
+++ packages/inventor/trunk/debian/patches/endianness.patch Mon Apr 25 08:01:56 2011
@@ -1,0 +1,189 @@
+Description: Use <endian.h> to determine machine word order
+ The patch also generalizes the conditions for applying
+ some 64-bit hacks.
+Author: Steve M. Robbins <smr at debian.org>
+Bug-Debian: http://bugs.debian.org/107470
+
+--- inventor-2.1.5-10.orig/lib/database/include/machine.h
++++ inventor-2.1.5-10/lib/database/include/machine.h
+@@ -176,6 +176,28 @@ extern int errno; /* missing from errno
+ #endif
+
+
++/* Added for Debian by Steve M. Robbins */
++#if !defined(MACHINE_WORD_FORMAT)
++# include <endian.h>
++
++# if __BYTE_ORDER == __BIG_ENDIAN
++# define MACHINE_WORD_FORMAT DGL_BIG_ENDIAN
++# elif __BYTE_ORDER == __LITTLE_ENDIAN
++# define MACHINE_WORD_FORMAT DGL_LITTLE_ENDIAN
++# else
++# error Inventor needs to be set up for your CPU type.
++# endif
++
++# if __FLOAT_WORD_ORDER == __BIG_ENDIAN
++# define MACHINE_FLOAT_FORMAT DGL_BIG_IEEE
++# else
++# define MACHINE_FLOAT_FORMAT DGL_NON_IEEE
++# endif
++
++#endif
++
++
++
+
+ /*
+ * 32/64-bit architecture dependent statements
+@@ -321,12 +343,10 @@ extern float dgl_ntoh_double();
+ */
+
+ #if MACHINE_FLOAT_FORMAT == DGL_NON_IEEE
+-#if __i386__ || __ia64__
+ void mem_hton_float(float *t, float *f);
+ void mem_ntoh_float(float *t, float *f);
+ void mem_hton_double(double *t, double *f);
+ void mem_ntoh_double(double *t, double *f);
+-#endif /* __i386__ || __ia64__ */
+ #define DGL_HTON_FLOAT(t,f) mem_hton_float(&t,&f)
+ #define DGL_NTOH_FLOAT(t,f) mem_ntoh_float(&t,&f)
+ #define DGL_HTON_DOUBLE(t,f) mem_hton_double(&t,&f)
+@@ -350,4 +370,11 @@ void mem_ntoh_double(double *t, double *
+ #define SHORT(p) (*(short *)(p))
+ #endif
+
++/* Added for Debian by Steve M. Robbins */
++#if (_MIPS_SZPTR == 64 || __ia64 || __x86_64 || __alpha__ || __powerpc64__)
++# define USE_64BIT_HACKS 1
++#else
++# define USE_64BIT_HACKS 0
++#endif
++
+ #endif /* __MACHINE_H__ */
+--- inventor-2.1.5-10.orig/lib/interaction/src/draggers/SoDragger.c++
++++ inventor-2.1.5-10/lib/interaction/src/draggers/SoDragger.c++
+@@ -52,6 +52,7 @@
+ _______________________________________________________________________
+ */
+
++#include <machine.h>
+ #include <stdio.h>
+
+ #include <Inventor/SbLinear.h>
+@@ -686,7 +687,7 @@ SoDragger::isTempPathToThisOk()
+ int indexInPath = tempPathToThis->getIndex(numFmHead+1);
+
+ int numKidsNow = children->getLength();
+-#if (_MIPS_SZPTR == 64 || __ia64)
++#if (USE_64BIT_HACKS)
+ int numKidsBefore = (int) ((long) (*tempPathNumKidsHack)[numFmHead]);
+ #else
+ int numKidsBefore = (int) (*tempPathNumKidsHack)[numFmHead];
+--- inventor-2.1.5-10.orig/lib/nodekits/src/upgraders/SoV1NkCatalog.c++
++++ inventor-2.1.5-10/lib/nodekits/src/upgraders/SoV1NkCatalog.c++
+@@ -51,7 +51,7 @@
+ _______________________________________________________________________
+ */
+
+-
++#include <machine.h>
+ #include <Inventor/misc/upgraders/SoV1NodekitCatalog.h>
+ #include <Inventor/SoDB.h>
+ #include <Inventor/misc/upgraders/SoV1BaseKit.h>
+@@ -330,7 +330,7 @@ SoV1NodekitCatalog::getPartNumber( const
+ void *castPNum;
+
+ if ( partNameDict.find( (unsigned long) theName.getString(), castPNum ) )
+-#if (_MIPS_SZPTR == 64 || __ia64)
++#if (USE_64BIT_HACKS)
+ return ( (int) ((long) castPNum) ); // System long
+ #else
+ return ( (int) castPNum );
+--- inventor-2.1.5-10.orig/lib/nodekits/src/nodekits/SoNkCatalog.c++
++++ inventor-2.1.5-10/lib/nodekits/src/nodekits/SoNkCatalog.c++
+@@ -51,7 +51,7 @@
+ _______________________________________________________________________
+ */
+
+-
++#include <machine.h>
+ #include <Inventor/errors/SoDebugError.h>
+ #include <Inventor/nodekits/SoNodekitCatalog.h>
+ #include <Inventor/nodekits/SoNodeKitListPart.h>
+@@ -336,7 +336,7 @@ SoNodekitCatalog::getPartNumber( const S
+ void *castPNum;
+
+ if ( partNameDict.find( (unsigned long) theName.getString(), castPNum ) )
+-#if (_MIPS_SZPTR == 64 || __ia64)
++#if (USE_64BIT_HACKS)
+ return ( (int) ((long) castPNum) ); // System long
+ #else
+ return ( (int) castPNum );
+--- inventor-2.1.5-10.orig/lib/database/src/sb/SbTime.c++
++++ inventor-2.1.5-10/lib/database/src/sb/SbTime.c++
+@@ -51,6 +51,7 @@
+ _______________________________________________________________________
+ */
+
++#include <machine.h>
+ #include <Inventor/SbTime.h>
+ #include <time.h>
+
+@@ -264,7 +265,7 @@ SbTime::formatDate(const char *fmt) cons
+ {
+ char buf[200];
+
+-#if (_MIPS_SZLONG == 64 || __ia64 || __APPLE__)
++#if (USE_64BIT_HACKS || __APPLE__)
+ int seconds;
+ seconds = (int) t.tv_sec;
+ strftime(buf, sizeof(buf), fmt, localtime((const time_t *) &seconds));
+--- inventor-2.1.5-10.orig/lib/database/src/so/SoOutput.c++
++++ inventor-2.1.5-10/lib/database/src/so/SoOutput.c++
+@@ -1462,7 +1462,7 @@ SoOutput::findReference(const SoBase *ba
+
+ // Generates a CC warning. Ho hum.
+ if (refDict->find((unsigned long) base, ref))
+-#if (_MIPS_SZPTR == 64 || __ia64)
++#if (USE_64BIT_HACKS)
+ referenceId = (int) ((unsigned long) ref);
+ #else
+ referenceId = (int)ref;
+--- inventor-2.1.5-10.orig/lib/database/src/so/SoType.c++
++++ inventor-2.1.5-10/lib/database/src/so/SoType.c++
+@@ -51,6 +51,7 @@
+ _______________________________________________________________________
+ */
+
++#include <machine.h>
+ #include <Inventor/SoType.h>
+ #include <Inventor/SoLists.h>
+ #include <Inventor/errors/SoDebugError.h>
+@@ -331,7 +332,7 @@ SoType::fromName(SbName name)
+ if (b == NULL)
+ return SoType::badType();
+
+-#if (_MIPS_SZPTR == 64 || __ia64)
++#if (USE_64BIT_HACKS)
+ SoType result = typeData[(int) ((unsigned long) b)].type;
+ #else
+ SoType result = typeData[(int)b].type;
+--- inventor-2.1.5-10.orig/libSoXt/src/SoXtRsrc.c++
++++ inventor-2.1.5-10/libSoXt/src/SoXtRsrc.c++
+@@ -51,6 +51,7 @@
+ _______________________________________________________________________
+ */
+
++#include <machine.h>
+ #include <Inventor/SbPList.h>
+ #include <Inventor/Xt/SoXtComponent.h>
+ #include <Inventor/Xt/SoXt.h>
+@@ -145,7 +146,7 @@ SoXtResource::SoXtResource(Widget widget
+ classList = new XrmQuark[listSize];
+ for (q = 0, s = len - 1;
+ s >= 0; q++, s--) {
+-#if (_MIPS_SZPTR == 64 || __ia64)
++#if (USE_64BIT_HACKS)
+ nameList[q] = (XrmQuark) ((long) nameplist[s]);
+ classList[q] = (XrmQuark) ((long) classplist[s]);
+ #else
Added: packages/inventor/trunk/debian/patches/ivman.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/patches/ivman.patch?rev=38424&op=file
==============================================================================
--- packages/inventor/trunk/debian/patches/ivman.patch (added)
+++ packages/inventor/trunk/debian/patches/ivman.patch Mon Apr 25 08:01:56 2011
@@ -1,0 +1,46 @@
+Description: build ivman cleanly
+Author: Steve M. Robbins <smr at debian.org>
+
+--- inventor-2.1.5-10.orig/doc/man/ivman/ClassDef.c++
++++ inventor-2.1.5-10/doc/man/ivman/ClassDef.c++
+@@ -237,7 +237,7 @@
+
+ #define NUM_KEY_WORDS (sizeof(keywords) / sizeof(keywords[0]))
+
+- int i;
++ size_t i;
+
+ if (names == NULL) {
+ names = new SbName[NUM_KEY_WORDS];
+--- inventor-2.1.5-10.orig/doc/man/ivman/Main.c++
++++ inventor-2.1.5-10/doc/man/ivman/Main.c++
+@@ -89,7 +89,7 @@
+ //
+ /////////////////////////////////////////////////////////////////////////////
+
+-main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+ SbBool ok = TRUE;
+ int c, curArg;
+--- inventor-2.1.5-10.orig/doc/man/ivman/Man.c++
++++ inventor-2.1.5-10/doc/man/ivman/Man.c++
+@@ -806,7 +806,7 @@
+
+ #define NUM_OP_NAMES (sizeof(opNames) / sizeof(opNames[0]))
+
+- int op;
++ size_t op;
+ for (op = 0; op < NUM_OP_NAMES; op++) {
+ if (name == opNames[op][0]) {
+ name = opNames[op][1];
+--- inventor-2.1.5-10.orig/doc/man/ivman/Man.h
++++ inventor-2.1.5-10/doc/man/ivman/Man.h
+@@ -131,6 +131,7 @@
+ virtual void write(SbBool runIn) = 0;
+ virtual SbBool read() = 0;
+ virtual int getNumPreTabChars() const;
++ virtual ~Item() {}
+ protected:
+ Item();
+ private:
Added: packages/inventor/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/patches/series?rev=38424&op=file
==============================================================================
--- packages/inventor/trunk/debian/patches/series (added)
+++ packages/inventor/trunk/debian/patches/series Mon Apr 25 08:01:56 2011
@@ -1,0 +1,6 @@
+build-libinventor.patch
+endianness.patch
+ivman.patch
+use-tcsh.patch
+const-correctness.patch
+socalcparse.patch
Added: packages/inventor/trunk/debian/patches/socalcparse.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/patches/socalcparse.patch?rev=38424&op=file
==============================================================================
--- packages/inventor/trunk/debian/patches/socalcparse.patch (added)
+++ packages/inventor/trunk/debian/patches/socalcparse.patch Mon Apr 25 08:01:56 2011
@@ -1,0 +1,17 @@
+Description: Fix SoCalcParse.y so bison accepts it
+ Do not declare twice the same nonterminal with %type (bison suddenly got
+ picky about this).
+Author: Steve M. Robbins <smr at debian.org>
+Bug-Debian: http://bugs.debian.org/165305
+
+--- inventor-2.1.5-10.orig/lib/database/src/so/engines/SoCalcParse.y
++++ inventor-2.1.5-10/lib/database/src/so/engines/SoCalcParse.y
+@@ -119,7 +119,7 @@ static struct {
+ %type <expr> asgn primary_expression postfix_expression
+ %type <expr> unary_expression
+ %type <expr> multiplicative_expression additive_expression
+-%type <expr> additive_expression relational_expression
++%type <expr> relational_expression
+ %type <expr> equality_expression logical_AND_expression
+ %type <expr> logical_OR_expression conditional_expression
+ %type <list> args
Added: packages/inventor/trunk/debian/patches/use-tcsh.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/patches/use-tcsh.patch?rev=38424&op=file
==============================================================================
--- packages/inventor/trunk/debian/patches/use-tcsh.patch (added)
+++ packages/inventor/trunk/debian/patches/use-tcsh.patch Mon Apr 25 08:01:56 2011
@@ -1,0 +1,11 @@
+Description: Use tcsh for script (workaround csh bug)
+Author: Steve M. Robbins <smr at debian.org>
+
+--- inventor-2.1.5-10.orig/doc/man/ivman/makeManDirs
++++ inventor-2.1.5-10/doc/man/ivman/makeManDirs
+@@ -1,4 +1,4 @@
+-#!/bin/csh -f
++#! /usr/bin/tcsh -f
+
+ #
+ # Prepares command line info to create a man page for the given class name
More information about the debian-science-commits
mailing list