openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File tulip-3.0.0.dif of Package tulip (Revision 2d598af1ea3eead7a3f676672a70b0c7)

Currently displaying revision 2d598af1ea3eead7a3f676672a70b0c7 , Show latest

diff -wruN ../orig-tulip-3.0.0/acinclude.m4 ./acinclude.m4
--- ../orig-tulip-3.0.0/acinclude.m4	2008-04-07 15:56:08.000000000 +0200
+++ ./acinclude.m4	2008-04-15 11:23:45.000000000 +0200
@@ -485,8 +485,8 @@
 dnl an QT_NO_DEBUG to enable the widgets plugins integration in Qt designer
   QT_CPPFLAGS="$QT_CPPFLAGS -DQT3_SUPPORT  -DQT_NO_DEBUG"
 
-qt_libdirs="$ac_qt_libraries ${QTDIR}/lib /usr/lib/qt4/lib /usr/local/lib/qt/lib /usr/lib/ /usr/local/lib/"
-test -n "${QTDIR}" && qt_libdirs="${QTDIR}/lib ${QTDIR} $qt_libdirs"
+qt_libdirs="$ac_qt_libraries ${QTDIR}/lib64 ${QTDIR}/lib /usr/lib64/qt4/lib /usr/lib/qt4/lib /usr/lib/qt/lib /usr/local/lib/qt/lib /usr/lib/ /usr/local/lib/"
+test -n "${QTDIR}" && qt_libdirs="${QTDIR}/lib64 ${QTDIR}/lib ${QTDIR} $qt_libdirs"
 if test ! "$ac_qt_libraries" = "NO"; then
   qt_libdirs="$ac_qt_libraries $qt_libdirs"
 fi
@@ -525,7 +525,7 @@
 dnl Qt3Support lib is for Qt 3 compatibility purpose
 if test ${VAR_WIN32} = 1
 then
-  LIB_QT_ASSISTANT="-L${QTDIR}/lib -lQtAssistantClient4"
+  LIB_QT_ASSISTANT="-L${QTDIR}/lib64 -L${QTDIR}/lib -lQtAssistantClient4"
   LIB_QT="-lQtCore4 -lQtGui4 -lQt3Support4 -lQtOpenGL4 -lQtNetwork4 -lQtXml4"
 dnl For linking purpose, we need to copy some libs
 dnl Copy $QTDIR/lib/Qt*4.dll in $QTDIR/lib/libQt*4.dll if needed
@@ -561,7 +561,7 @@
       fi
     fi
   else
-    LIB_QT_ASSISTANT="-L${QTDIR}/lib -lQtAssistantClient"
+    LIB_QT_ASSISTANT="-L${QTDIR}/lib64 -L${QTDIR}/lib -lQtAssistantClient"
     LIB_QT="-lQtCore -lQt3Support -lQtGui -lQtOpenGL"
   fi
 fi
diff -wruN ../orig-tulip-3.0.0/configure.in ./configure.in
--- ../orig-tulip-3.0.0/configure.in	2008-04-07 15:56:08.000000000 +0200
+++ ./configure.in	2008-04-15 11:19:45.000000000 +0200
@@ -193,7 +193,7 @@
 AC_ARG_ENABLE(debug,
 [  --enable-debug          Compilation flags to allow debugging],
   [CXXFLAGS="-Wall -g -pipe"],
-  CXXFLAGS="-DNDEBUG -O3 -funroll-loops -pipe " 
+  CXXFLAGS="$CXXFLAGS -DNDEBUG -O3 -funroll-loops -pipe " 
 )
 
 dnl statistics flag
diff -wruN ../orig-tulip-3.0.0/docs/developerHandbook/Makefile.am ./docs/developerHandbook/Makefile.am
--- ../orig-tulip-3.0.0/docs/developerHandbook/Makefile.am	2008-03-03 16:23:47.000000000 +0100
+++ ./docs/developerHandbook/Makefile.am	2008-04-15 11:19:45.000000000 +0200
@@ -13,13 +13,13 @@
 
 install-data-am :
 	if test -d html ; then \
-	  mkdir -p $(DESTDIR)$(pkgdatadir)/developerHandbook ;\
-	  cp -r images $(DESTDIR)$(pkgdatadir)/developerHandbook ;\
-	  cp -r html $(DESTDIR)$(pkgdatadir)/developerHandbook ;\
+	  mkdir -p $(DESTDIR)$(docdir)/developerHandbook ;\
+	  cp -r images $(DESTDIR)$(docdir)/developerHandbook ;\
+	  cp -r html $(DESTDIR)$(docdir)/developerHandbook ;\
 	fi;
 
 uninstall-am :
-	rm -rf $(DESTDIR)$(pkgdatadir)/developerHandbook
+	rm -rf $(DESTDIR)$(docdir)/developerHandbook
 
 all :
 
@@ -32,21 +32,12 @@
 html : html/index.html profile.dcf
 
 html/index.html : $(DOCBOOK_SRC) $(srcdir)/../common/tulip-html.xsl $(srcdir)/../common/CatalogManager.properties
