openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File tulip-3.1.1.dif of Package tulip (Revision 230e8af6f8f32f2b5bc78396c852cc85)

Currently displaying revision 230e8af6f8f32f2b5bc78396c852cc85 , Show latest

diff -wruN ../orig-tulip-3.1.1/acinclude.m4 ./acinclude.m4
--- ../orig-tulip-3.1.1/acinclude.m4	2009-01-21 11:56:56.000000000 +0100
+++ ./acinclude.m4	2009-03-05 16:59:05.000000000 +0100
@@ -368,10 +368,10 @@
 then
 gl_libdirs="$GLDIR $ac_gl_libraries $GLLIB /usr/X11R6/lib /usr/lib /usr/local/lib $x_libraries "
 else
-gl_libdirs="$ac_gl_libraries $GLLIB /usr/X11R6/lib /usr/lib /usr/local/lib $x_libraries "
+gl_libdirs="$ac_gl_libraries $GLLIB /usr/X11R6/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib /usr/lib /usr/local/lib $x_libraries "
 fi
 
-test -n "$GLDIR" && gl_libdirs="$GLDIR/lib $GLDIR $gl_libdirs"
+test -n "$GLDIR" && gl_libdirs="$GLDIR/lib64 $GLDIR/lib $GLDIR $gl_libdirs"
 test=NONE
 gl_libdir=NONE
 for dir in $gl_libdirs; do
@@ -383,6 +383,7 @@
 fi
   if test=`eval $try 2> /dev/null`; then 
     gl_libdir=$dir
+    break
   else 
     echo "tried $dir" >&AC_FD_CC
   fi
@@ -484,8 +485,8 @@
 dnl we add QT_NO_DEBUG to enable the widgets plugins integration in Qt designer
 QT_CPPFLAGS="$QT_CPPFLAGS -DQT_NO_DEBUG"
 
-qt_libdirs="$ac_qt_libraries ${QTDIR}/lib /usr/lib/qt4/lib /usr/local/lib/qt/lib /usr/lib/ /usr/lib64 /usr/local/lib/"
-test -n "${QTDIR}" && qt_libdirs="${QTDIR}/lib ${QTDIR} $qt_libdirs"
+qt_libdirs="$ac_qt_libraries ${QTDIR}/lib64 /usr/lib64/qt4/lib /usr/local/lib64/qt/lib /usr/lib64 /usr/local/lib64 ${QTDIR}/lib /usr/lib/qt4/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
@@ -558,7 +559,7 @@
       fi
     fi
   else
-    LIB_QT_ASSISTANT="-L${QTDIR}/lib -lQtAssistantClient"
+    LIB_QT_ASSISTANT="-L${QTDIR}/lib64 -L${QTDIR}/lib -lQtAssistantClient"
     LIB_QT="-lQtCore -lQtGui -lQtOpenGL -lQtXml -lQtNetwork"
   fi
 fi
