diff --git a/general.ent b/general.ent
index d50be50ba2..3d5c837342 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
-
+
-
+
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 0054c3d2f1..7a707a248d 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,16 @@
-->
+
+ December 26th, 2015
+
+
+ [fernando] - Update to tigervnc-1.6.0. Fixes
+ #7177.
+
+
+
+
December 25th, 2015
diff --git a/packages.ent b/packages.ent
index 8d00fcb35c..237f57c464 100644
--- a/packages.ent
+++ b/packages.ent
@@ -670,7 +670,7 @@
-
+
diff --git a/xsoft/other/tigervnc.xml b/xsoft/other/tigervnc.xml
index a3fd90e789..562979fe9c 100644
--- a/xsoft/other/tigervnc.xml
+++ b/xsoft/other/tigervnc.xml
@@ -6,11 +6,11 @@
-
-
-
+
+
+
-
+
]>
@@ -68,6 +68,12 @@
+
+
+ Required patch:
+
+
+
Required patch:
@@ -110,17 +116,27 @@
Install tigervnc by running the following
commands:
-tar -xf ../xorg-server-&tigervnc-xorg-version;.tar.bz2 -C unix/xserver --strip-components=1 &&
+patch -Np1 -i ../tigervnc-&tigervnc-version;-xorg118-1.patch &&
+patch -Np1 -i ../tigervnc-&tigervnc-version;-gethomedir-1.patch &&
-patch -Np1 -i ../tigervnc-&tigervnc-version;-gethomedir-1.patch &&
-sed -i 's/iconic/nowin/' unix/vncserver &&
+mkdir -vp build &&
+cd build &&
-cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr &&
+# Build viewer
+cmake -G "Unix Makefiles" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -Wno-dev .. &&
make &&
-pushd unix/xserver &&
- patch -Np1 -i ../xserver116.patch &&
- autoreconf -fiv &&
+# Build server
+cp -vR ../unix/xserver unix/ &&
+tar -xf ../xorg-server-&tigervnc-xorg-version;.tar.bz2 -C unix/xserver --strip-components=1 &&
+
+pushd unix/xserver &&
+ patch -Np1 -i ../../../unix/xserver117.patch &&
+ autoreconf -fi &&
./configure $XORG_CONFIG \
--disable-xwayland --disable-dri --disable-dmx \
@@ -130,18 +146,21 @@ pushd unix/xserver &&
--disable-unit-tests --disable-selective-werror \
--disable-static --enable-dri3 \
--without-dtrace --enable-dri2 --enable-glx \
- --enable-glx-tls --with-pic &&
- make &&
+ --with-pic &&
+ make TIGERVNC_SRCDIR=`pwd`/../../../ &&
popd
This package does not come with a test suite.
Now, as the root user:
-make install &&
+#Install viewer
+make install &&
-cd unix/xserver/hw/vnc &&
-make install &&
+#Install server
+pushd unix/xserver/hw/vnc &&
+ make install &&
+popd &&
[ -e /usr/bin/Xvnc ] || ln -svf $XORG_PREFIX/bin/Xvnc /usr/bin/Xvnc
@@ -158,19 +177,22 @@ Icon=tigervnc
Terminal=false
StartupNotify=false
Categories=Network;RemoteAccess;
-EOF
+EOF
+
+install -vm644 ../media/icons/tigervnc_24.png /usr/share/pixmaps &&
+ln -sfv tigervnc_24.png /usr/share/pixmaps/tigervnc.png
Command Explanations
- tar -xf .. xorg-server...: This command extracts the
- standard Xorg packages into the tree in a location needed for modification.
-
patch ...: This set of patches modifies the standard
Xorg server so that the Xvnc command can be built.
+ tar -xf .. xorg-server...: This command extracts the
+ standard Xorg packages into the tree in a location needed for modification.
+
: Most options that are usually needed for
the standard Xorg server are not needed fror the Xvnc instance being built.
@@ -217,7 +239,7 @@ startlxde &
x0vncserver
libvnc.so
- None
+ /usr/share/doc/tigervnc-&tigervnc-version;
@@ -283,7 +305,7 @@ startlxde &
x0vncserver
- is a program to make an X display onm a physical
+ is a program to make an X display on a physical
terminal accessible via TigerVNC or compatible viewers.
x0vncserver