Browse Source

Remove Ubuntu rethrow signals patch

This was removed from Ubunut's X.org packages years ago, so drop it from
our packing as well.
tags/v1.11.90
Pierre Ossman 2 years ago
parent
commit
5ebcee5c58

+ 0
- 1
contrib/packages/deb/ubuntu-bionic/debian/rules View File

@@ -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


+ 0
- 22
contrib/packages/deb/ubuntu-bionic/debian/xorg-source-patches/100_rethrow_signals.patch View File

@@ -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[])

+ 0
- 1
contrib/packages/deb/ubuntu-focal/debian/rules View File

@@ -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


+ 0
- 22
contrib/packages/deb/ubuntu-focal/debian/xorg-source-patches/100_rethrow_signals.patch View File

@@ -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[])

+ 0
- 1
contrib/packages/deb/ubuntu-xenial/debian/rules View File

@@ -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


+ 0
- 22
contrib/packages/deb/ubuntu-xenial/debian/xorg-source-patches/100_rethrow_signals.patch View File

@@ -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[])

Loading…
Cancel
Save