diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-21 16:19:00 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-21 16:19:00 +0100 |
| commit | bf6c93db356044781e343fe26da74d357b4beda3 (patch) | |
| tree | a640223e20b7d04679c9cbbb3404992ba24ec9df /community/tigervnc/xorg114.patch | |
| parent | b12a78eb94707e8c026051243bbafded96c7c103 (diff) | |
| parent | 76b6359ba6b2c7cce2f0b0725c7ecd831563cabf (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/perl-package-stash-xs/PKGBUILD
extra/mesa/PKGBUILD
Diffstat (limited to 'community/tigervnc/xorg114.patch')
| -rw-r--r-- | community/tigervnc/xorg114.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/community/tigervnc/xorg114.patch b/community/tigervnc/xorg114.patch new file mode 100644 index 000000000..702706d34 --- /dev/null +++ b/community/tigervnc/xorg114.patch @@ -0,0 +1,28 @@ +diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xorg-version.h tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h +--- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xorg-version.h 2013-03-19 16:22:42.240358422 +0100 ++++ tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h 2013-03-19 16:23:33.846355724 +0100 +@@ -42,8 +42,10 @@ + #define XORG 112 + #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (13 * 100000) + (99 * 1000)) + #define XORG 113 ++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (14 * 100000) + (99 * 1000)) ++#define XORG 114 + #else +-#error "X.Org newer than 1.13 is not supported" ++#error "X.Org newer than 1.14 is not supported" + #endif + + #endif +diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc +--- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc 2013-03-19 16:22:51.327357948 +0100 ++++ tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc 2013-03-19 16:23:33.847355727 +0100 +@@ -54,7 +54,9 @@ + #include "servermd.h" + #include "fb.h" + #include "mi.h" ++#if XORG < 114 + #include "mibstore.h" ++#endif + #include "colormapst.h" + #include "gcstruct.h" + #include "input.h" |