Brian P. Hinz
8 years ago
2 changed files with 23 additions and 0 deletions
+ 1
- 0
contrib/packages/deb/ubuntu-xenial/debian/rules
View File
| @@ -43,6 +43,7 @@ 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 | |||
| 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 | |||
+ 22
- 0
contrib/packages/deb/ubuntu-xenial/debian/xorg-source-patches/xserver118-patch.patch
View File
| @@ -0,0 +1,22 @@ | |||
| --- a/unix/xserver118.patch 2016-05-07 15:32:50.000000000 -0400 | |||
| +++ b/unix/xserver118.patch 2016-04-28 07:11:31.000000000 -0400 | |||
| @@ -48,14 +48,15 @@ | |||
| diff -ur xorg-server.orig/hw/Makefile.am xorg-server/hw/Makefile.am | |||
| --- xorg-server.orig/hw/Makefile.am 2016-04-09 21:28:27.059999965 +0200 | |||
| +++ xorg-server/hw/Makefile.am 2016-04-09 21:28:57.587999860 +0200 | |||
| -@@ -43,6 +43,7 @@ | |||
| +@@ -43,7 +43,8 @@ | |||
| $(KDRIVE_SUBDIRS) \ | |||
| $(XQUARTZ_SUBDIRS) \ | |||
| -- $(XWAYLAND_SUBDIRS) | |||
| -+ $(XWAYLAND_SUBDIRS) \ | |||
| + $(XWAYLAND_SUBDIRS) \ | |||
| +- $(XMIR_SUBDIRS) | |||
| ++ $(XMIR_SUBDIRS) \ | |||
| + vnc | |||
| - DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland | |||
| + DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland xmir | |||
| diff -ur xorg-server.orig/mi/miinitext.c xorg-server/mi/miinitext.c | |||
| --- xorg-server.orig/mi/miinitext.c 2016-04-09 21:28:27.015999965 +0200 | |||
Loading…