rev 10471 - in kde-extras/kmplayer/branches/experimental/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Mon May 5 10:22:05 UTC 2008


Author: fabo
Date: 2008-05-05 10:22:05 +0000 (Mon, 05 May 2008)
New Revision: 10471

Modified:
   kde-extras/kmplayer/branches/experimental/debian/control
   kde-extras/kmplayer/branches/experimental/debian/patches/97_fix_target_link_libraries.diff
   kde-extras/kmplayer/branches/experimental/debian/rules
Log:
* Build with cairo and npp.
* Adjust build dependencies.
* Update target_link_libraries patch.


Modified: kde-extras/kmplayer/branches/experimental/debian/control
===================================================================
--- kde-extras/kmplayer/branches/experimental/debian/control	2008-05-05 09:13:01 UTC (rev 10470)
+++ kde-extras/kmplayer/branches/experimental/debian/control	2008-05-05 10:22:05 UTC (rev 10471)
@@ -4,7 +4,7 @@
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
 Build-Depends: cdbs, debhelper (>= 6), cmake, quilt, kdelibs5-dev, libphonon-dev,
- libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libx11-dev, libxt-dev
+ libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libgtk2.0-dev, libx11-dev, libxt-dev
 Standards-Version: 3.7.3
 Homepage: http://kmplayer.kde.org
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kmplayer/?op=log

Modified: kde-extras/kmplayer/branches/experimental/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- kde-extras/kmplayer/branches/experimental/debian/patches/97_fix_target_link_libraries.diff	2008-05-05 09:13:01 UTC (rev 10470)
+++ kde-extras/kmplayer/branches/experimental/debian/patches/97_fix_target_link_libraries.diff	2008-05-05 10:22:05 UTC (rev 10471)
@@ -1,6 +1,17 @@
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -68,6 +68,7 @@
+@@ -59,15 +59,15 @@
+ SET_TARGET_PROPERTIES(kmplayercommon PROPERTIES COMPILE_FLAGS
+     "${CAIROCflags} ${GLibDBusCflags}")
+ 
+-SET_TARGET_PROPERTIES(kmplayercommon PROPERTIES LINK_FLAGS
+-    "${CAIROLinkFlags} ${GLibDBusLinkFlags}"
+-)
+ target_link_libraries(kmplayercommon
++  ${CAIROLinkFlags}
++  ${GLibDBusLinkFlags}
+   ${KDE4_KDECORE_LIBS}
+   ${KDE4_KPARTS_LIBS}
    ${KDE4_KDEUI_LIBS}
    ${QT_QT3SUPPORT_LIBRARY}
    ${KDE4_KDE3SUPPORT_LIBRARY}
@@ -8,3 +19,15 @@
    kmediaplayer
  )
  
+@@ -132,9 +132,8 @@
+     SET_TARGET_PROPERTIES(knpplayer PROPERTIES COMPILE_FLAGS
+         "${GLibDBusCflags} ${GTKCflags} ${GThreadCflags}"
+     )
+-    SET_TARGET_PROPERTIES(knpplayer PROPERTIES LINK_FLAGS
+-        "${GLibDBusLinkFlags} ${GTKLinkFlags} ${GThreadLinkFlags}"
+-    )
++
++    target_link_libraries(knpplayer ${GLibDBusLinkFlags} ${GTKLinkFlags} ${GThreadLinkFlags})
+ 
+     install(TARGETS knpplayer DESTINATION ${BIN_INSTALL_DIR})
+ 

Modified: kde-extras/kmplayer/branches/experimental/debian/rules
===================================================================
--- kde-extras/kmplayer/branches/experimental/debian/rules	2008-05-05 09:13:01 UTC (rev 10470)
+++ kde-extras/kmplayer/branches/experimental/debian/rules	2008-05-05 10:22:05 UTC (rev 10471)
@@ -2,3 +2,5 @@
 
 include debian/cdbs/kde.mk
 
+DEB_CMAKE_EXTRA_FLAGS += -DWITH_CAIRO:BOOL=ON -DWITH_NPP:BOOL=ON
+




More information about the pkg-kde-commits mailing list