[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.6.5-2-5-g6e8ffd8
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Mon Aug 8 16:28:14 UTC 2011
The following commit has been merged in the master branch:
commit 8541f7047f757816f3358ee8807717ece0626910
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Sun Aug 7 02:17:00 2011 +0200
Update patches.
---
debian/changelog | 6 ++
debian/patches/add_dlrestrictions_support.diff | 2 +-
.../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/kded4_deadlock.patch | 88 --------------------
debian/patches/kfreebsd_support.diff | 22 +++---
debian/patches/ktar_header_checksum_fix.diff | 4 +-
debian/patches/ktar_longlink_length_in_bytes.diff | 6 +-
debian/patches/ld_exclude_libs_qtuitools.diff | 2 +-
debian/patches/make_libkdeinit4_private.diff | 2 +-
debian/patches/series | 1 -
debian/patches/use_dejavu_as_default_font.diff | 4 +-
13 files changed, 30 insertions(+), 113 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0558c70..2adbb2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,12 @@ kde4libs (4:4.7.0-0r0) UNRELEASED; urgency=low
* New upstream release.
+ [ José Manuel Santamaría Lema ]
+ * Update patches:
+ - Remove kded4_deadlock.patch, applied upstream.
+ - Update kfreebsd_support.diff.
+ - Refreshed other patches to make them apply without offsets.
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 07 Aug 2011 01:03:43 +0200
kde4libs (4:4.6.5-2) unstable; urgency=low
diff --git a/debian/patches/add_dlrestrictions_support.diff b/debian/patches/add_dlrestrictions_support.diff
index 2f36b02..4475be3 100644
--- a/debian/patches/add_dlrestrictions_support.diff
+++ b/debian/patches/add_dlrestrictions_support.diff
@@ -53,7 +53,7 @@ on all (or some) the targets.
message(FATAL_ERROR "_KDE4_EXPORT_LIBRARY_DEPENDENCIES() was an internal macro and has been removed again. Just remove the code which calls it, there is no substitute.")
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
-@@ -382,6 +382,14 @@ kde4_add_library(kdecore ${LIBRARY_TYPE}
+@@ -397,6 +397,14 @@ kde4_add_library(kdecore ${LIBRARY_TYPE}
target_link_libraries(kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARY} ${kdecore_OPTIONAL_LIBS})
diff --git a/debian/patches/hack_in_etc_kde4_in_kstandarddirs.diff b/debian/patches/hack_in_etc_kde4_in_kstandarddirs.diff
index 624d03d..92528df 100644
--- a/debian/patches/hack_in_etc_kde4_in_kstandarddirs.diff
+++ b/debian/patches/hack_in_etc_kde4_in_kstandarddirs.diff
@@ -22,4 +22,4 @@ overridden by adding new files to /etc/kde4 by the sysadm.
+ //
local = false;
}
- else
+ else
diff --git a/debian/patches/hardcode_ptm_device.diff b/debian/patches/hardcode_ptm_device.diff
index cc35a51..276359e 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 @@ if (UNIX)
+@@ -186,13 +186,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 e3706cf..95dc200 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
-@@ -438,6 +438,16 @@ set_target_properties(kdeui PROPERTIES V
+@@ -457,6 +457,16 @@ set_target_properties(kdeui PROPERTIES V
)
install(TARGETS kdeui EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/debian/patches/kded4_deadlock.patch b/debian/patches/kded4_deadlock.patch
deleted file mode 100644
index b00a73a..0000000
--- a/debian/patches/kded4_deadlock.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Author: Mario Bensi <mbensi at ipsquad.net>
-Origin: https://projects.kde.org/projects/kde/kdelibs/repository/revisions/42d40d1d351588a71bef0af1d62a8f6dc586f141
-Origin: https://projects.kde.org/projects/kde/kdelibs/repository/revisions/350a5d8de016b6daa36c6e29d5d5f83ad6c2b38d
-Applied-Upstream: 4.7.0
-Description: This patch is suposed to prevent deadlocks in kded4.
- This patch includes the changes of a couple of upstream commits, these are the
- commit messages:
-
- ID: 42d40d1d351588a71bef0af1d62a8f6dc586f141
- Fix crash during the QFileSystemWatcher destruction
- The QFileSystemWatcher doesn't work correctly in a singleton
- The solution so far was to destroy the QFileSystemWatcher when the
- application quits but we have some crash with this solution.
- For the moment to workaround the problem, we detach the
- QFileSystemWatcher from the parent effectively leaking it on purpose.
-
- ID: 350a5d8de016b6daa36c6e29d5d5f83ad6c2b38d
- Fix solid test
- I need to detach parent on QFileSystemWatcher when the FstabWatcher
- destructor are called if the aboutToQuit is not called. It's the case in
- test.
-
----
- solid/solid/backends/fstab/fstabwatcher.cpp | 24 +++++++++++++++++++++++-
- solid/solid/backends/fstab/fstabwatcher.h | 1 +
- 2 files changed, 24 insertions(+), 1 deletion(-)
-
---- a/solid/solid/backends/fstab/fstabwatcher.cpp
-+++ b/solid/solid/backends/fstab/fstabwatcher.cpp
-@@ -40,6 +40,9 @@ FstabWatcher::FstabWatcher()
- : m_isRoutineInstalled(false)
- , m_fileSystemWatcher(new QFileSystemWatcher(this))
- {
-+ if (qApp) {
-+ connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(orphanFileSystemWatcher()));
-+ }
- m_fileSystemWatcher->addPath(MTAB);
- m_fileSystemWatcher->addPath(FSTAB);
- connect(m_fileSystemWatcher, SIGNAL(fileChanged(QString)), this, SLOT(onFileChanged(QString)));
-@@ -47,11 +50,27 @@ FstabWatcher::FstabWatcher()
-
- FstabWatcher::~FstabWatcher()
- {
-- qRemovePostRoutine(globalFstabWatcher.destroy);
-+ // The QFileSystemWatcher doesn't work correctly in a singleton
-+ // The solution so far was to destroy the QFileSystemWatcher when the application quits
-+ // But we have some crash with this solution.
-+ // For the moment to workaround the problem, we detach the QFileSystemWatcher from the parent
-+ // effectively leaking it on purpose.
-+
-+#if 0
-+ //qRemovePostRoutine(globalFstabWatcher.destroy);
-+#else
-+ m_fileSystemWatcher->setParent(0);
-+#endif
-+}
-+
-+void FstabWatcher::orphanFileSystemWatcher()
-+{
-+ m_fileSystemWatcher->setParent(0);
- }
-
- FstabWatcher *FstabWatcher::instance()
- {
-+#if 0
- FstabWatcher *fstabWatcher = globalFstabWatcher;
-
- if (fstabWatcher && !fstabWatcher->m_isRoutineInstalled) {
-@@ -59,6 +78,9 @@ FstabWatcher *FstabWatcher::instance()
- fstabWatcher->m_isRoutineInstalled = true;
- }
- return fstabWatcher;
-+#else
-+ return globalFstabWatcher;
-+#endif
- }
-
-
---- a/solid/solid/backends/fstab/fstabwatcher.h
-+++ b/solid/solid/backends/fstab/fstabwatcher.h
-@@ -46,6 +46,7 @@ namespace Fstab
-
- private Q_SLOTS:
- void onFileChanged(const QString &path);
-+ void orphanFileSystemWatcher();
-
- private:
- bool m_isRoutineInstalled;
diff --git a/debian/patches/kfreebsd_support.diff b/debian/patches/kfreebsd_support.diff
index 0500295..d2aca94 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 @@ if (UNIX)
+@@ -148,11 +148,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 @@ static bool fileSystemSupportsACL( const
+@@ -1901,7 +1901,15 @@ static bool fileSystemSupportsACL( const
fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
#else
fileSystemSupportsACLs =
@@ -48,11 +48,11 @@ cmake.
}
--- a/kioslave/file/file.cpp
+++ b/kioslave/file/file.cpp
-@@ -315,8 +315,10 @@ void FileProtocol::get( const KUrl& url
+@@ -317,8 +317,10 @@ void FileProtocol::get( const KUrl& url
}
- #ifdef HAVE_FADVISE
-+#ifdef POSIX_FADV_SEQUENTIAL
+ #if HAVE_FADVISE
++#if POSIX_FADV_SEQUENTIAL
posix_fadvise( fd, 0, 0, POSIX_FADV_SEQUENTIAL);
#endif
+#endif
@@ -61,22 +61,22 @@ 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 @@ void FileProtocol::copy( const KUrl &src
+@@ -156,8 +156,10 @@ void FileProtocol::copy( const KUrl &src
}
- #ifdef HAVE_FADVISE
-+#ifdef POSIX_FADV_SEQUENTIAL
+ #if HAVE_FADVISE
++#if POSIX_FADV_SEQUENTIAL
posix_fadvise(src_fd,0,0,POSIX_FADV_SEQUENTIAL);
#endif
+#endif
// 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 @@ void FileProtocol::copy( const KUrl &src
+@@ -179,8 +181,10 @@ void FileProtocol::copy( const KUrl &src
}
- #ifdef HAVE_FADVISE
-+#ifdef POSIX_FADV_SEQUENTIAL
+ #if HAVE_FADVISE
++#if POSIX_FADV_SEQUENTIAL
posix_fadvise(dest_fd,0,0,POSIX_FADV_SEQUENTIAL);
#endif
+#endif
diff --git a/debian/patches/ktar_header_checksum_fix.diff b/debian/patches/ktar_header_checksum_fix.diff
index 208fc92..a20c190 100644
--- a/debian/patches/ktar_header_checksum_fix.diff
+++ b/debian/patches/ktar_header_checksum_fix.diff
@@ -18,7 +18,7 @@ matches, archive is accepted.
--- a/kdecore/io/ktar.cpp
+++ b/kdecore/io/ktar.cpp
-@@ -184,26 +184,41 @@ qint64 KTar::KTarPrivate::readRawHeader(
+@@ -182,26 +182,41 @@ qint64 KTar::KTarPrivate::readRawHeader(
if (strncmp(buffer + 257, "ustar", 5)) {
// The magic isn't there (broken/old tars), but maybe a correct checksum?
@@ -76,7 +76,7 @@ matches, archive is accepted.
return -1;
}
}/*end if*/
-@@ -640,10 +655,12 @@ void KTar::KTarPrivate::fillBuffer( char
+@@ -637,10 +652,12 @@ void KTar::KTarPrivate::fillBuffer( char
// group
strcpy( buffer + 0x129, gname );
diff --git a/debian/patches/ktar_longlink_length_in_bytes.diff b/debian/patches/ktar_longlink_length_in_bytes.diff
index 8eb72c3..c2cd0c0 100644
--- a/debian/patches/ktar_longlink_length_in_bytes.diff
+++ b/debian/patches/ktar_longlink_length_in_bytes.diff
@@ -18,7 +18,7 @@ unreadable.
--- a/kdecore/io/ktar.cpp
+++ b/kdecore/io/ktar.cpp
-@@ -732,7 +732,7 @@ bool KTar::doPrepareWriting(const QStrin
+@@ -729,7 +729,7 @@ bool KTar::doPrepareWriting(const QStrin
const QByteArray gname = group.toLocal8Bit();
// If more than 100 chars, we need to use the LongLink trick
@@ -27,7 +27,7 @@ unreadable.
d->writeLonglink(buffer,encodedFileName,'L',uname,gname);
// Write (potentially truncated) name
-@@ -785,7 +785,7 @@ bool KTar::doWriteDir(const QString &nam
+@@ -782,7 +782,7 @@ bool KTar::doWriteDir(const QString &nam
QByteArray gname = group.toLocal8Bit();
// If more than 100 chars, we need to use the LongLink trick
@@ -36,7 +36,7 @@ unreadable.
d->writeLonglink(buffer,encodedDirname,'L',uname,gname);
// Write (potentially truncated) name
-@@ -837,9 +837,9 @@ bool KTar::doWriteSymLink(const QString
+@@ -834,9 +834,9 @@ bool KTar::doWriteSymLink(const QString
QByteArray gname = group.toLocal8Bit();
// If more than 100 chars, we need to use the LongLink trick
diff --git a/debian/patches/ld_exclude_libs_qtuitools.diff b/debian/patches/ld_exclude_libs_qtuitools.diff
index 7561a6e..1c3e0b4 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
-@@ -252,6 +252,9 @@ target_link_libraries(plasma ${QT_QTUITO
+@@ -263,6 +263,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})
diff --git a/debian/patches/make_libkdeinit4_private.diff b/debian/patches/make_libkdeinit4_private.diff
index 7acba2c..f7d6d13 100644
--- a/debian/patches/make_libkdeinit4_private.diff
+++ b/debian/patches/make_libkdeinit4_private.diff
@@ -47,7 +47,7 @@ libraries.
_set_fancy(IMPORTS_INSTALL_DIR "${PLUGIN_INSTALL_DIR}/imports" "The subdirectory relative to the install prefix where imports will be installed")
_set_fancy(CONFIG_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/config" "The config file install dir")
_set_fancy(DATA_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/apps" "The parent directory where applications can install their data")
-@@ -1334,6 +1335,10 @@ if (CMAKE_C_COMPILER MATCHES "icc")
+@@ -1328,6 +1329,10 @@ if (CMAKE_C_COMPILER MATCHES "icc")
endif (CMAKE_C_COMPILER MATCHES "icc")
diff --git a/debian/patches/series b/debian/patches/series
index 31994a1..76005a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,4 +20,3 @@ add_dlrestrictions_support.diff
findpythonlibrary_layout_deb_on_debian.diff
ktar_header_checksum_fix.diff
ktar_longlink_length_in_bytes.diff
-kded4_deadlock.patch
diff --git a/debian/patches/use_dejavu_as_default_font.diff b/debian/patches/use_dejavu_as_default_font.diff
index 2f862c8..b92bee8 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 @@ struct KFontData
+@@ -395,7 +395,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 @@ static const KFontData DefaultFontData[K
+@@ -409,7 +409,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