From: Pierre Ossman Date: Tue, 13 Jul 2021 12:25:23 +0000 (+0200) Subject: Remove Ubuntu rethrow signals patch X-Git-Tag: v1.11.90~28^2~20 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5ebcee5c58f847ba0bcf7faaec4c860e5a7c5038;p=tigervnc.git 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 e9bb8e87..54dfcd44 100644 --- 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 index 8c24720d..00000000 --- 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 7590e913..afb7830a 100644 --- 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 index 8c24720d..00000000 --- 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 f61099c0..1be1e75d 100644 --- 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 index 8c24720d..00000000 --- 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[])