rev 11694 - branches/kde4/packages/kdelibs/debian/patches
Ana Beatriz Guerrero López
ana at alioth.debian.org
Thu Jul 24 01:23:34 UTC 2008
Author: ana
Date: 2008-07-24 01:23:34 +0000 (Thu, 24 Jul 2008)
New Revision: 11694
Modified:
branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff
branches/kde4/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
branches/kde4/packages/kdelibs/debian/patches/90_reduced_linking.diff
Log:
refresh patches
Modified: branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff 2008-07-24 01:22:22 UTC (rev 11693)
+++ branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff 2008-07-24 01:23:34 UTC (rev 11694)
@@ -4,11 +4,9 @@
of twenty seconds with this define e.g. because of enabled caching of unknown
icons.
Debug output is not completely disabled, because QT_NO_DEBUG is not set.
-Index: b/cmake/modules/FindKDE4Internal.cmake
-===================================================================
---- a/cmake/modules/FindKDE4Internal.cmake
-+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -912,11 +912,13 @@
+--- kde4libs-4.1.0.orig/cmake/modules/FindKDE4Internal.cmake
++++ kde4libs-4.1.0/cmake/modules/FindKDE4Internal.cmake
+@@ -948,11 +948,13 @@
set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
Modified: branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff 2008-07-24 01:22:22 UTC (rev 11693)
+++ branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff 2008-07-24 01:23:34 UTC (rev 11694)
@@ -1,8 +1,6 @@
-Index: b/cmake/modules/FindQt4.cmake
-===================================================================
---- a/cmake/modules/FindQt4.cmake
-+++ b/cmake/modules/FindQt4.cmake
-@@ -1434,10 +1434,9 @@
+--- kde4libs-4.1.0.orig/cmake/modules/FindQt4.cmake
++++ kde4libs-4.1.0/cmake/modules/FindQt4.cmake
+@@ -1430,10 +1430,9 @@
IF(UNIX)
# on OS X X11 may not be required
IF (Q_WS_X11)
Modified: branches/kde4/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff 2008-07-24 01:22:22 UTC (rev 11693)
+++ branches/kde4/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff 2008-07-24 01:23:34 UTC (rev 11694)
@@ -1,6 +1,6 @@
---- kde4libs-4.0.84+svn828171.orig/kdecore/kernel/kstandarddirs.cpp
-+++ kde4libs-4.0.84+svn828171/kdecore/kernel/kstandarddirs.cpp
-@@ -1011,6 +1011,10 @@
+--- kde4libs-4.1.0.orig/kdecore/kernel/kstandarddirs.cpp
++++ kde4libs-4.1.0/kdecore/kernel/kstandarddirs.cpp
+@@ -1010,6 +1010,10 @@
if ((local || testdir.exists()) && !candidates.contains(path))
candidates.append(path);
}
Modified: branches/kde4/packages/kdelibs/debian/patches/90_reduced_linking.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/90_reduced_linking.diff 2008-07-24 01:22:22 UTC (rev 11693)
+++ branches/kde4/packages/kdelibs/debian/patches/90_reduced_linking.diff 2008-07-24 01:23:34 UTC (rev 11694)
@@ -1,5 +1,5 @@
---- kde4libs-4.0.84+svn828171.orig/khtml/CMakeLists.txt
-+++ kde4libs-4.0.84+svn828171/khtml/CMakeLists.txt
+--- kde4libs-4.1.0.orig/khtml/CMakeLists.txt
++++ kde4libs-4.1.0/khtml/CMakeLists.txt
@@ -336,7 +336,8 @@
target_link_libraries(khtml ${KDE4_KPARTS_LIBS} ktexteditor kjs ${KDE4_PHONON_LIBS} ${JPEG_LIBRARIES} ${GIF_LIBRARIES} ${PNG_LIBRARIES} ${X11_LIBRARIES})
@@ -10,8 +10,8 @@
set(CREATE_HASH_TABLE ${CMAKE_SOURCE_DIR}/kjs/create_hash_table )
---- kde4libs-4.0.84+svn828171.orig/kde3support/CMakeLists.txt
-+++ kde4libs-4.0.84+svn828171/kde3support/CMakeLists.txt
+--- kde4libs-4.1.0.orig/kde3support/CMakeLists.txt
++++ kde4libs-4.1.0/kde3support/CMakeLists.txt
@@ -81,7 +81,8 @@
target_link_libraries(kde3support ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBS} ${QT_QTXML_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KFILE_LIBS} ${X11_LIBRARIES})
@@ -22,8 +22,8 @@
install(TARGETS kde3support ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs-4.0.84+svn828171.orig/kfile/CMakeLists.txt
-+++ kde4libs-4.0.84+svn828171/kfile/CMakeLists.txt
+--- kde4libs-4.1.0.orig/kfile/CMakeLists.txt
++++ kde4libs-4.1.0/kfile/CMakeLists.txt
@@ -40,7 +40,8 @@
)
@@ -34,8 +34,8 @@
install(TARGETS kfile ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs-4.0.84+svn828171.orig/kross/core/CMakeLists.txt
-+++ kde4libs-4.0.84+svn828171/kross/core/CMakeLists.txt
+--- kde4libs-4.1.0.orig/kross/core/CMakeLists.txt
++++ kde4libs-4.1.0/kross/core/CMakeLists.txt
@@ -13,7 +13,8 @@
kde4_add_library(krosscore SHARED ${krosscore_LIB_SRCS})
target_link_libraries(krosscore ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTXML_LIBRARY})
@@ -46,8 +46,8 @@
install(TARGETS krosscore ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs-4.0.84+svn828171.orig/kross/ui/CMakeLists.txt
-+++ kde4libs-4.0.84+svn828171/kross/ui/CMakeLists.txt
+--- kde4libs-4.1.0.orig/kross/ui/CMakeLists.txt
++++ kde4libs-4.1.0/kross/ui/CMakeLists.txt
@@ -16,7 +16,8 @@
kde4_add_library(krossui SHARED ${krossui_LIB_SRCS})
target_link_libraries(krossui krosscore ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KIO_LIBS})
@@ -58,8 +58,8 @@
install(TARGETS krossui ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs-4.0.84+svn828171.orig/kparts/CMakeLists.txt
-+++ kde4libs-4.0.84+svn828171/kparts/CMakeLists.txt
+--- kde4libs-4.1.0.orig/kparts/CMakeLists.txt
++++ kde4libs-4.1.0/kparts/CMakeLists.txt
@@ -27,7 +27,8 @@
target_link_libraries(kparts ${KDE4_KDECORE_LIBS} kdeui kio)
@@ -70,9 +70,9 @@
install(TARGETS kparts ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs-4.0.84+svn828171.orig/kio/CMakeLists.txt
-+++ kde4libs-4.0.84+svn828171/kio/CMakeLists.txt
-@@ -260,7 +260,8 @@
+--- kde4libs-4.1.0.orig/kio/CMakeLists.txt
++++ kde4libs-4.1.0/kio/CMakeLists.txt
+@@ -267,7 +267,8 @@
endif(X11_Xrender_FOUND)
set_target_properties(kio PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION}
@@ -82,9 +82,9 @@
########### install files ###############
---- kde4libs-4.0.84+svn828171.orig/kdeui/CMakeLists.txt
-+++ kde4libs-4.0.84+svn828171/kdeui/CMakeLists.txt
-@@ -316,8 +316,9 @@
+--- kde4libs-4.1.0.orig/kdeui/CMakeLists.txt
++++ kde4libs-4.1.0/kdeui/CMakeLists.txt
+@@ -320,8 +320,9 @@
endif(X11_Xrender_FOUND)
set_target_properties(kdeui PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION}
@@ -96,8 +96,8 @@
install(TARGETS kdeui ${INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
---- kde4libs-4.0.84+svn828171.orig/kdecore/CMakeLists.txt
-+++ kde4libs-4.0.84+svn828171/kdecore/CMakeLists.txt
+--- kde4libs-4.1.0.orig/kdecore/CMakeLists.txt
++++ kde4libs-4.1.0/kdecore/CMakeLists.txt
@@ -248,7 +248,8 @@
set_target_properties(kdecore PROPERTIES
More information about the pkg-kde-commits
mailing list