Remove Ubuntu rethrow signals patch

This was removed from Ubunut's X.org packages years ago, so drop it from
our packing as well.

diff --git a/contrib/packages/deb/ubuntu-bionic/debian/rules b/contrib/packages/deb/ubuntu-bionic/debian/rules
index e9bb8e870524dc2ff65d77504b8bfc142adadf6c..54dfcd4458c76ee84786a6a2125ce320791dce99 100644 (file)
--- a/contrib/packages/deb/ubuntu-bionic/debian/rules
+++ b/contrib/packages/deb/ubuntu-bionic/debian/rules
@@ -46,7 +46,6 @@ XORG_SOURCE_ARCHIVE = /usr/src/xorg-server.tar.xz
 xorg-source-stamp: $(XORG_SOURCE_ARCHIVE)
        tar -C unix/xserver -axf $(XORG_SOURCE_ARCHIVE) --strip-components=1
        cd unix/xserver && patch -p1 < ../xserver119.patch
-       patch -p1 < debian/xorg-source-patches/100_rethrow_signals.patch
        patch -p1 < debian/xorg-source-patches/516_tigervnc-xorg-manpages.patch
        touch xorg-source-stamp
 

diff --git a/contrib/packages/deb/ubuntu-bionic/debian/xorg-source-patches/100_rethrow_signals.patch b/contrib/packages/deb/ubuntu-bionic/debian/xorg-source-patches/100_rethrow_signals.patch
deleted file mode 100644 (file)
index 8c24720..0000000
--- a/contrib/packages/deb/ubuntu-bionic/debian/xorg-source-patches/100_rethrow_signals.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up tigervnc-1.10.80/unix/xserver/hw/vnc/xvnc.c.orig tigervnc-1.10.80/unix/xserver/hw/vnc/xvnc.c
---- tigervnc-1.10.80/unix/xserver/hw/vnc/xvnc.c.orig   2020-04-02 11:18:00.000000000 +0200
-+++ tigervnc-1.10.80/unix/xserver/hw/vnc/xvnc.c        2020-04-02 12:44:06.365607230 +0200
-@@ -229,11 +229,17 @@ void ddxGiveUp(enum ExitCode error)
- }
- 
- void
--AbortDDX(enum ExitCode error)
-+SigAbortDDX(int signo, enum ExitCode error)
- {
-     ddxGiveUp(error);
- }
- 
-+void
-+AbortDDX(enum ExitCode error)
-+{
-+    SigAbortDDX(0, error);
-+}
-+
- #ifdef __DARWIN__
- void
- DarwinHandleGUI(int argc, char *argv[])

diff --git a/contrib/packages/deb/ubuntu-focal/debian/rules b/contrib/packages/deb/ubuntu-focal/debian/rules
index 7590e91361153618ac9c4438604c785d36dd4f79..afb7830a39cd1283efe895ed4671bcaad7db7519 100644 (file)
--- a/contrib/packages/deb/ubuntu-focal/debian/rules
+++ b/contrib/packages/deb/ubuntu-focal/debian/rules
@@ -46,7 +46,6 @@ XORG_SOURCE_ARCHIVE = /usr/src/xorg-server.tar.xz
 xorg-source-stamp: $(XORG_SOURCE_ARCHIVE)
        tar -C unix/xserver -axf $(XORG_SOURCE_ARCHIVE) --strip-components=1
        cd unix/xserver && patch -p1 < ../xserver120.patch
-       patch -p1 < debian/xorg-source-patches/100_rethrow_signals.patch
        patch -p1 < debian/xorg-source-patches/516_tigervnc-xorg-manpages.patch
        touch xorg-source-stamp
 

diff --git a/contrib/packages/deb/ubuntu-focal/debian/xorg-source-patches/100_rethrow_signals.patch b/contrib/packages/deb/ubuntu-focal/debian/xorg-source-patches/100_rethrow_signals.patch
deleted file mode 100644 (file)
index 8c24720..0000000
--- a/contrib/packages/deb/ubuntu-focal/debian/xorg-source-patches/100_rethrow_signals.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up tigervnc-1.10.80/unix/xserver/hw/vnc/xvnc.c.orig tigervnc-1.10.80/unix/xserver/hw/vnc/xvnc.c
---- tigervnc-1.10.80/unix/xserver/hw/vnc/xvnc.c.orig   2020-04-02 11:18:00.000000000 +0200
-+++ tigervnc-1.10.80/unix/xserver/hw/vnc/xvnc.c        2020-04-02 12:44:06.365607230 +0200
-@@ -229,11 +229,17 @@ void ddxGiveUp(enum ExitCode error)
- }
- 
- void
--AbortDDX(enum ExitCode error)
-+SigAbortDDX(int signo, enum ExitCode error)
- {
-     ddxGiveUp(error);
- }
- 
-+void
-+AbortDDX(enum ExitCode error)
-+{
-+    SigAbortDDX(0, error);
-+}
-+
- #ifdef __DARWIN__
- void
- DarwinHandleGUI(int argc, char *argv[])

diff --git a/contrib/packages/deb/ubuntu-xenial/debian/rules b/contrib/packages/deb/ubuntu-xenial/debian/rules
index f61099c074f775b03e4fe3edb0147f31d4eb98e4..1be1e75dd6b817558358590eb53be170a299ed40 100644 (file)
--- a/contrib/packages/deb/ubuntu-xenial/debian/rules
+++ b/contrib/packages/deb/ubuntu-xenial/debian/rules
@@ -47,7 +47,6 @@ xorg-source-stamp: $(XORG_SOURCE_ARCHIVE)
        tar -C unix/xserver -axf $(XORG_SOURCE_ARCHIVE) --strip-components=1
        patch -p1 < debian/xorg-source-patches/xserver118-patch.patch
        cd unix/xserver && patch -p1 < ../xserver118.patch
-       patch -p1 < debian/xorg-source-patches/100_rethrow_signals.patch
        patch -p1 < debian/xorg-source-patches/516_tigervnc-xorg-manpages.patch
        touch xorg-source-stamp
 

diff --git a/contrib/packages/deb/ubuntu-xenial/debian/xorg-source-patches/100_rethrow_signals.patch b/contrib/packages/deb/ubuntu-xenial/debian/xorg-source-patches/100_rethrow_signals.patch
deleted file mode 100644 (file)
index 8c24720..0000000
--- a/contrib/packages/deb/ubuntu-xenial/debian/xorg-source-patches/100_rethrow_signals.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up tigervnc-1.10.80/unix/xserver/hw/vnc/xvnc.c.orig tigervnc-1.10.80/unix/xserver/hw/vnc/xvnc.c
---- tigervnc-1.10.80/unix/xserver/hw/vnc/xvnc.c.orig   2020-04-02 11:18:00.000000000 +0200
-+++ tigervnc-1.10.80/unix/xserver/hw/vnc/xvnc.c        2020-04-02 12:44:06.365607230 +0200
-@@ -229,11 +229,17 @@ void ddxGiveUp(enum ExitCode error)
- }
- 
- void
--AbortDDX(enum ExitCode error)
-+SigAbortDDX(int signo, enum ExitCode error)
- {
-     ddxGiveUp(error);
- }
- 
-+void
-+AbortDDX(enum ExitCode error)
-+{
-+    SigAbortDDX(0, error);
-+}
-+
- #ifdef __DARWIN__
- void
- DarwinHandleGUI(int argc, char *argv[])