Browse Source

Update Ubuntu patches for current code

tags/v1.10.90
Pierre Ossman 4 years ago
parent
commit
c51bb5a415

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

@@ -1,25 +1,21 @@
--- a/unix/xserver/hw/vnc/xvnc.c 2013-07-14 14:05:29.963390223 -0400
+++ b/unix/xserver/hw/vnc/xvnc.c 2013-07-14 14:04:12.840357191 -0400
@@ -250,7 +250,7 @@
#if XORG < 111
AbortDDX()
#else
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)
#endif
{
#if XORG < 111
@@ -260,6 +260,14 @@
#endif
ddxGiveUp(error);
}
+#if XORG >= 111
+void
+AbortDDX(enum ExitCode error)
+{
+ SigAbortDDX(0, error);
+}
+#endif
+
#ifdef __DARWIN__
void

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

@@ -1,25 +1,21 @@
--- a/unix/xserver/hw/vnc/xvnc.c 2013-07-14 14:05:29.963390223 -0400
+++ b/unix/xserver/hw/vnc/xvnc.c 2013-07-14 14:04:12.840357191 -0400
@@ -250,7 +250,7 @@
#if XORG < 111
AbortDDX()
#else
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)
#endif
{
#if XORG < 111
@@ -260,6 +260,14 @@
#endif
ddxGiveUp(error);
}
+#if XORG >= 111
+void
+AbortDDX(enum ExitCode error)
+{
+ SigAbortDDX(0, error);
+}
+#endif
+
#ifdef __DARWIN__
void

Loading…
Cancel
Save