rev 15715 - kde-extras/gtk-qt-engine/trunk/debian/patches

Fathi Boudra fabo at alioth.debian.org
Fri Aug 21 14:54:00 UTC 2009


Author: fabo
Date: 2009-08-21 14:53:59 +0000 (Fri, 21 Aug 2009)
New Revision: 15715

Modified:
   kde-extras/gtk-qt-engine/trunk/debian/patches/01_fix_out_of_source_build.diff
   kde-extras/gtk-qt-engine/trunk/debian/patches/02_change_desktop_file_installation.diff
   kde-extras/gtk-qt-engine/trunk/debian/patches/06_no_bonobo.patch
Log:
refreshed.


Modified: kde-extras/gtk-qt-engine/trunk/debian/patches/01_fix_out_of_source_build.diff
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/patches/01_fix_out_of_source_build.diff	2009-08-21 14:30:28 UTC (rev 15714)
+++ kde-extras/gtk-qt-engine/trunk/debian/patches/01_fix_out_of_source_build.diff	2009-08-21 14:53:59 UTC (rev 15715)
@@ -5,13 +5,13 @@
 --- a/kcm_gtk/CMakeLists.txt
 +++ b/kcm_gtk/CMakeLists.txt
 @@ -16,7 +16,7 @@ KDE4_ADD_UI_FILES(kcm_gtk4_SOURCES ${kcm
-
+ 
  KDE4_ADD_PLUGIN(kcm_gtk4 ${kcm_gtk4_SOURCES})
-
+ 
 -INCLUDE_DIRECTORIES(${KDE4_INCLUDE_DIR})
 +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR})
  LINK_DIRECTORIES(${KDE4_LIB_DIR})
-
+ 
  TARGET_LINK_LIBRARIES(kcm_gtk4 ${KDE4_KDECORE_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
 --- a/po/CMakeLists.txt
 +++ b/po/CMakeLists.txt
@@ -20,24 +20,24 @@
 +FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt)
 +
  FILE(GLOB _pofiles *.po)
-
+ 
 -FOREACH(_file ${_pofiles})
 -	GET_FILENAME_COMPONENT(_file_we ${_file} NAME_WE)
 -	SET(_out "${_file_we}.gmo")
 -	SET(_in "${_file_we}.po")
--
+-	
 -	ADD_CUSTOM_COMMAND(
 -		OUTPUT ${_out}
 -		COMMAND ${MSGFMT_EXECUTABLE} -o ${_out} ${_in}
 -		DEPENDS ${_in}
 -	)
--
+-	
 -	INSTALL(
 -		FILES ${_out}
 -		DESTINATION share/locale/${_file_we}/LC_MESSAGES/
 -		RENAME gtkqtengine.mo
 -	)
--
+-	
 -	SET(_outputs ${_outputs} ${_out})
 -ENDFOREACH(_file)
 -

Modified: kde-extras/gtk-qt-engine/trunk/debian/patches/02_change_desktop_file_installation.diff
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/patches/02_change_desktop_file_installation.diff	2009-08-21 14:30:28 UTC (rev 15714)
+++ kde-extras/gtk-qt-engine/trunk/debian/patches/02_change_desktop_file_installation.diff	2009-08-21 14:53:59 UTC (rev 15715)
@@ -5,11 +5,11 @@
 --- a/kcm_gtk/CMakeLists.txt
 +++ b/kcm_gtk/CMakeLists.txt
 @@ -28,7 +28,7 @@ INSTALL(
-
+ 
  INSTALL(
  	FILES kcmgtk4.desktop
 -	DESTINATION ${XDG_APPS_INSTALL_DIR}
 +	DESTINATION ${SERVICES_INSTALL_DIR}
  )
-
+ 
  INSTALL(

Modified: kde-extras/gtk-qt-engine/trunk/debian/patches/06_no_bonobo.patch
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/patches/06_no_bonobo.patch	2009-08-21 14:30:28 UTC (rev 15714)
+++ kde-extras/gtk-qt-engine/trunk/debian/patches/06_no_bonobo.patch	2009-08-21 14:53:59 UTC (rev 15715)
@@ -9,7 +9,7 @@
 @@ -13,15 +13,8 @@ ENDIF (NOT GTK_INCLUDE_DIR)
  MESSAGE(STATUS "Found GTK include dir: ${GTK_INCLUDE_DIR}")
  MESSAGE(STATUS "Found GTK library dir: ${GTK_LIB_DIR}")
-
+ 
 -# Find Bonobo
 -PKGCONFIG(libbonoboui-2.0 BONOBO_INCLUDE_DIR BONOBO_LIB_DIR BONOBO_LINK_FLAGS BONOBO_CFLAGS)
 -IF (NOT BONOBO_INCLUDE_DIR)
@@ -21,6 +21,6 @@
 -ENDIF (NOT BONOBO_INCLUDE_DIR)
 +# Don't find Bonobo
 +MESSAGE(STATUS "Bonobo has been disabled on purpose for Debian because it is deprecated and pulls too much of Gnome.")
-
+ 
  # Find msgfmt
  SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules)




More information about the pkg-kde-commits mailing list