-	$(JAVA) -cp "$(top_srcdir)/thirdparty/saxon/saxon653.jar:$(top_srcdir)/thirdparty/saxon/saxon.jar:$(srcdir)/../common:$(top_srcdir)/thirdparty/xml-commons/resolver.jar" \
-	com.icl.saxon.StyleSheet \
-	-x org.apache.xml.resolver.tools.ResolvingXMLReader \
-	-y org.apache.xml.resolver.tools.ResolvingXMLReader \
-	-r org.apache.xml.resolver.tools.CatalogResolver -u \
-	$(srcdir)/index.docbook  $(srcdir)/../common/tulip-html.xsl
+	$(JAVA) -cp "$(top_srcdir)/thirdparty/saxon/saxon653.jar:$(top_srcdir)/thirdparty/saxon/saxon.jar:$(srcdir)/../common:$(top_srcdir)/thirdparty/xml-commons/resolver.jar" com.icl.saxon.StyleSheet -x org.apache.xml.resolver.tools.ResolvingXMLReader -y org.apache.xml.resolver.tools.ResolvingXMLReader -r org.apache.xml.resolver.tools.CatalogResolver -u $(srcdir)/index.docbook  $(srcdir)/../common/tulip-html.xsl
 
 pdf :   pdf/devHandbook.fo pdf/devHandbook.pdf
 
 pdf/devHandbook.fo : $(DOCBOOK_SRC) $(srcdir)/../common/tulip-pdf.xsl $(srcdir)/../common/CatalogManager.properties
-	$(JAVA) -cp "$(top_srcdir)/thirdparty/saxon/saxon653.jar:$(top_srcdir)/thirdparty/saxon/saxon.jar:$(srcdir)/../common:$(top_srcdir)/thirdparty/xml-commons/resolver.jar" \
-	com.icl.saxon.StyleSheet -x org.apache.xml.resolver.tools.ResolvingXMLReader \
-	-y org.apache.xml.resolver.tools.ResolvingXMLReader \
-	-r org.apache.xml.resolver.tools.CatalogResolver -u \
-	-o pdf/devHandbook.fo $(srcdir)/index.docbook  $(srcdir)/../common/tulip-pdf.xsl
+	$(JAVA) -cp "$(top_srcdir)/thirdparty/saxon/saxon653.jar:$(top_srcdir)/thirdparty/saxon/saxon.jar:$(srcdir)/../common:$(top_srcdir)/thirdparty/xml-commons/resolver.jar" com.icl.saxon.StyleSheet -x org.apache.xml.resolver.tools.ResolvingXMLReader -y org.apache.xml.resolver.tools.ResolvingXMLReader -r org.apache.xml.resolver.tools.CatalogResolver -u -o pdf/devHandbook.fo $(srcdir)/index.docbook  $(srcdir)/../common/tulip-pdf.xsl
 
 pdf/devHandbook.pdf : pdf/devHandbook.fo
 	$(PDFXMLTEX) --output-directory="pdf/" pdf/devHandbook.fo && \
@@ -54,10 +45,5 @@
 
 
 profile.dcf : $(srcdir)/../common/tulip-profile.xsl $(DOCBOOK_SRC) $(srcdir)/../common/CatalogManager.properties
-	$(JAVA) -cp "$(top_srcdir)/thirdparty/saxon/saxon653.jar:$(top_srcdir)/thirdparty/saxon/saxon.jar:$(srcdir)/../common:$(top_srcdir)/thirdparty/xml-commons/resolver.jar" \
-	com.icl.saxon.StyleSheet \
-	-x org.apache.xml.resolver.tools.ResolvingXMLReader \
-	-y org.apache.xml.resolver.tools.ResolvingXMLReader \
-	-r org.apache.xml.resolver.tools.CatalogResolver -u \
-	-o profile.dcf $(srcdir)/index.docbook  $(srcdir)/../common/tulip-profile.xsl install.path="developerHandbook/html/"
+	$(JAVA) -cp "$(top_srcdir)/thirdparty/saxon/saxon653.jar:$(top_srcdir)/thirdparty/saxon/saxon.jar:$(srcdir)/../common:$(top_srcdir)/thirdparty/xml-commons/resolver.jar" com.icl.saxon.StyleSheet -x org.apache.xml.resolver.tools.ResolvingXMLReader -y org.apache.xml.resolver.tools.ResolvingXMLReader -r org.apache.xml.resolver.tools.CatalogResolver -u -o profile.dcf $(srcdir)/index.docbook  $(srcdir)/../common/tulip-profile.xsl install.path="developerHandbook/html/"
 
diff -wruN ../orig-tulip-3.0.0/docs/doxygen/Makefile.am ./docs/doxygen/Makefile.am
--- ../orig-tulip-3.0.0/docs/doxygen/Makefile.am	2008-03-03 16:24:09.000000000 +0100
+++ ./docs/doxygen/Makefile.am	2008-04-15 11:19:45.000000000 +0200
@@ -95,28 +95,13 @@
 	cat general-man >> $@
 
 profile.dcf: ../common/CatalogManager.properties dox-profile.xsl tulip-plugins.tag
-	$(JAVA) -cp "$(top_builddir)/thirdparty/saxon/saxon653.jar:$(top_builddir)/thirdparty/saxon/saxon.jar:../common:$(top_builddir)/thirdparty/xml-commons/resolver.jar" \
-	com.icl.saxon.StyleSheet \
-	-x org.apache.xml.resolver.tools.ResolvingXMLReader \
-	-y org.apache.xml.resolver.tools.ResolvingXMLReader \
-	-r org.apache.xml.resolver.tools.CatalogResolver \
-	-o $@ tulip-plugins.tag  dox-profile.xsl
+	$(JAVA) -cp "$(top_builddir)/thirdparty/saxon/saxon653.jar:$(top_builddir)/thirdparty/saxon/saxon.jar:../common:$(top_builddir)/thirdparty/xml-commons/resolver.jar" com.icl.saxon.StyleSheet -x org.apache.xml.resolver.tools.ResolvingXMLReader -y org.apache.xml.resolver.tools.ResolvingXMLReader -r org.apache.xml.resolver.tools.CatalogResolver -o $@ tulip-plugins.tag  dox-profile.xsl
 
 tulipPlugins.html: ../common/CatalogManager.properties dox-plugins.xsl tulip-plugins.tag
