[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#859325: marked as done (unblock: kconfig/5.28.0-2)



Your message dated Mon, 03 Apr 2017 14:21:00 +0000
with message-id <b309c60d-1611-3eac-ff5b-e15d14545c70@thykier.net>
and subject line Re: Bug#859325: unblock: kconfig/5.28.0-2
has caused the Debian Bug report #859325,
regarding unblock: kconfig/5.28.0-2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
859325: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=859325
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Dear release team,

Checking some of the KDE frameworks bugs and pending upstream fixes I've 
backported a small fix in kconfig for stretch:
 Sanitize shortcut list on read/write from kdeglobals (59b1847)
  KDE#375555
 This patch fixes shortcuts with duplicated entries, and avoids giving useless
 warnings to the user.

And uploaded 5.28.0-2 with it.

I'm attaching the corresponding debdiff, the version 5.28.0-2 is already in 
sid, and built in all the release architectures.

Happy hacking,

Please unblock package kconfig.

unblock kconfig/5.28.0-2

- -- System Information:
Debian Release: 9.0
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'testing'), (500, 'stable'), (50, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf

Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: systemd (via /run/systemd/system)

-----BEGIN PGP SIGNATURE-----

iQJEBAEBCgAuFiEE+JIdOnQEyG4RNSIVxxl2mbKbIyoFAljgx4cQHG1heHlAZGVi
aWFuLm9yZwAKCRDHGXaZspsjKoFOD/9+4nKOIOeqX9R+Vpq5rfR9SRky83giuBNZ
tVcmhAqubI9auqMqinE1ku+yOPtnyVYFSkSc2un3dBEyY0LgHuJD7KGLQdqFKbkX
6waGAR/H8mTya5Uio6bmZrcL2Z0hjz1/17BVnw8EqYt6LpcLyPUc96aMfDX6bCok
1ct5BM5UNusUg+ssKdI6nTzV7YEqLEXoQoqvdkuyRyfp4N8/aKDlEdM1mK5CoG1a
Ft7lXLYD6GfMOvrxUmiGjbuLPCXuB8Y00bwxKIlz50IJoSuWBpXlfTKGUatid88D
bHqT45mZHZMtwnWIgK/9TXDrh5FMAjIlDfW82k4mAEqRBvxa0TAR+YVBsmoFqL1m
wT5I/c4U76nVacOYqDR6CoHZbPX9zXtmX6h6Bya1cMkSMjL7e1yZJPMFkHAZAMyF
WUitOkeNW50b2pfBM2kQ3S7PVZZ+w9aBwfm/miS7jTDAIv9w48yaRlHkeWV1HLQ1
fTjrbCpmiEPwQt5RCwg82JnfR6CLdWiy5nbPwwES7bZFmgULVmgm21jpmtCoky24
x6q3v9fkIckRWYmj6QAwdNwrJ7v6Of+tEdgkGXAKDiiDrlqSKjdAfS0Bibm+sFRF
mPJW+M4fJ3Ohy5mQJuajjv6vmAF4lna2MYTJ8+aXM2AaXHUAXCELXnhuhmtUcoEG
Ux/9rdppjw==
=epbX
-----END PGP SIGNATURE-----
diff -Nru kconfig-5.28.0/debian/changelog kconfig-5.28.0/debian/changelog
--- kconfig-5.28.0/debian/changelog	2016-11-18 16:01:02.000000000 +0100
+++ kconfig-5.28.0/debian/changelog	2017-03-31 14:35:36.000000000 +0200
@@ -1,3 +1,10 @@
+kconfig (5.28.0-2) unstable; urgency=medium
+
+  * Add new upstream patch:
+    Sanitize-shortcut-list-on-read-write-from-kdeglobals.patch
+
+ -- Maximiliano Curia <maxy@debian.org>  Fri, 31 Mar 2017 14:35:36 +0200
+
 kconfig (5.28.0-1) unstable; urgency=medium
 
   [ Automatic packaging ]
diff -Nru kconfig-5.28.0/debian/patches/Sanitize-shortcut-list-on-read-write-from-kdeglobals.patch kconfig-5.28.0/debian/patches/Sanitize-shortcut-list-on-read-write-from-kdeglobals.patch
--- kconfig-5.28.0/debian/patches/Sanitize-shortcut-list-on-read-write-from-kdeglobals.patch	1970-01-01 01:00:00.000000000 +0100
+++ kconfig-5.28.0/debian/patches/Sanitize-shortcut-list-on-read-write-from-kdeglobals.patch	2017-03-31 14:35:36.000000000 +0200
@@ -0,0 +1,59 @@
+From: Albert Astals Cid <aacid@kde.org>
+Date: Mon, 6 Mar 2017 22:57:39 +0100
+Subject: Sanitize shortcut list on read/write from kdeglobals
+
+For some reason some people have kdeglobals entries like
+   Close=Ctrl+W; Ctrl+Esc; Ctrl+W; Ctrl+Esc;
+having the same shortcut more than once in the shortcut declaration is clearly bogus so fix it
+
+BUGS: 375555
+REVIEW: 129987
+---
+ src/gui/kstandardshortcut.cpp | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/src/gui/kstandardshortcut.cpp b/src/gui/kstandardshortcut.cpp
+index 92eb091..dd6a6db 100644
+--- a/src/gui/kstandardshortcut.cpp
++++ b/src/gui/kstandardshortcut.cpp
+@@ -187,6 +187,24 @@ static KStandardShortcutInfo *guardedStandardShortcutInfo(StandardShortcut id)
+     }
+ }
+ 
++
++// Sanitize the list for duplicates. For some reason some
++// people have kdeglobals entries like
++//   Close=Ctrl+W; Ctrl+Esc; Ctrl+W; Ctrl+Esc;
++// having the same shortcut more than once in the shortcut
++// declaration is clearly bogus so fix it
++static void sanitizeShortcutList(QList<QKeySequence> *list)
++{
++    for (int i = 0; i < list->size(); ++i) {
++        const QKeySequence &ks = list->at(i);
++        int other = list->indexOf(ks, i + 1);
++        while (other != -1) {
++            list->removeAt(other);
++            other = list->indexOf(ks, other);
++        }
++    }
++}
++
+ /** Initialize the accelerator @p id by checking if it is overridden
+     in the configuration file (and if it isn't, use the default).
+     On X11, if QApplication was initialized with GUI disabled,
+@@ -209,6 +227,7 @@ static void initialize(StandardShortcut id)
+         QString s = cg.readEntry(info->name);
+         if (s != QLatin1String("none")) {
+             info->cut = QKeySequence::listFromString(s);
++            sanitizeShortcutList(&info->cut);
+         } else {
+             info->cut = QList<QKeySequence>();
+         }
+@@ -244,6 +263,7 @@ void saveShortcut(StandardShortcut id, const QList<QKeySequence> &newShortcut)
+     }
+ 
+     // Write the changed shortcut to kdeglobals
++    sanitizeShortcutList(&info->cut);
+     cg.writeEntry(info->name, QKeySequence::listToString(info->cut), KConfig::Global | KConfig::Persistent);
+ }
+ 
diff -Nru kconfig-5.28.0/debian/patches/series kconfig-5.28.0/debian/patches/series
--- kconfig-5.28.0/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ kconfig-5.28.0/debian/patches/series	2017-03-31 14:35:36.000000000 +0200
@@ -0,0 +1 @@
+Sanitize-shortcut-list-on-read-write-from-kdeglobals.patch

--- End Message ---
--- Begin Message ---
Maximiliano Curia:
> Package: release.debian.org
> Severity: normal
> User: release.debian.org@packages.debian.org
> Usertags: unblock
> 
> Dear release team,
> 
> Checking some of the KDE frameworks bugs and pending upstream fixes I've 
> backported a small fix in kconfig for stretch:
>  Sanitize shortcut list on read/write from kdeglobals (59b1847)
>   KDE#375555
>  This patch fixes shortcuts with duplicated entries, and avoids giving useless
>  warnings to the user.
> 
> And uploaded 5.28.0-2 with it.
> 
> I'm attaching the corresponding debdiff, the version 5.28.0-2 is already in 
> sid, and built in all the release architectures.
> 
> Happy hacking,
> 
> Please unblock package kconfig.
> 
> unblock kconfig/5.28.0-2
> 
> -- System Information:
> Debian Release: 9.0
>   APT prefers unstable-debug
>   APT policy: (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'testing'), (500, 'stable'), (50, 'unstable'), (1, 'experimental')
> Architecture: amd64 (x86_64)
> Foreign Architectures: i386, armhf
> 
> Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores)
> Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
> Shell: /bin/sh linked to /bin/bash
> Init: systemd (via /run/systemd/system)
> 

Unblocked, thanks.

~Niels


> 

--- End Message ---

Reply to: