diff options
| author | Brian P. Hinz <bphinz@users.sf.net> | 2016-05-07 18:18:38 -0400 |
|---|---|---|
| committer | Brian P. Hinz <bphinz@users.sf.net> | 2016-05-07 18:18:38 -0400 |
| commit | 3e89a9684cf24ad239fd8bca1dd8da64b7be44a7 (patch) | |
| tree | d5400c94f441e178f31642976131a6f96b7ca40b /contrib | |
| parent | d2a0fabf53d8029c426a163b746247320d73b538 (diff) | |
| download | tigervnc-3e89a9684cf24ad239fd8bca1dd8da64b7be44a7.tar.gz tigervnc-3e89a9684cf24ad239fd8bca1dd8da64b7be44a7.zip | |
Update xenial build to account for distro-specific xorg patches
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/packages/deb/ubuntu-xenial/debian/rules | 1 | ||||
| -rw-r--r-- | contrib/packages/deb/ubuntu-xenial/debian/xorg-source-patches/xserver118-patch.patch | 22 |
2 files changed, 23 insertions, 0 deletions
diff --git a/contrib/packages/deb/ubuntu-xenial/debian/rules b/contrib/packages/deb/ubuntu-xenial/debian/rules index e0606b34..97700834 100644 --- a/contrib/packages/deb/ubuntu-xenial/debian/rules +++ b/contrib/packages/deb/ubuntu-xenial/debian/rules @@ -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 diff --git a/contrib/packages/deb/ubuntu-xenial/debian/xorg-source-patches/xserver118-patch.patch b/contrib/packages/deb/ubuntu-xenial/debian/xorg-source-patches/xserver118-patch.patch new file mode 100644 index 00000000..cba45a3d --- /dev/null +++ b/contrib/packages/deb/ubuntu-xenial/debian/xorg-source-patches/xserver118-patch.patch @@ -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 |