-	$(JAVA) -cp "$(top_builddir)/thirdparty/saxon/saxon653.jar:$(top_builddir)/thirdparty/saxon/saxon.jar:../common:$(top_builddir)/thirdparty/xml-commons/resolver.jar" \
-	com.icl.saxon.StyleSheet \
-	-x org.apache.xml.resolver.tools.ResolvingXMLReader \
-	-y org.apache.xml.resolver.tools.ResolvingXMLReader \
-	-r org.apache.xml.resolver.tools.CatalogResolver \
-	-o $@ tulip-plugins.tag  dox-plugins.xsl
+	$(JAVA) -cp "$(top_builddir)/thirdparty/saxon/saxon653.jar:$(top_builddir)/thirdparty/saxon/saxon.jar:../common:$(top_builddir)/thirdparty/xml-commons/resolver.jar" com.icl.saxon.StyleSheet -x org.apache.xml.resolver.tools.ResolvingXMLReader -y org.apache.xml.resolver.tools.ResolvingXMLReader -r org.apache.xml.resolver.tools.CatalogResolver -o $@ tulip-plugins.tag  dox-plugins.xsl
 
 allPlugins.html: ../common/CatalogManager.properties dox-html.xsl tulip-plugins.tag
-	$(JAVA) -cp "$(top_builddir)/thirdparty/saxon/saxon653.jar:$(top_builddir)/thirdparty/saxon/saxon.jar:../common:$(top_builddir)/thirdparty/xml-commons/resolver.jar" \
-	 com.icl.saxon.StyleSheet \
-	-x org.apache.xml.resolver.tools.ResolvingXMLReader \
-	-y org.apache.xml.resolver.tools.ResolvingXMLReader \
-	-r org.apache.xml.resolver.tools.CatalogResolver \
-	-o $@ tulip-plugins.tag dox-html.xsl
+	$(JAVA) -cp "$(top_builddir)/thirdparty/saxon/saxon653.jar:$(top_builddir)/thirdparty/saxon/saxon.jar:../common:$(top_builddir)/thirdparty/xml-commons/resolver.jar" com.icl.saxon.StyleSheet -x org.apache.xml.resolver.tools.ResolvingXMLReader -y org.apache.xml.resolver.tools.ResolvingXMLReader -r org.apache.xml.resolver.tools.CatalogResolver -o $@ tulip-plugins.tag dox-html.xsl
 
 clean:
 	rm -rf tulip-man profile.dcf xml allPlugins.html tulipPlugins.html
@@ -124,31 +109,30 @@
 	rm -rf tulip-libogl tulip-libqt tulip-lib
 
 install-data-am :
-	mkdir -p $(DESTDIR)$(pkgdatadir)/doxygen
-	mkdir -p $(DESTDIR)$(pkgdatadir)/man
+	mkdir -p $(DESTDIR)$(docdir)/doxygen
+	mkdir -p $(DESTDIR)$(datadir)/man
 	if test -f tulipdoc.html ; then \
-		cp $(srcdir)/tulip.html $(DESTDIR)$(pkgdatadir)/doxygen/. ;\
-		cp tulipdoc.html $(DESTDIR)$(pkgdatadir)/doxygen/. ;\
+		cp $(srcdir)/tulip.html $(DESTDIR)$(docdir)/doxygen/. ;\
+		cp tulipdoc.html $(DESTDIR)$(docdir)/doxygen/. ;\
 	fi ; 
 	if test -d tulip-lib ; then \
-		cp -r tulip-lib $(DESTDIR)$(pkgdatadir)/doxygen/. ;\
+		cp -r tulip-lib $(DESTDIR)$(docdir)/doxygen/. ;\
 	fi ;
 	if test -d tulip-libogl ; then\
-		cp -r tulip-libogl $(DESTDIR)$(pkgdatadir)/doxygen/. ;\
+		cp -r tulip-libogl $(DESTDIR)$(docdir)/doxygen/. ;\
 	fi ;
 	if test -d tulip-libqt ; then\
-		cp -r tulip-libqt $(DESTDIR)$(pkgdatadir)/doxygen/. ;\
+		cp -r tulip-libqt $(DESTDIR)$(docdir)/doxygen/. ;\
 	fi ;
 	if test -d tulip-man ; then\
