rev 16748 - in trunk/packages/kdelibs/debian: . patches
Kai Wasserbäch
curan-guest at alioth.debian.org
Sun Jan 31 19:18:57 UTC 2010
Author: curan-guest
Date: 2010-01-31 19:18:56 +0000 (Sun, 31 Jan 2010)
New Revision: 16748
Removed:
trunk/packages/kdelibs/debian/patches/00_1034808_4.4_backport_rtldglobal.diff
trunk/packages/kdelibs/debian/patches/90_r1058555_fix_kxmlgui_crash_for_konq_plugins.diff
Modified:
trunk/packages/kdelibs/debian/changelog
trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.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/23_solid_no_double_build.diff
trunk/packages/kdelibs/debian/patches/25_ld_exclude_libs_qtuitools.diff
trunk/packages/kdelibs/debian/patches/28_find_kde3_html_documentation.diff
trunk/packages/kdelibs/debian/patches/series
Log:
[kde4libs] (trunk) Synced to r1083043 of upstream 4.4 branch.
* debian/patches:
- Dropped backported patches:
+ 00_1034808_4.4_backport_rtldglobal.diff
- Refreshed and reworked patches:
+ 08_add_debian_build_type.diff
+ 11_default_kde4_xdg_menu_prefix.diff
+ 14_hardcode_ptm_device.diff
+ 15_kfreebsd_support.diff
+ 17_findservicebydesktoppath_try_realfilepath.diff
+ 19_findqt4_optional_x11_pthread.diff
+ 20_use_dejavu_as_default_font.diff
+ 23_solid_no_double_build.diff
+ 25_ld_exclude_libs_qtuitools.diff
PLEASE NOTE: THIS IS JUST THE FIRST STEP FOR 4.4, THIS COMMIT MIGHT
NOT BUILD/COMPILE AT ALL!
Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog 2010-01-31 17:19:25 UTC (rev 16747)
+++ trunk/packages/kdelibs/debian/changelog 2010-01-31 19:18:56 UTC (rev 16748)
@@ -1,14 +1,27 @@
-kde4libs (4:4.3.4-2) UNRELEASED; urgency=low
+kde4libs (4:4.4.0~svn1083043-1) UNRELEASED; urgency=low
[ Modestas Vainius ]
* Change my email address to modax at debian.org in Uploaders field.
* Fix Vcs-Browser URL.
* Drop obsolete presubj.
- [ Xavier Vello ]
- * Backport r1058555's kxmlgui fix (needed for konq-plugins)
+ [ Kai Wasserbäch ]
+ * Synced to latest upstream SVN revision of the 4.4 branch (r1083043).
+ * debian/patches:
+ - Dropped backported patches:
+ + 00_1034808_4.4_backport_rtldglobal.diff
+ - Refreshed and reworked patches:
+ + 08_add_debian_build_type.diff
+ + 11_default_kde4_xdg_menu_prefix.diff
+ + 14_hardcode_ptm_device.diff
+ + 15_kfreebsd_support.diff
+ + 17_findservicebydesktoppath_try_realfilepath.diff
+ + 19_findqt4_optional_x11_pthread.diff
+ + 20_use_dejavu_as_default_font.diff
+ + 23_solid_no_double_build.diff
+ + 25_ld_exclude_libs_qtuitools.diff
- -- Xavier Vello <xavier.vello at gmail.com> Mon, 21 Dec 2009 01:01:49 +0100
+ -- Kai Wasserbäch <debian at carbon-project.org> Sun, 31 Jan 2010 18:57:53 +0100
kde4libs (4:4.3.4-1) unstable; urgency=low
Modified: trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff 2010-01-31 17:19:25 UTC (rev 16747)
+++ trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff 2010-01-31 19:18:56 UTC (rev 16748)
@@ -3,9 +3,13 @@
Define NDEBUG, otherwise we get pure debug code. Kfind will start in one instead
of twenty seconds with this define e.g. because of enabled caching of unknown
icons.
+---
+ cmake/modules/FindKDE4Internal.cmake | 2 ++
+ 1 file changed, 2 insertions(+)
+
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -1016,11 +1016,13 @@
+@@ -1076,11 +1076,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")
@@ -17,5 +21,5 @@
set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+ set(CMAKE_C_FLAGS_DEBIAN "-DNDEBUG -DQT_NO_DEBUG")
- if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
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 2010-01-31 17:19:25 UTC (rev 16747)
+++ trunk/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff 2010-01-31 19:18:56 UTC (rev 16748)
@@ -1,6 +1,11 @@
+---
+ kded/CMakeLists.txt | 2 +-
+ kded/vfolder_menu.cpp | 7 ++++---
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
--- 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 +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 @@
+@@ -772,8 +772,10 @@ VFolderMenu::locateMenuFile(const QStrin
QString result;
QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX"));
@@ -24,7 +29,7 @@
QFileInfo fileInfo(fileName);
QString fileNameOnly = fileInfo.fileName();
-@@ -781,7 +783,6 @@
+@@ -783,7 +785,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 2010-01-31 17:19:25 UTC (rev 16747)
+++ trunk/packages/kdelibs/debian/patches/13_qt4_designer_plugins_path.diff 2010-01-31 19:18:56 UTC (rev 16748)
@@ -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 2010-01-31 17:19:25 UTC (rev 16747)
+++ trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff 2010-01-31 19:18:56 UTC (rev 16748)
@@ -1,8 +1,12 @@
In a build environment /dev/ptmx is not always present.
Bypass build time check as /dev/ptmx is alsways present at runtime.
+---
+ ConfigureChecks.cmake | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
-@@ -196,13 +196,7 @@
+@@ -202,13 +202,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 2010-01-31 17:19:25 UTC (rev 16747)
+++ trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff 2010-01-31 19:18:56 UTC (rev 16748)
@@ -2,48 +2,34 @@
We can not push this patch to upstream since the:
CMAKE_SYSTEM_NAME MATCHES kFreeBSD stuff, needs the Debian patched
cmake.
---- a/kpty/kpty.cpp
-+++ b/kpty/kpty.cpp
-@@ -107,24 +107,24 @@
- # define _NEW_TTY_CTRL
- #endif
-
--#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
-+#if defined(HAVE_TCGETATTR)
-+# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
-+#elif defined(TIOCGETA)
- # define _tcgetattr(fd, ttmode) ioctl(fd, TIOCGETA, (char *)ttmode)
-+#elif defined(TCGETS)
-+# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
- #else
--# if defined(_HPUX_SOURCE) || defined(__Lynx__) || defined (__CYGWIN__)
--# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
--# else
--# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
--# endif
-+# error
- #endif
-
--#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
-+#if defined(HAVE_TCSETATTR) && defined(TCSANOW)
-+# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
-+#elif defined(TIOCSETA)
- # define _tcsetattr(fd, ttmode) ioctl(fd, TIOCSETA, (char *)ttmode)
-+#elif defined(TCSETS)
-+# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
- #else
--# if defined(_HPUX_SOURCE) || defined(__CYGWIN__)
--# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
--# else
--# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
--# endif
-+# error
- #endif
-
- #include <kdebug.h>
+---
+ ConfigureChecks.cmake | 6 +++---
+ kio/kfile/kpropertiesdialog.cpp | 10 +++++++++-
+ kioslave/file/file.cpp | 2 ++
+ kioslave/file/file_unix.cpp | 4 ++++
+ kpty/kpty.cpp | 24 ++++++++++++------------
+ 5 files changed, 30 insertions(+), 16 deletions(-)
+
+--- a/ConfigureChecks.cmake
++++ b/ConfigureChecks.cmake
+@@ -164,11 +164,11 @@ if (UNIX)
+ set(UTIL_LIBRARY util)
+ endif (login_in_libutil)
+ endif (NOT login_in_libc)
+- if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL GNU)
++ if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL GNU OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
+ set (HAVE_UTMPX)
+- else (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL GNU)
++ else (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL GNU OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
+ check_function_exists(getutxent HAVE_UTMPX)
+- endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL GNU)
++ endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL GNU OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
+ if (HAVE_UTMPX)
+ set(utmp utmpx)
+ if (login_in_libutil)
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
-@@ -1898,7 +1898,15 @@
+@@ -1896,7 +1896,15 @@ static bool fileSystemSupportsACL( const
fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
#else
fileSystemSupportsACLs =
@@ -60,26 +46,9 @@
#endif
return fileSystemSupportsACLs;
}
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -158,11 +158,11 @@
- set(UTIL_LIBRARY util)
- endif (login_in_libutil)
- endif (NOT login_in_libc)
-- if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD)
-+ if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
- set (HAVE_UTMPX)
-- else (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD)
-+ else (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
- check_function_exists(getutxent HAVE_UTMPX)
-- endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD)
-+ endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
- if (HAVE_UTMPX)
- set(utmp utmpx)
- if (login_in_libutil)
--- a/kioslave/file/file.cpp
+++ b/kioslave/file/file.cpp
-@@ -324,8 +324,10 @@
+@@ -324,8 +324,10 @@ void FileProtocol::get( const KUrl& url
}
#ifdef HAVE_FADVISE
@@ -92,7 +61,7 @@
// This is mandatory in all slaves (for KRun/BrowserRun to work)
--- a/kioslave/file/file_unix.cpp
+++ b/kioslave/file/file_unix.cpp
-@@ -133,8 +133,10 @@
+@@ -146,8 +146,10 @@ void FileProtocol::copy( const KUrl &src
}
#ifdef HAVE_FADVISE
@@ -103,7 +72,7 @@
// WABA: Make sure that we keep writing permissions ourselves,
// otherwise we can be in for a surprise on NFS.
mode_t initialMode;
-@@ -156,8 +158,10 @@
+@@ -169,8 +171,10 @@ void FileProtocol::copy( const KUrl &src
}
#ifdef HAVE_FADVISE
@@ -114,3 +83,42 @@
#ifdef HAVE_POSIX_ACL
acl = acl_get_fd(src_fd);
+--- a/kpty/kpty.cpp
++++ b/kpty/kpty.cpp
+@@ -107,24 +107,24 @@ extern "C" {
+ # define _NEW_TTY_CTRL
+ #endif
+
+-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
++#if defined(HAVE_TCGETATTR)
++# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
++#elif defined(TIOCGETA)
+ # define _tcgetattr(fd, ttmode) ioctl(fd, TIOCGETA, (char *)ttmode)
++#elif defined(TCGETS)
++# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
+ #else
+-# if defined(_HPUX_SOURCE) || defined(__Lynx__) || defined (__CYGWIN__)
+-# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
+-# else
+-# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
+-# endif
++# error
+ #endif
+
+-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
++#if defined(HAVE_TCSETATTR) && defined(TCSANOW)
++# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
++#elif defined(TIOCSETA)
+ # define _tcsetattr(fd, ttmode) ioctl(fd, TIOCSETA, (char *)ttmode)
++#elif defined(TCSETS)
++# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
+ #else
+-# if defined(_HPUX_SOURCE) || defined(__CYGWIN__)
+-# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
+-# else
+-# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
+-# endif
++# error
+ #endif
+
+ #include <kdebug.h>
Modified: trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff 2010-01-31 17:19:25 UTC (rev 16747)
+++ trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff 2010-01-31 19:18:56 UTC (rev 16748)
@@ -1,10 +1,9 @@
This patch is an attempt to make KDE find desktop files
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
-@@ -116,16 +116,10 @@
+@@ -124,33 +124,49 @@ KService::Ptr KServiceFactory::findServi
return newService;
}
@@ -18,11 +17,25 @@
-
int offset = m_relNameDict->find_string( _name );
if (!offset) {
-- kDebug() << QString("findServiceByDesktopPath: %1 not found").arg( _name );
- return KService::Ptr(); // Not found
+- //kDebug(servicesDebugArea()) << "findServiceByDesktopPath:" << _name << "not found";
+- return KService::Ptr(); // Not found
++ return KService::Ptr(); // Not found
}
-@@ -142,6 +136,27 @@
+ KService::Ptr newService(createEntry(offset));
+ if (!newService) {
+- kDebug(servicesDebugArea()) << "findServiceByDesktopPath: createEntry failed!";
++ kDebug() << "findServiceByDesktopPath: createEntry failed!";
+ }
+ // Check whether the dictionary was right
+ // It's ok that it's wrong, for the case where we're looking up an unknown service,
+ // and the hash value gave us another one.
+- if (newService && (newService->entryPath() != _name)) {
++ if (newService && (newService->entryPath() != _name))
++ {
+ // No it wasn't...
+ return KService::Ptr();
+ }
return newService;
}
@@ -33,8 +46,8 @@
+ // Warning : this assumes we're NOT building a database
+ // KBuildServiceFactory reimplements it for the case where we are building one
+
-+ KService::Ptr newService(serviceFromPath( _name ));
-+ if ( !newService ) {
++ KService::Ptr newService(serviceFromPath(_name));
++ if (!newService) {
+ // We might have been given a symlink or non-canonical path of some sort.
+ // Therefore try looking up KStandardDirs::realFilePath'ed path too.
+ newService = serviceFromPath( KStandardDirs::realFilePath( _name ) );
@@ -52,7 +65,7 @@
if (!m_menuIdDict) return KService::Ptr(); // Error!
--- 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;
Modified: trunk/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff 2010-01-31 17:19:25 UTC (rev 16747)
+++ trunk/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff 2010-01-31 19:18:56 UTC (rev 16748)
@@ -1,16 +1,19 @@
-qt doesn't expose the x11 headers to the world, so no need to make it required.
+Qt doesn't expose the X11 headers to the world, so no need to make it required.
+---
+ cmake/modules/Qt4ConfigDependentSettings.cmake | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
---- a/cmake/modules/FindQt4.cmake
-+++ b/cmake/modules/FindQt4.cmake
-@@ -1470,10 +1470,9 @@
- IF(UNIX)
- # on OS X X11 may not be required
- IF (Q_WS_X11)
-- FIND_PACKAGE(X11 REQUIRED)
-+ FIND_PACKAGE(X11)
- ENDIF (Q_WS_X11)
- FIND_PACKAGE(Threads)
-- SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
- ENDIF(UNIX)
+--- a/cmake/modules/Qt4ConfigDependentSettings.cmake
++++ b/cmake/modules/Qt4ConfigDependentSettings.cmake
+@@ -27,10 +27,9 @@
+ IF(UNIX)
+ # on OS X X11 may not be required
+ IF (Q_WS_X11)
+- FIND_PACKAGE(X11 REQUIRED)
++ FIND_PACKAGE(X11)
+ ENDIF (Q_WS_X11)
+ FIND_PACKAGE(Threads)
+- SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+ ENDIF(UNIX)
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 2010-01-31 17:19:25 UTC (rev 16747)
+++ trunk/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff 2010-01-31 19:18:56 UTC (rev 16748)
@@ -1,7 +1,12 @@
-Use DejaVu Sans as default font and adjusts sizes accordingly.
+Use DejaVu Sans as default font and adjusts sizes accordingly (where
+needed).
+---
+ kdeui/kernel/kglobalsettings.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
--- a/kdeui/kernel/kglobalsettings.cpp
+++ b/kdeui/kernel/kglobalsettings.cpp
-@@ -381,7 +381,7 @@
+@@ -381,7 +381,7 @@ struct KFontData
// NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
static const char GeneralId[] = "General";
@@ -10,21 +15,12 @@
#ifdef Q_WS_MAC
static const char DefaultMacFont[] = "Lucida Grande";
#endif
-@@ -394,13 +394,13 @@
- { GeneralId, "toolBarFont", DefaultMacFont, 11, -1, QFont::SansSerif },
+@@ -395,7 +395,7 @@ static const KFontData DefaultFontData[K
{ GeneralId, "menuFont", DefaultMacFont, 13, -1, QFont::SansSerif },
#else
-- { GeneralId, "font", DefaultFont, 10, -1, QFont::SansSerif },
-- { GeneralId, "fixed", "Monospace", 10, -1, QFont::TypeWriter },
-+ { GeneralId, "font", DefaultFont, 9, -1, QFont::SansSerif },
+ { GeneralId, "font", DefaultFont, 9, -1, QFont::SansSerif },
+- { GeneralId, "fixed", "Monospace", 9, -1, QFont::TypeWriter },
+ { GeneralId, "fixed", "DejaVu Sans Mono", 9, -1, QFont::TypeWriter },
{ GeneralId, "toolBarFont", DefaultFont, 8, -1, QFont::SansSerif },
-- { GeneralId, "menuFont", DefaultFont, 10, -1, QFont::SansSerif },
-+ { GeneralId, "menuFont", DefaultFont, 9, -1, QFont::SansSerif },
+ { GeneralId, "menuFont", DefaultFont, 9, -1, QFont::SansSerif },
#endif
- { "WM", "activeFont", DefaultFont, 9, QFont::Bold, QFont::SansSerif },// inconsistency
-- { GeneralId, "taskbarFont", DefaultFont, 10, -1, QFont::SansSerif },
-+ { GeneralId, "taskbarFont", DefaultFont, 9, -1, QFont::SansSerif },
- { GeneralId, "smallestReadableFont", DefaultFont, 8, -1, QFont::SansSerif }
- };
-
Modified: trunk/packages/kdelibs/debian/patches/23_solid_no_double_build.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/23_solid_no_double_build.diff 2010-01-31 17:19:25 UTC (rev 16747)
+++ trunk/packages/kdelibs/debian/patches/23_solid_no_double_build.diff 2010-01-31 19:18:56 UTC (rev 16748)
@@ -1,6 +1,10 @@
+---
+ solid/solid/CMakeLists.txt | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
--- a/solid/solid/CMakeLists.txt
+++ b/solid/solid/CMakeLists.txt
-@@ -220,7 +220,14 @@
+@@ -235,7 +235,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/25_ld_exclude_libs_qtuitools.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/25_ld_exclude_libs_qtuitools.diff 2010-01-31 17:19:25 UTC (rev 16747)
+++ trunk/packages/kdelibs/debian/patches/25_ld_exclude_libs_qtuitools.diff 2010-01-31 19:18:56 UTC (rev 16748)
@@ -1,15 +1,18 @@
Exclude QtUiTools symbols from libplasma dynamic symbols table.
+---
+ plasma/CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
--- a/plasma/CMakeLists.txt
+++ b/plasma/CMakeLists.txt
-@@ -156,6 +156,10 @@
- target_link_libraries(plasma ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} knewstuff2
+@@ -212,6 +212,9 @@ target_link_libraries(plasma ${KDE4_KIO_
${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY}
- threadweaver ${KDE4_SOLID_LIBS} )
-+
+ kdnssd threadweaver ${KDE4_SOLID_LIBS} )
+
+# Do not export QtUiTools internal symbols
+set_target_properties(plasma PROPERTIES LINK_FLAGS_DEBIAN "-Wl,--exclude-libs -Wl,libQtUiTools.a")
+
- if(X11_FOUND)
- target_link_libraries(plasma ${X11_LIBRARIES})
- endif(X11_FOUND)
+ if(QCA2_FOUND)
+ target_link_libraries(plasma ${QCA2_LIBRARIES})
+ endif(QCA2_FOUND)
Modified: trunk/packages/kdelibs/debian/patches/28_find_kde3_html_documentation.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/28_find_kde3_html_documentation.diff 2010-01-31 17:19:25 UTC (rev 16747)
+++ trunk/packages/kdelibs/debian/patches/28_find_kde3_html_documentation.diff 2010-01-31 19:18:56 UTC (rev 16748)
@@ -1,6 +1,6 @@
--- a/kdecore/kernel/kstandarddirs.cpp
+++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1769,6 +1769,9 @@
+@@ -1769,6 +1769,9 @@ void KStandardDirs::addKDEDefaults()
addResourceType("autostart", "xdgconf-autostart", "/"); // merge them, start with xdg autostart
addResourceType("autostart", NULL, "share/autostart"); // KDE ones are higher priority
Modified: trunk/packages/kdelibs/debian/patches/series
===================================================================
--- trunk/packages/kdelibs/debian/patches/series 2010-01-31 17:19:25 UTC (rev 16747)
+++ trunk/packages/kdelibs/debian/patches/series 2010-01-31 19:18:56 UTC (rev 16748)
@@ -1,4 +1,3 @@
-00_1034808_4.4_backport_rtldglobal.diff
08_add_debian_build_type.diff
11_default_kde4_xdg_menu_prefix.diff
13_qt4_designer_plugins_path.diff
@@ -14,4 +13,3 @@
26_fixmanpage.diff
27_konsole_kfreebsd_fix.diff
28_find_kde3_html_documentation.diff
-90_r1058555_fix_kxmlgui_crash_for_konq_plugins.diff
More information about the pkg-kde-commits
mailing list