[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.7.2-2-6-g29c30df
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Mon Dec 5 01:21:13 UTC 2011
The following commit has been merged in the master branch:
commit 1b388fd82aaa17554145e9d2e07aafc01573d0c9
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Mon Dec 5 00:48:14 2011 +0100
Update patches.
---
debian/changelog | 5 ++
debian/patches/add_debian_build_type.diff | 2 +-
debian/patches/add_dlrestrictions_support.diff | 2 +-
debian/patches/glibc_filesystem.diff | 2 +-
debian/patches/hurd_support.diff | 2 +-
.../kconf_update_migrate_from_kde3_icon_theme.diff | 2 +-
debian/patches/ld_exclude_libs_qtuitools.diff | 4 +-
debian/patches/make_libkdeinit4_private.diff | 4 +-
debian/patches/nepomuk_unicode.diff | 67 --------------------
debian/patches/series | 1 -
debian/patches/use_dejavu_as_default_font.diff | 6 +-
11 files changed, 17 insertions(+), 80 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d07955d..5b6af44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ kde4libs (4:4.7.4-0r0) UNRELEASED; urgency=low
* New upstream release:
+ [ José Manuel Santamaría Lema ]
+ * Update patches:
+ - Remove nepomuk_unicode.diff, applied upstream.
+ - Refreshed other patches to make them apply without offsets.
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 05 Dec 2011 00:26:46 +0100
kde4libs (4:4.7.2-2) experimental; urgency=low
diff --git a/debian/patches/add_debian_build_type.diff b/debian/patches/add_debian_build_type.diff
index 918cfac..f24dbf0 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
-@@ -1201,11 +1201,13 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+@@ -1202,11 +1202,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/add_dlrestrictions_support.diff b/debian/patches/add_dlrestrictions_support.diff
index 4475be3..3a2dffa 100644
--- a/debian/patches/add_dlrestrictions_support.diff
+++ b/debian/patches/add_dlrestrictions_support.diff
@@ -37,7 +37,7 @@ on all (or some) the targets.
endif (${_lib_TYPE} STREQUAL "MODULE")
set(_SRCS ${_first_SRC} ${ARGN})
-@@ -1341,6 +1345,13 @@ function(KDE4_INSTALL_AUTH_ACTIONS HELPE
+@@ -1317,6 +1321,13 @@ function(KDE4_INSTALL_AUTH_ACTIONS HELPE
endfunction(KDE4_INSTALL_AUTH_ACTIONS)
diff --git a/debian/patches/glibc_filesystem.diff b/debian/patches/glibc_filesystem.diff
index 48b4740..acd087b 100644
--- a/debian/patches/glibc_filesystem.diff
+++ b/debian/patches/glibc_filesystem.diff
@@ -7,7 +7,7 @@ Forwarded: no
--- a/kdecore/io/kfilesystemtype_p.cpp
+++ b/kdecore/io/kfilesystemtype_p.cpp
-@@ -47,7 +47,7 @@
+@@ -53,7 +53,7 @@ KFileSystemType::Type determineFileSyste
return kde_typeFromName(buf.f_fstypename);
}
diff --git a/debian/patches/hurd_support.diff b/debian/patches/hurd_support.diff
index 258eedd..0d11680 100644
--- a/debian/patches/hurd_support.diff
+++ b/debian/patches/hurd_support.diff
@@ -34,7 +34,7 @@ Last-Update: 2011-05-30
int build_link(const char* tmp, const char *tmp_prefix, const char *kde_prefix);
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -1218,8 +1218,8 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+@@ -1219,8 +1219,8 @@ if (CMAKE_COMPILER_IS_GNUCXX)
endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
if (CMAKE_SYSTEM_NAME STREQUAL GNU)
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 95dc200..ffbb79e 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
-@@ -457,6 +457,16 @@ set_target_properties(kdeui PROPERTIES V
+@@ -470,6 +470,16 @@ set_target_properties(kdeui PROPERTIES V
)
install(TARGETS kdeui EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/debian/patches/ld_exclude_libs_qtuitools.diff b/debian/patches/ld_exclude_libs_qtuitools.diff
index 1c3e0b4..61941f9 100644
--- a/debian/patches/ld_exclude_libs_qtuitools.diff
+++ b/debian/patches/ld_exclude_libs_qtuitools.diff
@@ -5,9 +5,9 @@ Forwarded: not-needed
--- a/plasma/CMakeLists.txt
+++ b/plasma/CMakeLists.txt
-@@ -263,6 +263,9 @@ target_link_libraries(plasma ${QT_QTUITO
+@@ -270,6 +270,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})
+ ${KDE4_KDEUI_LIBS} ${KDE4_KDNSSD_LIBS} ${KDE4_THREADWEAVER_LIBS} ${PLASMA_EXTRA_LIBS})
+# Do not export QtUiTools internal symbols
+set_target_properties(plasma PROPERTIES LINK_FLAGS_DEBIAN "-Wl,--exclude-libs -Wl,libQtUiTools.a")
diff --git a/debian/patches/make_libkdeinit4_private.diff b/debian/patches/make_libkdeinit4_private.diff
index f7d6d13..fa0ecd1 100644
--- a/debian/patches/make_libkdeinit4_private.diff
+++ b/debian/patches/make_libkdeinit4_private.diff
@@ -39,7 +39,7 @@ libraries.
set(KDE4_SBIN_INSTALL_DIR \"${KDE4_SBIN_INSTALL_DIR}\")
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -870,6 +870,7 @@ else (WIN32)
+@@ -871,6 +871,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)")
@@ -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")
-@@ -1328,6 +1329,10 @@ if (CMAKE_C_COMPILER MATCHES "icc")
+@@ -1329,6 +1330,10 @@ if (CMAKE_C_COMPILER MATCHES "icc")
endif (CMAKE_C_COMPILER MATCHES "icc")
diff --git a/debian/patches/nepomuk_unicode.diff b/debian/patches/nepomuk_unicode.diff
deleted file mode 100644
index 162ff67..0000000
--- a/debian/patches/nepomuk_unicode.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-Author: Sebastian Trüg <trueg at kde.org>
-Applied-Upstream: 4.7.3
-Description: Fix a bug that prevents any query which does NOT use wide unicode
- characters to fail.
---- a/nepomuk/query/querybuilderdata_p.h
-+++ b/nepomuk/query/querybuilderdata_p.h
-@@ -32,6 +32,28 @@
- #include "query_p.h"
- #include "groupterm_p.h"
-
-+namespace {
-+/// A hack to avoid passing extended chars to the bif:search_excerpts method which cannot handle
-+/// utf8 chars which use more than one char, ie. wide chars.
-+/// Thus, we simply truncate each term at the first wide char.
-+QStringList stripExtendedCharsHack(const QStringList& terms) {
-+ QStringList newTerms;
-+ foreach(const QString& term, terms) {
-+ int i = 0;
-+ while(i < term.length()) {
-+ if(term[i].unicode() > 0x7f) {
-+ break;
-+ }
-+ ++i;
-+ }
-+ if(i > 0) {
-+ newTerms.append(term.left(i));
-+ }
-+ }
-+ return newTerms;
-+}
-+}
-+
- namespace Nepomuk {
- namespace Query {
- class QueryBuilderData
-@@ -246,16 +268,23 @@ namespace Nepomuk {
- for( QHash<QString, QStringList>::const_iterator it = m_fullTextSearchTerms.constBegin();
- it != m_fullTextSearchTerms.constEnd(); ++it ) {
- const QString& varName = it.key();
-- const QStringList& terms = it.value();
-- // bif:search_excerpt wants a vector of all search terms
-- excerptParts
-- << QString::fromLatin1("bif:search_excerpt(bif:vector(bif:charset_recode('%1', '_WIDE_', 'UTF-8')), %2)")
-- .arg( terms.join(QLatin1String("','")),
-- varName );
-+ const QStringList terms = stripExtendedCharsHack(it.value());
-+ if(terms.count()) {
-+ // bif:search_excerpt wants a vector of all search terms
-+ excerptParts
-+ << QString::fromLatin1("bif:search_excerpt(bif:vector('%1'), %2)")
-+ .arg( terms.join(QLatin1String("','")),
-+ varName );
-+ }
- }
-
-- return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
-- .arg(excerptParts.join(QLatin1String(",")));
-+ if(excerptParts.count()) {
-+ return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
-+ .arg(excerptParts.join(QLatin1String(",")));
-+ }
-+ else {
-+ return QString();
-+ }
- }
- else {
- return QString();
diff --git a/debian/patches/series b/debian/patches/series
index 036cc21..0395be1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,5 +20,4 @@ add_dlrestrictions_support.diff
findpythonlibrary_layout_deb_on_debian.diff
ktar_header_checksum_fix.diff
ktar_longlink_length_in_bytes.diff
-nepomuk_unicode.diff
glibc_filesystem.diff
diff --git a/debian/patches/use_dejavu_as_default_font.diff b/debian/patches/use_dejavu_as_default_font.diff
index b92bee8..60ed6c8 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
-@@ -395,7 +395,7 @@ struct KFontData
+@@ -398,7 +398,7 @@ struct KFontData
// NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
static const char GeneralId[] = "General";
@@ -15,8 +15,8 @@ needed).
#ifdef Q_WS_MAC
static const char DefaultMacFont[] = "Lucida Grande";
#endif
-@@ -409,7 +409,7 @@ static const KFontData DefaultFontData[K
- { GeneralId, "menuFont", DefaultMacFont, 13, -1, QFont::SansSerif },
+@@ -417,7 +417,7 @@ static const KFontData DefaultFontData[K
+ { GeneralId, "menuFont", DefaultFont, 16, -1, QFont::SansSerif },
#else
{ GeneralId, "font", DefaultFont, 9, -1, QFont::SansSerif },
- { GeneralId, "fixed", "Monospace", 9, -1, QFont::TypeWriter },
--
KDE Development Platform Libraries module packaging
More information about the pkg-kde-commits
mailing list