From e96e4e9cef3a0137b789117f72a93a8e9106562e Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Fri, 6 Dec 2013 15:54:12 +0100
Subject: Handle SIGWINCH in APT::Progress-Fancy=1

---
 apt-pkg/install-progress.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'apt-pkg/install-progress.h')

diff --git a/apt-pkg/install-progress.h b/apt-pkg/install-progress.h
index d721c6373..4b7590983 100644
--- a/apt-pkg/install-progress.h
+++ b/apt-pkg/install-progress.h
@@ -3,7 +3,7 @@
 
 #include <string>
 #include <unistd.h>
-
+#include <signal.h>
 
 namespace APT {
 namespace Progress {
@@ -117,11 +117,14 @@ namespace Progress {
  class PackageManagerFancy : public PackageManager
  {
  protected:
-    int nr_terminal_rows;
-    void SetupTerminalScrollArea(int nr_rows);
+    static void SetupTerminalScrollArea(int nr_rows);
+    static int GetNumberTerminalRows();
+    static void HandleSIGWINCH(int);
+    sighandler_t old_SIGWINCH;
 
  public:
     PackageManagerFancy();
+    ~PackageManagerFancy();
     virtual void Start();
     virtual void Stop();
     virtual bool StatusChanged(std::string PackageName, 
-- 
cgit v1.2.3


From 4754718a4461ebff89f5b49c385a007b4197bcff Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Sun, 22 Dec 2013 14:38:39 +0100
Subject: first proof-of-concept for a fix for #731738

---
 apt-pkg/install-progress.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'apt-pkg/install-progress.h')

diff --git a/apt-pkg/install-progress.h b/apt-pkg/install-progress.h
index 4b7590983..010be82fd 100644
--- a/apt-pkg/install-progress.h
+++ b/apt-pkg/install-progress.h
@@ -28,7 +28,7 @@ namespace Progress {
     virtual ~PackageManager() {};
 
     /* Global Start/Stop */
-    virtual void Start() {};
+    virtual void Start(int child_pty=-1) {};
     virtual void Stop() {};
 
     /* When dpkg is invoked (may happen multiple times for each 
@@ -125,7 +125,7 @@ namespace Progress {
  public:
     PackageManagerFancy();
     ~PackageManagerFancy();
-    virtual void Start();
+    virtual void Start(int child_pty=-1);
     virtual void Stop();
     virtual bool StatusChanged(std::string PackageName, 
                                unsigned int StepsDone,
-- 
cgit v1.2.3


From 5ed887855df9c39dcd22971073ed05b28a9ee95f Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Sat, 28 Dec 2013 00:26:17 +0100
Subject: properly handle SIGWINCH in PackageManagerFancy again

---
 apt-pkg/install-progress.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'apt-pkg/install-progress.h')

diff --git a/apt-pkg/install-progress.h b/apt-pkg/install-progress.h
index 010be82fd..513de1c08 100644
--- a/apt-pkg/install-progress.h
+++ b/apt-pkg/install-progress.h
@@ -116,11 +116,17 @@ namespace Progress {
 
  class PackageManagerFancy : public PackageManager
  {
+ private:
+    static void staticSIGWINCH(int);
+    static std::vector<PackageManagerFancy*> instances;
+
  protected:
-    static void SetupTerminalScrollArea(int nr_rows);
-    static int GetNumberTerminalRows();
-    static void HandleSIGWINCH(int);
+    void SetupTerminalScrollArea(int nr_rows);
+    void HandleSIGWINCH(int);
+
+    int GetNumberTerminalRows();
     sighandler_t old_SIGWINCH;
+    int child_pty;
 
  public:
     PackageManagerFancy();
-- 
cgit v1.2.3


From 23bd09778261c945b460b46d855b1a6ef998cfd8 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Sat, 28 Dec 2013 09:50:06 +0100
Subject: add missing vector include

---
 apt-pkg/install-progress.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'apt-pkg/install-progress.h')

diff --git a/apt-pkg/install-progress.h b/apt-pkg/install-progress.h
index 513de1c08..8a5b68a8f 100644
--- a/apt-pkg/install-progress.h
+++ b/apt-pkg/install-progress.h
@@ -4,6 +4,7 @@
 #include <string>
 #include <unistd.h>
 #include <signal.h>
+#include <vector>
 
 namespace APT {
 namespace Progress {
-- 
cgit v1.2.3