[SCM] Akonadi packaging branch, debian/sid, updated. debian/16.04.3-4-1-g99bbdcf

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/akonadi.git;a=commitdiff;h=99bbdcf

The following commit has been merged in the debian/sid branch:
commit 99bbdcf7df647327d51012857daa47eea0f41b0a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Dec 6 18:55:09 2016 +0100

    Add new patch: Delete-the-properties-window-if-closed.patch
    
    Closes: 845553
    Thanks: Nancy Anthracite for reporting
---
 .../Delete-the-properties-window-if-closed.patch   | 21 +++++++++++++++++
 .../patches/QSqlite3-fix-build-with-Qt-5.7.patch   |  8 ++-----
 .../kubuntu_disable_secure_file_priv_check.diff    | 26 ++++++++++++++--------
 debian/patches/series                              |  1 +
 4 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/debian/patches/Delete-the-properties-window-if-closed.patch b/debian/patches/Delete-the-properties-window-if-closed.patch
new file mode 100644
index 0000000..ebdb4d8
--- /dev/null
+++ b/debian/patches/Delete-the-properties-window-if-closed.patch
@@ -0,0 +1,21 @@
+From: Maximiliano Curia <maxy at gnuservers.com.ar>
+Date: Tue, 6 Dec 2016 18:53:58 +0100
+Subject: Delete the properties window if closed
+
+This should allow the window to be created again on request.
+---
+ src/widgets/collectionpropertiesdialog.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/widgets/collectionpropertiesdialog.cpp b/src/widgets/collectionpropertiesdialog.cpp
+index 8e31957..6922306 100644
+--- a/src/widgets/collectionpropertiesdialog.cpp
++++ b/src/widgets/collectionpropertiesdialog.cpp
+@@ -119,6 +119,7 @@ void CollectionPropertiesDialog::Private::init()
+ {
+     QVBoxLayout *mainLayout = new QVBoxLayout;
+     q->setLayout(mainLayout);
++    q->setAttribute(Qt::WA_DeleteOnClose);
+     mTabWidget = new QTabWidget(q);
+     mainLayout->addWidget(mTabWidget);
+ 
diff --git a/debian/patches/QSqlite3-fix-build-with-Qt-5.7.patch b/debian/patches/QSqlite3-fix-build-with-Qt-5.7.patch
index 5912b17..afb8e5c 100644
--- a/debian/patches/QSqlite3-fix-build-with-Qt-5.7.patch
+++ b/debian/patches/QSqlite3-fix-build-with-Qt-5.7.patch
@@ -1,7 +1,6 @@
-From c2a649216da9670b5c037f21a3b1ededfbc5f371 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil at kde.org>
+From: =?utf-8?q?Daniel_Vr=C3=A1til?= <dvratil at kde.org>
 Date: Sun, 5 Jun 2016 15:49:29 +0200
-Subject: [PATCH] QSqlite3: fix build with Qt 5.7
+Subject: QSqlite3: fix build with Qt 5.7
 
 Use ${QtSql_PRIVATE_INCLUDE_DIRS} to include the private headers
 directly from current Qt install instead of carrying a local copy.
@@ -908,6 +907,3 @@ index 06301cf..e4971a3 100644
          }
  
          if (sqlite3_close(d->access) != SQLITE_OK)
--- 
-2.10.2
-
diff --git a/debian/patches/kubuntu_disable_secure_file_priv_check.diff b/debian/patches/kubuntu_disable_secure_file_priv_check.diff
index e6e70d8..6df2773 100644
--- a/debian/patches/kubuntu_disable_secure_file_priv_check.diff
+++ b/debian/patches/kubuntu_disable_secure_file_priv_check.diff
@@ -1,15 +1,23 @@
-Description: disable the secure_file_priv check
- MySQL 5.7 introduced a premission check for export and import operations.
- In Ubuntu, only the full mysql-server package creates the set system wide
- directory causing mysqld-akonadi to error out on startup if only
- mysql-server-core-5.7 is installed.
- To prevent that the key is set to empty, which reverts mysqld to the 5.6
- behavior.
- See http://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_secure_file_priv
-Author: Philip Muskovac <yofel at gmx.net>
+From: Philip Muskovac <yofel at gmx.net>
+Date: Tue, 6 Dec 2016 18:43:17 +0100
+Subject: disable the secure_file_priv check
+
+MySQL 5.7 introduced a premission check for export and import operations.
+In Ubuntu, only the full mysql-server package creates the set system wide
+directory causing mysqld-akonadi to error out on startup if only
+mysql-server-core-5.7 is installed.
+To prevent that the key is set to empty, which reverts mysqld to the 5.6
+behavior.
+See http://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_secure_file_priv
 Last-Update: 2016-04-18
 Forwarded: not-needed
 Origin: vendor
+---
+ src/server/storage/mysql-global.conf | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/server/storage/mysql-global.conf b/src/server/storage/mysql-global.conf
+index 55b667b..a137f72 100644
 --- a/src/server/storage/mysql-global.conf
 +++ b/src/server/storage/mysql-global.conf
 @@ -100,5 +100,9 @@ wait_timeout=31536000
diff --git a/debian/patches/series b/debian/patches/series
index 3fee9fc..93912f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ postgresql-data-checksums.patch
 set_dependency_order.diff
 QSqlite3-fix-build-with-Qt-5.7.patch
 kubuntu_disable_secure_file_priv_check.diff
+Delete-the-properties-window-if-closed.patch

-- 
Akonadi packaging