[SCM] KDE Base Runtime module packaging branch, master, updated. debian/16.04.3-1-6-g4f07534
Pino Toscano
pino at moszumanska.debian.org
Sun Aug 21 07:55:46 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-runtime.git;a=commitdiff;h=4f07534
The following commit has been merged in the master branch:
commit 4f07534b59ef95bec1581c717cc8c44b240153fb
Author: Pino Toscano <pino at debian.org>
Date: Sun Aug 21 09:55:24 2016 +0200
update the patches
- kubuntu_drkonqi_whoopsie_integration.patch: drop, KUbuntu-specific
(whoopsie is not even available in Debian)
- kubuntu_disable-gpg-backend.diff: drop, as it was not applied anymore
since 4:16.04.2-2
---
debian/changelog | 5 ++
debian/patches/kubuntu_disable-gpg-backend.diff | 84 ----------------------
.../kubuntu_drkonqi_whoopsie_integration.patch | 71 ------------------
debian/patches/series | 2 -
4 files changed, 5 insertions(+), 157 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1d3cf96..d15b064 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,11 @@ kde-runtime (4:16.08.0-0r1) UNRELEASED; urgency=medium
* Update lintian overrides.
* Limit the udisks2 recommend in kde-runtime as linux-any, as udisks2 is
Linux-specific.
+ * Update the patches:
+ - kubuntu_drkonqi_whoopsie_integration.patch: drop, KUbuntu-specific
+ (whoopsie is not even available in Debian)
+ - kubuntu_disable-gpg-backend.diff: drop, as it was not applied anymore
+ since 4:16.04.2-2
-- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 01 Aug 2016 07:36:49 +0200
diff --git a/debian/patches/kubuntu_disable-gpg-backend.diff b/debian/patches/kubuntu_disable-gpg-backend.diff
deleted file mode 100644
index f6318d4..0000000
--- a/debian/patches/kubuntu_disable-gpg-backend.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-From: Alex Fiestas <afiestas at kde.org>
-Date: Sat, 18 Jun 2016 13:51:49 +0200
-Subject: kubuntu_disable-gpg-backend.diff
-
-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>
----
- 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
---- a/kwalletd/CMakeLists.txt
-+++ b/kwalletd/CMakeLists.txt
-@@ -1,15 +1,15 @@
- project(kwalletd)
-
- ########### find needed packages ######
--find_package(Gpgme) # Called by FindQGpgme, but since we call some gpgme
-- # functions ourselves we need to link against it directly.
--find_package(QGpgme) # provided by kdepimlibs
-+# find_package(Gpgme) # Called by FindQGpgme, but since we call some gpgme
-+# # functions ourselves we need to link against it directly.
-+# find_package(QGpgme) # provided by kdepimlibs
-
--if (GPGME_FOUND AND QGPGME_FOUND)
-- add_definitions(-DHAVE_QGPGME)
-- include_directories(${GPGME_INCLUDES} ${QGPGME_INCLUDE_DIR})
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
--endif(GPGME_FOUND AND QGPGME_FOUND)
-+# if (GPGME_FOUND AND QGPGME_FOUND)
-+# add_definitions(-DHAVE_QGPGME)
-+# include_directories(${GPGME_INCLUDES} ${QGPGME_INCLUDE_DIR})
-+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
-+# endif(GPGME_FOUND AND QGPGME_FOUND)
-
- ########### build backends #########
- add_subdirectory(backend)
-@@ -37,18 +37,18 @@ kde4_add_ui_files(kwalletd_KDEINIT_SRCS
- kwalletwizardpagepassword.ui
- )
-
--if (GPGME_FOUND AND QGPGME_FOUND)
-- set(kwalletd_KDEINIT_SRCS
-- ${kwalletd_KDEINIT_SRCS}
-- knewwalletdialog.cpp
-- )
-- kde4_add_ui_files(kwalletd_KDEINIT_SRCS
-- kwalletwizardpagepasswordgpg.ui
-- kwalletwizardpagegpgkey.ui
-- knewwalletdialogintro.ui
-- knewwalletdialoggpg.ui
-- )
--endif(GPGME_FOUND AND QGPGME_FOUND)
-+# if (GPGME_FOUND AND QGPGME_FOUND)
-+# set(kwalletd_KDEINIT_SRCS
-+# ${kwalletd_KDEINIT_SRCS}
-+# knewwalletdialog.cpp
-+# )
-+# kde4_add_ui_files(kwalletd_KDEINIT_SRCS
-+# kwalletwizardpagepasswordgpg.ui
-+# kwalletwizardpagegpgkey.ui
-+# knewwalletdialogintro.ui
-+# knewwalletdialoggpg.ui
-+# )
-+# endif(GPGME_FOUND AND QGPGME_FOUND)
-
- find_file(kwallet_xml org.kde.KWallet.xml HINTS ${KDE4_DBUS_INTERFACES_DIR} )
-
-@@ -57,9 +57,9 @@ qt4_add_dbus_adaptor( kwalletd_KDEINIT_SRCS ${kwallet_xml} kwalletd.h KWalletD )
- kde4_add_kdeinit_executable( kwalletd NOGUI ${kwalletd_KDEINIT_SRCS} )
-
- target_link_libraries(kdeinit_kwalletd ${KDE4_KDEUI_LIBS} kwalletbackend )
--if (GPGME_FOUND AND QGPGME_FOUND)
-- target_link_libraries(kdeinit_kwalletd ${QGPGME_LIBRARIES} )
--endif(GPGME_FOUND AND QGPGME_FOUND)
-+# if (GPGME_FOUND AND QGPGME_FOUND)
-+# target_link_libraries(kdeinit_kwalletd ${QGPGME_LIBRARIES} )
-+# endif(GPGME_FOUND AND QGPGME_FOUND)
-
- install(TARGETS kdeinit_kwalletd ${INSTALL_TARGETS_DEFAULT_ARGS})
-
diff --git a/debian/patches/kubuntu_drkonqi_whoopsie_integration.patch b/debian/patches/kubuntu_drkonqi_whoopsie_integration.patch
deleted file mode 100644
index e0d52f0..0000000
--- a/debian/patches/kubuntu_drkonqi_whoopsie_integration.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-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
-
-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
----
- 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";
-
-+static QCheckBox *s_whoopsieCheckBox = 0;
-+
- DrKonqiDialog::DrKonqiDialog(QWidget * parent) :
- KDialog(parent),
- m_aboutBugReportingDialog(0),
-@@ -75,6 +77,25 @@ DrKonqiDialog::DrKonqiDialog(QWidget * parent) :
-
- DrKonqiDialog::~DrKonqiDialog()
- {
-+ if (s_whoopsieCheckBox && s_whoopsieCheckBox->isChecked()) {
-+ const CrashedApplication *crashedApp = DrKonqi::crashedApplication();
-+
-+ const QString procPath = QString::fromUtf8("/proc/%1").arg(QString::number(crashedApp->pid()));
-+ const QFileInfo procFileInfo(procPath);
-+
-+ const QString executable = QFileInfo(procPath + QLatin1String("/exe")).symLinkTarget().replace('/', '_');
-+ const QString uid = QString::number(procFileInfo.ownerId());
-+ const QString filePath =
-+ QString("/var/crash/%1.%2.drkonqi-accept").arg(executable,
-+ uid);
-+
-+ kDebug() << executable << uid << filePath << s_whoopsieCheckBox->isChecked();
-+
-+ QFile acceptFile(filePath);
-+ acceptFile.open(QFile::WriteOnly);
-+ acceptFile.close();
-+ }
-+
- KConfigGroup config(KGlobal::config(), "General");
- saveDialogSize(config);
-
-@@ -158,6 +179,16 @@ void DrKonqiDialog::buildIntroWidget()
-
- KGlobal::locale()->formatTime(crashedApp->datetime().time(), true)
- ));
-+
-+ // Read file because it's faster than dbus.
-+ QFile whoopsieConfig(QLatin1String("/etc/default/whoopsie"));
-+ whoopsieConfig.open(QFile::ReadOnly);
-+ if (whoopsieConfig.readAll().contains(QByteArray("report_crashes=true"))) {
-+ s_whoopsieCheckBox = new QCheckBox(m_introWidget);
-+ s_whoopsieCheckBox->setText(i18n("Automatically submit a crash report"));
-+ s_whoopsieCheckBox->setChecked(true);
-+ m_introWidget->layout()->addWidget(s_whoopsieCheckBox);
-+ }
- }
-
- void DrKonqiDialog::buildDialogButtons()
diff --git a/debian/patches/series b/debian/patches/series
index eadb42f..dcd44fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,5 @@ disable_flacky_tests
disable_kwalletd_autotests
kubuntu_nodisplay_knetattach.diff
kubuntu_shutup_shutup_shutup.diff
-kubuntu_drkonqi_whoopsie_integration.patch
-# kubuntu_disable-gpg-backend.diff
add_glib_for_nm
hurd.diff
--
KDE Base Runtime module packaging
More information about the pkg-kde-commits
mailing list