rev 14208 - in trunk/packages/kdelibs/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Sat Apr 4 08:08:08 UTC 2009
Author: fabo
Date: 2009-04-04 08:08:08 +0000 (Sat, 04 Apr 2009)
New Revision: 14208
Modified:
trunk/packages/kdelibs/debian/changelog
trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
trunk/packages/kdelibs/debian/patches/09_disable_debug_messages_if_not_explicitly_enabled.diff
trunk/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff
trunk/packages/kdelibs/debian/patches/13_qt4_designer_plugins_path.diff
trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff
trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff
trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
trunk/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff
trunk/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff
trunk/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
trunk/packages/kdelibs/debian/patches/23_solid_no_double_build.diff
trunk/packages/kdelibs/debian/patches/24_runtime_qt45_locale_initialization.diff
Log:
Refresh patches and remove extra spaces.
Add header to patch 24: runtime qt_locale_initialized.
Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog 2009-04-04 00:33:52 UTC (rev 14207)
+++ trunk/packages/kdelibs/debian/changelog 2009-04-04 08:08:08 UTC (rev 14208)
@@ -14,9 +14,9 @@
+++ Changes by Ana Beatriz Guerrero Lopez:
* Remove 01_kcmdlineargs_decoding_svn934640.diff, merged upstream.
-
+
+++ Changes by Aurelien Jarno:
-
+
* Update 15_kfreebsd.diff (Closes: #520123).
+++ Changes by George Kiagiadakis:
Modified: trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff 2009-04-04 00:33:52 UTC (rev 14207)
+++ trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff 2009-04-04 08:08:08 UTC (rev 14208)
@@ -6,7 +6,7 @@
Debug output is not completely disabled, because QT_NO_DEBUG is not set.
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -965,11 +965,13 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+@@ -972,11 +972,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")
Modified: trunk/packages/kdelibs/debian/patches/09_disable_debug_messages_if_not_explicitly_enabled.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/09_disable_debug_messages_if_not_explicitly_enabled.diff 2009-04-04 00:33:52 UTC (rev 14207)
+++ trunk/packages/kdelibs/debian/patches/09_disable_debug_messages_if_not_explicitly_enabled.diff 2009-04-04 08:08:08 UTC (rev 14208)
@@ -6,15 +6,15 @@
In KDE 4.3 trunk this has been committed as r916186.
--- a/kdecore/kdebugrc
+++ b/kdecore/kdebugrc
-@@ -82,7 +82,7 @@ InfoOutput=4
+@@ -78,7 +78,7 @@ InfoOutput=4
# KMail
[5006]
-InfoOutput=2
+InfoOutput=4
- # KitchenSync (Syncing Algorithm)
- [5250]
+ [5120]
+ InfoOutput=2
--- a/kdecore/io/kdebug.cpp
+++ b/kdecore/io/kdebug.cpp
@@ -181,6 +181,11 @@ struct KDebugPrivate
Modified: trunk/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff 2009-04-04 00:33:52 UTC (rev 14207)
+++ trunk/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff 2009-04-04 08:08:08 UTC (rev 14208)
@@ -1,6 +1,6 @@
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
-@@ -69,7 +69,7 @@
+@@ -69,7 +69,7 @@ install(TARGETS kdontchangethehostname D
if (WIN32)
install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus )
else (WIN32)
@@ -11,7 +11,7 @@
install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
-@@ -769,8 +769,10 @@
+@@ -769,8 +769,10 @@ VFolderMenu::locateMenuFile(const QStrin
QString result;
QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX"));
@@ -24,7 +24,7 @@
QFileInfo fileInfo(fileName);
QString fileNameOnly = fileInfo.fileName();
-@@ -780,7 +782,6 @@
+@@ -780,7 +782,6 @@ VFolderMenu::locateMenuFile(const QStrin
QString baseName = QDir::cleanPath(m_docInfo.baseDir +
fileInfo.path() + '/' + fileNameOnly);
result = KStandardDirs::locate("xdgconf-menu", baseName);
Modified: trunk/packages/kdelibs/debian/patches/13_qt4_designer_plugins_path.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/13_qt4_designer_plugins_path.diff 2009-04-04 00:33:52 UTC (rev 14207)
+++ trunk/packages/kdelibs/debian/patches/13_qt4_designer_plugins_path.diff 2009-04-04 08:08:08 UTC (rev 14208)
@@ -1,6 +1,6 @@
--- a/kdewidgets/CMakeLists.txt
+++ b/kdewidgets/CMakeLists.txt
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ if(NOT WIN32)
)
endif(NOT WIN32)
Modified: trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff 2009-04-04 00:33:52 UTC (rev 14207)
+++ trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff 2009-04-04 08:08:08 UTC (rev 14208)
@@ -2,7 +2,7 @@
Bypass build time check as /dev/ptmx is alsways present at runtime.
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
-@@ -191,13 +191,7 @@
+@@ -191,13 +191,7 @@ if (UNIX)
set(HAVE_OPENPTY)
EXECUTE_PROCESS(
Modified: trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff 2009-04-04 00:33:52 UTC (rev 14207)
+++ trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff 2009-04-04 08:08:08 UTC (rev 14208)
@@ -4,7 +4,7 @@
cmake.
--- a/kpty/kpty.cpp
+++ b/kpty/kpty.cpp
-@@ -107,24 +107,24 @@
+@@ -107,24 +107,24 @@ extern "C" {
# define _NEW_TTY_CTRL
#endif
@@ -43,7 +43,7 @@
#include <kdebug.h>
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
-@@ -1879,7 +1879,15 @@
+@@ -1867,7 +1867,15 @@ static bool fileSystemSupportsACL( const
fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
#else
fileSystemSupportsACLs =
@@ -62,7 +62,7 @@
}
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
-@@ -153,11 +153,11 @@
+@@ -153,11 +153,11 @@ if (UNIX)
set(UTIL_LIBRARY util)
endif (login_in_libutil)
endif (NOT login_in_libc)
@@ -79,7 +79,7 @@
if (login_in_libutil)
--- a/kioslave/file/file.cpp
+++ b/kioslave/file/file.cpp
-@@ -307,8 +307,10 @@
+@@ -315,8 +315,10 @@ void FileProtocol::get( const KUrl& url
}
#ifdef HAVE_FADVISE
@@ -92,7 +92,7 @@
// This is mandatory in all slaves (for KRun/BrowserRun to work)
--- a/kioslave/file/file_unix.cpp
+++ b/kioslave/file/file_unix.cpp
-@@ -129,8 +129,10 @@
+@@ -129,8 +129,10 @@ void FileProtocol::copy( const KUrl &src
}
#ifdef HAVE_FADVISE
@@ -103,7 +103,7 @@
// WABA: Make sure that we keep writing permissions ourselves,
// otherwise we can be in for a surprise on NFS.
mode_t initialMode;
-@@ -152,8 +154,10 @@
+@@ -152,8 +154,10 @@ void FileProtocol::copy( const KUrl &src
}
#ifdef HAVE_FADVISE
Modified: trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff 2009-04-04 00:33:52 UTC (rev 14207)
+++ trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff 2009-04-04 08:08:08 UTC (rev 14208)
@@ -4,7 +4,7 @@
--- a/kdecore/services/kservicefactory.cpp
+++ b/kdecore/services/kservicefactory.cpp
-@@ -125,16 +125,10 @@
+@@ -125,16 +125,10 @@ KService::Ptr KServiceFactory::findServi
return newService;
}
@@ -22,7 +22,7 @@
return KService::Ptr(); // Not found
}
-@@ -151,6 +145,27 @@
+@@ -151,6 +145,27 @@ KService::Ptr KServiceFactory::findServi
return newService;
}
@@ -52,7 +52,7 @@
if (!m_menuIdDict) return KService::Ptr(); // Error!
--- a/kdecore/services/kservicefactory.h
+++ b/kdecore/services/kservicefactory.h
-@@ -123,6 +123,8 @@
+@@ -123,6 +123,8 @@ protected:
virtual void virtual_hook( int id, void* data );
private:
class KServiceFactoryPrivate* d;
Modified: trunk/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff 2009-04-04 00:33:52 UTC (rev 14207)
+++ trunk/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff 2009-04-04 08:08:08 UTC (rev 14208)
@@ -2,7 +2,7 @@
--- a/cmake/modules/FindQt4.cmake
+++ b/cmake/modules/FindQt4.cmake
-@@ -1457,10 +1457,9 @@
+@@ -1457,10 +1457,9 @@ IF (QT4_QMAKE_FOUND)
IF(UNIX)
# on OS X X11 may not be required
IF (Q_WS_X11)
Modified: trunk/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff 2009-04-04 00:33:52 UTC (rev 14207)
+++ trunk/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff 2009-04-04 08:08:08 UTC (rev 14208)
@@ -1,7 +1,7 @@
Use DejaVu Sans as default font and adjusts sizes accordingly.
--- a/kdeui/kernel/kglobalsettings.cpp
+++ b/kdeui/kernel/kglobalsettings.cpp
-@@ -374,7 +374,7 @@
+@@ -374,7 +374,7 @@ struct KFontData
// NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
static const char GeneralId[] = "General";
@@ -10,7 +10,7 @@
#ifdef Q_WS_MAC
static const char DefaultMacFont[] = "Lucida Grande";
#endif
-@@ -387,13 +387,13 @@
+@@ -387,13 +387,13 @@ static const KFontData DefaultFontData[K
{ GeneralId, "toolBarFont", DefaultMacFont, 11, -1, QFont::SansSerif },
{ GeneralId, "menuFont", DefaultMacFont, 13, -1, QFont::SansSerif },
#else
Modified: trunk/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff 2009-04-04 00:33:52 UTC (rev 14207)
+++ trunk/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff 2009-04-04 08:08:08 UTC (rev 14208)
@@ -12,7 +12,7 @@
--- a/kdecore/kernel/kstandarddirs.cpp
+++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1031,6 +1031,10 @@
+@@ -1031,6 +1031,10 @@ QStringList KStandardDirs::resourceDirs(
if ((local || testdir.exists()) && !candidates.contains(path))
candidates.append(path);
}
Modified: trunk/packages/kdelibs/debian/patches/23_solid_no_double_build.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/23_solid_no_double_build.diff 2009-04-04 00:33:52 UTC (rev 14207)
+++ trunk/packages/kdelibs/debian/patches/23_solid_no_double_build.diff 2009-04-04 08:08:08 UTC (rev 14208)
@@ -1,6 +1,6 @@
--- a/solid/solid/CMakeLists.txt
+++ b/solid/solid/CMakeLists.txt
-@@ -194,7 +194,14 @@
+@@ -194,7 +194,14 @@ install(FILES org.freedesktop.PowerManag
install(FILES org.freedesktop.PowerManagement.Inhibit.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
########### static lib for tests ###############
Modified: trunk/packages/kdelibs/debian/patches/24_runtime_qt45_locale_initialization.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/24_runtime_qt45_locale_initialization.diff 2009-04-04 00:33:52 UTC (rev 14207)
+++ trunk/packages/kdelibs/debian/patches/24_runtime_qt45_locale_initialization.diff 2009-04-04 08:08:08 UTC (rev 14208)
@@ -1,8 +1,12 @@
-Index: kdelibs/kdecore/CMakeLists.txt
-===================================================================
---- kdelibs.orig/kdecore/CMakeLists.txt 2009-04-04 01:57:18.000000000 +0300
-+++ kdelibs/kdecore/CMakeLists.txt 2009-04-04 01:57:49.000000000 +0300
-@@ -275,7 +275,7 @@
+author: Will Stephenson <wstephenson at suse.de>
+
+change choice to initialise qt locale for 4.5 to runtime instead of build time
+so kdelibs built with Qt4.4 works with Qt4.5
+Patch is linux-specific, hence can't be upstreamed.
+
+--- a/kdecore/CMakeLists.txt
++++ b/kdecore/CMakeLists.txt
+@@ -275,7 +275,7 @@ endif (NOT Q_WS_X11 AND NOT Q_WS_QWS)
kde4_add_library(kdecore SHARED ${kdecore_LIB_SRCS})
@@ -11,10 +15,8 @@
if(WIN32)
set(kdecore_LINK_INTERFACE_LIBRARIES ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} ${KDEWIN32_LIBRARIES})
-Index: kdelibs/kdecore/localization/kcatalog.cpp
-===================================================================
---- kdelibs.orig/kdecore/localization/kcatalog.cpp 2009-04-04 01:57:30.000000000 +0300
-+++ kdelibs/kdecore/localization/kcatalog.cpp 2009-04-04 01:57:49.000000000 +0300
+--- a/kdecore/localization/kcatalog.cpp
++++ b/kdecore/localization/kcatalog.cpp
@@ -26,6 +26,8 @@
#include <kdebug.h>
@@ -24,7 +26,7 @@
#include <stdlib.h>
#include <locale.h>
#include "gettext.h"
-@@ -39,10 +41,9 @@
+@@ -39,10 +41,9 @@ static bool s_localeSet = false;
int kInitializeLocale()
{
setlocale(LC_ALL, "");
More information about the pkg-kde-commits
mailing list