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

List:       kde-commits
Subject:    KDE/kdepim/mobile/calendar
From:       Sergio Luis Martins <iamsergio () gmail ! com>
Date:       2010-12-03 20:07:08
Message-ID: 20101203200708.80A07AC8A4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1203384 by smartins:

Don't use an hardcoded path in korganizer-mobile.sh.
KDBusServiceStarter will call whatever is in korganizer-mobile.desktop, which \
currently is korganizer-mobile.sh, without this fix, starting korg-mobile would only \
work on maemo, or any other environment that installs kde in /usr/bin. Use PROGRAMS \
instead of FILES.

 M  +3 -1      CMakeLists.txt  
 MM +1 -2      korganizer-mobile.sh  
 A             korganizer-mobile.sh.cmake  


--- trunk/KDE/kdepim/mobile/calendar/CMakeLists.txt #1203383:1203384
@@ -66,8 +66,10 @@
   target_link_libraries(korganizer-mobile akonadi_serializer_addressee \
akonadi_serializer_contactgroup akonadi_serializer_kcalcore akonadi_serializer_mail)  \
endif (RUNTIME_PLUGINS_STATIC)  
+configure_file(korganizer-mobile.sh.cmake \
${CMAKE_CURRENT_BINARY_DIR}/korganizer-mobile.sh) +
 install(TARGETS korganizer-mobile ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES korganizer-mobile.sh DESTINATION ${BIN_INSTALL_DIR})
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/korganizer-mobile.sh DESTINATION \
${BIN_INSTALL_DIR})  install(PROGRAMS korganizer-mobile.desktop DESTINATION \
${XDG_APPS_INSTALL_DIR})  install(FILES
   BulkActionComponent.qml
--- trunk/KDE/kdepim/mobile/calendar/korganizer-mobile.sh #1203383:1203384
@@ -8,5 +8,4 @@
 	export LD_LIBRARY_PATH=$QT_DIR:$LD_LIBRARY_PATH
 fi
 
-# PLEASE MAKE SURE THAT THIS LINE POINTS TO /usr/bin/korganizer-mobile ON MAEMO
-/usr/bin/korganizer-mobile --graphicssystem raster
+/data/installation/kde/trunk/bin/korganizer-mobile --graphicssystem raster


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