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

List:       kde-commits
Subject:    extragear/multimedia/kmplayer
From:       Koos Vriezen <koos.vriezen () gmail ! com>
Date:       2012-03-03 14:47:39
Message-ID: 20120303144739.57DFCAC896 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1283397 by vriezen:

gcc-4.7 compilation, build against more recent glib and data perm fixes

Patches from Orcan Ogetbil

 M  +1 -0      CMakeLists.txt  
 M  +3 -3      src/CMakeLists.txt  
 M  +1 -1      src/kmplayerplaylist.h  
 M  +1 -1      src/npplayer.cpp  


--- trunk/extragear/multimedia/kmplayer/CMakeLists.txt #1283396:1283397
@@ -34,6 +34,7 @@
 
   if (KMPLAYER_BUILT_WITH_NPP)
     PKGCONFIG(dbus-glib-1 GLibDBusIncDir GLibDBusLinkDir GLibDBusLinkFlags \
GLibDBusCflags) +    PKGCONFIG(gmodule-2.0 GModuleIncDir GModuleLinkDir \
GModuleLinkFlags GModuleCflags)  
     if (GLibDBusCflags)
       set(KMPLAYER_WITH_GDBUS 1)
--- trunk/extragear/multimedia/kmplayer/src/CMakeLists.txt #1283396:1283397
@@ -132,7 +132,7 @@
 
 install(TARGETS kmplayer ${INSTALL_TARGETS_DEFAULT_ARGS})
 
-install(PROGRAMS kmplayer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(FILES kmplayer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
 
 #qt4_add_dbus_interface(kmplayer_SRCS org.kde.Konqueror.Main.xml kmplayer_interface)
 
@@ -145,10 +145,10 @@
     add_executable(knpplayer ${knpplayer_SRCS})
 
     SET_TARGET_PROPERTIES(knpplayer PROPERTIES COMPILE_FLAGS
-        "${GLibDBusCflags} ${GTKCflags} ${GThreadCflags} ${KMPLAYER_SCRIPTABLE}"
+        "${GLibDBusCflags} ${GTKCflags} ${GThreadCflags}  ${GModuleCflags} \
${KMPLAYER_SCRIPTABLE}"  )
 
-    target_link_libraries(knpplayer ${GLibDBusLinkFlags} ${GTKLinkFlags} \
${GThreadLinkFlags} +    target_link_libraries(knpplayer ${GLibDBusLinkFlags} \
${GTKLinkFlags} ${GThreadLinkFlags  ${GModuleLinkFlags}}  ${X11_X11_LIB} )
 
     install(TARGETS knpplayer ${INSTALL_TARGETS_DEFAULT_ARGS})
--- trunk/extragear/multimedia/kmplayer/src/kmplayerplaylist.h #1283396:1283397
@@ -40,7 +40,7 @@
 namespace KMPlayer {
 
 class Document;
-class Node;
+class KMPLAYER_EXPORT Node;
 class TextNode;
 class Posting;
 class Mrl;
--- trunk/extragear/multimedia/kmplayer/src/npplayer.cpp #1283396:1283397
@@ -32,7 +32,7 @@
 #include <fcntl.h>
 
 #include <glib/gprintf.h>
-#include <glib/gthread.h>
+#include <glib.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 


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