[med-svn] r9141 - trunk/packages/sofa-framework/trunk/debian/patches

[Andreas Tille]

Author: tille
Date: 2012-01-02 21:58:20 +0000 (Mon, 02 Jan 2012)
New Revision: 9141

Modified:
   trunk/packages/sofa-framework/trunk/debian/patches/30_use_debian_packaged_libraries.patch
Log:
Apply Eric's patches to build Modeller but fails building Plugin Examples


Modified: trunk/packages/sofa-framework/trunk/debian/patches/30_use_debian_packaged_libraries.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/30_use_debian_packaged_libraries.patch	2012-01-02 21:39:56 UTC (rev 9140)
+++ trunk/packages/sofa-framework/trunk/debian/patches/30_use_debian_packaged_libraries.patch	2012-01-02 21:58:20 UTC (rev 9141)
@@ -61,3 +61,44 @@
 +++ sofa-1.0-rc1/features/sofa/QGLViewer.prf
 @@ -0,0 +1 @@
 +LIBS *= -lqglviewer-qt4
+--- sofa-framework-1.0~rc1.orig/applications/projects/Modeler/exec/exec.pro
++++ sofa-framework-1.0~rc1/applications/projects/Modeler/exec/exec.pro
+@@ -8,6 +8,12 @@
+ INCLUDEPATH += $$BUILD_DIR/../lib/$$UI_DIR # HACK: some uic generated headers are generated in another .pro
+ DEPENDPATH += $$BUILD_DIR/../lib/$$UI_DIR # HACK: some uic generated headers are generated in another .pro
+ 
++contains (DEFINES, SOFA_QT4) {
++  QT *= qt3support
++  DEFINES *= QT3_SUPPORT
++  LIBS *= -lQt3Support -lQtGui -lQtCore
++}
++
+ macx : {
+ 	CONFIG +=app_bundle
+ 	RC_FILE = Modeler.icns
+--- sofa-framework-1.0~rc1.orig/applications/projects/Modeler/lib/lib.pro
++++ sofa-framework-1.0~rc1/applications/projects/Modeler/lib/lib.pro
+@@ -41,8 +41,9 @@
+ 	           QCategoryTreeLibrary.cpp \ 
+ 	           QComponentTreeLibrary.cpp
+                      
+-	CONFIG += qt uic uic3
+-	QT += qt3support xml
++	CONFIG *= qt uic uic3
++	QT *= qt3support xml
++	DEFINES *= QT3_SUPPORT
+ 	FORMS3 += Modeler.ui 
+ 	FORMS3 += DialogAddPreset.ui
+ 	FORMS3 += ../../../sofa/gui/qt/PluginManager.ui
+--- sofa-framework-1.0~rc1.orig/applications/sofa/gui/qt/qt.pro
++++ sofa-framework-1.0~rc1/applications/sofa/gui/qt/qt.pro
+@@ -11,7 +11,8 @@
+ 
+ contains(DEFINES, SOFA_QT4) {	
+ 	CONFIG += qt uic uic3
+-	QT += opengl qt3support xml
++	QT *= opengl qt3support xml
++	DEFINES *= QT3_SUPPORT
+ 
+ 	FORMS3 += GUI.ui
+ 	FORMS3 += BaseGenGraphForm.ui