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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/context
From:       Seb Ruiz <ruiz () kde ! org>
Date:       2008-11-07 10:39:26
Message-ID: 1226054366.267162.11347.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 881039 by seb:

Don't overwrite plasma files. Since Amarok is using plasma trunk, this causes big \
problems for users with KDE 4.1 plasma installed. For anybody that has suffered at \
the hands of this indiscretion, you'll have to manually uninstall amarok, then \
replace your original plasma installation from your package manager. A big sideeffect \
of this fix is that Amarok-plasma probably won't work for anyone with no plasma \
                installation. We need to resolve this.
CCMAIL: vianasw@gmail.com
CCMAIL: lfranchi@kde.org
BUG: 174389


 M  +20 -17    CMakeLists.txt  


--- trunk/extragear/multimedia/amarok/src/context/CMakeLists.txt #881038:881039
@@ -131,28 +131,31 @@
 install(TARGETS amarokplasma ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 find_package(Plasma)
-if(NOT PLASMA_FOUND)
-install(FILES
-    plasma/servicetypes/plasma-animator.desktop
-    plasma/servicetypes/plasma-applet.desktop
-    plasma/servicetypes/plasma-dataengine.desktop
-    plasma/servicetypes/plasma-runner.desktop
-    plasma/servicetypes/plasma-scriptengine.desktop
-    plasma/servicetypes/plasma-containment.desktop
-    DESTINATION ${SERVICETYPES_INSTALL_DIR})
 
-set(default_animator_SRCS
-    animators/default/defaultAnimator.cpp
-   )
+# The following "installation" breaks plasma installations which do not match \
Amarok's plasma version exactly. +# Notable side effects include: no desktop \
background, failure to load data engines etc. +#if(NOT PLASMA_FOUND)
+#install(FILES
+#    plasma/servicetypes/plasma-animator.desktop
+#    plasma/servicetypes/plasma-applet.desktop
+#    plasma/servicetypes/plasma-dataengine.desktop
+#    plasma/servicetypes/plasma-runner.desktop
+#    plasma/servicetypes/plasma-scriptengine.desktop
+#    plasma/servicetypes/plasma-containment.desktop
+#    DESTINATION ${SERVICETYPES_INSTALL_DIR})
 
-kde4_add_plugin(plasma_animator_default ${default_animator_SRCS})
-target_link_libraries(plasma_animator_default ${KDE4_KDECORE_LIBS} amarokplasma)
+#set(default_animator_SRCS
+#    animators/default/defaultAnimator.cpp
+#   )
 
-install(TARGETS plasma_animator_default DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES animators/default/plasma-animator-default.desktop DESTINATION \
${SERVICES_INSTALL_DIR} ) +#kde4_add_plugin(plasma_animator_default \
${default_animator_SRCS}) +#target_link_libraries(plasma_animator_default \
${KDE4_KDECORE_LIBS} amarokplasma)  
-endif(NOT PLASMA_FOUND)
+#install(TARGETS plasma_animator_default DESTINATION ${PLUGIN_INSTALL_DIR})
+#install(FILES animators/default/plasma-animator-default.desktop DESTINATION \
${SERVICES_INSTALL_DIR} )  
+#endif(NOT PLASMA_FOUND)
+
 ########### next target ###############
 
 set(amarokpud_LIB_SRCS


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