[SCM] KDE Base Runtime module packaging branch, master, updated. debian/15.12.1-1-14-gfefc86b
Maximiliano Curia
maxy at moszumanska.debian.org
Fri May 13 20:42:29 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-runtime.git;a=commitdiff;h=d89e02e
The following commit has been merged in the master branch:
commit d89e02e4cc3a8204d8243a6670b8a8a6e49249a2
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date: Wed Apr 13 13:53:31 2016 +0200
Refresh patches
---
debian/patches/add_glib_for_nm | 17 +-
debian/patches/disable_flacky_tests | 23 +-
debian/patches/disable_kwalletd_autotests | 15 +-
debian/patches/disable_usr_lib_install_rpath.diff | 17 +-
debian/patches/kde4_information_menu.diff | 23 -
debian/patches/khelp_htdig.diff | 22 +-
.../kshorturifilter_qgetenv_calling_error.diff | 18 -
debian/patches/kubuntu_disable-gpg-backend.diff | 11 +-
.../kubuntu_drkonqi_whoopsie_integration.patch | 28 +-
debian/patches/kubuntu_langpack_install.diff | 601 ---------------------
debian/patches/kubuntu_nodisplay_knetattach.diff | 17 +-
debian/patches/kubuntu_shutup_shutup_shutup.diff | 14 +-
debian/patches/series | 2 -
.../patches/use_always_present_path_to_test.patch | 26 +-
debian/patches/use_the_correct_locale.patch | 16 +-
15 files changed, 138 insertions(+), 712 deletions(-)
diff --git a/debian/patches/add_glib_for_nm b/debian/patches/add_glib_for_nm
index f109adb..c6ff9ab 100644
--- a/debian/patches/add_glib_for_nm
+++ b/debian/patches/add_glib_for_nm
@@ -1,8 +1,17 @@
-Index: kde-runtime/solid-networkstatus/kded/CMakeLists.txt
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Apr 2016 13:53:28 +0200
+Subject: add_glib_for_nm
+
===================================================================
---- kde-runtime.orig/solid-networkstatus/kded/CMakeLists.txt 2015-08-31 17:08:45.262292739 +0200
-+++ kde-runtime/solid-networkstatus/kded/CMakeLists.txt 2015-08-31 18:50:55.592167844 +0200
-@@ -16,6 +16,12 @@
+---
+ solid-networkstatus/kded/CMakeLists.txt | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/solid-networkstatus/kded/CMakeLists.txt b/solid-networkstatus/kded/CMakeLists.txt
+index 633c7f1..5dfcbf4 100644
+--- a/solid-networkstatus/kded/CMakeLists.txt
++++ b/solid-networkstatus/kded/CMakeLists.txt
+@@ -16,6 +16,12 @@ set_package_properties(NetworkManager PROPERTIES DESCRIPTION "The NetworkManager
)
if(NETWORKMANAGER_FOUND)
diff --git a/debian/patches/disable_flacky_tests b/debian/patches/disable_flacky_tests
index 0bd992f..a1af66d 100644
--- a/debian/patches/disable_flacky_tests
+++ b/debian/patches/disable_flacky_tests
@@ -1,8 +1,17 @@
-Index: kde-runtime/kurifilter-plugins/tests/kurifiltertest.cpp
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Apr 2016 13:53:28 +0200
+Subject: disable_flacky_tests
+
===================================================================
---- kde-runtime.orig/kurifilter-plugins/tests/kurifiltertest.cpp 2014-05-20 15:03:30.637246910 +0200
-+++ kde-runtime/kurifilter-plugins/tests/kurifiltertest.cpp 2014-05-20 15:05:01.693663586 +0200
-@@ -256,7 +256,7 @@
+---
+ kurifilter-plugins/tests/kurifiltertest.cpp | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/kurifilter-plugins/tests/kurifiltertest.cpp b/kurifilter-plugins/tests/kurifiltertest.cpp
+index 32f968c..13c8e36 100644
+--- a/kurifilter-plugins/tests/kurifiltertest.cpp
++++ b/kurifilter-plugins/tests/kurifiltertest.cpp
+@@ -256,7 +256,7 @@ void KUriFilterTest::shortUris()
filter( "ftp.kde.org:21", "ftp://ftp.kde.org:21", KUriFilterData::NetProtocol );
filter( "cr.yp.to", "http://cr.yp.to", KUriFilterData::NetProtocol );
filter( "www.kde.org:21", "http://www.kde.org:21", KUriFilterData::NetProtocol );
@@ -11,7 +20,7 @@ Index: kde-runtime/kurifilter-plugins/tests/kurifiltertest.cpp
filter( "foo at bar.com", "mailto:foo at bar.com", KUriFilterData::NetProtocol );
filter( "firstname.lastname at x.foo.bar", "mailto:firstname.lastname at x.foo.bar", KUriFilterData::NetProtocol );
filter( "www.123.foo", "http://www.123.foo", KUriFilterData::NetProtocol );
-@@ -299,8 +299,8 @@
+@@ -299,8 +299,8 @@ void KUriFilterTest::shortUris()
// The default search engine is set to 'Google'
//this may fail if your DNS knows domains KDE or FTP
filter( "gg:", "", KUriFilterData::NetProtocol ); // see bug 56218
@@ -22,7 +31,7 @@ Index: kde-runtime/kurifilter-plugins/tests/kurifiltertest.cpp
}
void KUriFilterTest::executables()
-@@ -308,8 +308,8 @@
+@@ -308,8 +308,8 @@ void KUriFilterTest::executables()
// Executable tests - No IKWS in minicli
filter( "cp", "cp", KUriFilterData::Executable, minicliFilters );
filter( "ktraderclient", "ktraderclient", KUriFilterData::Executable, minicliFilters );
@@ -33,7 +42,7 @@ Index: kde-runtime/kurifilter-plugins/tests/kurifiltertest.cpp
filter( "/I/dont/exist", 0, KUriFilterData::Error, minicliFilters ); //krazy:exclude=spelling
filter( "/I/dont/exist#a", 0, KUriFilterData::Error, minicliFilters ); //krazy:exclude=spelling
filter( "ktraderclient --help", "ktraderclient --help", KUriFilterData::Executable, minicliFilters ); // the args are in argsAndOptions()
-@@ -319,8 +319,8 @@
+@@ -319,8 +319,8 @@ void KUriFilterTest::executables()
// Typing 'cp' or any other valid unix command in konq's location bar should result in
// a search using the default search engine
// 'ls' is a bit of a special case though, due to the toplevel domain called 'ls'
diff --git a/debian/patches/disable_kwalletd_autotests b/debian/patches/disable_kwalletd_autotests
index a14ee30..968f6de 100644
--- a/debian/patches/disable_kwalletd_autotests
+++ b/debian/patches/disable_kwalletd_autotests
@@ -1,7 +1,16 @@
-Index: kde-runtime/kwalletd/autotests/CMakeLists.txt
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Apr 2016 13:53:28 +0200
+Subject: disable_kwalletd_autotests
+
===================================================================
---- kde-runtime.orig/kwalletd/autotests/CMakeLists.txt 2014-05-20 14:51:39.977188082 +0200
-+++ kde-runtime/kwalletd/autotests/CMakeLists.txt 2014-05-20 14:51:58.912444084 +0200
+---
+ kwalletd/autotests/CMakeLists.txt | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/kwalletd/autotests/CMakeLists.txt b/kwalletd/autotests/CMakeLists.txt
+index 5ffbba4..dae2e6e 100644
+--- a/kwalletd/autotests/CMakeLists.txt
++++ b/kwalletd/autotests/CMakeLists.txt
@@ -1,11 +1,11 @@
add_definitions(-DTEST_DATA="\\"${CMAKE_CURRENT_SOURCE_DIR}/\\"")
diff --git a/debian/patches/disable_usr_lib_install_rpath.diff b/debian/patches/disable_usr_lib_install_rpath.diff
index 0f761e6..59a161f 100644
--- a/debian/patches/disable_usr_lib_install_rpath.diff
+++ b/debian/patches/disable_usr_lib_install_rpath.diff
@@ -1,12 +1,17 @@
-Author: George Kiagiadakis <gkiagiad at csd.uoc.gr>
-Subject: Do not set install RPATH to /usr/lib by default
- /usr/lib RPATH is disallowed on Debian systems and is a bad practise in
- general
-Forwarded: not-needed
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Apr 2016 13:53:28 +0200
+Subject: Do not set install RPATH to /usr/lib by default /usr/lib RPATH is
+ disallowed on Debian systems and is a bad practise in general
+---
+ phonon/platform_kde/CMakeLists.txt | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/phonon/platform_kde/CMakeLists.txt b/phonon/platform_kde/CMakeLists.txt
+index f41a4dc..3d3df10 100644
--- a/phonon/platform_kde/CMakeLists.txt
+++ b/phonon/platform_kde/CMakeLists.txt
-@@ -19,10 +19,8 @@
+@@ -19,10 +19,8 @@ endif(ALSA_FOUND)
if(NOT WIN32)
set_target_properties(kde PROPERTIES
diff --git a/debian/patches/kde4_information_menu.diff b/debian/patches/kde4_information_menu.diff
deleted file mode 100644
index a62f584..0000000
--- a/debian/patches/kde4_information_menu.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/kcontrol/menus/CMakeLists.txt
-+++ b/kcontrol/menus/CMakeLists.txt
-@@ -5,7 +5,7 @@
- if (WIN32)
- install( FILES kde-information.menu DESTINATION ${SHARE_INSTALL_DIR}/xdg/menus/)
- else (WIN32)
--install( FILES kde-information.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus/)
-+install( FILES kde-information.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus/ RENAME kde4-information.menu )
- endif (WIN32)
-
--install( FILES kde-information.directory DESTINATION ${XDG_DIRECTORY_INSTALL_DIR} )
-+install( FILES kde-information.directory DESTINATION ${XDG_DIRECTORY_INSTALL_DIR} RENAME kde4-information.directory )
---- a/kcontrol/menus/kde-information.menu
-+++ b/kcontrol/menus/kde-information.menu
-@@ -3,7 +3,7 @@
-
- <Menu>
- <Name>Information</Name>
-- <Directory>kde-information.directory</Directory>
-+ <Directory>kde4-information.directory</Directory>
- <Include>
- <Category>X-KDE-information</Category>
- </Include>
diff --git a/debian/patches/khelp_htdig.diff b/debian/patches/khelp_htdig.diff
index 9633855..beb7085 100644
--- a/debian/patches/khelp_htdig.diff
+++ b/debian/patches/khelp_htdig.diff
@@ -1,6 +1,18 @@
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Apr 2016 13:53:28 +0200
+Subject: khelp_htdig
+
+---
+ khelpcenter/searchhandlers/khc_docbookdig.pl.cmake | 2 +-
+ khelpcenter/searchhandlers/khc_htdig.pl.cmake | 2 +-
+ khelpcenter/searchhandlers/khc_htsearch.pl | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/khelpcenter/searchhandlers/khc_docbookdig.pl.cmake b/khelpcenter/searchhandlers/khc_docbookdig.pl.cmake
+index 3b424c4..7fa6671 100755
--- a/khelpcenter/searchhandlers/khc_docbookdig.pl.cmake
+++ b/khelpcenter/searchhandlers/khc_docbookdig.pl.cmake
-@@ -26,7 +26,7 @@
+@@ -26,7 +26,7 @@ use strict;
use Getopt::Long;
@@ -9,9 +21,11 @@
my $htdigbin = "/usr/bin";
my $kdeprefix = "@CMAKE_INSTALL_PREFIX@";
chomp $kdeprefix;
+diff --git a/khelpcenter/searchhandlers/khc_htdig.pl.cmake b/khelpcenter/searchhandlers/khc_htdig.pl.cmake
+index 511adc8..7270b16 100755
--- a/khelpcenter/searchhandlers/khc_htdig.pl.cmake
+++ b/khelpcenter/searchhandlers/khc_htdig.pl.cmake
-@@ -26,7 +26,7 @@
+@@ -26,7 +26,7 @@ use strict;
use Getopt::Long;
@@ -20,9 +34,11 @@
my $htdigbin = "/usr/bin";
my $kdeprefix = "@CMAKE_INSTALL_PREFIX@";
chomp $kdeprefix;
+diff --git a/khelpcenter/searchhandlers/khc_htsearch.pl b/khelpcenter/searchhandlers/khc_htsearch.pl
+index 5dc3f5f..aa1f872 100755
--- a/khelpcenter/searchhandlers/khc_htsearch.pl
+++ b/khelpcenter/searchhandlers/khc_htsearch.pl
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,7 @@ use Getopt::Long;
use open IO => ':utf8';
use open ':std';
diff --git a/debian/patches/kshorturifilter_qgetenv_calling_error.diff b/debian/patches/kshorturifilter_qgetenv_calling_error.diff
deleted file mode 100644
index 6278dcf..0000000
--- a/debian/patches/kshorturifilter_qgetenv_calling_error.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: kde-runtime/kurifilter-plugins/shorturi/kshorturifilter.cpp
-===================================================================
---- kde-runtime.orig/kurifilter-plugins/shorturi/kshorturifilter.cpp 2014-01-21 17:18:45.895102067 -0300
-+++ kde-runtime/kurifilter-plugins/shorturi/kshorturifilter.cpp 2014-01-22 14:00:20.347354650 -0300
-@@ -279,10 +279,10 @@
- // Environment variable expansion.
- if ( sEnvVarExp.indexIn( path ) == 0 )
- {
-- const char* exp = qgetenv( path.mid( 1, sEnvVarExp.matchedLength() - 1 ).toLocal8Bit().data() );
-- if(exp)
-+ QByteArray exp = qgetenv( path.mid( 1, sEnvVarExp.matchedLength() - 1 ).toLocal8Bit().data() );
-+ if(! exp.isNull())
- {
-- path.replace( 0, sEnvVarExp.matchedLength(), QString::fromLocal8Bit(exp) );
-+ path.replace( 0, sEnvVarExp.matchedLength(), QString::fromLocal8Bit(exp.constData()) );
- expanded = true;
- }
- }
diff --git a/debian/patches/kubuntu_disable-gpg-backend.diff b/debian/patches/kubuntu_disable-gpg-backend.diff
index 397b51d..412c4f4 100644
--- a/debian/patches/kubuntu_disable-gpg-backend.diff
+++ b/debian/patches/kubuntu_disable-gpg-backend.diff
@@ -1,7 +1,10 @@
-Description: disable kwallet gpg backend as it is not working perfectly
-Forwarded: no
-Author: Alex Fiestas <afiestas at kde.org>
-Reviewed-by: Harald Sitter <apachelogger at kubuntu.org>
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Apr 2016 13:53:28 +0200
+Subject: kubuntu_disable-gpg-backend
+
+---
+ kwalletd/CMakeLists.txt | 46 +++++++++++++++++++++++-----------------------
+ 1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/kwalletd/CMakeLists.txt b/kwalletd/CMakeLists.txt
index 73aec82..4d73d5c 100644
diff --git a/debian/patches/kubuntu_drkonqi_whoopsie_integration.patch b/debian/patches/kubuntu_drkonqi_whoopsie_integration.patch
index 84ef20b..1940af7 100644
--- a/debian/patches/kubuntu_drkonqi_whoopsie_integration.patch
+++ b/debian/patches/kubuntu_drkonqi_whoopsie_integration.patch
@@ -1,16 +1,16 @@
-Description: automatic crash report integration
- integraes drkonqi with whoopsie/kubuntu-notification-helper/apport to allow
- automatic crash reporting to errors.ubuntu.com. this is achieved by
- adding a checkbox to drkonqi that will create a marker file (*.drkonqi-accept)
- if the user wishes to automatically submit the crash report to us.
-Origin: vendor
-Forwarded: no
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Apr 2016 13:53:28 +0200
+Subject: kubuntu_drkonqi_whoopsie_integration
-Index: kde-runtime-4.11.2/drkonqi/drkonqidialog.cpp
-===================================================================
---- kde-runtime-4.11.2.orig/drkonqi/drkonqidialog.cpp 2013-08-28 18:59:56.412413678 +0200
-+++ kde-runtime-4.11.2/drkonqi/drkonqidialog.cpp 2013-12-09 13:29:39.777253818 +0100
-@@ -41,6 +41,8 @@
+---
+ drkonqi/drkonqidialog.cpp | 31 +++++++++++++++++++++++++++++++
+ 1 file changed, 31 insertions(+)
+
+diff --git a/drkonqi/drkonqidialog.cpp b/drkonqi/drkonqidialog.cpp
+index 0ea3931..17dedb8 100644
+--- a/drkonqi/drkonqidialog.cpp
++++ b/drkonqi/drkonqidialog.cpp
+@@ -41,6 +41,8 @@ static const char ABOUT_BUG_REPORTING_URL[] = "#aboutbugreporting";
static const char DRKONQI_REPORT_BUG_URL[] =
KDE_BUGZILLA_URL "enter_bug.cgi?product=drkonqi&format=guided";
@@ -19,7 +19,7 @@ Index: kde-runtime-4.11.2/drkonqi/drkonqidialog.cpp
DrKonqiDialog::DrKonqiDialog(QWidget * parent) :
KDialog(parent),
m_aboutBugReportingDialog(0),
-@@ -75,6 +77,25 @@
+@@ -75,6 +77,25 @@ DrKonqiDialog::DrKonqiDialog(QWidget * parent) :
DrKonqiDialog::~DrKonqiDialog()
{
@@ -45,7 +45,7 @@ Index: kde-runtime-4.11.2/drkonqi/drkonqidialog.cpp
KConfigGroup config(KGlobal::config(), "General");
saveDialogSize(config);
-@@ -158,6 +179,16 @@
+@@ -158,6 +179,16 @@ void DrKonqiDialog::buildIntroWidget()
KGlobal::locale()->formatTime(crashedApp->datetime().time(), true)
));
diff --git a/debian/patches/kubuntu_langpack_install.diff b/debian/patches/kubuntu_langpack_install.diff
deleted file mode 100644
index e2f1fba..0000000
--- a/debian/patches/kubuntu_langpack_install.diff
+++ /dev/null
@@ -1,601 +0,0 @@
-diff --git a/kcontrol/locale/CMakeLists.txt b/kcontrol/locale/CMakeLists.txt
-index 3b1f2b9..1022dd8 100644
---- a/kcontrol/locale/CMakeLists.txt
-+++ b/kcontrol/locale/CMakeLists.txt
-@@ -1,6 +1,14 @@
-
- add_subdirectory( pics )
-
-+find_package(Kubuntu QUIET CONFIG)
-+set_package_properties(Kubuntu
-+ PROPERTIES DESCRIPTION "Kubuntu Platform Integration"
-+# URL ""
-+ TYPE REQUIRED
-+ PURPOSE "Kubuntu specific l10n bits."
-+)
-+
- ########### next target ###############
-
- set(kcm_locale_PART_SRCS kcmlocale.cpp)
-@@ -9,11 +17,11 @@ kde4_add_ui_files(kcm_locale_PART_SRCS kcmlocalewidget.ui )
-
- kde4_add_plugin(kcm_locale ${kcm_locale_PART_SRCS})
-
--target_link_libraries(kcm_locale ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} )
-+target_link_libraries(kcm_locale ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} ${KUBUNTU_LIBRARY})
-+include_directories(${KUBUNTU_INCLUDE_DIR})
-
- install(TARGETS kcm_locale DESTINATION ${PLUGIN_INSTALL_DIR} )
-
- ########### install files ###############
-
- install( FILES language.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
--
-diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp
-index 3b7d310..cacf119 100644
---- a/kcontrol/locale/kcmlocale.cpp
-+++ b/kcontrol/locale/kcmlocale.cpp
-@@ -25,7 +25,10 @@
- #include <QListWidget>
- #include <QListWidgetItem>
- #include <QPrinter>
-+#include <QProgressBar>
- #include <QTimer>
-+#include <QFile>
-+#include <QDir>
-
- #include <KAboutData>
- #include <KActionSelector>
-@@ -37,9 +40,15 @@
- #include <KLocalizedString>
- #include <KMessageBox>
- #include <KPluginFactory>
-+#include <KProtocolManager>
- #include <KStandardDirs>
- #include <KCurrencyCode>
-
-+#include <Kubuntu/l10n_language.h>
-+#include <Kubuntu/l10n_languagecollection.h>
-+#include <Kubuntu/l10n_locale.h>
-+#include <Kubuntu/busyoverlay.h>
-+
- #include "ui_kcmlocalewidget.h"
-
- K_PLUGIN_FACTORY( KCMLocaleFactory, registerPlugin<KCMLocale>(); )
-@@ -57,6 +66,7 @@ KCMLocale::KCMLocale( QWidget *parent, const QVariantList &args )
- m_kcmLocale( 0 ),
- m_defaultLocale( 0 ),
- m_ui( new Ui::KCMLocaleWidget )
-+ , m_kubuntuLanguages(new Kubuntu::LanguageCollection)
- {
- KAboutData *about = new KAboutData( "kcmlocale", 0, ki18n( "Localization options for KDE applications" ),
- 0, KLocalizedString(), KAboutData::License_GPL,
-@@ -67,6 +77,10 @@ KCMLocale::KCMLocale( QWidget *parent, const QVariantList &args )
- setAboutData( about );
-
- m_ui->setupUi( this );
-+ m_ui->m_messageWidget->hide();
-+
-+ m_ui->installWidgets->hide();
-+ m_ui->installProgressBar->setValue(0);
-
- initSettings();
-
-@@ -567,8 +581,24 @@ void KCMLocale::mergeSettings()
- if ( m_kcmTranslations.count() >= 1 ) {
- locale = m_kcmTranslations.first();
- } else {
-- locale = "en_US";
-+ // If no language is explicitly selected, switch to the global one.
-+ // This actually by-passes QApt integration as obviously we would not
-+ // want to trigger additional package installation without context.
-+ // Not having a language manually selected is pretty much as uncontextual
-+ // as it gets.
-+ const QString globalLanguage = KGlobal::locale()->language();
-+ kDebug() << "No language selected yet. Forcing KGlobal's language." << globalLanguage;
-+ kDebug() << "Installed Languages:" << m_installedTranslations;
-+ if (m_installedTranslations.contains(globalLanguage)) {
-+ m_manuallySetLanguage = globalLanguage;
-+ setTranslations(globalLanguage);
-+ return;
-+ }
-+ kDebug() << "Fallback not available, using en_US instead.";
-+ setTranslations("en_US");
-+ return;
- }
-+ kDebug() << locale;
-
- m_cConfig->setLocale( locale );
- m_countryConfig->setLocale( locale );
-@@ -659,6 +689,17 @@ void KCMLocale::save()
-
- load();
- KGlobalSettings::self()->emitChange(KGlobalSettings::SettingsChanged, KGlobalSettings::SETTINGS_LOCALE);
-+
-+ // -------------------------------------------------------------------------
-+ // Write LANG and LANGUAGE to ~/.kde/env/setlocale.sh
-+
-+ const QString envPath = KGlobal::dirs()->localkdedir() % QLatin1String("/env");
-+ const QString envFile = envPath % QLatin1String("/setlocale.sh");
-+
-+ kDebug() << m_kcmTranslations;
-+ Kubuntu::Locale locale(m_kcmTranslations, m_kcmLocale->countryDivisionCode());
-+ kDebug() << "write env" << locale.writeToFile(envFile);
-+
- }
-
- QString KCMLocale::quickHelp() const
-@@ -1194,12 +1235,53 @@ void KCMLocale::initTranslations()
- m_ui->m_selectTranslations->availableListWidget()->clear();
- m_ui->m_selectTranslations->selectedListWidget()->clear();
-
-+ // To do a search we need to open the cache and if necessary build it first.
-+ // This can take quite a while so we busy indicate by default and only once init is done
-+ // we switch to the actual UI.
-+ m_ui->m_tabTranslations->setEnabled(false);
-+ Kubuntu::BusyOverlay *b = new Kubuntu::BusyOverlay(m_ui->m_tabTranslations, this);
-+ connect(m_kubuntuLanguages, SIGNAL(updateProgress(int)), b, SLOT(setProgress(int)));
-+ connect(m_kubuntuLanguages, SIGNAL(updated()), b, SLOT(throwAway()));
-+ connect(m_kubuntuLanguages, SIGNAL(updated()), this, SLOT(continueInitTranslations()));
-+ m_kubuntuLanguages->update();
-+}
-+
-+/**
-+ * Unlike KLocale::languageCodeToName this function *always* returns a
-+ * non-empty string. In particular if there is no mapping it returns the code.
-+ */
-+QString KCMLocale::languageCodeToName(const QString &code) const
-+{
-+ QString name = m_kcmLocale->languageCodeToName(code);
-+ if (name.isEmpty())
-+ name = code;
-+ return name;
-+}
-+
-+void KCMLocale::continueInitTranslations()
-+{
-+ disconnect(m_kubuntuLanguages, SIGNAL(updated()), this, SLOT(continueInitTranslations()));
-+
-+ QSet<Kubuntu::Language *> kubuntuLanguageSet = m_kubuntuLanguages->languages();
-+ QMap<QString, Kubuntu::Language*> kubuntuLanguageMap;
-+ foreach (Kubuntu::Language *language, kubuntuLanguageSet) {
-+ kubuntuLanguageMap.insert(language->kdeLanguageCode(), language);
-+ }
-+
-+ // Please note that the reason we are setting the languageCode explicitly is
-+ // that even when the package based Kubuntu::Language magic fails we
-+ // have something to fall back to when applying the languages.
-+
- // Load each user selected language into the selected list
- int i = 0;
- foreach ( const QString &languageCode, m_kcmTranslations ) {
- QListWidgetItem *listItem = new QListWidgetItem( m_ui->m_selectTranslations->selectedListWidget() );
-+ kDebug() << "adding translations" << m_kcmLocale->languageCodeToName( languageCode );
-+
- listItem->setText( m_kcmLocale->languageCodeToName( languageCode ) );
- listItem->setData( Qt::UserRole, languageCode );
-+ if (Kubuntu::Language *language = kubuntuLanguageMap.value(languageCode))
-+ listItem->setData(Qt::UserRole+1, QVariant::fromValue<Kubuntu::Language *>(language));
- ++i;
- }
-
-@@ -1208,11 +1290,29 @@ void KCMLocale::initTranslations()
- foreach ( const QString &languageCode, m_installedTranslations ) {
- if ( !m_kcmTranslations.contains( languageCode ) ) {
- QListWidgetItem *listItem = new QListWidgetItem( m_ui->m_selectTranslations->availableListWidget() );
-+ kDebug() << "adding installed" << m_kcmLocale->languageCodeToName( languageCode );
- listItem->setText( m_kcmLocale->languageCodeToName( languageCode ) );
- listItem->setData( Qt::UserRole, languageCode );
-+ if (Kubuntu::Language *language = kubuntuLanguageMap.value(languageCode))
-+ listItem->setData(Qt::UserRole+1, QVariant::fromValue<Kubuntu::Language *>(language));
- ++i;
- }
- }
-+
-+ // Load all other languages avialable for installation.
-+ foreach (Kubuntu::Language *language, kubuntuLanguageSet) {
-+ // Don't list languages that are either already known as being installed or selected for use.
-+ if (m_kcmTranslations.contains(language->kdeLanguageCode()) ||
-+ m_installedTranslations.contains(language->kdeLanguageCode()))
-+ continue;
-+
-+ QListWidgetItem *listItem = new QListWidgetItem(m_ui->m_selectTranslations->availableListWidget());
-+ const QString languageName = languageCodeToName(language->kdeLanguageCode());
-+ listItem->setText(languageName);
-+ listItem->setData(Qt::UserRole, language->kdeLanguageCode());
-+ listItem->setData(Qt::UserRole+1, QVariant::fromValue<Kubuntu::Language *>(language));
-+ }
-+
- m_ui->m_selectTranslations->availableListWidget()->sortItems();
-
- // Default to selecting the first Selected language,
-@@ -1224,6 +1324,7 @@ void KCMLocale::initTranslations()
- m_ui->m_selectTranslations->availableListWidget()->setCurrentRow( 0 );
- }
-
-+ m_ui->m_tabTranslations->setEnabled(true);
- enableItemWidgets( "Language",
- &m_userSettings, &m_kcmSettings, &m_defaultSettings,
- m_ui->m_selectTranslations, m_ui->m_buttonDefaultTranslations );
-@@ -1239,6 +1340,14 @@ void KCMLocale::defaultTranslations()
- void KCMLocale::changedTranslationsAvailable( QListWidgetItem *item )
- {
- Q_UNUSED( item );
-+ if (item->data(Qt::UserRole).toString() == m_manuallySetLanguage) {
-+ // It is re-inserted by mergeSettings(). No need to do it manually here.
-+ m_ui->m_messageWidget->setText(i18nc("@status message widget",
-+ "You tried to remove your active system language, this is not supported."));
-+ m_ui->m_messageWidget->setMessageType(KMessageWidget::Error);
-+ m_ui->m_messageWidget->animatedShow();
-+ }
-+
- m_ui->m_selectTranslations->availableListWidget()->sortItems();
- int row = m_ui->m_selectTranslations->availableListWidget()->currentRow();
- changedTranslations();
-@@ -1259,9 +1368,95 @@ void KCMLocale::changedTranslations()
- QStringList selectedTranslations;
- for ( int i = 0; i < m_ui->m_selectTranslations->selectedListWidget()->count(); ++i ) {
- selectedTranslations.append( m_ui->m_selectTranslations->selectedListWidget()->item( i )->data( Qt::UserRole ).toString() );
-+
-+ // Use Kubuntu addons to figure out whether or not this installation
-+ // needs installation actions.
-+ QListWidgetItem* item = m_ui->m_selectTranslations->selectedListWidget()->item( i );
-+
-+ Kubuntu::Language *language = 0;
-+ const QVariant variant = item->data(Qt::UserRole+1);
-+ kDebug() << "variant" << variant;
-+ kDebug() << "variant" << variant.isValid() << variant.canConvert<Kubuntu::Language *>();
-+ if (variant.isValid())
-+ language = variant.value<Kubuntu::Language *>();
-+
-+ if (language && !language->isSupportComplete()) {
-+ kDebug() << "support not complete for" << language->kdeLanguageCode();
-+ m_kubuntuLanguagesMap[language] = i;
-+
-+ // Deactivate UI during install.
-+ m_ui->m_selectTranslations->setEnabled(false);
-+ m_ui->m_buttonDefaultTranslations->setEnabled(false);
-+
-+ connect(language, SIGNAL(supportCompletionProgress(int)),
-+ this, SLOT(onLanguageCompletionProgress(int)));
-+ connect(language, SIGNAL(supportComplete()),
-+ this, SLOT(onLanguageCompletion()));
-+ connect(language, SIGNAL(supportCompletionFailed()),
-+ this, SLOT(onLanguageCompletionError()));
-+ language->completeSupport();
-+ } else if (language)
-+ kDebug() << "support complete for" << language->kdeLanguageCode();
-+ else
-+ kDebug() << "this language has no Kubuntu::Language associated with it :'<" << item->text();
-+ }
-+
-+ kDebug() << m_kubuntuLanguagesMap;
-+
-+ // setting of translations is delayed until all transactions returned, if we started any
-+ if (m_kubuntuLanguagesMap.count() == 0) {
-+ kDebug() << "setTranslations" << selectedTranslations;
-+ setTranslations( selectedTranslations.join( ":" ) );
-+ }
-+}
-+
-+void KCMLocale::onLanguageCompletionError()
-+{
-+ const int i = m_kubuntuLanguagesMap.value(qobject_cast<Kubuntu::Language *>(sender()));
-+ // Error'd item cleanup needs to happen in one go or the index will change
-+ m_selectedCleanupList.append(i);
-+ kDebug() << "Transaction error on selected item" << i;
-+ onLanguageCompletion();
-+}
-+
-+void KCMLocale::onLanguageCompletion()
-+{
-+ const int i = m_kubuntuLanguagesMap.take(qobject_cast<Kubuntu::Language *>(sender()));
-+ kDebug() << "Completion finished for item" << i;
-+ sender()->deleteLater();
-+ if (m_kubuntuLanguagesMap.count() == 0) {
-+ kDebug() << "Out of transactions ... enabling UI and clearing pending packages";
-+
-+ // Move selected items with errors from selected to available.
-+ // Loop the list backwards as otherwise the index may change due to removal
-+ // of a previous entry.
-+ for (int i = m_selectedCleanupList.size() - 1; i >= 0; --i) {
-+ const int index = m_selectedCleanupList.at(i);
-+ QListWidgetItem *item = m_ui->m_selectTranslations->selectedListWidget()->takeItem(index);
-+ Q_ASSERT(item);
-+ m_ui->m_selectTranslations->selectedListWidget()->removeItemWidget(item);
-+ kDebug() << "Dropping item" << index << item->text() << "because it had an error.";
-+ m_ui->m_selectTranslations->availableListWidget()->addItem(item);
-+ m_ui->m_selectTranslations->availableListWidget()->sortItems();
-+ }
-+ m_selectedCleanupList.clear();
-+
-+ m_ui->m_selectTranslations->setEnabled(true);
-+ m_ui->m_buttonDefaultTranslations->setEnabled(true);
-+ QStringList selectedTranslations;
-+ for ( int i = 0; i < m_ui->m_selectTranslations->selectedListWidget()->count(); ++i )
-+ selectedTranslations.append( m_ui->m_selectTranslations->selectedListWidget()->item( i )->data( Qt::UserRole ).toString() );
-+ setTranslations( selectedTranslations.join( ":" ) );
- }
-+}
-
-- setTranslations( selectedTranslations.join( ":" ) );
-+void KCMLocale::onLanguageCompletionProgress(int percentage) {
-+ if (percentage == 100) {
-+ m_ui->installWidgets->hide();
-+ } else {
-+ m_ui->installWidgets->show();
-+ m_ui->installProgressBar->setValue(percentage);
-+ }
- }
-
- void KCMLocale::setTranslations( const QString &newValue )
-diff --git a/kcontrol/locale/kcmlocale.h b/kcontrol/locale/kcmlocale.h
-index c7b29bc..f72d373 100644
---- a/kcontrol/locale/kcmlocale.h
-+++ b/kcontrol/locale/kcmlocale.h
-@@ -29,6 +29,7 @@
-
- class QListWidgetItem;
- class QCheckBox;
-+class QProgressBar;
- class KPushButton;
- class KComboBox;
- class KIntNumInput;
-@@ -37,6 +38,11 @@ namespace Ui {
- class KCMLocaleWidget;
- }
-
-+namespace Kubuntu {
-+ class Language;
-+ class LanguageCollection;
-+}
-+
- /**
- * @short A KCM to configure locale settings
- *
-@@ -408,7 +414,18 @@ private Q_SLOTS:
- void defaultBinaryUnitDialect();
- void changedBinaryUnitDialectIndex( int index );
-
-+ // Kubuntu adhoc l10n installation patch slots
-+ void onLanguageCompletionProgress(int);
-+ void onLanguageCompletionError();
-+ void onLanguageCompletion();
-+ void continueInitTranslations();
-+
- private:
-+ // Kubuntu langpack patch privates.
-+ QString languageCodeToName(const QString &code) const;
-+ /** !empty when the system language was inserted as only selection */
-+ QString m_manuallySetLanguage;
-+
- // Date/Time format map utilities
- QString posixToUserDate( const QString &posixFormat ) const;
- QString posixToUserTime( const QString &posixFormat ) const;
-@@ -478,6 +495,11 @@ private:
- KLocale *m_defaultLocale;
-
- Ui::KCMLocaleWidget *m_ui;
-+ Kubuntu::LanguageCollection *m_kubuntuLanguages;
-+ QMap<Kubuntu::Language *, int> m_kubuntuLanguagesMap;
-+ QList<int> m_selectedCleanupList;
- };
-
--#endif //KCMLOCALE_H
-\ No newline at end of file
-+Q_DECLARE_METATYPE(Kubuntu::Language*)
-+
-+#endif //KCMLOCALE_H
-diff --git a/kcontrol/locale/kcmlocalewidget.ui b/kcontrol/locale/kcmlocalewidget.ui
-index bba9074..1a97d75 100644
---- a/kcontrol/locale/kcmlocalewidget.ui
-+++ b/kcontrol/locale/kcmlocalewidget.ui
-@@ -7,7 +7,7 @@
- <x>0</x>
- <y>0</y>
- <width>702</width>
-- <height>439</height>
-+ <height>443</height>
- </rect>
- </property>
- <property name="sizePolicy">
-@@ -20,7 +20,7 @@
- <item>
- <widget class="KTabWidget" name="m_tabWidgetSettings">
- <property name="currentIndex">
-- <number>0</number>
-+ <number>1</number>
- </property>
- <widget class="QWidget" name="m_tabLocation">
- <attribute name="title">
-@@ -105,16 +105,36 @@
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
-- <widget class="KActionSelector" name="m_selectTranslations">
-- <property name="availableLabel">
-+ <widget class="KMessageWidget" name="m_messageWidget" native="true"/>
-+ </item>
-+ <item>
-+ <widget class="KActionSelector" name="m_selectTranslations" native="true">
-+ <property name="availableLabel" stdset="0">
- <string>Available Languages:</string>
- </property>
-- <property name="selectedLabel">
-+ <property name="selectedLabel" stdset="0">
- <string>Preferred Languages:</string>
- </property>
-- <property name="availableInsertionPolicy">
-- <enum>KActionSelector::BelowCurrent</enum>
-- </property>
-+ </widget>
-+ </item>
-+ <item>
-+ <widget class="QWidget" name="installWidgets" native="true">
-+ <layout class="QHBoxLayout" name="horizontalLayout_15">
-+ <item>
-+ <widget class="QLabel" name="installLabel">
-+ <property name="text">
-+ <string>Install Progress:</string>
-+ </property>
-+ </widget>
-+ </item>
-+ <item>
-+ <widget class="QProgressBar" name="installProgressBar">
-+ <property name="value">
-+ <number>24</number>
-+ </property>
-+ </widget>
-+ </item>
-+ </layout>
- </widget>
- </item>
- <item>
-@@ -284,7 +304,7 @@
- <item row="3" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout_13">
- <item>
-- <widget class="KIntNumInput" name="m_intDecimalPlaces">
-+ <widget class="KIntNumInput" name="m_intDecimalPlaces" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
-@@ -297,10 +317,10 @@
- <property name="whatsThis">
- <string/>
- </property>
-- <property name="minimum">
-+ <property name="minimum" stdset="0">
- <number>0</number>
- </property>
-- <property name="maximum">
-+ <property name="maximum" stdset="0">
- <number>10</number>
- </property>
- </widget>
-@@ -645,7 +665,7 @@
- <item row="5" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout_5">
- <item>
-- <widget class="KIntNumInput" name="m_intMonetaryDecimalPlaces">
-+ <widget class="KIntNumInput" name="m_intMonetaryDecimalPlaces" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
-@@ -658,10 +678,10 @@
- <property name="whatsThis">
- <string/>
- </property>
-- <property name="minimum">
-+ <property name="minimum" stdset="0">
- <number>0</number>
- </property>
-- <property name="maximum">
-+ <property name="maximum" stdset="0">
- <number>10</number>
- </property>
- </widget>
-@@ -871,20 +891,20 @@
- <item row="2" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout_29">
- <item>
-- <widget class="KIntNumInput" name="m_intShortYearWindowStartYear">
-+ <widget class="KIntNumInput" name="m_intShortYearWindowStartYear" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="value">
-+ <property name="value" stdset="0">
- <number>2000</number>
- </property>
-- <property name="minimum">
-+ <property name="minimum" stdset="0">
- <number>-9999</number>
- </property>
-- <property name="maximum">
-+ <property name="maximum" stdset="0">
- <number>9999</number>
- </property>
- </widget>
-@@ -1534,6 +1554,13 @@
- <string/>
- </property>
- <layout class="QGridLayout" name="gridLayout">
-+ <item row="3" column="1" colspan="2">
-+ <widget class="QLabel" name="m_textShortDateSample">
-+ <property name="text">
-+ <string/>
-+ </property>
-+ </widget>
-+ </item>
- <item row="0" column="0">
- <widget class="QLabel" name="m_labelNumbersSample">
- <property name="text">
-@@ -1590,13 +1617,6 @@
- </property>
- </widget>
- </item>
-- <item row="3" column="1" colspan="2">
-- <widget class="QLabel" name="m_textShortDateSample">
-- <property name="text">
-- <string/>
-- </property>
-- </widget>
-- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="m_labelTimeSample">
- <property name="text">
-@@ -1625,9 +1645,9 @@
- </widget>
- <customwidgets>
- <customwidget>
-- <class>KIntSpinBox</class>
-- <extends>QSpinBox</extends>
-- <header>knuminput.h</header>
-+ <class>KComboBox</class>
-+ <extends>QComboBox</extends>
-+ <header>kcombobox.h</header>
- </customwidget>
- <customwidget>
- <class>KPushButton</class>
-@@ -1635,9 +1655,14 @@
- <header>kpushbutton.h</header>
- </customwidget>
- <customwidget>
-- <class>KComboBox</class>
-- <extends>QComboBox</extends>
-- <header>kcombobox.h</header>
-+ <class>KIntSpinBox</class>
-+ <extends>QSpinBox</extends>
-+ <header>knuminput.h</header>
-+ </customwidget>
-+ <customwidget>
-+ <class>KIntNumInput</class>
-+ <extends>QWidget</extends>
-+ <header>knuminput.h</header>
- </customwidget>
- <customwidget>
- <class>KTabWidget</class>
-@@ -1646,14 +1671,15 @@
- <container>1</container>
- </customwidget>
- <customwidget>
-- <class>KIntNumInput</class>
-+ <class>KActionSelector</class>
- <extends>QWidget</extends>
-- <header>knuminput.h</header>
-+ <header>kactionselector.h</header>
- </customwidget>
- <customwidget>
-- <class>KActionSelector</class>
-+ <class>KMessageWidget</class>
- <extends>QWidget</extends>
-- <header>kactionselector.h</header>
-+ <header location="global">KMessageWidget</header>
-+ <container>1</container>
- </customwidget>
- </customwidgets>
- <tabstops>
diff --git a/debian/patches/kubuntu_nodisplay_knetattach.diff b/debian/patches/kubuntu_nodisplay_knetattach.diff
index 88d04e8..dbb724f 100644
--- a/debian/patches/kubuntu_nodisplay_knetattach.diff
+++ b/debian/patches/kubuntu_nodisplay_knetattach.diff
@@ -1,8 +1,17 @@
-Index: kde-runtime/knetattach/knetattach.desktop
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Apr 2016 13:53:28 +0200
+Subject: kubuntu_nodisplay_knetattach
+
===================================================================
---- kde-runtime.orig/knetattach/knetattach.desktop 2015-02-23 22:57:53.683998274 +0100
-+++ kde-runtime/knetattach/knetattach.desktop 2015-02-23 22:57:53.679998329 +0100
-@@ -186,3 +186,4 @@
+---
+ knetattach/knetattach.desktop | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/knetattach/knetattach.desktop b/knetattach/knetattach.desktop
+index 88b5585..f61827f 100755
+--- a/knetattach/knetattach.desktop
++++ b/knetattach/knetattach.desktop
+@@ -186,3 +186,4 @@ X-KDE-StartupNotify=true
Categories=Qt;KDE;Network;RemoteAccess;
X-DocPath=knetattach/index.html
OnlyShowIn=KDE;
diff --git a/debian/patches/kubuntu_shutup_shutup_shutup.diff b/debian/patches/kubuntu_shutup_shutup_shutup.diff
index bad4a38..90ca0f3 100644
--- a/debian/patches/kubuntu_shutup_shutup_shutup.diff
+++ b/debian/patches/kubuntu_shutup_shutup_shutup.diff
@@ -1,6 +1,16 @@
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Apr 2016 13:53:28 +0200
+Subject: kubuntu_shutup_shutup_shutup
+
+---
+ attica/kdeplugin/kdeplatformdependent.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/attica/kdeplugin/kdeplatformdependent.cpp b/attica/kdeplugin/kdeplatformdependent.cpp
+index d0041b8..fde029c 100644
--- a/attica/kdeplugin/kdeplatformdependent.cpp
+++ b/attica/kdeplugin/kdeplatformdependent.cpp
-@@ -221,7 +221,7 @@
+@@ -221,7 +221,7 @@ QList<QUrl> KdePlatformDependent::getDefaultProviderFiles() const
foreach (const QString& pathString, pathStrings) {
paths.append(QUrl(pathString));
}
@@ -9,7 +19,7 @@
return paths;
}
-@@ -234,7 +234,7 @@
+@@ -234,7 +234,7 @@ void KdePlatformDependent::addDefaultProviderFile(const QUrl& url)
pathStrings.append(urlString);
group.writeEntry("providerFiles", pathStrings);
group.sync();
diff --git a/debian/patches/series b/debian/patches/series
index 5add865..aa8a553 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,9 @@
-#kde4_information_menu.diff
disable_usr_lib_install_rpath.diff
khelp_htdig.diff
use_the_correct_locale.patch
use_always_present_path_to_test.patch
disable_flacky_tests
disable_kwalletd_autotests
-#kubuntu_langpack_install.diff
kubuntu_nodisplay_knetattach.diff
kubuntu_shutup_shutup_shutup.diff
kubuntu_drkonqi_whoopsie_integration.patch
diff --git a/debian/patches/use_always_present_path_to_test.patch b/debian/patches/use_always_present_path_to_test.patch
index 8e7bd2d..20cc1ff 100644
--- a/debian/patches/use_always_present_path_to_test.patch
+++ b/debian/patches/use_always_present_path_to_test.patch
@@ -1,18 +1,16 @@
-Description: use a path that's always there
- Or at least in Debian ;)
- .
- To try to use /etc/cups/ it will require to install cups first. But to be
- able to achieve the same result one can simply use /etc/crond.d, which
- is present both in Debian and Red Hat almost always (if not always).
-Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-Forwarded: https://bugs.kde.org/show_bug.cgi?id=330107
-Last-Update: 2014-01-17
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Apr 2016 13:53:28 +0200
+Subject: use_always_present_path_to_test
-Index: kde-runtime/kioslave/trash/tests/testtrash.cpp
-===================================================================
---- kde-runtime.orig/kioslave/trash/tests/testtrash.cpp 2015-02-23 22:55:56.275954508 +0100
-+++ kde-runtime/kioslave/trash/tests/testtrash.cpp 2015-02-23 22:55:56.231955988 +0100
-@@ -894,8 +894,8 @@
+---
+ kioslave/trash/tests/testtrash.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/kioslave/trash/tests/testtrash.cpp b/kioslave/trash/tests/testtrash.cpp
+index f99f0f0..bb4e87f 100644
+--- a/kioslave/trash/tests/testtrash.cpp
++++ b/kioslave/trash/tests/testtrash.cpp
+@@ -894,8 +894,8 @@ void TestTrash::moveDirectoryFromTrash()
void TestTrash::trashDirectoryOwnedByRoot()
{
KUrl u;
diff --git a/debian/patches/use_the_correct_locale.patch b/debian/patches/use_the_correct_locale.patch
index 598b9db..b9310b6 100644
--- a/debian/patches/use_the_correct_locale.patch
+++ b/debian/patches/use_the_correct_locale.patch
@@ -1,11 +1,13 @@
-Description: Use the correct locale.
- The test was expecting a specific locale. Everything seems to indicate
- that any UTF-8 enabled locale would work for this testcases, so use
- C.UTF-8 and avoid to have to depend on all locales.
-Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-Forwarded: https://bugs.kde.org/show_bug.cgi?id=329983
-Last-Update: 2014-01-14
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Apr 2016 13:53:28 +0200
+Subject: use_the_correct_locale
+---
+ kioslave/trash/tests/testtrash.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kioslave/trash/tests/testtrash.cpp b/kioslave/trash/tests/testtrash.cpp
+index bccb0e5..f99f0f0 100644
--- a/kioslave/trash/tests/testtrash.cpp
+++ b/kioslave/trash/tests/testtrash.cpp
@@ -58,7 +58,7 @@ int initLocale()
--
KDE Base Runtime module packaging
More information about the pkg-kde-commits
mailing list