[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/trinity/kdenetwork
From:       Timothy Pearson <kb9vqf () pearsoncomputing ! net>
Date:       2011-10-29 2:11:46
Message-ID: 20111029021146.20BE7AC889 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1261216 by tpearson:

Fix kdenetwork FTBFS on Fedora 15
Thanks to François Androit for the patch!


 M  +1 -1      kget/CMakeLists.txt  
 M  +8 -0      kopete/ConfigureChecks.cmake  
 M  +1 -1      krdc/CMakeLists.txt  
 M  +1 -1      krfb/krfb/CMakeLists.txt  
 M  +1 -1      wifi/CMakeLists.txt  


--- branches/trinity/kdenetwork/kget/CMakeLists.txt #1261215:1261216
@@ -46,6 +46,6 @@
     dlgIndividual.cpp dlgDirectories.cpp dlgConnection.cpp
     dlgAutomation.cpp dlgAdvanced.cpp main.cpp dockindividual.cpp
     kget_iface.skel safedelete.cpp
-  LINK kio-shared
+  LINK kio-shared Xext
   DESTINATION ${BIN_INSTALL_DIR}
 )
--- branches/trinity/kdenetwork/kopete/ConfigureChecks.cmake #1261215:1261216
@@ -18,3 +18,11 @@
     tde_message_fatal( "glib-2.0 is required, but was not found on your system" )
   endif( )
 endif( )
+
+# -- Check for libv4l1-videodev.h presence --------------------
+CHECK_INCLUDE_FILE ( "libv4l1-videodev.h" HAVE_LIBV4L1_VIDEODEV_H )
+if ( HAVE_LIBV4L1_VIDEODEV_H )
+  add_definitions( -DHAVE_LIBV4L1_VIDEODEV_H )
+endif ( )
+# -- End libv4l1-videodev.h ----------------------------------------------
+
--- branches/trinity/kdenetwork/krdc/CMakeLists.txt #1261215:1261216
@@ -60,6 +60,6 @@
     maindialogbase.ui keycapturewidget.ui kservicelocator.cpp
     keycapturedialog.cpp kremoteview.cpp smartptr.cpp hostpreferences.cpp
     preferencesdialog.cpp maindialogwidget.cpp maindialog.cpp
-  LINK vnc-static rdp-static kdeui-shared kdnssd-shared kwalletclient-shared
+  LINK vnc-static rdp-static kdeui-shared kdnssd-shared kwalletclient-shared jpeg \
Xext  DESTINATION ${BIN_INSTALL_DIR}
 )
--- branches/trinity/kdenetwork/krfb/krfb/CMakeLists.txt #1261215:1261216
@@ -39,7 +39,7 @@
     rfbcontroller.cc xupdatescanner.cc main.cpp connectionwidget.ui
     krfbifaceimpl.cc krfbiface.skel trayicon.cpp connectiondialog.cc
   LINK
-    krfbconfig-static vncserver-static srvloc-static kdeui-shared kio-shared \
${XTST_LIBRARIES} +    krfbconfig-static vncserver-static srvloc-static kdeui-shared \
kio-shared jpeg Xext pthread ${XTST_LIBRARIES}  DESTINATION ${BIN_INSTALL_DIR}
 )
 
--- branches/trinity/kdenetwork/wifi/CMakeLists.txt #1261215:1261216
@@ -29,7 +29,7 @@
 )
 
 if( WITH_ARTS )
-  set( ARTS_LIBRARIES artsflow;mcop )
+  set( ARTS_LIBRARIES artsflow;artsflow_idl;mcop )
 endif( )
 
 


[prev in list] [next in list] [prev in thread] [next in thread]