[qjoypad] 01/01: Import Debian changes 4.1.0-2.1

[Stephen Kitt]

This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch master
in repository qjoypad.

commit 7fe5b2aae0616085615b0a0668038a69baabbd93
Author: Adam Borowski <kilobyte at angband.pl>
Date:   Mon May 15 22:16:08 2017 +0200

    Import Debian changes 4.1.0-2.1
    
    qjoypad (4.1.0-2.1) unstable; urgency=medium
    
      * Non-maintainer upload.
      * Use proper RAII to fix crash (Closes: #853801), thanks Frédéric Brière.
---
 debian/changelog                         |  7 ++++
 debian/patches/fix_ftbfs_clang.patch     | 22 ------------
 debian/patches/properly-fix-752125.patch | 58 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  2 +-
 4 files changed, 66 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1153fe3..e20dc2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qjoypad (4.1.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use proper RAII to fix crash (Closes: #853801), thanks Frédéric Brière.
+
+ -- Adam Borowski <kilobyte at angband.pl>  Mon, 15 May 2017 22:16:08 +0200
+
 qjoypad (4.1.0-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/fix_ftbfs_clang.patch b/debian/patches/fix_ftbfs_clang.patch
deleted file mode 100644
index fb8729e..0000000
--- a/debian/patches/fix_ftbfs_clang.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# From: Alexander Ovchinnikov <sanek23994 at gmail.com>
-# Subject: Fix compile issues using clang
---- a/src/layout_edit.cpp
-+++ b/src/layout_edit.cpp
-@@ -39,7 +39,7 @@
-     //this is only necesary since joystick devices need not always be
-     //contiguous
-     int padcount = available.count();
--    QString names[padcount];
-+    QString *names = static_cast<QString *>(alloca(sizeof(QString) * padcount));
-     int i = 0;
-     do
-     {
-@@ -119,7 +119,7 @@
-     int indexOfFlashRadio = LMain->indexOf(JoyButtons);
-     FlashRadioArray *newJoyButtons;
-     int padcount = available.count();
--    QString names[padcount];
-+    QString *names = static_cast<QString *>(alloca(sizeof(QString) * padcount));
-     int i = 0;
-     do
-     {
diff --git a/debian/patches/properly-fix-752125.patch b/debian/patches/properly-fix-752125.patch
new file mode 100644
index 0000000..1a8a3b8
--- /dev/null
+++ b/debian/patches/properly-fix-752125.patch
@@ -0,0 +1,58 @@
+From 96c9052c9d2033320019947035dcd3869b076f3f Mon Sep 17 00:00:00 2001
+From: Frédéric Brière <fbriere at fbriere.net>
+Date: Fri, 17 Mar 2017 15:32:15 -0400
+Subject: [PATCH] Properly fix #752125  (closes #853801)
+
+---
+ src/layout_edit.cpp | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/layout_edit.cpp b/src/layout_edit.cpp
+index 8365104..5703ee3 100644
+--- a/src/layout_edit.cpp
++++ b/src/layout_edit.cpp
+@@ -1,4 +1,5 @@
+ #include "layout_edit.h"
++#include <vector>
+ 
+ //build the dialog
+ LayoutEdit::LayoutEdit( LayoutManager* l ): QWidget(NULL) {
+@@ -39,7 +40,7 @@ LayoutEdit::LayoutEdit( LayoutManager* l ): QWidget(NULL) {
+     //this is only necesary since joystick devices need not always be
+     //contiguous
+     int padcount = available.count();
+-    QString names[padcount];
++    std::vector<QString> names(padcount);
+     int i = 0;
+     do
+     {
+@@ -54,7 +55,7 @@ LayoutEdit::LayoutEdit( LayoutManager* l ): QWidget(NULL) {
+     } while (0);
+     
+     //flash radio array
+-    JoyButtons = new FlashRadioArray(padcount, names, true, this );
++    JoyButtons = new FlashRadioArray(padcount, &names[0], true, this );
+     LMain->addWidget( JoyButtons );
+     
+     //we have a WidgetStack to represent the multiple joypads
+@@ -119,7 +120,7 @@ void LayoutEdit::updateJoypadWidgets() {
+     int indexOfFlashRadio = LMain->indexOf(JoyButtons);
+     FlashRadioArray *newJoyButtons;
+     int padcount = available.count();
+-    QString names[padcount];
++    std::vector<QString> names(padcount);
+     int i = 0;
+     do
+     {
+@@ -132,7 +133,7 @@ void LayoutEdit::updateJoypadWidgets() {
+         }
+     } while (0);
+     
+-    newJoyButtons = new FlashRadioArray(padcount, names, true, this );
++    newJoyButtons = new FlashRadioArray(padcount, &names[0], true, this );
+     LMain->insertWidget(indexOfFlashRadio, newJoyButtons);
+     LMain->removeWidget(JoyButtons);
+     FlashRadioArray* oldJoyButtons = JoyButtons;
+-- 
+2.11.0
+
diff --git a/debian/patches/series b/debian/patches/series
index f957355..eca97f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-fix_ftbfs_clang.patch
 build_prefix.patch
+properly-fix-752125.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/qjoypad.git