rev 10271 - in branches/kde4/packages/kdelibs/debian: . patches

Fri Apr 25 20:59:28 UTC 2008

Author: modax-guest
Date: 2008-04-25 20:59:27 +0000 (Fri, 25 Apr 2008)
New Revision: 10271

Added:
   branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff
Removed:
   branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11.diff
Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/kdelibs5-data.install
   branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff
   branches/kde4/packages/kdelibs/debian/patches/series
   branches/kde4/packages/kdelibs/debian/rules
Log:
* New snapshot. 
* --as-needed is an ultimate solution for excess linkage in KDE.

Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================

--- branches/kde4/packages/kdelibs/debian/changelog	2008-04-25 15:28:31 UTC (rev 10270)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-04-25 20:59:27 UTC (rev 10271)
@@ -1,8 +1,10 @@
-kde4libs (4:4.0.71+svn800799-1~pre1) UNRELEASED; urgency=low
+kde4libs (4:4.0.71+svn801160-1~pre1) UNRELEASED; urgency=low
 
   * New upstream development snapshot:
-    - The latest upstream commit is r800799 by dfaure
-    - Date: Thu, 24 Apr 2008 22:03:28 -0000
+    - The latest upstream commit is r801160 by neundorf
+    - Date: Fri, 25 Apr 2008 20:24:01 -0000
+  * Corrections to *.install files:
+    - kdelibs5-data.install: 1 new file(s) added;
 
   +++ Changes by Modestas Vainius:
 
@@ -15,9 +17,10 @@
   * Fix offsets in other patches so they apply cleanly.
   * Move usr/include/KDE/Phonon from kdelibs5-dev to libphonon-dev. Update
     *.install files and Replaces for libphonon-dev appropriately.
-  * Disable --as-needed.
+  * Enhance 19_findqt4_optional_x11.diff patch. Do not implicitly add
+    -lphread.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 25 Apr 2008 01:17:29 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 25 Apr 2008 23:40:24 +0300
 
 kde4libs (4:4.0.70+svn799089-2) experimental; urgency=low
 

Modified: branches/kde4/packages/kdelibs/debian/kdelibs5-data.install
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs5-data.install	2008-04-25 15:28:31 UTC (rev 10270)
+++ branches/kde4/packages/kdelibs/debian/kdelibs5-data.install	2008-04-25 20:59:27 UTC (rev 10271)
@@ -254,6 +254,7 @@
 usr/share/kde4/apps/kcm_componentchooser/kcm_instantmessenger.desktop
 usr/share/kde4/apps/kcm_componentchooser/kcm_ktexteditor.desktop
 usr/share/kde4/apps/kcm_phonon/listview-background.png
+usr/share/kde4/apps/kconf_update/devicepreference.upd
 usr/share/kde4/apps/kconf_update/kcookiescfg.upd
 usr/share/kde4/apps/kconf_update/kded.upd
 usr/share/kde4/apps/kconf_update/kio_help.upd

Deleted: branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11.diff

Added: branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff	                        (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff	2008-04-25 20:59:27 UTC (rev 10271)
@@ -0,0 +1,14 @@
+--- kde4libs-4.0.70+svn798712.orig/cmake/modules/FindQt4.cmake	2008-04-20 19:11:27.000000000 +0000
++++ kde4libs-4.0.70+svn798712/cmake/modules/FindQt4.cmake	2008-04-20 19:11:34.000000000 +0000
+@@ -1341,10 +1341,9 @@
+   IF(UNIX)
+     # on OS X X11 may not be required
+     IF (Q_WS_X11)
+-      FIND_PACKAGE(X11 REQUIRED)
++      FIND_PACKAGE(X11)
+     ENDIF (Q_WS_X11)
+     FIND_PACKAGE(Threads)
+-    SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+   ENDIF(UNIX)
+ 
+ 

Modified: branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff	2008-04-25 15:28:31 UTC (rev 10270)
+++ branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff	2008-04-25 20:59:27 UTC (rev 10271)
@@ -63,7 +63,7 @@
 -target_link_libraries(kde3support  ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBS} ${QT_QTXML_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KFILE_LIBS})
 +target_link_libraries(kde3support  ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBS} ${QT_QTXML_LIBRARY}
 +   ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KFILE_LIBS} ${X11_X11_LIB} )
-+set_target_properties(kde3support PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};kdecore;kparts;kdeui;${QT_QTGUI_LIBRARY};kio;${QT_QT3SUPPORT_LIBRARY}")
++set_target_properties(kde3support PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};kdecore;kdeui;${QT_QTGUI_LIBRARY};kio;${QT_QT3SUPPORT_LIBRARY}")
  
  set_target_properties(kde3support PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS kde3support ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
@@ -226,7 +226,7 @@
 +target_link_libraries(kio ${KDE4_KDEUI_LIBS} ${QT_QTNETWORK_LIBRARY} ${X11_X11_LIB}
 +  ${ZLIB_LIBRARY} ${STRIGI_STREAMANALYZER_LIBRARY} ${KDE4_SOLID_LIBS}
 +  ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} )
-+set_target_properties(kio PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};kdecore;kdeui;${QT_QTGUI_LIBRARY}")
++set_target_properties(kio PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};kdecore;kdeui")
  
  
  set(SYS_INOTIFY_H_FOUND 0)
@@ -474,7 +474,7 @@
  kde4_add_library(${KJSEMBEDLIBNAME} SHARED ${kjsembed_LIB_SRCS})
  
  target_link_libraries(${KJSEMBEDLIBNAME} ${KDE4_KDECORE_LIBS} ${QT_QTUITOOLS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTCORE_LIBRARY} ${KJSLIBNAME} )
-+set_target_properties(${KJSEMBEDLIBNAME} PROPERTIES LINK_INTERFACE_LIBRARIES ${KJSLIBNAME} ${QT_QTCORE_LIBRARY}) 
++set_target_properties(${KJSEMBEDLIBNAME} PROPERTIES LINK_INTERFACE_LIBRARIES "${KJSLIBNAME};${QT_QTCORE_LIBRARY}") 
  
  set_target_properties(${KJSEMBEDLIBNAME} PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS ${KJSEMBEDLIBNAME} ${INSTALL_TARGETS_DEFAULT_ARGS})

Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series	2008-04-25 15:28:31 UTC (rev 10270)
+++ branches/kde4/packages/kdelibs/debian/patches/series	2008-04-25 20:59:27 UTC (rev 10271)
@@ -8,6 +8,6 @@
 15_kfreebsd_support.diff
 17_findservicebydesktoppath_try_realfilepath.diff
 18_always_set_cmake_policy.diff
-19_findqt4_optional_x11.diff
+19_findqt4_optional_x11_pthread.diff
 97_use_imported_targets_with_cmake26.diff
 98_link_interface_libraries.diff

Modified: branches/kde4/packages/kdelibs/debian/rules
===================================================================
--- branches/kde4/packages/kdelibs/debian/rules	2008-04-25 15:28:31 UTC (rev 10270)
+++ branches/kde4/packages/kdelibs/debian/rules	2008-04-25 20:59:27 UTC (rev 10271)
@@ -14,8 +14,5 @@
 # remove the dependency on kdebase-runtime
 DEB_DH_SHLIBDEPS_ARGS_ALL := -- -xkdebase-runtime
 
-# Disable --as-needed. KDELibs is pretty clean now.
-DEB_KDE_LINK_WITH_AS_NEEDED := no
-
 include debian/cdbs/kde.mk
 