@@ -613,7 +614,7 @@
 AC_DEFUN([AC_PATH_QT_MOC],
 [
    FIND_PATH(moc, MOC, [$ac_qt_bindir ${QTDIR}/bin ${QTDIR}/src/moc \
-	    /usr/bin /usr/X11R6/bin /usr/lib/qt4/bin \
+	    /usr/bin /usr/X11R6/bin /usr/lib64/qt4/bin /usr/lib/qt4/bin \
 	    /usr/local/qt/bin], [MOC_ERROR_MESSAGE])
  
    if test -z "$MOC"; then
@@ -629,7 +630,7 @@
    else
      $MOC -v 2>&1 | grep 'Qt 4' > /dev/null
      if test $? -eq 1; then
-       qt_bin_dirs="$ac_qt_bindir ${QTDIR}/bin ${QTDIR}/src/moc /usr/bin /usr/X11R6/bin /usr/lib/qt4/bin /usr/local/qt/bin ";
+       qt_bin_dirs="$ac_qt_bindir ${QTDIR}/bin ${QTDIR}/src/moc /usr/bin /usr/X11R6/bin /usr/lib64/qt4/bin /usr/lib/qt4/bin /usr/local/qt/bin ";
        AC_FIND_FILE(moc-qt4, $qt_bin_dirs, qt_bin_dir)
        MOC=$qt_bin_dir/moc-qt4
        if test ! -x $MOC; then
@@ -650,7 +651,7 @@
 AC_DEFUN([AC_PATH_QT_RCC],
 [
    FIND_PATH(rcc, RCC, [$ac_qt_bindir ${QTDIR}/bin ${QTDIR}/src/rcc \
-	    /usr/bin /usr/X11R6/bin /usr/lib/qt4/bin \
+	    /usr/bin /usr/X11R6/bin /usr/lib64/qt4/bin /usr/lib/qt4/bin \
 	    /usr/local/qt/bin], [RCC_ERROR_MESSAGE])
  
    if test -z "$RCC"; then
@@ -670,7 +671,7 @@
 AC_DEFUN([AC_PATH_QT_UIC],
 [
    FIND_PATH(uic, UIC, [$ac_qt_bindir ${QTDIR}/bin ${QTDIR}/src/uic \
-             /usr/bin /usr/X11R6/bin /usr/lib/qt/bin /usr/lib/qt4/bin\
+             /usr/bin /usr/X11R6/bin /usr/lib64/qt/bin /usr/lib/qt/bin /usr/lib64/qt4/bin /usr/lib/qt4/bin\
 	     /usr/local/qt/bin], [UIC_ERROR_MESSAGE])
    if test -z "$UIC"; then
      if test -n "$ac_cv_path_uic"; then
@@ -685,7 +686,7 @@
    fi
    $UIC -version 2>&1 | grep "version 4" > /dev/null
    if test $? -eq 1; then
-     qt_bin_dirs="$ac_qt_bindir ${QTDIR}/bin ${QTDIR}/src/moc /usr/bin /usr/X11R6/bin /usr/lib/qt4/bin /usr/local/qt/bin ";
+     qt_bin_dirs="$ac_qt_bindir ${QTDIR}/bin ${QTDIR}/src/moc /usr/bin /usr/X11R6/bin /usr/lib64/qt4/bin /usr/lib/qt4/bin /usr/local/qt/bin ";
      AC_FIND_FILE(uic-qt4, $qt_bin_dirs, qt_bin_dir)
      UIC=$qt_bin_dir/uic-qt4
      if test ! -x $UIC; then
diff -wruN ../orig-tulip-3.1.1/configure.in ./configure.in
--- ../orig-tulip-3.1.1/configure.in	2009-01-22 12:38:20.000000000 +0100
+++ ./configure.in	2009-03-02 11:38:29.000000000 +0100
@@ -118,7 +118,6 @@
 case "`uname -s`" in
     *win32* | *WIN32* | *mingw* | *MINGW32*)
 	 VAR_WIN32=1
-	 AC_LIBTOOL_WIN32_DLL
 	 WIN_VERSION=`echo ${MAJOR_VERSION}-${MINOR_VERSION}`
 	 WIN_EXE_VERSION=`echo ${VERSION} | tr . _`
 	 AC_SUBST(WIN_VERSION)
diff -wruN ../orig-tulip-3.1.1/library/tulip/src/TlpTools.cpp ./library/tulip/src/TlpTools.cpp
--- ../orig-tulip-3.1.1/library/tulip/src/TlpTools.cpp	2009-01-22 14:05:18.000000000 +0100
+++ ./library/tulip/src/TlpTools.cpp	2009-03-06 10:39:58.000000000 +0100
@@ -67,8 +67,12 @@
       // one dir up to initialize the lib dir
       char *last = strrchr(appDirPath, '/');
       last[1] = 0;
+#if __WORDSIZE == 64
+      TulipLibDir = std::string(appDirPath) + "lib64";
+#else
       TulipLibDir = std::string(appDirPath) + "lib";
 #endif
+#endif
     } else
       TulipLibDir=string(_TULIP_LIB_DIR);
   }
diff -wruN ../orig-tulip-3.1.1/software/plugins-manager/server/src/ServerGenerator.cpp ./software/plugins-manager/server/src/ServerGenerator.cpp
--- ../orig-tulip-3.1.1/software/plugins-manager/server/src/ServerGenerator.cpp	2009-01-22 14:05:30.000000000 +0100
+++ ./software/plugins-manager/server/src/ServerGenerator.cpp	2009-03-06 10:32:40.000000000 +0100
@@ -106,7 +106,11 @@
     QStringList pluginsDocs = pluginsDocDir.entryList(filters);
     QString fileName = QString((*it).fileName.c_str());
     QString libName = fileName.split("-").first();
+#if __WORDSIZE == 64
+    libName=libName.split("lib64").last();
+#else
     libName=libName.split("lib").last();
+#endif
     //cout << "lib name : " << libName.toStdString() << endl;
   
     QList<QString>::iterator iter = pluginsDocs.begin();

Places

File tulip-3.1.1.dif of Package tulip (Revision 230e8af6f8f32f2b5bc78396c852cc85)

Places