Changeset e7d893b for xsoft/other/tigervnc.xml

Timestamp:

05/19/2019 04:54:33 AM (5 years ago)

Author:

DJ Lucas <dj@…>

Branches:

elogind

Children:

215c728b

Parents:

853ae3e5

Message:

Merge to HEAD 21602.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/BOOK-elogind@21603 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• xsoft/other/tigervnc.xml (modified) (5 diffs)

xsoft/other/tigervnc.xml

@@ -11 +11 @@
   <!ENTITY tigervnc-buildsize     "94 MB">
   <!ENTITY tigervnc-time          "1.3 SBU">
-  <!ENTITY tigervnc-xorg-version  "1.20.0">
+  <!ENTITY tigervnc-xorg-version  "1.20.4">
 ]>
 
@@ -107 +107 @@
 
 <screen><userinput># Put code in place
-pushd unix/xserver &amp;&amp;
-  tar -xf $DIR/xorg-server-$XORG_VER.tar.bz2 --strip-components=1 &amp;&amp;
-  patch -Np1 -i ../xserver120.patch &amp;&amp;
-popd &amp;&amp;
+tar -xf ../xorg-server-&tigervnc-xorg-version;.tar.bz2 \
+    --strip-components=1              \
+    -C unix/xserver                   &amp;&amp;
+( cd unix/xserver &amp;&amp;
+  patch -Np1 -i ../xserver120.patch ) &amp;&amp;
 
 # Build viewer
@@ -144 +145 @@
 
 #Install server
-pushd unix/xserver/hw/vnc &amp;&amp;
-  make install &amp;&amp;
-popd &amp;&amp;
+( cd unix/xserver/hw/vnc &amp;&amp; make install ) &amp;&amp;
 
 [ -e /usr/bin/Xvnc ] || ln -svf $XORG_PREFIX/bin/Xvnc /usr/bin/Xvnc</userinput></screen>
@@ -165 +164 @@
 EOF
 
-install -vm644 ../media/icons/tigervnc_24.png /usr/share/pixmaps &amp;&amp;
+install -vm644 media/icons/tigervnc_24.png /usr/share/pixmaps &amp;&amp;
 ln -sfv tigervnc_24.png /usr/share/pixmaps/tigervnc.png</userinput></screen>
 
@@ -174 +173 @@
 
     <para><command>tar -xf .. xorg-server...</command>: This command extracts the
-    standard Xorg packages into the tree in a location needed for modification.</para>
+    standard Xorg package into the tree in a location needed for modification.</para>
 
     <para><option>--disable ...</option>: Most options that are usually needed for
-    the standard Xorg server are not needed fror the Xvnc instance being built.</para>
+    the standard Xorg server are not needed for the Xvnc instance being built.</para>
 
     <para><command>[ -e /usr/bin/Xvnc ] || ln ... Xvnc</command>: If the Xvnc server