-		cp -r tulip-man/* $(DESTDIR)$(pkgdatadir)/man/. ;\
+		cp -r tulip-man/* $(DESTDIR)$(datadir)/man/. ;\
 	fi ;
 	if test -f allPlugins.html ; then \
-		cp allPlugins.html $(DESTDIR)$(pkgdatadir)/doxygen/. ;\
+		cp allPlugins.html $(DESTDIR)$(docdir)/doxygen/. ;\
 	fi ;
 	if test -f tulipPlugins.html ; then \
-		cp tulipPlugins.html $(DESTDIR)$(pkgdatadir)/doxygen/. ;\
+		cp tulipPlugins.html $(DESTDIR)$(docdir)/doxygen/. ;\
 	fi ;
 uninstall-am :
-	rm -rf $(DESTDIR)$(pkgdatadir)/doxygen
-	rm -rf $(DESTDIR)$(pkgdatadir)/man
-
+	rm -rf $(DESTDIR)$(docdir)/doxygen
+	rm -rf $(DESTDIR)$(datadir)/man
diff -wruN ../orig-tulip-3.0.0/docs/Makefile.am ./docs/Makefile.am
--- ../orig-tulip-3.0.0/docs/Makefile.am	2008-03-03 16:23:19.000000000 +0100
+++ ./docs/Makefile.am	2008-04-15 11:19:45.000000000 +0200
@@ -36,12 +36,12 @@
 	fi;
 endif
 	if test -f profile.adp ; then \
-		cp profile.adp $(DESTDIR)$(pkgdatadir)/.; \
-		mkdir -p $(DESTDIR)$(pkgdatadir)/common ;\
-		cp -r $(srcdir)/common/*.png $(srcdir)/common/*.gif $(srcdir)/common/*.css $(srcdir)/common/favicon.ico $(DESTDIR)$(pkgdatadir)/common/. ;\
+		cp profile.adp $(DESTDIR)$(docdir)/.; \
+		mkdir -p $(DESTDIR)$(docdir)/common ;\
+		cp -r $(srcdir)/common/*.png $(srcdir)/common/*.css $(srcdir)/common/favicon.ico $(DESTDIR)$(docdir)/common/. ;\
 	fi;
 
 uninstall-am:
-	rm -rf $(DESTDIR)$(pkgdatadir)/common $(DESTDIR)$(pkgdatadir)/profile.adp
+	rm -rf $(DESTDIR)$(docdir)/common $(DESTDIR)$(docdir)/profile.adp
 
 
diff -wruN ../orig-tulip-3.0.0/docs/userHandbook/Makefile.am ./docs/userHandbook/Makefile.am
--- ../orig-tulip-3.0.0/docs/userHandbook/Makefile.am	2008-03-03 16:24:20.000000000 +0100
+++ ./docs/userHandbook/Makefile.am	2008-04-15 11:19:45.000000000 +0200
@@ -4,12 +4,12 @@
 
 install-data-am :
 	if test -d html ; then \
-	  mkdir -p $(DESTDIR)$(pkgdatadir)/userHandbook ;\
-	  cp -r images html $(DESTDIR)$(pkgdatadir)/userHandbook/. ;\
+	  mkdir -p $(DESTDIR)$(docdir)/userHandbook ;\
+	  cp -r images html $(DESTDIR)$(docdir)/userHandbook/. ;\
 	fi;
 
 uninstall-am :
-	rm -rf $(DESTDIR)$(pkgdatadir)/userHandbook
+	rm -rf $(DESTDIR)$(docdir)/userHandbook
 
 all : 
 
@@ -23,31 +23,18 @@
 
 
 html/index.html : $(DOCBOOK_SRC) $(srcdir)/../common/tulip-html.xsl $(srcdir)/../common/CatalogManager.properties
-	$(JAVA) -cp "$(top_srcdir)/thirdparty/saxon/saxon653.jar:$(top_srcdir)/thirdparty/saxon/saxon.jar:$(srcdir)/../common:$(top_srcdir)/thirdparty/xml-commons/resolver.jar" \
-	com.icl.saxon.StyleSheet \
-	-x org.apache.xml.resolver.tools.ResolvingXMLReader \
-	-y org.apache.xml.resolver.tools.ResolvingXMLReader \
-	-r org.apache.xml.resolver.tools.CatalogResolver -u \
-	$(srcdir)/index.docbook  $(srcdir)/../common/tulip-html.xsl
+	$(JAVA) -cp "$(top_srcdir)/thirdparty/saxon/saxon653.jar:$(top_srcdir)/thirdparty/saxon/saxon.jar:$(srcdir)/../common:$(top_srcdir)/thirdparty/xml-commons/resolver.jar" com.icl.saxon.StyleSheet -x org.apache.xml.resolver.tools.ResolvingXMLReader -y org.apache.xml.resolver.tools.ResolvingXMLReader -r org.apache.xml.resolver.tools.CatalogResolver -u $(srcdir)/index.docbook  $(srcdir)/../common/tulip-html.xsl
 
 
 pdf :   pdf/userManual.fo pdf/userManual.pdf
 
 pdf/userManual.fo : $(DOCBOOK_SRC) $(srcdir)/../common/tulip-pdf.xsl $(srcdir)/../common/CatalogManager.properties
-	$(JAVA) -cp "$(top_srcdir)/thirdparty/saxon/saxon653.jar:$(top_srcdir)/thirdparty/saxon/saxon.jar:$(srcdir)/../common:$(top_srcdir)/thirdparty/xml-commons/resolver.jar" \
-	com.icl.saxon.StyleSheet -x org.apache.xml.resolver.tools.ResolvingXMLReader \
-	-y org.apache.xml.resolver.tools.ResolvingXMLReader \
-	-r org.apache.xml.resolver.tools.CatalogResolver -u -o pdf/userManual.fo \
-	$(srcdir)/index.docbook  $(srcdir)/../common/tulip-pdf.xsl
+	$(JAVA) -cp "$(top_srcdir)/thirdparty/saxon/saxon653.jar:$(top_srcdir)/thirdparty/saxon/saxon.jar:$(srcdir)/../common:$(top_srcdir)/thirdparty/xml-commons/resolver.jar" com.icl.saxon.StyleSheet -x org.apache.xml.resolver.tools.ResolvingXMLReader -y org.apache.xml.resolver.tools.ResolvingXMLReader -r org.apache.xml.resolver.tools.CatalogResolver -u -o pdf/userManual.fo $(srcdir)/index.docbook  $(srcdir)/../common/tulip-pdf.xsl
 
 pdf/userManual.pdf : pdf/userManual.fo
 	$(PDFXMLTEX) --output-directory="pdf/" pdf/userManual.fo && $(PDFXMLTEX) --output-directory="pdf/" pdf/userManual.fo
 
 profile.dcf : $(srcdir)/../common/tulip-profile.xsl $(DOCBOOK_SRC) $(srcdir)/../common/CatalogManager.properties
-	$(JAVA) -cp "$(top_srcdir)/thirdparty/saxon/saxon653.jar:$(top_srcdir)/thirdparty/saxon/saxon.jar:$(srcdir)/../common:$(top_srcdir)/thirdparty/xml-commons/resolver.jar" \
-	com.icl.saxon.StyleSheet \
-	-x org.apache.xml.resolver.tools.ResolvingXMLReader \
-	-y org.apache.xml.resolver.tools.ResolvingXMLReader \
-	-r org.apache.xml.resolver.tools.CatalogResolver -o profile.dcf $(srcdir)/index.docbook  $(srcdir)/../common/tulip-profile.xsl install.path="userHandbook/html/"
+	$(JAVA) -cp "$(top_srcdir)/thirdparty/saxon/saxon653.jar:$(top_srcdir)/thirdparty/saxon/saxon.jar:$(srcdir)/../common:$(top_srcdir)/thirdparty/xml-commons/resolver.jar" com.icl.saxon.StyleSheet -x org.apache.xml.resolver.tools.ResolvingXMLReader -y org.apache.xml.resolver.tools.ResolvingXMLReader -r org.apache.xml.resolver.tools.CatalogResolver -o profile.dcf $(srcdir)/index.docbook  $(srcdir)/../common/tulip-profile.xsl install.path="userHandbook/html/"
 
 
diff -wruN ../orig-tulip-3.0.0/gen-conf.sh ./gen-conf.sh
--- ../orig-tulip-3.0.0/gen-conf.sh	2005-04-27 01:16:08.000000000 +0200
+++ ./gen-conf.sh	2008-04-15 11:19:45.000000000 +0200
@@ -2,7 +2,7 @@
 
 
 echo "Creating configure for main package"
-for CMD in "libtoolize -c -f" "aclocal" "autoheader" "automake -a -c" "autoconf"
+for CMD in "aclocal -I." "libtoolize -c -f" "autoheader" "automake -a -c" "autoconf"
 do
   echo "Running $CMD"
   $CMD
diff -wruN ../orig-tulip-3.0.0/library/tulip/include/tulip/cxx/Circle.cxx ./library/tulip/include/tulip/cxx/Circle.cxx
--- ../orig-tulip-3.0.0/library/tulip/include/tulip/cxx/Circle.cxx	2008-04-08 14:19:49.000000000 +0200
+++ ./library/tulip/include/tulip/cxx/Circle.cxx	2008-04-15 11:19:45.000000000 +0200
@@ -9,6 +9,9 @@
  the Free Software Foundation; either version 2 of the License, or     
  (at your option) any later version.
 */
