rev 11822 - in branches/kde4/packages/kdelibs/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Fri Aug 1 11:00:27 UTC 2008
Author: modax-guest
Date: 2008-08-01 11:00:27 +0000 (Fri, 01 Aug 2008)
New Revision: 11822
Added:
branches/kde4/packages/kdelibs/debian/patches/01_r840377_840379_unload_on_close.diff
branches/kde4/packages/kdelibs/debian/patches/02_41branch_link_interface_libraries.diff
branches/kde4/packages/kdelibs/debian/patches/99_conservative_link_interface_libraries.diff
Removed:
branches/kde4/packages/kdelibs/debian/patches/90_reduced_linking.diff
Modified:
branches/kde4/packages/kdelibs/debian/changelog
branches/kde4/packages/kdelibs/debian/control
branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install
branches/kde4/packages/kdelibs/debian/kdelibs5-dev.manpages
branches/kde4/packages/kdelibs/debian/patches/series
Log:
+++ Changes by Modestas Vainius:
* Add 01_r840377_840379_unload_on_close.diff patch.
Fixes a nasty bug which makes some KDE4 apps stay in memory when closed
resulting into excessive memory usage after some time.
* Readd usr/share/man/man1/kdecmake.1 kdelibs5-dev.
* Build depend on cmake >= 2.6.
* Update automoc build-dependency.
* Replace unofficial 90 patch with the one taken from KDE 4.1 branch.
(02_41branch_link_interface_libraries.diff). It is the version "supported"
by upstream with some extra features. It does not seem to be much different
from the previous 90_ patch.
* Add 99_conservative_link_interface_libraries.diff which *adds* some more
LINK_INTERFACE_LIBRARIES to reduce linking failures of third party
applications. This patch surely does not break anything, it only adds more
libraries which are eliminated by --as-needed in Debian packaging.
However, it might help to link a random KDE4 3rd party application against
our kde4libs.
Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog 2008-08-01 10:05:13 UTC (rev 11821)
+++ branches/kde4/packages/kdelibs/debian/changelog 2008-08-01 11:00:27 UTC (rev 11822)
@@ -1,3 +1,26 @@
+kde4libs (4:4.1.0-2~pre3) UNRELEASED; urgency=low
+
+ +++ Changes by Modestas Vainius:
+
+ * Add 01_r840377_840379_unload_on_close.diff patch.
+ Fixes a nasty bug which makes some KDE4 apps stay in memory when closed
+ resulting into excessive memory usage after some time.
+ * Readd usr/share/man/man1/kdecmake.1 kdelibs5-dev.
+ * Build depend on cmake >= 2.6.
+ * Update automoc build-dependency.
+ * Replace unofficial 90 patch with the one taken from KDE 4.1 branch.
+ (02_41branch_link_interface_libraries.diff). It is the version "supported"
+ by upstream with some extra features. It does not seem to be much different
+ from the previous 90_ patch.
+ * Add 99_conservative_link_interface_libraries.diff which *adds* some more
+ LINK_INTERFACE_LIBRARIES to reduce linking failures of third party
+ applications. This patch surely does not break anything, it only adds more
+ libraries which are eliminated by --as-needed in Debian packaging.
+ However, it might help to link a random KDE4 3rd party application against
+ our kde4libs.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 01 Aug 2008 12:52:04 +0300
+
kde4libs (4:4.1.0-1) unstable; urgency=low
* New upstream release 4.1.0.
Modified: branches/kde4/packages/kdelibs/debian/control
===================================================================
--- branches/kde4/packages/kdelibs/debian/control 2008-08-01 10:05:13 UTC (rev 11821)
+++ branches/kde4/packages/kdelibs/debian/control 2008-08-01 11:00:27 UTC (rev 11822)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>, Modestas Vainius <modestas at vainius.eu>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.4.8),
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.6),
shared-mime-info (>= 0.20), libphonon-dev (>= 4:4.2.0),
libcupsys2-dev, libdbus-1-dev, libqt4-dev (>= 4.4.0~),
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
@@ -13,7 +13,7 @@
libxml2-dev, libxml2-utils, libxslt1-dev, libxtst-dev, libgif-dev,
libavahi-common-dev, libaspell-dev, libbz2-dev, libenchant-dev, libfam-dev,
libjasper-dev, libopenexr-dev, libpcre3-dev, libtiff4-dev, hspell, xsltproc,
- libglu1-mesa-dev, libenchant-dev, libacl1-dev, automoc (>= 1.0~svn805317),
+ libglu1-mesa-dev, libenchant-dev, libacl1-dev, automoc (>= 1.0~svn834416),
libxcursor-dev
Standards-Version: 3.7.3
Homepage: http://www.kde.org/
@@ -44,7 +44,7 @@
Package: kdelibs5-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, kdelibs5 (= ${binary:Version}), cmake (>= 2.6.0), automoc (>= 1.0~svn805317),
+Depends: ${shlibs:Depends}, kdelibs5 (= ${binary:Version}), cmake (>= 2.6.0), automoc (>= 1.0~svn834416),
${sameVersionDep:libqt4-dev}, ${sameVersionDep:libsoprano-dev}, ${sameVersionDep:libphonon-dev}
#Suggests: kdelibs5-doc (= ${source:Version})
Replaces: kdebase-runtime-data (<< 4:4.0.60), kdelibs5-data (<< 4:4.0.80-1)
Modified: branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install 2008-08-01 10:05:13 UTC (rev 11821)
+++ branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install 2008-08-01 11:00:27 UTC (rev 11822)
@@ -954,5 +954,3 @@
usr/share/kde4/apps/cmake/modules/kde4init_dummy.cpp.in
usr/share/kde4/apps/cmake/modules/kde4init_win32lib_dummy.cpp.in
usr/share/kde4/apps/cmake/modules/kde4uic.cmake
-#usr/share/man/man1/kdecmake.1
-usr/share/man/man1/makekdewidgets.1
Modified: branches/kde4/packages/kdelibs/debian/kdelibs5-dev.manpages
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs5-dev.manpages 2008-08-01 10:05:13 UTC (rev 11821)
+++ branches/kde4/packages/kdelibs/debian/kdelibs5-dev.manpages 2008-08-01 11:00:27 UTC (rev 11822)
@@ -1,2 +1,3 @@
debian/tmp/usr/share/man/man1/checkXML.1
+debian/tmp/usr/share/man/man1/kdecmake.1
debian/tmp/usr/share/man/man1/makekdewidgets.1
Added: branches/kde4/packages/kdelibs/debian/patches/01_r840377_840379_unload_on_close.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/01_r840377_840379_unload_on_close.diff (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/01_r840377_840379_unload_on_close.diff 2008-08-01 11:00:27 UTC (rev 11822)
@@ -0,0 +1,84 @@
+--- a/kdecore/kernel/kglobal.cpp
++++ b/kdecore/kernel/kglobal.cpp
+@@ -251,11 +251,14 @@
+
+ /**
+ * This counter indicates when to quit the application.
+- * It starts at 1, is decremented in KMainWindow when the last window is closed, but
+- * is incremented by operations that should outlive the last window closed
+- * (e.g. a file copy for a file manager, or 'compacting folders on exit' for a mail client).
++ * It starts at 0, is incremented by KMainWindow, systray icons, running jobs, etc.
++ * and decremented again when those things are destroyed.
++ * This mechanism allows dialogs and jobs to outlive the last window closed
++ * e.g. a file copy for a file manager, or 'compacting folders on exit' for a mail client,
++ * the job progress widget with "keep open" checked, etc.
+ */
+-static int s_refCount = 1;
++static int s_refCount = 0;
++static bool s_allowQuit = false;
+
+ void KGlobal::ref()
+ {
+@@ -267,9 +270,14 @@
+ {
+ --s_refCount;
+ //kDebug() << "KGlobal::deref() : refCount = " << s_refCount;
+- if (s_refCount <= 0) {
++ if (s_refCount <= 0 && s_allowQuit) {
+ QCoreApplication::instance()->quit();
+ }
+ }
+
++void KGlobal::setAllowQuit(bool allowQuit)
++{
++ s_allowQuit = allowQuit;
++}
++
+ #undef PRIVATE_DATA
+--- a/kdecore/kernel/kglobal.h
++++ b/kdecore/kernel/kglobal.h
+@@ -409,6 +409,16 @@
+ * "last window closed" event, but some events should outlive the last window closed
+ * (e.g. a file copy for a file manager, or 'compacting folders on exit' for a mail client).
+ *
++ * We have some use cases that we want to take care of (the format is "action refcount"):
++ * - open window -> setAllowQuit(true) 1 ; close window 0 => EXIT
++ * - job start 1; job end 0 [don't exit yet]; open window -> setAllowQuit(true) 1 ; close window 0 => EXIT
++ * - job start 1; open window -> setAllowQuit(true) 2; close window 1; job end 0 => EXIT
++ * - job start 1; open window -> setAllowQuit(true) 2; job end 1; close window 0 => EXIT
++ * - open dialog 0; close dialog 0; => DO NOT EXIT
++ * - job start 1; job end 0; create two main objects 2; delete both main objects 0 => EXIT
++ * - open window -> setAllowQuit(true) 1; add systray icon 2; close window 1 => DO NOT EXIT
++ * - open window -> setAllowQuit(true) 1; add systray icon 2; remove systray icon 1; close window 0 => EXIT
++ *
+ * Note that for this to happen you must call qApp->setQuitOnLastWindowClosed(false),
+ * in main() for instance.
+ */
+@@ -421,6 +431,13 @@
+ KDECORE_EXPORT void deref();
+
+ /**
++ * If refcounting reaches 0 (or less), and @p allowQuit is true, the instance of the application
++ * will automatically be exited. Otherwise, the application will not exit automatically.
++ * @since 4.2
++ */
++ KDECORE_EXPORT void setAllowQuit(bool allowQuit);
++
++ /**
+ * The component currently active (useful in a multi-component
+ * application, such as a KParts application).
+ * Don't use this - it's mainly for KAboutDialog and KBugReport.
+--- a/kdeui/widgets/kmainwindow.cpp
++++ b/kdeui/widgets/kmainwindow.cpp
+@@ -226,6 +226,11 @@
+ {
+ KGlobal::ref();
+
++ // We set allow quit to true, so when the refcounting reaches 0 the application instance will
++ // be exited. This has a similar purpose than setQuitOnLastWindowClosed (from
++ // QApplication), but it honors (de)refing from KGlobal.
++ KGlobal::setAllowQuit(true);
++
+ q = _q;
+
+ q->setAnimated(KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects);
Added: branches/kde4/packages/kdelibs/debian/patches/02_41branch_link_interface_libraries.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/02_41branch_link_interface_libraries.diff (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/02_41branch_link_interface_libraries.diff 2008-08-01 11:00:27 UTC (rev 11822)
@@ -0,0 +1,116 @@
+--- kdelibs-4.1.0/interfaces/ktexteditor/CMakeLists.txt 2008-05-21 14:06:25.000000000 +0300
++++ kdelibs-branch/interfaces/ktexteditor/CMakeLists.txt 2008-08-01 10:37:49.000000000 +0300
+@@ -26,7 +26,11 @@
+
+ target_link_libraries(ktexteditor ${KDE4_KDECORE_LIBS} ${QT_QTDBUS_LIBRARY} kparts )
+
+-set_target_properties(ktexteditor PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
++set_target_properties(ktexteditor
++ PROPERTIES VERSION ${GENERIC_LIB_VERSION}
++ SOVERSION ${GENERIC_LIB_SOVERSION}
++ ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kparts"
++)
+ install(TARGETS ktexteditor ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ ########### install files ###############
+--- kdelibs-4.1.0/kde3support/CMakeLists.txt 2008-07-03 08:06:23.000000000 +0300
++++ kdelibs-branch/kde3support/CMakeLists.txt 2008-08-01 10:37:39.000000000 +0300
+@@ -81,7 +81,9 @@
+ target_link_libraries(kde3support ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBS} ${QT_QTXML_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KFILE_LIBS} ${X11_LIBRARIES})
+
+ set_target_properties(kde3support PROPERTIES VERSION ${GENERIC_LIB_VERSION}
+- SOVERSION ${GENERIC_LIB_SOVERSION} )
++ SOVERSION ${GENERIC_LIB_SOVERSION}
++ ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kio;kdeui;kdecore;${QT_QT3SUPPORT_LIBRARY}"
++)
+
+ install(TARGETS kde3support ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- kdelibs-4.1.0/kdecore/CMakeLists.txt 2008-07-03 08:06:30.000000000 +0300
++++ kdelibs-branch/kdecore/CMakeLists.txt 2008-08-01 10:39:38.000000000 +0300
+@@ -246,9 +246,17 @@
+
+ target_link_libraries(kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARY} ${kdecore_OPTIONAL_LIBS})
+
+-set_target_properties(kdecore PROPERTIES
+- VERSION ${KDE_NON_GENERIC_LIB_VERSION}
+- SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
++if(WIN32)
++ set(kdecore_LINK_INTERFACE_LIBRARIES "${QT_QTDBUS_LIBRARY};${QT_QTCORE_LIBRARY};${KDEWIN32_LIBRARIES}")
++else(WiN32)
++ set(kdecore_LINK_INTERFACE_LIBRARIES "${QT_QTDBUS_LIBRARY};${QT_QTCORE_LIBRARY}")
++endif(WIN32)
++
++set_target_properties(kdecore PROPERTIES
++ VERSION ${KDE_NON_GENERIC_LIB_VERSION}
++ SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION}
++ ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "${kdecore_LINK_INTERFACE_LIBRARIES}"
++)
+
+ install(TARGETS kdecore ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- kdelibs-4.1.0/kdeui/CMakeLists.txt 2008-07-15 22:50:58.000000000 +0300
++++ kdelibs-branch/kdeui/CMakeLists.txt 2008-08-01 10:39:57.000000000 +0300
+@@ -320,7 +320,9 @@
+ endif(X11_Xrender_FOUND)
+
+ set_target_properties(kdeui PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION}
+- SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
++ SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION}
++ ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kdecore;${QT_QTSVG_LIBRARY};${QT_QTGUI_LIBRARY}"
++)
+
+ install(TARGETS kdeui ${INSTALL_TARGETS_DEFAULT_ARGS})
+ ########### install files ###############
+--- kdelibs-4.1.0/khtml/CMakeLists.txt 2008-07-03 08:06:21.000000000 +0300
++++ kdelibs-branch/khtml/CMakeLists.txt 2008-08-01 10:38:13.000000000 +0300
+@@ -336,7 +336,9 @@
+ target_link_libraries(khtml ${KDE4_KPARTS_LIBS} ktexteditor kjs ${KDE4_PHONON_LIBS} ${JPEG_LIBRARIES} ${GIF_LIBRARIES} ${PNG_LIBRARIES} ${X11_LIBRARIES})
+
+ set_target_properties(khtml PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION}
+- SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
++ SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION}
++ ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kparts;kjs;kio;kdeui;kdecore"
++)
+
+
+ set(CREATE_HASH_TABLE ${CMAKE_SOURCE_DIR}/kjs/create_hash_table )
+--- kdelibs-4.1.0/kio/CMakeLists.txt 2008-07-15 22:50:57.000000000 +0300
++++ kdelibs-branch/kio/CMakeLists.txt 2008-08-01 10:37:53.000000000 +0300
+@@ -267,7 +267,9 @@
+ endif(X11_Xrender_FOUND)
+
+ set_target_properties(kio PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION}
+- SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
++ SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION}
++ ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kdeui;kdecore;${QT_QTNETWORK_LIBRARY};${QT_QTXML_LIBRARY};${QT_QTGUI_LIBRARY}"
++)
+
+
+ ########### install files ###############
+--- kdelibs-4.1.0/kparts/CMakeLists.txt 2008-07-03 08:06:26.000000000 +0300
++++ kdelibs-branch/kparts/CMakeLists.txt 2008-08-01 10:39:49.000000000 +0300
+@@ -27,7 +27,9 @@
+ target_link_libraries(kparts ${KDE4_KDECORE_LIBS} kdeui kio)
+
+ set_target_properties(kparts PROPERTIES VERSION ${GENERIC_LIB_VERSION}
+- SOVERSION ${GENERIC_LIB_SOVERSION} )
++ SOVERSION ${GENERIC_LIB_SOVERSION}
++ ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kio;kdeui;kdecore"
++)
+
+
+ install(TARGETS kparts ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kdelibs-4.1.0/kross/core/CMakeLists.txt 2008-07-03 08:06:23.000000000 +0300
++++ kdelibs-branch/kross/core/CMakeLists.txt 2008-08-01 10:38:00.000000000 +0300
+@@ -13,7 +13,9 @@
+ kde4_add_library(krosscore SHARED ${krosscore_LIB_SRCS})
+ target_link_libraries(krosscore ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTXML_LIBRARY})
+ set_target_properties(krosscore PROPERTIES VERSION ${GENERIC_LIB_VERSION}
+- SOVERSION ${GENERIC_LIB_SOVERSION} )
++ SOVERSION ${GENERIC_LIB_SOVERSION}
++ ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kdecore;${QT_QTSCRIPT_LIBRARY};${QT_QTXML_LIBRARY}"
++)
+
+ install(TARGETS krosscore ${INSTALL_TARGETS_DEFAULT_ARGS})
+
Deleted: branches/kde4/packages/kdelibs/debian/patches/90_reduced_linking.diff
Added: branches/kde4/packages/kdelibs/debian/patches/99_conservative_link_interface_libraries.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/99_conservative_link_interface_libraries.diff (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/99_conservative_link_interface_libraries.diff 2008-08-01 11:00:27 UTC (rev 11822)
@@ -0,0 +1,151 @@
+--- a/interfaces/ktexteditor/CMakeLists.txt
++++ b/interfaces/ktexteditor/CMakeLists.txt
+@@ -29,7 +29,7 @@
+ set_target_properties(ktexteditor
+ PROPERTIES VERSION ${GENERIC_LIB_VERSION}
+ SOVERSION ${GENERIC_LIB_SOVERSION}
+- ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kparts"
++ ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kparts;kdeui"
+ )
+ install(TARGETS ktexteditor ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- a/kde3support/CMakeLists.txt
++++ b/kde3support/CMakeLists.txt
+@@ -82,7 +82,7 @@
+
+ set_target_properties(kde3support PROPERTIES VERSION ${GENERIC_LIB_VERSION}
+ SOVERSION ${GENERIC_LIB_SOVERSION}
+- ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kio;kdeui;kdecore;${QT_QT3SUPPORT_LIBRARY}"
++ ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kio;kdeui;kdecore;${QT_QT3SUPPORT_LIBRARY};kparts"
+ )
+
+ install(TARGETS kde3support ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- a/kdecore/CMakeLists.txt
++++ b/kdecore/CMakeLists.txt
+@@ -249,7 +249,7 @@
+ if(WIN32)
+ set(kdecore_LINK_INTERFACE_LIBRARIES "${QT_QTDBUS_LIBRARY};${QT_QTCORE_LIBRARY};${KDEWIN32_LIBRARIES}")
+ else(WiN32)
+- set(kdecore_LINK_INTERFACE_LIBRARIES "${QT_QTDBUS_LIBRARY};${QT_QTCORE_LIBRARY}")
++ set(kdecore_LINK_INTERFACE_LIBRARIES "${QT_QTDBUS_LIBRARY};${QT_QTCORE_LIBRARY};${QT_QTNETWORK_LIBRARY};${QT_QTXML_LIBRARY}")
+ endif(WIN32)
+
+ set_target_properties(kdecore PROPERTIES
+--- a/kfile/CMakeLists.txt
++++ b/kfile/CMakeLists.txt
+@@ -40,7 +40,9 @@
+ )
+
+ set_target_properties(kfile PROPERTIES VERSION ${GENERIC_LIB_VERSION}
+- SOVERSION ${GENERIC_LIB_SOVERSION} )
++ SOVERSION ${GENERIC_LIB_SOVERSION}
++ ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};${QT_QTGUI_LIBRARY};kio;kdeui"
++)
+
+ install(TARGETS kfile ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- a/khtml/CMakeLists.txt
++++ b/khtml/CMakeLists.txt
+@@ -337,7 +337,7 @@
+
+ set_target_properties(khtml PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION}
+ SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION}
+- ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kparts;kjs;kio;kdeui;kdecore"
++ ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kparts;kio;kdeui;kdecore"
+ )
+
+
+--- a/kio/CMakeLists.txt
++++ b/kio/CMakeLists.txt
+@@ -268,7 +268,7 @@
+
+ set_target_properties(kio PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION}
+ SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION}
+- ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kdeui;kdecore;${QT_QTNETWORK_LIBRARY};${QT_QTXML_LIBRARY};${QT_QTGUI_LIBRARY}"
++ ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kdeui;kdecore;${QT_QTNETWORK_LIBRARY};${QT_QTXML_LIBRARY};${QT_QTGUI_LIBRARY};solid"
+ )
+
+
+--- a/kjsembed/kjsembed/CMakeLists.txt
++++ b/kjsembed/kjsembed/CMakeLists.txt
+@@ -68,7 +68,10 @@
+
+ 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 VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
++set_target_properties(${KJSEMBEDLIBNAME} PROPERTIES VERSION ${GENERIC_LIB_VERSION}
++ SOVERSION ${GENERIC_LIB_SOVERSION}
++ ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "${KJSLIBNAME};${QT_QTCORE_LIBRARY}"
++)
+ install(TARGETS ${KJSEMBEDLIBNAME} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+
+--- a/knewstuff/knewstuff2/CMakeLists.txt
++++ b/knewstuff/knewstuff2/CMakeLists.txt
+@@ -54,7 +54,10 @@
+ kde4_add_library(knewstuff2 SHARED ${knewstuff2_core_SRCS} ${knewstuff2_dxs_SRCS} ${knewstuff2_ui_SRCS} ${knewstuff2_SRCS})
+
+ target_link_libraries(knewstuff2 ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY})
+-set_target_properties(knewstuff2 PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
++set_target_properties(knewstuff2 PROPERTIES VERSION ${GENERIC_LIB_VERSION}
++ SOVERSION ${GENERIC_LIB_SOVERSION}
++ ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kdecore"
++)
+ install(TARGETS knewstuff2 ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ install(FILES
+--- a/kpty/CMakeLists.txt
++++ b/kpty/CMakeLists.txt
+@@ -13,7 +13,10 @@
+
+ target_link_libraries(kpty ${KDE4_KDECORE_LIBS} ${UTIL_LIBRARY} ${UTEMPTER_LIBRARY})
+
+-set_target_properties(kpty PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
++set_target_properties(kpty PROPERTIES VERSION ${GENERIC_LIB_VERSION}
++ SOVERSION ${GENERIC_LIB_SOVERSION}
++ ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};kdecore"
++)
+ install(TARGETS kpty ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ install( FILES
+--- a/kross/ui/CMakeLists.txt
++++ b/kross/ui/CMakeLists.txt
+@@ -16,7 +16,9 @@
+ kde4_add_library(krossui SHARED ${krossui_LIB_SRCS})
+ target_link_libraries(krossui krosscore ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KIO_LIBS})
+ set_target_properties(krossui PROPERTIES VERSION ${GENERIC_LIB_VERSION}
+- SOVERSION ${GENERIC_LIB_SOVERSION} )
++ SOVERSION ${GENERIC_LIB_SOVERSION}
++ ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "${QT_QTGUI_LIBRARY};kparts"
++)
+
+
+ install(TARGETS krossui ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- a/kutils/CMakeLists.txt
++++ b/kutils/CMakeLists.txt
+@@ -51,7 +51,10 @@
+
+ target_link_libraries(kutils ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} )
+
+-set_target_properties(kutils PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
++set_target_properties(kutils PROPERTIES VERSION ${GENERIC_LIB_VERSION}
++ SOVERSION ${GENERIC_LIB_SOVERSION}
++ ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kdeui"
++)
+ install(TARGETS kutils ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ ########### install files ###############
+--- a/solid/solid/CMakeLists.txt
++++ b/solid/solid/CMakeLists.txt
+@@ -182,7 +182,10 @@
+
+ target_link_libraries(solid ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} ${solid_OPTIONAL_LIBS})
+
+-set_target_properties(solid PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
++set_target_properties(solid PROPERTIES VERSION ${GENERIC_LIB_VERSION}
++ SOVERSION ${GENERIC_LIB_SOVERSION}
++ ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY}"
++)
+ install(TARGETS solid ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ install(FILES org.kde.Solid.Networking.Client.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series 2008-08-01 10:05:13 UTC (rev 11821)
+++ branches/kde4/packages/kdelibs/debian/patches/series 2008-08-01 11:00:27 UTC (rev 11822)
@@ -1,3 +1,5 @@
+01_r840377_840379_unload_on_close.diff
+02_41branch_link_interface_libraries.diff
08_add_debian_build_type.diff
09_disable_debug_messages_if_not_explicitly_enabled.diff
11_kde4_applications_menu.diff
@@ -9,4 +11,4 @@
19_findqt4_optional_x11_pthread.diff
20_use_dejavu_as_default_font.diff
22_hack_in_etc_kde4_in_kstandarddirs.diff
-90_reduced_linking.diff
+99_conservative_link_interface_libraries.diff
More information about the pkg-kde-commits
mailing list