rev 10512 - in branches/kde4/packages/kdelibs/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Fri May 9 17:34:22 UTC 2008
Author: fabo
Date: 2008-05-09 17:34:21 +0000 (Fri, 09 May 2008)
New Revision: 10512
Added:
branches/kde4/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff
Modified:
branches/kde4/packages/kdelibs/debian/changelog
branches/kde4/packages/kdelibs/debian/kdelibs5-data.install
branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
branches/kde4/packages/kdelibs/debian/patches/10_kdehome_kde4.diff
branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff
branches/kde4/packages/kdelibs/debian/patches/15_kfreebsd_support.diff
branches/kde4/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
branches/kde4/packages/kdelibs/debian/patches/18_always_set_cmake_policy.diff
branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff
branches/kde4/packages/kdelibs/debian/patches/97_use_imported_targets_with_cmake26.diff
branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff
branches/kde4/packages/kdelibs/debian/patches/series
Log:
* Add 20 patch to use DejaVu font as default font.
* Refresh patches.
* Add thumb_frame.png file.
Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog 2008-05-09 17:24:24 UTC (rev 10511)
+++ branches/kde4/packages/kdelibs/debian/changelog 2008-05-09 17:34:21 UTC (rev 10512)
@@ -1,22 +1,26 @@
-kde4libs (4:4.0.72+svn804262-1~pre1) UNRELEASED; urgency=low
+kde4libs (4:4.0.73-1) UNRELEASED; urgency=low
+ [ Debian Qt/KDE Maintainers ]
* New upstream development snapshot:
- - The latest upstream commit is r804262 by dfaure
- - Date: Mon, 05 May 2008 13:40:54 -0000
-
+ - The latest upstream commit is r804973 by mueller
+ - Date: Wed May 7 09:03:08 2008 UTC
+
* 99 patch is disabled. Build is not for public usage.
+++ Changes by Modestas Vainius:
- * Add libacl1-dev to build depends. Refresh 98 patch (kio_file build
- failure).
+ * Add libacl1-dev to build depends.
+ Refresh 98 patch (kio_file build failure).
* Allow to set UPSTREAMVERSION in the environment.
+++ Changes by Armin Berres:
- * kdelibs5-dev must replace kdelibs-data << 4:4.0.72-1 after the move of the
+ * kdelibs5-dev must replace kdelibs-data << 4:4.0.72-1 after the move of the
dbus-1 XML interfaces.
+ +++ Changes by Fathi Boudra:
+ * Add 20 patch to use DejaVu font as default font.
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 04 May 2008 23:37:47 +0200
kde4libs (4:4.0.72-1) experimental; urgency=low
Modified: branches/kde4/packages/kdelibs/debian/kdelibs5-data.install
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs5-data.install 2008-05-09 17:24:24 UTC (rev 10511)
+++ branches/kde4/packages/kdelibs/debian/kdelibs5-data.install 2008-05-09 17:34:21 UTC (rev 10512)
@@ -330,6 +330,7 @@
usr/share/kde4/apps/knewstuff/pics/ghns.png
usr/share/kde4/apps/knewstuff/pics/ghns_star.png
usr/share/kde4/apps/knewstuff/pics/ghns_star_gray.png
+usr/share/kde4/apps/knewstuff/pics/thumb_frame.png
usr/share/kde4/apps/ksgmltools2/customization/
usr/share/kde4/apps/ksgmltools2/docbook/README.kde
usr/share/kde4/apps/ksgmltools2/docbook/xml-dtd-4.1.2/40chg.txt
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-05-09 17:24:24 UTC (rev 10511)
+++ branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff 2008-05-09 17:34:21 UTC (rev 10512)
@@ -4,8 +4,8 @@
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.
---- kde4libs-4.0.66+svn790271.orig/cmake/modules/FindKDE4Internal.cmake
-+++ kde4libs-4.0.66+svn790271/cmake/modules/FindKDE4Internal.cmake
+--- a/cmake/modules/FindKDE4Internal.cmake
++++ b/cmake/modules/FindKDE4Internal.cmake
@@ -896,11 +896,13 @@
set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
Modified: branches/kde4/packages/kdelibs/debian/patches/10_kdehome_kde4.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/10_kdehome_kde4.diff 2008-05-09 17:24:24 UTC (rev 10511)
+++ branches/kde4/packages/kdelibs/debian/patches/10_kdehome_kde4.diff 2008-05-09 17:34:21 UTC (rev 10512)
@@ -1,5 +1,5 @@
---- kde4libs-4.0.10~svn783501.orig/kdecore/kernel/kstandarddirs.cpp
-+++ kde4libs-4.0.10~svn783501/kdecore/kernel/kstandarddirs.cpp
+--- a/kdecore/kernel/kstandarddirs.cpp
++++ b/kdecore/kernel/kstandarddirs.cpp
@@ -1478,7 +1478,7 @@
#ifdef Q_WS_MACX
localKdeDir = QDir::homePath() + "/Library/Preferences/KDE/";
@@ -9,9 +9,9 @@
#endif
}
---- kde4libs-4.0.10~svn783501.orig/kdeui/util/kcrash.cpp
-+++ kde4libs-4.0.10~svn783501/kdeui/util/kcrash.cpp
-@@ -500,7 +500,7 @@
+--- a/kdeui/util/kcrash.cpp
++++ b/kdeui/util/kcrash.cpp
+@@ -492,7 +492,7 @@
if (!kde_home || !kde_home[0])
{
@@ -20,8 +20,8 @@
}
if (kde_home[0] == '~')
---- kde4libs-4.0.10~svn783501.orig/kinit/lnusertemp.c
-+++ kde4libs-4.0.10~svn783501/kinit/lnusertemp.c
+--- a/kinit/lnusertemp.c
++++ b/kinit/lnusertemp.c
@@ -127,7 +127,7 @@
if (!kde_home || !kde_home[0])
@@ -31,8 +31,8 @@
}
if (kde_home[0] == '~')
---- kde4libs-4.0.10~svn783501.orig/kinit/wrapper.c
-+++ kde4libs-4.0.10~svn783501/kinit/wrapper.c
+--- a/kinit/wrapper.c
++++ b/kinit/wrapper.c
@@ -142,7 +142,7 @@
if (!kde_home || !kde_home[0])
Modified: branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff 2008-05-09 17:24:24 UTC (rev 10511)
+++ branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff 2008-05-09 17:34:21 UTC (rev 10512)
@@ -1,5 +1,5 @@
---- kde4libs-4.0.10~svn783501.orig/kded/kbuildsycoca.cpp
-+++ kde4libs-4.0.10~svn783501/kded/kbuildsycoca.cpp
+--- a/kded/kbuildsycoca.cpp
++++ b/kded/kbuildsycoca.cpp
@@ -307,7 +307,7 @@
connect(g_vfolder, SIGNAL(newService(const QString &, KService::Ptr *)),
this, SLOT(slotCreateEntry(const QString &, KService::Ptr *)));
@@ -9,8 +9,8 @@
KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
entry->setLayoutInfo(kdeMenu->layoutList);
---- kde4libs-4.0.10~svn783501.orig/kded/CMakeLists.txt
-+++ kde4libs-4.0.10~svn783501/kded/CMakeLists.txt
+--- a/kded/CMakeLists.txt
++++ b/kded/CMakeLists.txt
@@ -67,7 +67,7 @@
########### install files ###############
Modified: branches/kde4/packages/kdelibs/debian/patches/15_kfreebsd_support.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/15_kfreebsd_support.diff 2008-05-09 17:24:24 UTC (rev 10511)
+++ branches/kde4/packages/kdelibs/debian/patches/15_kfreebsd_support.diff 2008-05-09 17:34:21 UTC (rev 10512)
@@ -1,8 +1,8 @@
I do not think we can push this patch to upstream since the:
CMAKE_SYSTEM_NAME MATCHES kFreeBSD stuff, needs the Debian patched
cmake.
---- kde4libs-4.0.66+svn790271.orig/kpty/kpty.cpp
-+++ kde4libs-4.0.66+svn790271/kpty/kpty.cpp
+--- a/kpty/kpty.cpp
++++ b/kpty/kpty.cpp
@@ -107,24 +107,24 @@
# define _NEW_TTY_CTRL
#endif
@@ -40,8 +40,8 @@
#endif
#include <kdebug.h>
---- kde4libs-4.0.66+svn790271.orig/kio/kfile/kpropertiesdialog.cpp
-+++ kde4libs-4.0.66+svn790271/kio/kfile/kpropertiesdialog.cpp
+--- a/kio/kfile/kpropertiesdialog.cpp
++++ b/kio/kfile/kpropertiesdialog.cpp
@@ -1868,7 +1868,15 @@
fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
#else
@@ -59,8 +59,8 @@
#endif
return fileSystemSupportsACLs;
}
---- kde4libs-4.0.66+svn790271.orig/kioslave/file/file.cpp
-+++ kde4libs-4.0.66+svn790271/kioslave/file/file.cpp
+--- a/kioslave/file/file.cpp
++++ b/kioslave/file/file.cpp
@@ -361,9 +361,10 @@
}
@@ -95,8 +95,8 @@
#ifdef HAVE_POSIX_ACL
acl = acl_get_fd(src_fd);
---- kde4libs-4.0.66+svn790271.orig/ConfigureChecks.cmake
-+++ kde4libs-4.0.66+svn790271/ConfigureChecks.cmake
+--- a/ConfigureChecks.cmake
++++ b/ConfigureChecks.cmake
@@ -154,11 +154,11 @@
set(UTIL_LIBRARY util)
endif (login_in_libutil)
Modified: branches/kde4/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff 2008-05-09 17:24:24 UTC (rev 10511)
+++ branches/kde4/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff 2008-05-09 17:34:21 UTC (rev 10512)
@@ -1,5 +1,5 @@
---- kde4libs-4.0.68+svn794096/kdecore/services/kservicefactory.cpp 2008-03-19 11:23:39.000000000 +0200
-+++ kde4libs-4.0.68+svn794096/kdecore/services/kservicefactory.cpp 2008-04-07 00:42:29.000000000 +0300
+--- a/kdecore/services/kservicefactory.cpp
++++ b/kdecore/services/kservicefactory.cpp
@@ -125,16 +125,10 @@
return newService;
}
@@ -46,8 +46,8 @@
KService::Ptr KServiceFactory::findServiceByMenuId(const QString &_menuId)
{
if (!m_menuIdDict) return KService::Ptr(); // Error!
---- kde4libs-4.0.68+svn794096/kdecore/services/kservicefactory.h 2008-03-26 00:51:27.000000000 +0200
-+++ kde4libs-4.0.68+svn794096/kdecore/services/kservicefactory.h 2008-04-07 00:44:00.000000000 +0300
+--- a/kdecore/services/kservicefactory.h
++++ b/kdecore/services/kservicefactory.h
@@ -123,6 +123,8 @@
virtual void virtual_hook( int id, void* data );
private:
Modified: branches/kde4/packages/kdelibs/debian/patches/18_always_set_cmake_policy.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/18_always_set_cmake_policy.diff 2008-05-09 17:24:24 UTC (rev 10511)
+++ branches/kde4/packages/kdelibs/debian/patches/18_always_set_cmake_policy.diff 2008-05-09 17:34:21 UTC (rev 10512)
@@ -1,7 +1,5 @@
-Index: kde4libs-4.0.70+svn798712/cmake/modules/FindKDE4Internal.cmake
-===================================================================
---- kde4libs-4.0.70+svn798712.orig/cmake/modules/FindKDE4Internal.cmake 2008-04-20 04:40:43.000000000 +0300
-+++ kde4libs-4.0.70+svn798712/cmake/modules/FindKDE4Internal.cmake 2008-04-20 04:41:27.000000000 +0300
+--- a/cmake/modules/FindKDE4Internal.cmake
++++ b/cmake/modules/FindKDE4Internal.cmake
@@ -218,6 +218,24 @@
# this is required now by cmake 2.6 and so must not be skipped by if(KDE4_FOUND) below
cmake_minimum_required(VERSION 2.4.5 FATAL_ERROR)
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-05-09 17:24:24 UTC (rev 10511)
+++ branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff 2008-05-09 17:34:21 UTC (rev 10512)
@@ -1,6 +1,6 @@
---- 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 @@
+--- a/cmake/modules/FindQt4.cmake
++++ b/cmake/modules/FindQt4.cmake
+@@ -1427,10 +1427,9 @@
IF(UNIX)
# on OS X X11 may not be required
IF (Q_WS_X11)
Added: branches/kde4/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff 2008-05-09 17:34:21 UTC (rev 10512)
@@ -0,0 +1,75 @@
+--- a/kdeui/kernel/kglobalsettings.cpp
++++ b/kdeui/kernel/kglobalsettings.cpp
+@@ -327,8 +327,8 @@
+ _generalFont->setPointSize(13);
+ #else
+ // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+- _generalFont = new QFont("Sans Serif", 10);
+- _generalFont->setPointSize(10);
++ _generalFont = new QFont("DejaVu Sans", 8);
++ _generalFont->setPointSize(8);
+ #endif
+ _generalFont->setStyleHint(QFont::SansSerif);
+
+@@ -348,8 +348,8 @@
+ _fixedFont->setPointSize(10);
+ #else
+ // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+- _fixedFont = new QFont("Monospace", 10);
+- _fixedFont->setPointSize(10);
++ _fixedFont = new QFont("DejaVu Sans Mono", 8);
++ _fixedFont->setPointSize(8);
+ #endif
+ _fixedFont->setStyleHint(QFont::TypeWriter);
+
+@@ -369,7 +369,7 @@
+ _toolBarFont->setPointSize(11);
+ #else
+ // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+- _toolBarFont = new QFont("Sans Serif", 8);
++ _toolBarFont = new QFont("DejaVu Sans", 8);
+ _toolBarFont->setPointSize(8);
+ #endif
+ _toolBarFont->setStyleHint(QFont::SansSerif);
+@@ -390,8 +390,8 @@
+ _menuFont->setPointSize(13);
+ #else
+ // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+- _menuFont = new QFont("Sans Serif", 10);
+- _menuFont->setPointSize(10);
++ _menuFont = new QFont("DejaVu Sans", 8);
++ _menuFont->setPointSize(8);
+ #endif
+ _menuFont->setStyleHint(QFont::SansSerif);
+
+@@ -407,8 +407,8 @@
+ return *_windowTitleFont;
+
+ // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+- _windowTitleFont = new QFont("Sans Serif", 9, QFont::Bold);
+- _windowTitleFont->setPointSize(10);
++ _windowTitleFont = new QFont("DejaVu Sans", 8, QFont::Bold);
++ _windowTitleFont->setPointSize(8);
+ _windowTitleFont->setStyleHint(QFont::SansSerif);
+
+ KConfigGroup g( KGlobal::config(), "WM" );
+@@ -423,8 +423,8 @@
+ return *_taskbarFont;
+
+ // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+- _taskbarFont = new QFont("Sans Serif", 10);
+- _taskbarFont->setPointSize(10);
++ _taskbarFont = new QFont("DejaVu Sans", 8);
++ _taskbarFont->setPointSize(8);
+ _taskbarFont->setStyleHint(QFont::SansSerif);
+
+ KConfigGroup g( KGlobal::config(), "General" );
+@@ -498,7 +498,7 @@
+ return *_smallestReadableFont;
+
+ // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+- _smallestReadableFont = new QFont("Sans Serif", 8);
++ _smallestReadableFont = new QFont("DejaVu Sans", 8);
+ _smallestReadableFont->setPointSize(8);
+ _smallestReadableFont->setStyleHint(QFont::SansSerif);
+
Modified: branches/kde4/packages/kdelibs/debian/patches/97_use_imported_targets_with_cmake26.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/97_use_imported_targets_with_cmake26.diff 2008-05-09 17:24:24 UTC (rev 10511)
+++ branches/kde4/packages/kdelibs/debian/patches/97_use_imported_targets_with_cmake26.diff 2008-05-09 17:34:21 UTC (rev 10512)
@@ -1,5 +1,5 @@
---- kde4libs-4.0.70+svn798712.orig/cmake/modules/FindKDE4Internal.cmake 2008-04-20 19:09:07.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/cmake/modules/FindKDE4Internal.cmake 2008-04-20 19:09:52.000000000 +0000
+--- a/cmake/modules/FindKDE4Internal.cmake
++++ b/cmake/modules/FindKDE4Internal.cmake
@@ -214,8 +214,8 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
@@ -224,8 +224,8 @@
get_filename_component(KDE4_LIB_DIR ${KDE4_KDECORE_LIBRARY} PATH )
# kpassworddialog.h is new with KDE4
---- kde4libs-4.0.70+svn798712.orig/CMakeLists.txt 2008-04-20 18:04:52.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/CMakeLists.txt 2008-04-20 19:09:07.000000000 +0000
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -318,7 +318,17 @@
# file (APPEND ${CMAKE_BINARY_DIR}/KDELibsDependencies.cmake "${__deps}")
endif(WIN32)
@@ -245,8 +245,8 @@
########### install files ###############
---- kde4libs-4.0.70+svn798712.orig/dnssd/CMakeLists.txt 2008-04-20 18:04:53.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/dnssd/CMakeLists.txt 2008-04-20 19:09:14.000000000 +0000
+--- a/dnssd/CMakeLists.txt
++++ b/dnssd/CMakeLists.txt
@@ -63,7 +63,7 @@
endif (HAVE_DNSSD)
@@ -256,8 +256,8 @@
########### install files ###############
install( FILES dnssd_export.h domainbrowser.h remoteservice.h servicetypebrowser.h publicservice.h
---- kde4libs-4.0.70+svn798712.orig/interfaces/ktexteditor/CMakeLists.txt 2008-04-20 18:04:52.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/interfaces/ktexteditor/CMakeLists.txt 2008-04-20 19:09:13.000000000 +0000
+--- a/interfaces/ktexteditor/CMakeLists.txt
++++ b/interfaces/ktexteditor/CMakeLists.txt
@@ -27,7 +27,7 @@
target_link_libraries(ktexteditor ${KDE4_KDECORE_LIBS} ${QT_QTDBUS_LIBRARY} kparts )
@@ -267,8 +267,8 @@
########### install files ###############
install( FILES
---- kde4libs-4.0.70+svn798712.orig/kde3support/CMakeLists.txt 2008-04-20 18:04:52.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kde3support/CMakeLists.txt 2008-04-20 19:09:13.000000000 +0000
+--- a/kde3support/CMakeLists.txt
++++ b/kde3support/CMakeLists.txt
@@ -81,7 +81,7 @@
target_link_libraries(kde3support ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBS} ${QT_QTXML_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KFILE_LIBS})
@@ -278,8 +278,8 @@
########### install files ###############
---- kde4libs-4.0.70+svn798712.orig/kdecore/CMakeLists.txt 2008-04-20 18:04:53.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kdecore/CMakeLists.txt 2008-04-20 19:09:14.000000000 +0000
+--- a/kdecore/CMakeLists.txt
++++ b/kdecore/CMakeLists.txt
@@ -105,7 +105,7 @@
if (NOT HAVE_TRUNC)
target_link_libraries(kdefakes m )
@@ -298,8 +298,8 @@
########### next target ###############
---- kde4libs-4.0.70+svn798712.orig/kdesu/CMakeLists.txt 2008-04-20 18:04:52.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kdesu/CMakeLists.txt 2008-04-20 19:09:13.000000000 +0000
+--- a/kdesu/CMakeLists.txt
++++ b/kdesu/CMakeLists.txt
@@ -25,7 +25,7 @@
endif(KDESU_USE_SUDO_DEFAULT)
@@ -309,8 +309,8 @@
########### next target ###############
---- kde4libs-4.0.70+svn798712.orig/kdeui/CMakeLists.txt 2008-04-20 18:04:53.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kdeui/CMakeLists.txt 2008-04-20 19:09:14.000000000 +0000
+--- a/kdeui/CMakeLists.txt
++++ b/kdeui/CMakeLists.txt
@@ -303,7 +303,7 @@
endif(X11_Xrender_FOUND)
@@ -320,8 +320,8 @@
########### install files ###############
if (Q_WS_MAC)
---- kde4libs-4.0.70+svn798712.orig/kfile/CMakeLists.txt 2008-04-20 18:04:52.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kfile/CMakeLists.txt 2008-04-20 19:09:14.000000000 +0000
+--- a/kfile/CMakeLists.txt
++++ b/kfile/CMakeLists.txt
@@ -40,7 +40,7 @@
)
@@ -331,8 +331,8 @@
install( FILES
kdiroperator.h
---- kde4libs-4.0.70+svn798712.orig/khtml/CMakeLists.txt 2008-04-20 18:04:52.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/khtml/CMakeLists.txt 2008-04-20 19:09:14.000000000 +0000
+--- a/khtml/CMakeLists.txt
++++ b/khtml/CMakeLists.txt
@@ -334,7 +334,7 @@
create_lut(ecma/kjs_audio.cpp kjs_audio.lut.h)
@@ -342,9 +342,9 @@
########### khtmlpart ###############
---- kde4libs-4.0.70+svn798712.orig/kio/CMakeLists.txt 2008-04-20 18:04:52.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kio/CMakeLists.txt 2008-04-20 19:09:13.000000000 +0000
-@@ -261,7 +261,7 @@
+--- a/kio/CMakeLists.txt
++++ b/kio/CMakeLists.txt
+@@ -264,7 +264,7 @@
set_target_properties(kio PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
########### install files ###############
@@ -353,8 +353,8 @@
install( PROGRAMS useragent.pl proxytype.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
---- kde4libs-4.0.70+svn798712.orig/kjs/CMakeLists.txt 2008-04-20 18:04:52.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kjs/CMakeLists.txt 2008-04-20 19:09:14.000000000 +0000
+--- a/kjs/CMakeLists.txt
++++ b/kjs/CMakeLists.txt
@@ -174,7 +174,7 @@
endif(PCRE_FOUND)
@@ -364,8 +364,8 @@
########### kjs - basic shell ###############
---- kde4libs-4.0.70+svn798712.orig/kjs/api/CMakeLists.txt 2008-04-20 18:04:52.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kjs/api/CMakeLists.txt 2008-04-20 19:09:07.000000000 +0000
+--- a/kjs/api/CMakeLists.txt
++++ b/kjs/api/CMakeLists.txt
@@ -13,7 +13,7 @@
target_link_libraries(kjsapi ${KJSLIBNAME} ${KDE4_KDECORE_LIBS})
@@ -375,8 +375,8 @@
install(FILES
kjsapi_export.h
---- kde4libs-4.0.70+svn798712.orig/knewstuff/knewstuff2/CMakeLists.txt 2008-04-20 18:04:52.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/knewstuff/knewstuff2/CMakeLists.txt 2008-04-20 19:09:13.000000000 +0000
+--- a/knewstuff/knewstuff2/CMakeLists.txt
++++ b/knewstuff/knewstuff2/CMakeLists.txt
@@ -55,7 +55,7 @@
target_link_libraries(knewstuff2 ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY})
@@ -386,8 +386,8 @@
install(FILES
core/author.h
---- kde4libs-4.0.70+svn798712.orig/knotify/config/CMakeLists.txt 2008-04-20 18:04:52.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/knotify/config/CMakeLists.txt 2008-04-20 19:09:14.000000000 +0000
+--- a/knotify/config/CMakeLists.txt
++++ b/knotify/config/CMakeLists.txt
@@ -21,7 +21,7 @@
target_link_libraries(knotifyconfig ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS} )
@@ -397,8 +397,8 @@
########### install files ###############
install( FILES knotifyconfig_export.h knotifyconfigwidget.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
---- kde4libs-4.0.70+svn798712.orig/kparts/CMakeLists.txt 2008-04-20 18:04:53.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kparts/CMakeLists.txt 2008-04-20 19:09:14.000000000 +0000
+--- a/kparts/CMakeLists.txt
++++ b/kparts/CMakeLists.txt
@@ -27,7 +27,7 @@
target_link_libraries(kparts ${KDE4_KDECORE_LIBS} kdeui kio)
@@ -408,8 +408,8 @@
########### install files ###############
---- kde4libs-4.0.70+svn798712.orig/kpty/CMakeLists.txt 2008-04-20 18:04:52.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kpty/CMakeLists.txt 2008-04-20 19:09:14.000000000 +0000
+--- a/kpty/CMakeLists.txt
++++ b/kpty/CMakeLists.txt
@@ -14,7 +14,7 @@
target_link_libraries(kpty ${KDE4_KDECORE_LIBS} ${UTIL_LIBRARY} ${UTEMPTER_LIBRARY})
@@ -419,8 +419,8 @@
install( FILES
kpty_export.h
---- kde4libs-4.0.70+svn798712.orig/kross/core/CMakeLists.txt 2008-04-20 18:04:52.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kross/core/CMakeLists.txt 2008-04-20 19:09:14.000000000 +0000
+--- a/kross/core/CMakeLists.txt
++++ b/kross/core/CMakeLists.txt
@@ -13,7 +13,7 @@
kde4_add_library(krosscore SHARED ${krosscore_LIB_SRCS})
target_link_libraries(krosscore ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARY})
@@ -430,8 +430,8 @@
install(FILES
kross_export.h
---- kde4libs-4.0.70+svn798712.orig/kross/ui/CMakeLists.txt 2008-04-20 18:04:52.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kross/ui/CMakeLists.txt 2008-04-20 19:09:13.000000000 +0000
+--- a/kross/ui/CMakeLists.txt
++++ b/kross/ui/CMakeLists.txt
@@ -16,7 +16,7 @@
kde4_add_library(krossui SHARED ${krossui_LIB_SRCS})
target_link_libraries(krossui krosscore ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KIO_LIBS})
@@ -441,8 +441,8 @@
########### install files ###############
---- kde4libs-4.0.70+svn798712.orig/kutils/CMakeLists.txt 2008-04-20 18:04:53.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kutils/CMakeLists.txt 2008-04-20 19:09:14.000000000 +0000
+--- a/kutils/CMakeLists.txt
++++ b/kutils/CMakeLists.txt
@@ -33,7 +33,7 @@
target_link_libraries(kutils ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} )
@@ -452,8 +452,8 @@
########### install files ###############
---- kde4libs-4.0.70+svn798712.orig/phonon/CMakeLists.txt 2008-04-20 18:04:52.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/phonon/CMakeLists.txt 2008-04-20 19:09:07.000000000 +0000
+--- a/phonon/CMakeLists.txt
++++ b/phonon/CMakeLists.txt
@@ -65,7 +65,7 @@
target_link_libraries(phonon ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
#do not use GENERIC versioning in phonon
@@ -463,8 +463,8 @@
########### install files ###############
---- kde4libs-4.0.70+svn798712.orig/phonon/libkaudiodevicelist/CMakeLists.txt 2008-04-20 18:04:52.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/phonon/libkaudiodevicelist/CMakeLists.txt 2008-04-20 19:09:13.000000000 +0000
+--- a/phonon/libkaudiodevicelist/CMakeLists.txt
++++ b/phonon/libkaudiodevicelist/CMakeLists.txt
@@ -32,7 +32,7 @@
set_target_properties(kaudiodevicelist PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
@@ -474,8 +474,8 @@
install(FILES
kaudiodevicelist_export.h
audiodevice.h
---- kde4libs-4.0.70+svn798712.orig/solid/solid/CMakeLists.txt 2008-04-20 18:04:52.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/solid/solid/CMakeLists.txt 2008-04-20 19:09:13.000000000 +0000
+--- a/solid/solid/CMakeLists.txt
++++ b/solid/solid/CMakeLists.txt
@@ -183,7 +183,7 @@
target_link_libraries(solid ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} ${solid_OPTIONAL_LIBS})
@@ -485,8 +485,8 @@
install(FILES org.kde.Solid.Networking.Client.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
---- kde4libs-4.0.70+svn798712.orig/threadweaver/Weaver/CMakeLists.txt 2008-04-20 18:04:53.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/threadweaver/Weaver/CMakeLists.txt 2008-04-20 19:09:07.000000000 +0000
+--- a/threadweaver/Weaver/CMakeLists.txt
++++ b/threadweaver/Weaver/CMakeLists.txt
@@ -33,7 +33,7 @@
kde4_add_library(threadweaver SHARED ${ThreadWeaver_LIB_SRCS})
target_link_libraries(threadweaver ${QT_QTCORE_LIBRARY})
Modified: branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff 2008-05-09 17:24:24 UTC (rev 10511)
+++ branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff 2008-05-09 17:34:21 UTC (rev 10512)
@@ -1,5 +1,5 @@
---- kde4libs.orig/dnssd/CMakeLists.txt
-+++ kde4libs/dnssd/CMakeLists.txt
+--- a/dnssd/CMakeLists.txt
++++ b/dnssd/CMakeLists.txt
@@ -59,8 +59,9 @@
if (HAVE_DNSSD)
target_link_libraries(kdnssd ${KDE4_KDEUI_LIBS} ${DNSSD_LIBRARIES} )
@@ -11,8 +11,8 @@
set_target_properties(kdnssd PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kdnssd ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/interfaces/kimproxy/library/CMakeLists.txt
-+++ kde4libs/interfaces/kimproxy/library/CMakeLists.txt
+--- a/interfaces/kimproxy/library/CMakeLists.txt
++++ b/interfaces/kimproxy/library/CMakeLists.txt
@@ -16,7 +16,7 @@
kde4_add_library(kimproxy SHARED ${kimproxy_LIB_SRCS})
@@ -22,8 +22,8 @@
set_target_properties(kimproxy PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
---- kde4libs.orig/interfaces/kmediaplayer/CMakeLists.txt
-+++ kde4libs/interfaces/kmediaplayer/CMakeLists.txt
+--- a/interfaces/kmediaplayer/CMakeLists.txt
++++ b/interfaces/kmediaplayer/CMakeLists.txt
@@ -14,7 +14,7 @@
kde4_add_library(kmediaplayer SHARED ${kmediaplayer_LIB_SRCS})
@@ -33,8 +33,8 @@
set_target_properties(kmediaplayer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kmediaplayer ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/interfaces/ktexteditor/CMakeLists.txt
-+++ kde4libs/interfaces/ktexteditor/CMakeLists.txt
+--- a/interfaces/ktexteditor/CMakeLists.txt
++++ b/interfaces/ktexteditor/CMakeLists.txt
@@ -25,6 +25,7 @@
kde4_add_library(ktexteditor SHARED ${ktexteditor_LIB_SRCS})
@@ -43,9 +43,9 @@
set_target_properties(ktexteditor PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS ktexteditor ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/kate/CMakeLists.txt
-+++ kde4libs/kate/CMakeLists.txt
-@@ -144,7 +144,7 @@
+--- a/kate/CMakeLists.txt
++++ b/kate/CMakeLists.txt
+@@ -145,7 +145,7 @@
kde4_add_plugin(katepart ${katepart_PART_SRCS})
# linking
@@ -54,8 +54,8 @@
if(KDE4_ENABLE_FINAL)
macro_add_file_dependencies(${CMAKE_CURRENT_BINARY_DIR}/katepart_final_cpp.cpp )
---- kde4libs.orig/kde3support/CMakeLists.txt
-+++ kde4libs/kde3support/CMakeLists.txt
+--- a/kde3support/CMakeLists.txt
++++ b/kde3support/CMakeLists.txt
@@ -78,7 +78,9 @@
kde4_add_library(kde3support SHARED ${kde3support_LIB_SRCS})
@@ -67,8 +67,8 @@
set_target_properties(kde3support PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kde3support ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/kdecore/CMakeLists.txt
-+++ kde4libs/kdecore/CMakeLists.txt
+--- a/kdecore/CMakeLists.txt
++++ b/kdecore/CMakeLists.txt
@@ -105,6 +105,7 @@
if (NOT HAVE_TRUNC)
target_link_libraries(kdefakes m )
@@ -85,8 +85,8 @@
set_target_properties(kdecore PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
install(TARGETS kdecore ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/kded/CMakeLists.txt
-+++ kde4libs/kded/CMakeLists.txt
+--- a/kded/CMakeLists.txt
++++ b/kded/CMakeLists.txt
@@ -13,7 +13,7 @@
kde4_add_kdeinit_executable(kded4 ${kded_KDEINIT_SRCS})
@@ -105,8 +105,8 @@
install(TARGETS kdeinit_kbuildsycoca4 ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/kdesu/CMakeLists.txt
-+++ kde4libs/kdesu/CMakeLists.txt
+--- a/kdesu/CMakeLists.txt
++++ b/kdesu/CMakeLists.txt
@@ -18,6 +18,7 @@
kde4_add_library(kdesu SHARED ${kdesu_LIB_SRCS})
@@ -115,8 +115,8 @@
if(KDESU_USE_SUDO_DEFAULT)
set_source_files_properties(su.cpp
---- kde4libs.orig/kdeui/CMakeLists.txt
-+++ kde4libs/kdeui/CMakeLists.txt
+--- a/kdeui/CMakeLists.txt
++++ b/kdeui/CMakeLists.txt
@@ -280,7 +280,8 @@
kde4_add_library(kdeui SHARED ${kdeui_LIB_SRCS})
@@ -147,8 +147,8 @@
install( TARGETS kded_globalaccel DESTINATION ${PLUGIN_INSTALL_DIR} )
---- kde4libs.orig/kfile/CMakeLists.txt
-+++ kde4libs/kfile/CMakeLists.txt
+--- a/kfile/CMakeLists.txt
++++ b/kfile/CMakeLists.txt
@@ -37,7 +37,9 @@
${ZLIB_LIBRARY}
${STRIGI_LIBRARIES}
@@ -159,8 +159,8 @@
set_target_properties(kfile PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kfile ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/khtml/CMakeLists.txt
-+++ kde4libs/khtml/CMakeLists.txt
+--- a/khtml/CMakeLists.txt
++++ b/khtml/CMakeLists.txt
@@ -297,7 +297,11 @@
kde4_add_library(khtml SHARED ${khtml_LIB_SRCS})
@@ -183,8 +183,8 @@
install(TARGETS khtmlpart DESTINATION ${PLUGIN_INSTALL_DIR} )
---- kde4libs.orig/khtml/java/CMakeLists.txt
-+++ kde4libs/khtml/java/CMakeLists.txt
+--- a/khtml/java/CMakeLists.txt
++++ b/khtml/java/CMakeLists.txt
@@ -23,7 +23,7 @@
kde4_add_plugin(kjavaappletviewer ${kjavaappletviewer_PART_SRCS})
@@ -194,8 +194,8 @@
install(TARGETS kjavaappletviewer DESTINATION ${PLUGIN_INSTALL_DIR} )
---- kde4libs.orig/khtml/kmultipart/CMakeLists.txt
-+++ kde4libs/khtml/kmultipart/CMakeLists.txt
+--- a/khtml/kmultipart/CMakeLists.txt
++++ b/khtml/kmultipart/CMakeLists.txt
@@ -9,7 +9,7 @@
kde4_add_plugin(kmultipart WITH_PREFIX ${kmultipart_PART_SRCS})
@@ -205,8 +205,8 @@
install(TARGETS kmultipart DESTINATION ${PLUGIN_INSTALL_DIR} )
---- kde4libs.orig/kinit/CMakeLists.txt
-+++ kde4libs/kinit/CMakeLists.txt
+--- a/kinit/CMakeLists.txt
++++ b/kinit/CMakeLists.txt
@@ -132,7 +132,7 @@
kde4_add_kdeinit_executable( klauncher NOGUI ${klauncher_KDEINIT_SRCS})
set_target_properties(kdeinit_klauncher PROPERTIES DEFINE_SYMBOL MAKE_KLAUNCHER)
@@ -216,8 +216,8 @@
install(TARGETS kdeinit_klauncher ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/kio/CMakeLists.txt
-+++ kde4libs/kio/CMakeLists.txt
+--- a/kio/CMakeLists.txt
++++ b/kio/CMakeLists.txt
@@ -238,7 +238,10 @@
kde4_add_library(kio SHARED ${kio_LIB_SRCS})
@@ -230,8 +230,8 @@
set(SYS_INOTIFY_H_FOUND 0)
---- kde4libs.orig/kio/misc/kpac/CMakeLists.txt
-+++ kde4libs/kio/misc/kpac/CMakeLists.txt
+--- a/kio/misc/kpac/CMakeLists.txt
++++ b/kio/misc/kpac/CMakeLists.txt
@@ -15,7 +15,7 @@
kde4_add_plugin(kded_proxyscout ${kded_proxyscout_PART_SRCS})
@@ -241,8 +241,8 @@
# this needs -lresolv e.g on Slackware, but not on FreeBSD
if (HAVE_RESOLV_LIBRARY)
---- kde4libs.orig/kio/misc/kssld/CMakeLists.txt
-+++ kde4libs/kio/misc/kssld/CMakeLists.txt
+--- a/kio/misc/kssld/CMakeLists.txt
++++ b/kio/misc/kssld/CMakeLists.txt
@@ -6,7 +6,7 @@
kde4_add_plugin(kded_kssld ${kded_kssld_PART_SRCS})
@@ -252,8 +252,8 @@
install(TARGETS kded_kssld DESTINATION ${PLUGIN_INSTALL_DIR} )
---- kde4libs.orig/kio/misc/kwalletd/CMakeLists.txt
-+++ kde4libs/kio/misc/kwalletd/CMakeLists.txt
+--- a/kio/misc/kwalletd/CMakeLists.txt
++++ b/kio/misc/kwalletd/CMakeLists.txt
@@ -22,7 +22,7 @@
kde4_add_plugin(kded_kwalletd ${kded_kwalletd_PART_SRCS})
@@ -263,8 +263,8 @@
install(TARGETS kded_kwalletd DESTINATION ${PLUGIN_INSTALL_DIR} )
---- kde4libs.orig/kioslave/ftp/CMakeLists.txt
-+++ kde4libs/kioslave/ftp/CMakeLists.txt
+--- a/kioslave/ftp/CMakeLists.txt
++++ b/kioslave/ftp/CMakeLists.txt
@@ -13,7 +13,7 @@
kde4_add_plugin(kio_ftp ${kio_ftp_PART_SRCS})
@@ -274,8 +274,8 @@
install(TARGETS kio_ftp DESTINATION ${PLUGIN_INSTALL_DIR} )
---- kde4libs.orig/kioslave/http/CMakeLists.txt
-+++ kde4libs/kioslave/http/CMakeLists.txt
+--- a/kioslave/http/CMakeLists.txt
++++ b/kioslave/http/CMakeLists.txt
@@ -37,7 +37,7 @@
kde4_add_kdeinit_executable( kio_http_cache_cleaner NOGUI ${kio_http_cache_cleaner_KDEINIT_SRCS})
@@ -294,8 +294,8 @@
if(GSSAPI_FOUND)
target_link_libraries(kio_http ${GSSAPI_LIBS} )
endif(GSSAPI_FOUND)
---- kde4libs.orig/kioslave/http/kcookiejar/CMakeLists.txt
-+++ kde4libs/kioslave/http/kcookiejar/CMakeLists.txt
+--- a/kioslave/http/kcookiejar/CMakeLists.txt
++++ b/kioslave/http/kcookiejar/CMakeLists.txt
@@ -25,7 +25,7 @@
set_target_properties(kcookiejar4 PROPERTIES COMPILE_FLAGS "-include \"${CMAKE_CURRENT_SOURCE_DIR}/qdeclareqlistint_hack.h\"" )
endif(MSVC)
@@ -314,8 +314,8 @@
install(TARGETS kded_kcookiejar DESTINATION ${PLUGIN_INSTALL_DIR} )
---- kde4libs.orig/kjs/CMakeLists.txt
-+++ kde4libs/kjs/CMakeLists.txt
+--- a/kjs/CMakeLists.txt
++++ b/kjs/CMakeLists.txt
@@ -167,6 +167,7 @@
if(UNIX)
@@ -324,8 +324,8 @@
endif(UNIX)
if(PCRE_FOUND)
---- kde4libs.orig/knewstuff/knewstuff2/CMakeLists.txt
-+++ kde4libs/knewstuff/knewstuff2/CMakeLists.txt
+--- a/knewstuff/knewstuff2/CMakeLists.txt
++++ b/knewstuff/knewstuff2/CMakeLists.txt
@@ -53,7 +53,8 @@
kde4_add_library(knewstuff2 SHARED ${knewstuff2_core_SRCS} ${knewstuff2_dxs_SRCS} ${knewstuff2_ui_SRCS} ${knewstuff2_SRCS})
@@ -336,8 +336,8 @@
set_target_properties(knewstuff2 PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
install(TARGETS knewstuff2 ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/knotify/config/CMakeLists.txt
-+++ kde4libs/knotify/config/CMakeLists.txt
+--- a/knotify/config/CMakeLists.txt
++++ b/knotify/config/CMakeLists.txt
@@ -19,6 +19,7 @@
# Needs KIO for KUrlRequester
@@ -346,8 +346,8 @@
set_target_properties(knotifyconfig PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS knotifyconfig ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/kparts/CMakeLists.txt
-+++ kde4libs/kparts/CMakeLists.txt
+--- a/kparts/CMakeLists.txt
++++ b/kparts/CMakeLists.txt
@@ -24,7 +24,8 @@
kde4_add_library(kparts SHARED ${kparts_LIB_SRCS})
@@ -358,8 +358,8 @@
set_target_properties(kparts PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kparts ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/kpty/CMakeLists.txt
-+++ kde4libs/kpty/CMakeLists.txt
+--- a/kpty/CMakeLists.txt
++++ b/kpty/CMakeLists.txt
@@ -12,6 +12,7 @@
kde4_add_library(kpty SHARED ${kpty_LIB_SRCS})
@@ -368,8 +368,8 @@
set_target_properties(kpty PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kpty ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/kross/core/CMakeLists.txt
-+++ kde4libs/kross/core/CMakeLists.txt
+--- a/kross/core/CMakeLists.txt
++++ b/kross/core/CMakeLists.txt
@@ -11,7 +11,8 @@
)
@@ -380,8 +380,8 @@
set_target_properties(krosscore PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
install(TARGETS krosscore ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/kross/modules/CMakeLists.txt
-+++ kde4libs/kross/modules/CMakeLists.txt
+--- a/kross/modules/CMakeLists.txt
++++ b/kross/modules/CMakeLists.txt
@@ -12,5 +12,5 @@
set(krossmoduleforms_SRCS form.cpp)
kde4_add_plugin(krossmoduleforms ${krossmoduleforms_SRCS})
@@ -389,8 +389,8 @@
-target_link_libraries(krossmoduleforms ${QT_QTUITOOLS_LIBRARY} ${QT_QTDESIGNER_LIBRARY} ${KDE4_KPARTS_LIBS} ${KDE4_KFILE_LIBS} krosscore krossui)
+target_link_libraries(krossmoduleforms ${QT_QTUITOOLS_LIBRARY} ${QT_QTDESIGNER_LIBRARY} ${QT_QTXML_LIBRARY} ${KDE4_KPARTS_LIBS} ${KDE4_KFILE_LIBS} krosscore)
install(TARGETS krossmoduleforms DESTINATION ${PLUGIN_INSTALL_DIR})
---- kde4libs.orig/kross/qts/CMakeLists.txt
-+++ kde4libs/kross/qts/CMakeLists.txt
+--- a/kross/qts/CMakeLists.txt
++++ b/kross/qts/CMakeLists.txt
@@ -3,7 +3,7 @@
########### next target ###############
set(krossqtsplugin_LIB_SRCS plugin.cpp)
@@ -400,8 +400,8 @@
set_target_properties(krossqtsplugin PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
install(TARGETS krossqtsplugin DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/script)
---- kde4libs.orig/kross/ui/CMakeLists.txt
-+++ kde4libs/kross/ui/CMakeLists.txt
+--- a/kross/ui/CMakeLists.txt
++++ b/kross/ui/CMakeLists.txt
@@ -14,7 +14,8 @@
)
@@ -412,8 +412,8 @@
set_target_properties(krossui PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
install(TARGETS krossui ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/kutils/CMakeLists.txt
-+++ kde4libs/kutils/CMakeLists.txt
+--- a/kutils/CMakeLists.txt
++++ b/kutils/CMakeLists.txt
@@ -30,7 +30,8 @@
kde4_add_library(kutils SHARED ${kutils_LIB_SRCS})
@@ -424,8 +424,8 @@
set_target_properties(kutils PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kutils ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/phonon/libkaudiodevicelist/CMakeLists.txt
-+++ kde4libs/phonon/libkaudiodevicelist/CMakeLists.txt
+--- a/phonon/libkaudiodevicelist/CMakeLists.txt
++++ b/phonon/libkaudiodevicelist/CMakeLists.txt
@@ -28,7 +28,8 @@
endif(ALSA_FOUND)
@@ -436,8 +436,8 @@
set_target_properties(kaudiodevicelist PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
---- kde4libs.orig/solid/solid/CMakeLists.txt
-+++ kde4libs/solid/solid/CMakeLists.txt
+--- a/solid/solid/CMakeLists.txt
++++ b/solid/solid/CMakeLists.txt
@@ -181,6 +181,7 @@
kde4_add_library(solid SHARED ${solid_LIB_SRCS})
@@ -446,8 +446,8 @@
set_target_properties(solid PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS solid ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/sonnet/plugins/hspell/CMakeLists.txt
-+++ kde4libs/sonnet/plugins/hspell/CMakeLists.txt
+--- a/sonnet/plugins/hspell/CMakeLists.txt
++++ b/sonnet/plugins/hspell/CMakeLists.txt
@@ -9,7 +9,7 @@
kde4_add_plugin(kspell_hspell ${kspell_hspell_PART_SRCS})
@@ -457,8 +457,8 @@
install(TARGETS kspell_hspell DESTINATION ${PLUGIN_INSTALL_DIR} )
---- kde4libs.orig/kjsembed/kjsembed/CMakeLists.txt
-+++ kde4libs/kjsembed/kjsembed/CMakeLists.txt
+--- a/kjsembed/kjsembed/CMakeLists.txt
++++ b/kjsembed/kjsembed/CMakeLists.txt
@@ -69,6 +69,7 @@
kde4_add_library(${KJSEMBEDLIBNAME} SHARED ${kjsembed_LIB_SRCS})
@@ -467,8 +467,8 @@
set_target_properties(${KJSEMBEDLIBNAME} PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS ${KJSEMBEDLIBNAME} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/kioslave/file/CMakeLists.txt
-+++ kde4libs/kioslave/file/CMakeLists.txt
+--- a/kioslave/file/CMakeLists.txt
++++ b/kioslave/file/CMakeLists.txt
@@ -20,6 +20,10 @@
target_link_libraries(kio_file -lvolmgt)
endif (HAVE_VOLMGT AND CMAKE_SYSTEM_NAME MATCHES SunOS)
Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series 2008-05-09 17:24:24 UTC (rev 10511)
+++ branches/kde4/packages/kdelibs/debian/patches/series 2008-05-09 17:34:21 UTC (rev 10512)
@@ -9,6 +9,7 @@
17_findservicebydesktoppath_try_realfilepath.diff
18_always_set_cmake_policy.diff
19_findqt4_optional_x11_pthread.diff
+20_use_dejavu_as_default_font.diff
97_use_imported_targets_with_cmake26.diff
98_link_interface_libraries.diff
#99_more_implicit_link_libs.diff
More information about the pkg-kde-commits
mailing list