+#include <cstdlib>
+
+#include <stdlib.h>
 
 template<typename Obj>
 tlp::Circle<Obj> & tlp::Circle<Obj>::merge(const tlp::Circle<Obj> &c) {
diff -wruN ../orig-tulip-3.0.0/library/tulip/include/tulip/TLPParser.h ./library/tulip/include/tulip/TLPParser.h
--- ../orig-tulip-3.0.0/library/tulip/include/tulip/TLPParser.h	2008-04-08 14:19:53.000000000 +0200
+++ ./library/tulip/include/tulip/TLPParser.h	2008-04-15 11:19:45.000000000 +0200
@@ -14,7 +14,9 @@
 #include <iostream>
 #include <sstream>
 #include <string>
+#include <cstring>
 #include <list>
+#include <cstring>
 
 #include <tulip/PluginProgress.h>
 
diff -wruN ../orig-tulip-3.0.0/library/tulip/include/tulip/tulipconf.h ./library/tulip/include/tulip/tulipconf.h
--- ../orig-tulip-3.0.0/library/tulip/include/tulip/tulipconf.h	2008-04-08 14:19:53.000000000 +0200
+++ ./library/tulip/include/tulip/tulipconf.h	2008-04-15 11:19:45.000000000 +0200
@@ -22,7 +22,11 @@
 #  if  (__GNUC_MINOR__ < 4 && __GNUC__ < 4)
 #    include <ext/stl_hash_fun.h>
 #  else
+#    if  (__GNUC_MINOR__ < 3 && __GNUC__ == 4)
 #    include <ext/hash_fun.h>
+#    else
+#      include <backward/hash_fun.h>
+#    endif
 #  endif
 #endif
 
diff -wruN ../orig-tulip-3.0.0/library/tulip/src/IdManager.cpp ./library/tulip/src/IdManager.cpp
--- ../orig-tulip-3.0.0/library/tulip/src/IdManager.cpp	2008-04-08 14:19:54.000000000 +0200
+++ ./library/tulip/src/IdManager.cpp	2008-04-15 11:19:45.000000000 +0200
@@ -23,6 +23,8 @@
 #endif
 
 #include "tulip/IdManager.h"
+#include <limits.h>
+
 using namespace std;
 using namespace tlp;
 IdManager::IdManager():
diff -wruN ../orig-tulip-3.0.0/library/tulip/src/PluginLibraryLoader.cpp ./library/tulip/src/PluginLibraryLoader.cpp
--- ../orig-tulip-3.0.0/library/tulip/src/PluginLibraryLoader.cpp	2008-04-08 14:19:55.000000000 +0200
+++ ./library/tulip/src/PluginLibraryLoader.cpp	2008-04-15 11:19:45.000000000 +0200
@@ -11,12 +11,14 @@
 */
 #include "tulip/PluginLibraryLoader.h"
 #include "tulip/TulipRelease.h"
+#include <cstring>
 
 #ifdef _WIN32
 #include <windows.h>
 #else
 #include <dlfcn.h>
 #include <dirent.h>
+#include <string.h>
 #endif
 
 using namespace tlp;
diff -wruN ../orig-tulip-3.0.0/library/tulip/src/StringCollection.cpp ./library/tulip/src/StringCollection.cpp
--- ../orig-tulip-3.0.0/library/tulip/src/StringCollection.cpp	2008-04-08 14:19:55.000000000 +0200
+++ ./library/tulip/src/StringCollection.cpp	2008-04-15 11:19:45.000000000 +0200
@@ -10,6 +10,7 @@
  (at your option) any later version.
 */
 #include<vector>
+#include <algorithm>
 #include<tulip/StringCollection.h>
 
 using namespace std;
diff -wruN ../orig-tulip-3.0.0/library/tulip/src/TLPExport.cpp ./library/tulip/src/TLPExport.cpp
--- ../orig-tulip-3.0.0/library/tulip/src/TLPExport.cpp	2008-04-08 14:19:56.000000000 +0200
+++ ./library/tulip/src/TLPExport.cpp	2008-04-15 11:19:45.000000000 +0200
@@ -13,10 +13,15 @@
 #if (__GNUC__ < 3)
 #include <hash_map>
 #else
+#if (__GNUC_MINOR__ < 3)
 #include <ext/hash_map>
+#else
+#include <backward/hash_map>
+#endif
 #endif
 #include <iostream>
 #include <time.h>
+#include <cstring>
 
 #include <tulip/TulipPlugin.h>
 #include <tulip/Coord.h>
diff -wruN ../orig-tulip-3.0.0/library/tulip/src/TlpTools.cpp ./library/tulip/src/TlpTools.cpp
--- ../orig-tulip-3.0.0/library/tulip/src/TlpTools.cpp	2008-04-08 14:19:56.000000000 +0200
+++ ./library/tulip/src/TlpTools.cpp	2008-04-15 11:19:45.000000000 +0200
@@ -105,7 +105,7 @@
   // one dir up to initialize the doc dir
   pos = TulipLibDir.length() - 2;
   pos = TulipLibDir.rfind("/", pos);
-  tulipDocDir=TulipLibDir.substr(0, pos + 1)+"share/tulip/";
+  tulipDocDir=TulipLibDir.substr(0, pos + 1)+"share/doc/packages/tulip/";
   TulipDocProfile=tulipDocDir+"profile.adp";
   TulipUserHandBookIndex=tulipDocDir+"userHandbook/html/index.html";
 
diff -wruN ../orig-tulip-3.0.0/library/tulip-ogl/include/tulip/GlSceneObserver.h ./library/tulip-ogl/include/tulip/GlSceneObserver.h
--- ../orig-tulip-3.0.0/library/tulip-ogl/include/tulip/GlSceneObserver.h	2008-04-08 14:19:58.000000000 +0200
+++ ./library/tulip-ogl/include/tulip/GlSceneObserver.h	2008-04-15 12:20:31.000000000 +0200
@@ -14,6 +14,7 @@
 #define Tulip_GLSCENEOBSERVER_H
 
 #include <set>
+#include <string>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff -wruN ../orig-tulip-3.0.0/library/tulip-ogl/src/Curves.cpp ./library/tulip-ogl/src/Curves.cpp
--- ../orig-tulip-3.0.0/library/tulip-ogl/src/Curves.cpp	2008-04-08 14:19:59.000000000 +0200
+++ ./library/tulip-ogl/src/Curves.cpp	2008-04-15 12:09:33.000000000 +0200
@@ -17,6 +17,7 @@
 #include "tulip/Curves.h"
 #include "tulip/GlTools.h"
 
+#include <string.h> // for memcpy()
 
 using namespace std;
 using namespace tlp;
diff -wruN ../orig-tulip-3.0.0/library/tulip-ogl/src/GlFeedBackRecorder.cpp ./library/tulip-ogl/src/GlFeedBackRecorder.cpp
--- ../orig-tulip-3.0.0/library/tulip-ogl/src/GlFeedBackRecorder.cpp	2008-04-08 14:19:59.000000000 +0200
+++ ./library/tulip-ogl/src/GlFeedBackRecorder.cpp	2008-04-15 12:35:34.000000000 +0200
@@ -12,6 +12,7 @@
 #include "tulip/GlFeedBackRecorder.h"
 
 #include <iostream>
+#include <stdlib.h> // for malloc()/free()/qsort()
 
 using namespace std;
 
diff -wruN ../orig-tulip-3.0.0/library/tulip-ogl/src/TextRenderer.cpp ./library/tulip-ogl/src/TextRenderer.cpp
--- ../orig-tulip-3.0.0/library/tulip-ogl/src/TextRenderer.cpp	2008-04-08 14:20:00.000000000 +0200
+++ ./library/tulip-ogl/src/TextRenderer.cpp	2008-04-15 11:19:45.000000000 +0200
@@ -22,6 +22,7 @@
 #include <iostream>
 #include <cassert>
 #include <stack>
+#include <cstring>
 
 using namespace std;
 using namespace tlp;
diff -wruN ../orig-tulip-3.0.0/library/tulip-qt/src/Makefile.am ./library/tulip-qt/src/Makefile.am
--- ../orig-tulip-3.0.0/library/tulip-qt/src/Makefile.am	2008-04-07 15:57:10.000000000 +0200
+++ ./library/tulip-qt/src/Makefile.am	2008-04-15 11:25:25.000000000 +0200
@@ -24,11 +24,11 @@
 AM_CPPFLAGS= @QT_CPPFLAGS@
 qtplugindir = $(libdir)/tlp/designer
 
-libPropertyWidgetPlugin_la_LDFLAGS = @TULIP_QT_LDFLAGS@ -module -avoid-version
-libElementPropertiesWidgetPlugin_la_LDFLAGS = @TULIP_QT_LDFLAGS@ -module -avoid-version
-libGlMainWidgetPlugin_la_LDFLAGS = @TULIP_QT_LDFLAGS@ -module -avoid-version
-libGWOverviewWidgetPlugin_la_LDFLAGS = @TULIP_QT_LDFLAGS@ -module -avoid-version
-libSGHierarchyWidgetPlugin_la_LDFLAGS = @TULIP_QT_LDFLAGS@ -module -avoid-version
+libPropertyWidgetPlugin_la_LDFLAGS = $(AM_LDFLAGS) @TULIP_QT_LDFLAGS@ -module -avoid-version
+libElementPropertiesWidgetPlugin_la_LDFLAGS = $(AM_LDFLAGS) @TULIP_QT_LDFLAGS@ -module -avoid-version
+libGlMainWidgetPlugin_la_LDFLAGS = $(AM_LDFLAGS) @TULIP_QT_LDFLAGS@ -module -avoid-version
+libGWOverviewWidgetPlugin_la_LDFLAGS = $(AM_LDFLAGS) @TULIP_QT_LDFLAGS@ -module -avoid-version
+libSGHierarchyWidgetPlugin_la_LDFLAGS = $(AM_LDFLAGS) @TULIP_QT_LDFLAGS@ -module -avoid-version
 
 libPropertyWidgetPlugin_laINCLUDES = ${DLL_TULIP_QT2}
 libElementPropertiesWidgetPlugin_laINCLUDES = ${DLL_TULIP_QT2}
diff -wruN ../orig-tulip-3.0.0/plugins/import/dotImportCLUT.h ./plugins/import/dotImportCLUT.h
--- ../orig-tulip-3.0.0/plugins/import/dotImportCLUT.h	2008-04-08 14:20:05.000000000 +0200
+++ ./plugins/import/dotImportCLUT.h	2008-04-15 11:19:45.000000000 +0200
@@ -10,6 +10,7 @@
  (at your option) any later version.
 */
 
+#include <cstring>
 
 struct X11Color
 {
diff -wruN ../orig-tulip-3.0.0/plugins/import/dotImport.cpp ./plugins/import/dotImport.cpp
--- ../orig-tulip-3.0.0/plugins/import/dotImport.cpp	2008-04-08 14:20:05.000000000 +0200
+++ ./plugins/import/dotImport.cpp	2008-04-15 11:19:45.000000000 +0200
@@ -11,6 +11,7 @@
 */
 #include <fstream>
 #include <sstream>
+#include <cstring>
 #include <math.h>
 #include <tulip/TulipPlugin.h>
 #include <tulip/hash_string.h>
diff -wruN ../orig-tulip-3.0.0/plugins/import/dotImportParser.h ./plugins/import/dotImportParser.h
--- ../orig-tulip-3.0.0/plugins/import/dotImportParser.h	2008-04-08 14:20:05.000000000 +0200
+++ ./plugins/import/dotImportParser.h	2008-04-15 11:19:45.000000000 +0200
@@ -139,18 +139,18 @@
 
 ShapeAttr ShapeAttrA[] = {
   // tulip shapes
-  "box", 0,
-  "boxoutlined", 1,
-  "sphere", 2,
-  "cone", 3,
-  "square", 4,
-  "teapot", 5,
-  "cyclinder", 6,
-  "billboard", 7,
+  { "box", 0 },
+  { "boxoutlined", 1 },
+  { "sphere", 2 },
+  { "cone", 3 },
+  { "square", 4 },
+  { "teapot", 5 },
+  { "cyclinder", 6 },
+  { "billboard", 7 },
   
   // dot shapes
-  "circle", 2, // as a sphere
-  "ellipse", 2, // as a sphere
+  { "circle", 2 }, // as a sphere
+  { "ellipse", 2 } // as a sphere
 };
 
 //
diff -wruN ../orig-tulip-3.0.0/plugins/import/GMLImport.cpp ./plugins/import/GMLImport.cpp
--- ../orig-tulip-3.0.0/plugins/import/GMLImport.cpp	2008-04-08 14:20:04.000000000 +0200
+++ ./plugins/import/GMLImport.cpp	2008-04-15 11:19:45.000000000 +0200
@@ -10,6 +10,7 @@
  (at your option) any later version.
 */
 #include <fstream>
+#include <cstring>
 #include <tulip/TulipPlugin.h>
 #include <tulip/AbstractProperty.h>
 #include "GMLParser.h"
@@ -283,11 +284,12 @@
     if (st==SOURCE) source=id;
     if (st==TARGET) target=id;
     if ((!edgeOk) && (source!=-1) && (target!=-1)) {edgeOk=true;curEdge=graphBuilder->addEdge(source,target);}
-    if ((st!=SOURCE) && (st!=TARGET))
+    if ((st!=SOURCE) && (st!=TARGET)) {
       if (edgeOk && curEdge.isValid())
 	result=graphBuilder->setEdgeValue(curEdge, st, id);
       else
 	edgeAttributeError();
+    }
     return result;
   }
   bool addDouble(const string &st,const double real) {
diff -wruN ../orig-tulip-3.0.0/plugins/import/GMLParser.h ./plugins/import/GMLParser.h
--- ../orig-tulip-3.0.0/plugins/import/GMLParser.h	2008-04-08 14:20:04.000000000 +0200
+++ ./plugins/import/GMLParser.h	2008-04-15 11:19:45.000000000 +0200
@@ -12,6 +12,7 @@
 #include <iostream>
 #include <string>
 #include <list>
+#include <cstring>
 
 /*
   Il faut ajouter la gestion correcte des erreurs et cest nikel.
diff -wruN ../orig-tulip-3.0.0/plugins/import/WebImport.cpp ./plugins/import/WebImport.cpp
--- ../orig-tulip-3.0.0/plugins/import/WebImport.cpp	2008-04-08 14:20:05.000000000 +0200
+++ ./plugins/import/WebImport.cpp	2008-04-15 11:19:45.000000000 +0200
@@ -89,7 +89,8 @@
 }
 
 void HttpContext::headerReceived(const QHttpResponseHeader & resp) {
-  if (isHtml = resp.isValid()) {
+  isHtml = resp.isValid();
+  if (isHtml) {
     int code = resp.statusCode();
     if (code > 399) /* error codes */
       isHtml = false;
diff -wruN ../orig-tulip-3.0.0/plugins/layout/rectanglePackingFonctions.cpp ./plugins/layout/rectanglePackingFonctions.cpp
--- ../orig-tulip-3.0.0/plugins/layout/rectanglePackingFonctions.cpp	2008-04-08 14:20:07.000000000 +0200
+++ ./plugins/layout/rectanglePackingFonctions.cpp	2008-04-15 11:19:45.000000000 +0200
@@ -10,6 +10,7 @@
  (at your option) any later version.
 */
 #include "rectanglePackingFonctions.h"
+#include <cstdlib>
 
 vector<Rectangle<float> > & RectanglePackingLimitRectangles(vector<Rectangle<float> > & v, const char * quality, PluginProgress * progress){
 
diff -wruN ../orig-tulip-3.0.0/plugins/layout/SquarifiedTreeMap.h ./plugins/layout/SquarifiedTreeMap.h
--- ../orig-tulip-3.0.0/plugins/layout/SquarifiedTreeMap.h	2008-04-08 14:20:07.000000000 +0200
+++ ./plugins/layout/SquarifiedTreeMap.h	2008-04-15 11:19:45.000000000 +0200
@@ -1,3 +1,5 @@
+
+
 //-*-c++-*-
 /**
  Authors: David Auber, Romain Bourqui, Patrick Mary, Morgan Mathiaut
diff -wruN ../orig-tulip-3.0.0/software/tlprender/src/JPEGWriter.cpp ./software/tlprender/src/JPEGWriter.cpp
--- ../orig-tulip-3.0.0/software/tlprender/src/JPEGWriter.cpp	2008-04-08 14:20:09.000000000 +0200
+++ ./software/tlprender/src/JPEGWriter.cpp	2008-04-15 11:19:45.000000000 +0200
@@ -13,6 +13,7 @@
 #include <config.h>
 #endif
 
+#include <cstring>
 #include <stdio.h>
 #include <iostream>
 #include <sstream>
diff -wruN ../orig-tulip-3.0.0/software/tulip/src/viewGl.cpp ./software/tulip/src/viewGl.cpp
--- ../orig-tulip-3.0.0/software/tulip/src/viewGl.cpp	2008-04-09 18:32:24.000000000 +0200
+++ ./software/tulip/src/viewGl.cpp	2008-04-15 13:17:36.000000000 +0200
@@ -170,7 +170,7 @@
   graphMenu->removeAction(Action);
   graphMenu->removeAction(menunew_itemAction);
   // set workspace background
-  workspace->setBackground(QBrush(Ui_TulipData::icon(image1_ID)));
+  workspace->setBackground(QBrush(Ui_TulipData::qt_get_icon(image1_ID)));
 
   Observable::holdObservers();
   glWidget=0;
diff -wruN ../orig-tulip-3.0.0/thirdparty/libgpugraph/libgpugraph.cpp ./thirdparty/libgpugraph/libgpugraph.cpp
--- ../orig-tulip-3.0.0/thirdparty/libgpugraph/libgpugraph.cpp	2008-04-08 14:20:15.000000000 +0200
+++ ./thirdparty/libgpugraph/libgpugraph.cpp	2008-04-15 12:00:18.000000000 +0200
@@ -18,6 +18,8 @@
 #include <math.h>
 #include <map>
 
+#include <string.h> // for memcpy
+
 using namespace std;
 
 // for error output

Places

File tulip-3.0.0.dif of Package tulip (Revision 2d598af1ea3eead7a3f676672a70b0c7)

Places