[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.4.5-2+squeeze1-119-g8489bf3
Modestas Vainius
modax at alioth.debian.org
Sun Mar 27 17:43:01 UTC 2011
The following commit has been merged in the master branch:
commit 7c6ed42b7d61d68c60bb741e2b867d96b291913b
Author: Modestas Vainius <modax at debian.org>
Date: Sun Mar 27 14:31:50 2011 +0300
Refresh patches.
---
debian/patches/add_debian_build_type.diff | 2 +-
debian/patches/default_kde4_xdg_menu_prefix.diff | 6 ++--
debian/patches/disable_usr_lib_install_rpath.diff | 8 +++---
.../findservicebydesktoppath_try_realfilepath.diff | 6 ++--
.../patches/hack_in_etc_kde4_in_kstandarddirs.diff | 2 +-
debian/patches/hardcode_ptm_device.diff | 2 +-
.../kconf_update_migrate_from_kde3_icon_theme.diff | 2 +-
debian/patches/kfileshare_kdesu_fileshareset.diff | 2 +-
debian/patches/kfreebsd_support.diff | 12 ++++----
debian/patches/ld_exclude_libs_qtuitools.diff | 4 +-
debian/patches/make_libkdeinit4_private.diff | 26 ++++++++++----------
debian/patches/qt4_designer_plugins_path.diff | 14 ++++------
debian/patches/relax_plugin_kde_version_check.diff | 4 +-
debian/patches/use_dejavu_as_default_font.diff | 4 +-
14 files changed, 46 insertions(+), 48 deletions(-)
diff --git a/debian/patches/add_debian_build_type.diff b/debian/patches/add_debian_build_type.diff
index 4030bbf..918cfac 100644
--- a/debian/patches/add_debian_build_type.diff
+++ b/debian/patches/add_debian_build_type.diff
@@ -9,7 +9,7 @@ icons.
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -1198,11 +1198,13 @@
+@@ -1201,11 +1201,13 @@ if (CMAKE_COMPILER_IS_GNUCXX)
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")
diff --git a/debian/patches/default_kde4_xdg_menu_prefix.diff b/debian/patches/default_kde4_xdg_menu_prefix.diff
index d264d98..1e8c236 100644
--- a/debian/patches/default_kde4_xdg_menu_prefix.diff
+++ b/debian/patches/default_kde4_xdg_menu_prefix.diff
@@ -5,7 +5,7 @@
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
-@@ -74,7 +74,7 @@
+@@ -74,7 +74,7 @@ install(TARGETS kbuildsycoca4 ${INSTALL_
if (WIN32)
install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus )
else (WIN32)
@@ -16,7 +16,7 @@
install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
-@@ -770,8 +770,10 @@
+@@ -770,8 +770,10 @@ VFolderMenu::locateMenuFile(const QStrin
QString result;
QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX"));
@@ -29,7 +29,7 @@
QFileInfo fileInfo(fileName);
QString fileNameOnly = fileInfo.fileName();
-@@ -781,7 +783,6 @@
+@@ -781,7 +783,6 @@ VFolderMenu::locateMenuFile(const QStrin
QString baseName = QDir::cleanPath(m_docInfo.baseDir +
fileInfo.path() + '/' + fileNameOnly);
result = KStandardDirs::locate("xdgconf-menu", baseName);
diff --git a/debian/patches/disable_usr_lib_install_rpath.diff b/debian/patches/disable_usr_lib_install_rpath.diff
index c720993..6888127 100644
--- a/debian/patches/disable_usr_lib_install_rpath.diff
+++ b/debian/patches/disable_usr_lib_install_rpath.diff
@@ -13,7 +13,7 @@ Last-Update: 2011-01-30
--- a/kdewidgets/CMakeLists.txt
+++ b/kdewidgets/CMakeLists.txt
-@@ -51,7 +51,6 @@
+@@ -51,7 +51,6 @@ if(QT_QTDESIGNER_FOUND)
INSTALL_RPATH_USE_LINK_PATH TRUE
SKIP_BUILD_RPATH TRUE
BUILD_WITH_INSTALL_RPATH TRUE
@@ -21,7 +21,7 @@ Last-Update: 2011-01-30
)
endif(NOT WIN32)
-@@ -81,7 +80,6 @@
+@@ -81,7 +80,6 @@ if(QT_QTDESIGNER_FOUND)
INSTALL_RPATH_USE_LINK_PATH TRUE
SKIP_BUILD_RPATH TRUE
BUILD_WITH_INSTALL_RPATH TRUE
@@ -29,7 +29,7 @@ Last-Update: 2011-01-30
)
endif(NOT WIN32)
-@@ -116,7 +114,6 @@
+@@ -116,7 +114,6 @@ if(QT_QTDESIGNER_FOUND)
INSTALL_RPATH_USE_LINK_PATH TRUE
SKIP_BUILD_RPATH TRUE
BUILD_WITH_INSTALL_RPATH TRUE
@@ -37,7 +37,7 @@ Last-Update: 2011-01-30
)
endif(NOT WIN32)
-@@ -152,7 +149,6 @@
+@@ -152,7 +149,6 @@ if(QT_QTDESIGNER_FOUND)
INSTALL_RPATH_USE_LINK_PATH TRUE
SKIP_BUILD_RPATH TRUE
BUILD_WITH_INSTALL_RPATH TRUE
diff --git a/debian/patches/findservicebydesktoppath_try_realfilepath.diff b/debian/patches/findservicebydesktoppath_try_realfilepath.diff
index c4ad3cd..a1802eb 100644
--- a/debian/patches/findservicebydesktoppath_try_realfilepath.diff
+++ b/debian/patches/findservicebydesktoppath_try_realfilepath.diff
@@ -3,7 +3,7 @@ and other stuff when /usr or anything else in the file
path is a symlink.
--- a/kdecore/services/kservicefactory.cpp
+++ b/kdecore/services/kservicefactory.cpp
-@@ -124,22 +124,16 @@
+@@ -124,22 +124,16 @@ KService::Ptr KServiceFactory::findServi
return newService;
}
@@ -28,7 +28,7 @@ path is a symlink.
}
// Check whether the dictionary was right
// It's ok that it's wrong, for the case where we're looking up an unknown service,
-@@ -150,6 +144,27 @@
+@@ -150,6 +144,27 @@ KService::Ptr KServiceFactory::findServi
}
return newService;
}
@@ -58,7 +58,7 @@ path is a symlink.
{
--- a/kdecore/services/kservicefactory.h
+++ b/kdecore/services/kservicefactory.h
-@@ -121,6 +121,8 @@
+@@ -121,6 +121,8 @@ protected:
virtual void virtual_hook( int id, void* data );
private:
class KServiceFactoryPrivate* d;
diff --git a/debian/patches/hack_in_etc_kde4_in_kstandarddirs.diff b/debian/patches/hack_in_etc_kde4_in_kstandarddirs.diff
index a361980..624d03d 100644
--- a/debian/patches/hack_in_etc_kde4_in_kstandarddirs.diff
+++ b/debian/patches/hack_in_etc_kde4_in_kstandarddirs.diff
@@ -12,7 +12,7 @@ overridden by adding new files to /etc/kde4 by the sysadm.
--- a/kdecore/kernel/kstandarddirs.cpp
+++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1174,6 +1174,10 @@
+@@ -1174,6 +1174,10 @@ QStringList KStandardDirs::KStandardDirs
if ((local || testdir.exists()) && !candidates.contains(path))
candidates.append(path);
}
diff --git a/debian/patches/hardcode_ptm_device.diff b/debian/patches/hardcode_ptm_device.diff
index 5b19b33..cc35a51 100644
--- a/debian/patches/hardcode_ptm_device.diff
+++ b/debian/patches/hardcode_ptm_device.diff
@@ -6,7 +6,7 @@ Bypass build time check as /dev/ptmx is alsways present at runtime.
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
-@@ -202,13 +202,7 @@
+@@ -202,13 +202,7 @@ if (UNIX)
set(HAVE_OPENPTY)
execute_process(
diff --git a/debian/patches/kconf_update_migrate_from_kde3_icon_theme.diff b/debian/patches/kconf_update_migrate_from_kde3_icon_theme.diff
index 2d2074b..e3706cf 100644
--- a/debian/patches/kconf_update_migrate_from_kde3_icon_theme.diff
+++ b/debian/patches/kconf_update_migrate_from_kde3_icon_theme.diff
@@ -172,7 +172,7 @@ Useful when upgrading from KDE 3 to KDE 4 because default KDE 3 theme
+}
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
-@@ -376,6 +376,16 @@ set_target_properties(kdeui PROPERTIES V
+@@ -438,6 +438,16 @@ set_target_properties(kdeui PROPERTIES V
)
install(TARGETS kdeui EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/debian/patches/kfileshare_kdesu_fileshareset.diff b/debian/patches/kfileshare_kdesu_fileshareset.diff
index cf470c5..f6c9993 100644
--- a/debian/patches/kfileshare_kdesu_fileshareset.diff
+++ b/debian/patches/kfileshare_kdesu_fileshareset.diff
@@ -9,7 +9,7 @@ Last-Update: 2010-05-31
--- a/kio/kio/kfileshare.cpp
+++ b/kio/kio/kfileshare.cpp
-@@ -239,17 +239,19 @@
+@@ -239,17 +239,19 @@ bool KFileShare::setShared( const QStrin
return false;
kDebug(7000) << path << "," << shared;
diff --git a/debian/patches/kfreebsd_support.diff b/debian/patches/kfreebsd_support.diff
index a9ade84..0500295 100644
--- a/debian/patches/kfreebsd_support.diff
+++ b/debian/patches/kfreebsd_support.diff
@@ -12,7 +12,7 @@ cmake.
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
-@@ -164,11 +164,11 @@
+@@ -164,11 +164,11 @@ if (UNIX)
set(UTIL_LIBRARY util)
endif (login_in_libutil)
endif (NOT login_in_libc)
@@ -29,7 +29,7 @@ cmake.
if (login_in_libutil)
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
-@@ -1910,7 +1910,15 @@
+@@ -1910,7 +1910,15 @@ static bool fileSystemSupportsACL( const
fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
#else
fileSystemSupportsACLs =
@@ -48,7 +48,7 @@ cmake.
}
--- a/kioslave/file/file.cpp
+++ b/kioslave/file/file.cpp
-@@ -315,8 +315,10 @@
+@@ -315,8 +315,10 @@ void FileProtocol::get( const KUrl& url
}
#ifdef HAVE_FADVISE
@@ -61,7 +61,7 @@ cmake.
// This is mandatory in all slaves (for KRun/BrowserRun to work)
--- a/kioslave/file/file_unix.cpp
+++ b/kioslave/file/file_unix.cpp
-@@ -155,8 +155,10 @@
+@@ -155,8 +155,10 @@ void FileProtocol::copy( const KUrl &src
}
#ifdef HAVE_FADVISE
@@ -72,7 +72,7 @@ cmake.
// WABA: Make sure that we keep writing permissions ourselves,
// otherwise we can be in for a surprise on NFS.
mode_t initialMode;
-@@ -178,8 +180,10 @@
+@@ -178,8 +180,10 @@ void FileProtocol::copy( const KUrl &src
}
#ifdef HAVE_FADVISE
@@ -85,7 +85,7 @@ cmake.
acl = acl_get_fd(src_fd);
--- a/kpty/kpty.cpp
+++ b/kpty/kpty.cpp
-@@ -109,24 +109,24 @@
+@@ -109,24 +109,24 @@ extern "C" {
# define _NEW_TTY_CTRL
#endif
diff --git a/debian/patches/ld_exclude_libs_qtuitools.diff b/debian/patches/ld_exclude_libs_qtuitools.diff
index 7537f73..7561a6e 100644
--- a/debian/patches/ld_exclude_libs_qtuitools.diff
+++ b/debian/patches/ld_exclude_libs_qtuitools.diff
@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/plasma/CMakeLists.txt
+++ b/plasma/CMakeLists.txt
-@@ -253,6 +253,9 @@
+@@ -252,6 +252,9 @@ target_link_libraries(plasma ${QT_QTUITO
${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
${KDE4_KDEUI_LIBS} kdnssd threadweaver ${PLASMA_EXTRA_LIBS})
@@ -17,7 +17,7 @@ Forwarded: not-needed
endif(QCA2_FOUND)
--- a/kjsembed/kjsembed/CMakeLists.txt
+++ b/kjsembed/kjsembed/CMakeLists.txt
-@@ -71,7 +71,8 @@
+@@ -71,7 +71,8 @@ target_link_libraries(${KJSEMBEDLIBNAME}
set_target_properties(${KJSEMBEDLIBNAME} PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS ${KJSEMBEDLIBNAME} EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/debian/patches/make_libkdeinit4_private.diff b/debian/patches/make_libkdeinit4_private.diff
index 23a2d2c..8e91637 100644
--- a/debian/patches/make_libkdeinit4_private.diff
+++ b/debian/patches/make_libkdeinit4_private.diff
@@ -21,7 +21,7 @@ Last-Update: 2010-06-07
--- a/CreateKDELibsDependenciesFile.cmake
+++ b/CreateKDELibsDependenciesFile.cmake
-@@ -32,6 +32,7 @@
+@@ -32,6 +32,7 @@ set(KDE4_INSTALL_DIR "${CMAKE_INSTALL_PR
make_install_path_absolute(KDE4_LIB_INSTALL_DIR ${LIB_INSTALL_DIR})
make_install_path_absolute(KDE4_IMPORTS_INSTALL_DIR ${IMPORTS_INSTALL_DIR})
make_install_path_absolute(KDE4_LIBEXEC_INSTALL_DIR ${LIBEXEC_INSTALL_DIR})
@@ -29,7 +29,7 @@ Last-Update: 2010-06-07
make_install_path_absolute(KDE4_INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR})
make_install_path_absolute(KDE4_BIN_INSTALL_DIR ${BIN_INSTALL_DIR})
make_install_path_absolute(KDE4_SBIN_INSTALL_DIR ${SBIN_INSTALL_DIR})
-@@ -65,6 +66,7 @@
+@@ -65,6 +66,7 @@ endif (NOT KDE4_INSTALL_DIR)
set(KDE4_LIB_INSTALL_DIR \"${KDE4_LIB_INSTALL_DIR}\")
set(KDE4_IMPORTS_INSTALL_DIR \"${KDE4_IMPORTS_INSTALL_DIR}\")
set(KDE4_LIBEXEC_INSTALL_DIR \"${KDE4_LIBEXEC_INSTALL_DIR}\")
@@ -39,7 +39,7 @@ Last-Update: 2010-06-07
set(KDE4_SBIN_INSTALL_DIR \"${KDE4_SBIN_INSTALL_DIR}\")
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -867,6 +867,7 @@
+@@ -870,6 +870,7 @@ else (WIN32)
_set_fancy(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" "The subdirectory to the header prefix")
_set_fancy(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/kde4" "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde4)")
@@ -49,7 +49,7 @@ Last-Update: 2010-06-07
_set_fancy(DATA_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/apps" "The parent directory where applications can install their data")
--- a/cmake/modules/KDE4Macros.cmake
+++ b/cmake/modules/KDE4Macros.cmake
-@@ -810,6 +810,17 @@
+@@ -810,6 +810,17 @@ macro (KDE4_ADD_KDEINIT_EXECUTABLE _targ
set_target_properties(kdeinit_${_target_NAME} PROPERTIES OUTPUT_NAME kdeinit4_${_target_NAME})
kde4_add_executable(${_target_NAME} "${_nogui}" ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp)
@@ -69,7 +69,7 @@ Last-Update: 2010-06-07
--- a/kinit/CMakeLists.txt
+++ b/kinit/CMakeLists.txt
-@@ -57,6 +57,17 @@
+@@ -58,6 +58,17 @@ endif(Q_WS_X11)
install(TARGETS kdeinit4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
@@ -99,7 +99,7 @@ Last-Update: 2010-06-07
#define INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_DIR}"
--- a/kdecore/kde-config.cpp
+++ b/kdecore/kde-config.cpp
-@@ -144,6 +144,7 @@
+@@ -144,6 +144,7 @@ int main(int argc, char **argv)
"html", I18N_NOOP("HTML documentation"),
"icon", I18N_NOOP("Icons"),
"kcfg", I18N_NOOP("Configuration description files"),
@@ -109,7 +109,7 @@ Last-Update: 2010-06-07
"locale", I18N_NOOP("Translation files for KLocale"),
--- a/kdecore/kernel/kstandarddirs.cpp
+++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -165,6 +165,8 @@
+@@ -165,6 +165,8 @@ xdgconf-menu
menus
xdgconf-autostart
autostart
@@ -118,7 +118,7 @@ Last-Update: 2010-06-07
*/
static const char types_string[] =
-@@ -219,6 +221,8 @@
+@@ -219,6 +221,8 @@ static const char types_string[] =
"menus\0"
"xdgconf-autostart\0"
"autostart\0"
@@ -127,7 +127,7 @@ Last-Update: 2010-06-07
"\0";
static const int types_indices[] = {
-@@ -228,7 +232,7 @@
+@@ -228,7 +232,7 @@ static const int types_indices[] = {
248, 258, 275, 285, 301, 305, 309, 316,
326, 336, 354, 359, 377, 387, 403, 416,
429, 442, 448, 463, 471, 484, 504, 217,
@@ -138,7 +138,7 @@ Last-Update: 2010-06-07
static void tokenize(QStringList& token, const QString& str,
--- a/kdecore/kernel/kstandarddirs_unix.cpp
+++ b/kdecore/kernel/kstandarddirs_unix.cpp
-@@ -40,6 +40,8 @@
+@@ -40,6 +40,8 @@ QString KStandardDirs::installPath(const
return QFile::decodeName(KCFG_INSTALL_DIR "/");
if (strcmp("kdedir", type) == 0)
return QFile::decodeName(KDEDIR "/");
@@ -149,7 +149,7 @@ Last-Update: 2010-06-07
if (strcmp("data", type) == 0)
--- a/kdecore/kernel/kstandarddirs_win.cpp
+++ b/kdecore/kernel/kstandarddirs_win.cpp
-@@ -47,6 +47,8 @@
+@@ -47,6 +47,8 @@ QString KStandardDirs::installPath(const
return share() + QLatin1String("config.kcfg/");
if (strcmp("kdedir", type) == 0)
return prefix();
@@ -160,7 +160,7 @@ Last-Update: 2010-06-07
if (strcmp("data", type) == 0)
--- a/kdecore/util/kpluginloader.cpp
+++ b/kdecore/util/kpluginloader.cpp
-@@ -113,6 +113,13 @@
+@@ -113,6 +113,13 @@ QString findLibraryInternal(const QStrin
libname = fileinfo.path() + QLatin1String("/lib") + fileinfo.fileName();
#endif
@@ -176,7 +176,7 @@ Last-Update: 2010-06-07
if (!kdeinit) {
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
-@@ -499,11 +499,23 @@
+@@ -499,11 +499,23 @@ static pid_t launch(int argc, const char
// try to match an absolute path to an executable binary (either in bin/ or in libexec/)
// to a kdeinit module in the same prefix
if( lib.contains( QLatin1String( "/lib" KDELIBSUFF "/kde4/libexec/" ))) {
diff --git a/debian/patches/qt4_designer_plugins_path.diff b/debian/patches/qt4_designer_plugins_path.diff
index e720d73..4d0f8a2 100644
--- a/debian/patches/qt4_designer_plugins_path.diff
+++ b/debian/patches/qt4_designer_plugins_path.diff
@@ -1,8 +1,6 @@
-Index: kde4libs/kdewidgets/CMakeLists.txt
-===================================================================
---- kde4libs.orig/kdewidgets/CMakeLists.txt 2010-12-18 13:02:55.710619796 +0100
-+++ kde4libs/kdewidgets/CMakeLists.txt 2010-12-18 13:11:17.282071131 +0100
-@@ -54,7 +54,7 @@
+--- a/kdewidgets/CMakeLists.txt
++++ b/kdewidgets/CMakeLists.txt
+@@ -54,7 +54,7 @@ if(QT_QTDESIGNER_FOUND)
)
endif(NOT WIN32)
@@ -11,7 +9,7 @@ Index: kde4libs/kdewidgets/CMakeLists.txt
# deprecated widgets
if(NOT KDE_NO_DEPRECATED)
-@@ -84,7 +84,7 @@
+@@ -83,7 +83,7 @@ if(QT_QTDESIGNER_FOUND)
)
endif(NOT WIN32)
@@ -20,7 +18,7 @@ Index: kde4libs/kdewidgets/CMakeLists.txt
endif(NOT KDE_NO_DEPRECATED)
-@@ -119,7 +119,7 @@
+@@ -117,7 +117,7 @@ if(QT_QTDESIGNER_FOUND)
)
endif(NOT WIN32)
@@ -29,7 +27,7 @@ Index: kde4libs/kdewidgets/CMakeLists.txt
if (QT_QT3SUPPORT_FOUND)
-@@ -154,7 +154,7 @@
+@@ -152,7 +152,7 @@ if(QT_QTDESIGNER_FOUND)
)
endif(NOT WIN32)
diff --git a/debian/patches/relax_plugin_kde_version_check.diff b/debian/patches/relax_plugin_kde_version_check.diff
index be082e5..de1c208 100644
--- a/debian/patches/relax_plugin_kde_version_check.diff
+++ b/debian/patches/relax_plugin_kde_version_check.diff
@@ -18,7 +18,7 @@ Last-Update: 2010-06-22
--- a/kdecore/util/kpluginloader.cpp
+++ b/kdecore/util/kpluginloader.cpp
-@@ -243,7 +243,6 @@
+@@ -243,7 +243,6 @@ bool KPluginLoader::load()
d->verificationData = (KDEPluginVerificationData *) lib.resolve("kde_plugin_verification_data");
if (d->verificationData) {
if (d->verificationData->dataVersion < KDEPluginVerificationData::PluginVerificationDataVersion
@@ -28,7 +28,7 @@ Last-Update: 2010-06-22
d->errorString = i18n("The plugin '%1' uses an incompatible KDE library (%2).", d->name, QString::fromLatin1(d->verificationData->KDEVersionString));
--- a/plasma/version.cpp
+++ b/plasma/version.cpp
-@@ -58,12 +58,11 @@
+@@ -58,12 +58,11 @@ bool isPluginVersionCompatible(unsigned
// we require PLASMA_VERSION_MAJOR and PLASMA_VERSION_MINOR
const quint32 minVersion = PLASMA_MAKE_VERSION(PLASMA_VERSION_MAJOR, 0, 0);
diff --git a/debian/patches/use_dejavu_as_default_font.diff b/debian/patches/use_dejavu_as_default_font.diff
index ad4eed7..2f862c8 100644
--- a/debian/patches/use_dejavu_as_default_font.diff
+++ b/debian/patches/use_dejavu_as_default_font.diff
@@ -6,7 +6,7 @@ needed).
--- a/kdeui/kernel/kglobalsettings.cpp
+++ b/kdeui/kernel/kglobalsettings.cpp
-@@ -397,7 +397,7 @@
+@@ -397,7 +397,7 @@ struct KFontData
// NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
static const char GeneralId[] = "General";
@@ -15,7 +15,7 @@ needed).
#ifdef Q_WS_MAC
static const char DefaultMacFont[] = "Lucida Grande";
#endif
-@@ -411,7 +411,7 @@
+@@ -411,7 +411,7 @@ static const KFontData DefaultFontData[K
{ GeneralId, "menuFont", DefaultMacFont, 13, -1, QFont::SansSerif },
#else
{ GeneralId, "font", DefaultFont, 9, -1, QFont::SansSerif },
--
KDE Development Platform Libraries module packaging
More information about the pkg-kde-commits
mailing list