linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-02-03 23:07:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

• Update to tigervnc-1.6.0.

Browse Source 
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@16762 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Fernando de Oliveira 2015-12-26 22:40:39 +00:00
parent 909a01545f
commit b636cda323
4 changed files with 57 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
general.ent
View File

@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ --> <!-- $LastChangedBy$ $Date$ -->
<!ENTITY day "25"> <!-- Always 2 digits --> <!ENTITY day "26"> <!-- Always 2 digits -->
<!ENTITY month "12"> <!-- Always 2 digits --> <!ENTITY month "12"> <!-- Always 2 digits -->
<!ENTITY year "2015"> <!ENTITY year "2015">
<!ENTITY copyrightdate "2001-&year;"> <!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team"> <!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;"> <!ENTITY version "&year;-&month;-&day;">
<!ENTITY releasedate "December 25th &year;"> <!ENTITY releasedate "December 26th &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP --> <!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] --> <!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development] --> <!ENTITY lfs-version "development"> <!-- x.y|development] -->

10
introduction/welcome/changelog.xml
View File

@ -44,6 +44,16 @@
--> -->
<listitem>
<para>December 26th, 2015</para>
<itemizedlist>
<listitem>
<para>[fernando] - Update to tigervnc-1.6.0. Fixes
<ulink url="&blfs-ticket-root;7177">#7177</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem> <listitem>
<para>December 25th, 2015</para> <para>December 25th, 2015</para>
<itemizedlist> <itemizedlist>

2
packages.ent
View File

@ -670,7 +670,7 @@
<!ENTITY rox-filer-version "2.11"> <!ENTITY rox-filer-version "2.11">
<!ENTITY rxvt-unicode-version "9.21"> <!ENTITY rxvt-unicode-version "9.21">
<!ENTITY thunderbird-version "38.5.0"> <!ENTITY thunderbird-version "38.5.0">
<!ENTITY tigervnc-version "1.5.0"> <!ENTITY tigervnc-version "1.6.0">
<!ENTITY transmission-version "2.84"> <!ENTITY transmission-version "2.84">
<!ENTITY xarchiver-version "0.5.4"> <!ENTITY xarchiver-version "0.5.4">
<!ENTITY xchat-version "2.8.8"> <!ENTITY xchat-version "2.8.8">

66
xsoft/other/tigervnc.xml
View File

@ -6,11 +6,11 @@
<!ENTITY tigervnc-download-http "&sources-anduin-http;/tigervnc/tigervnc-&tigervnc-version;.tar.gz"> <!ENTITY tigervnc-download-http "&sources-anduin-http;/tigervnc/tigervnc-&tigervnc-version;.tar.gz">
<!ENTITY tigervnc-download-ftp " "> <!ENTITY tigervnc-download-ftp " ">
<!ENTITY tigervnc-md5sum "b11cc4c4d5249b9b8e355ee6f47ec4fe"> <!ENTITY tigervnc-md5sum "78b736445781d86c48e942465a391ccc">
<!ENTITY tigervnc-size "1.6 MB"> <!ENTITY tigervnc-size "1.3 MB">
<!ENTITY tigervnc-buildsize "167 MB"> <!ENTITY tigervnc-buildsize "171 MB">
<!ENTITY tigervnc-time "1.6 SBU"> <!ENTITY tigervnc-time "1.6 SBU">
<!ENTITY tigervnc-xorg-version "1.17.2"> <!ENTITY tigervnc-xorg-version "1.18.0">
]> ]>
<sect1 id="tigervnc" xreflabel="tigervnc-&tigervnc-version;"> <sect1 id="tigervnc" xreflabel="tigervnc-&tigervnc-version;">
@ -68,6 +68,12 @@
<ulink url="&xorg-download-http;/xserver/xorg-server-&tigervnc-xorg-version;.tar.bz2"/> <ulink url="&xorg-download-http;/xserver/xorg-server-&tigervnc-xorg-version;.tar.bz2"/>
</para> </para>
</listitem> </listitem>
<listitem>
<para>
Required patch:
<ulink url="&patch-root;/tigervnc-&tigervnc-version;-xorg118-1.patch"/>
</para>
</listitem>
<listitem> <listitem>
<para> <para>
Required patch: Required patch:
@ -110,17 +116,27 @@
<para>Install <application>tigervnc</application> by running the following <para>Install <application>tigervnc</application> by running the following
commands:</para> commands:</para>
<screen><userinput>tar -xf ../xorg-server-&tigervnc-xorg-version;.tar.bz2 -C unix/xserver --strip-components=1 &amp;&amp; <screen><userinput>patch -Np1 -i ../tigervnc-&tigervnc-version;-xorg118-1.patch &amp;&amp;
patch -Np1 -i ../tigervnc-&tigervnc-version;-gethomedir-1.patch &amp;&amp;<!--
sed -i 's/iconic/nowin/' unix/vncserver &amp;&amp;-->
patch -Np1 -i ../tigervnc-&tigervnc-version;-gethomedir-1.patch &amp;&amp; mkdir -vp build &amp;&amp;
sed -i 's/iconic/nowin/' unix/vncserver &amp;&amp; cd build &amp;&amp;
cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr &amp;&amp; # Build viewer
cmake -G "Unix Makefiles" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-Wno-dev .. &amp;&amp;
make &amp;&amp; make &amp;&amp;
pushd unix/xserver &amp;&amp; # Build server
patch -Np1 -i ../xserver116.patch &amp;&amp; cp -vR ../unix/xserver unix/ &amp;&amp;
autoreconf -fiv &amp;&amp; tar -xf ../xorg-server-&tigervnc-xorg-version;.tar.bz2 -C unix/xserver --strip-components=1 &amp;&amp;
pushd unix/xserver &amp;&amp;
patch -Np1 -i ../../../unix/xserver117.patch &amp;&amp;
autoreconf -fi &amp;&amp;
./configure $XORG_CONFIG \ ./configure $XORG_CONFIG \
--disable-xwayland --disable-dri --disable-dmx \ --disable-xwayland --disable-dri --disable-dmx \
@ -130,18 +146,21 @@ pushd unix/xserver &amp;&amp;
--disable-unit-tests --disable-selective-werror \ --disable-unit-tests --disable-selective-werror \
--disable-static --enable-dri3 \ --disable-static --enable-dri3 \
--without-dtrace --enable-dri2 --enable-glx \ --without-dtrace --enable-dri2 --enable-glx \
--enable-glx-tls --with-pic &amp;&amp; --with-pic &amp;&amp;
make &amp;&amp; make TIGERVNC_SRCDIR=`pwd`/../../../ &amp;&amp;
popd</userinput></screen> popd</userinput></screen>
<para>This package does not come with a test suite.</para> <para>This package does not come with a test suite.</para>
<para>Now, as the <systemitem class="username">root</systemitem> user:</para> <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
<screen role="root"><userinput>make install &amp;&amp; <screen role="root"><userinput>#Install viewer
make install &amp;&amp;
cd unix/xserver/hw/vnc &amp;&amp; #Install server
make install &amp;&amp; pushd unix/xserver/hw/vnc &amp;&amp;
make install &amp;&amp;
popd &amp;&amp;
[ -e /usr/bin/Xvnc ] || ln -svf $XORG_PREFIX/bin/Xvnc /usr/bin/Xvnc</userinput></screen> [ -e /usr/bin/Xvnc ] || ln -svf $XORG_PREFIX/bin/Xvnc /usr/bin/Xvnc</userinput></screen>
@ -158,19 +177,22 @@ Icon=tigervnc
Terminal=false Terminal=false
StartupNotify=false StartupNotify=false
Categories=Network;RemoteAccess;</literal> Categories=Network;RemoteAccess;</literal>
EOF</userinput></screen> EOF
install -vm644 ../media/icons/tigervnc_24.png /usr/share/pixmaps &amp;&amp;
ln -sfv tigervnc_24.png /usr/share/pixmaps/tigervnc.png</userinput></screen>
</sect2> </sect2>
<sect2 role="commands"> <sect2 role="commands">
<title>Command Explanations</title> <title>Command Explanations</title>
<para><command>tar -xf .. xorg-server...</command>: This command extracts the
standard Xorg packages into the tree in a location needed for modification.</para>
<para><command>patch ...</command>: This set of patches modifies the standard <para><command>patch ...</command>: This set of patches modifies the standard
Xorg server so that the Xvnc command can be built.</para> Xorg server so that the Xvnc command can be built.</para>
<para><command>tar -xf .. xorg-server...</command>: This command extracts the
standard Xorg packages into the tree in a location needed for modification.</para>
<para><option>--disable ...</option>: Most options that are usually needed for <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 fror the Xvnc instance being built.</para>
@ -217,7 +239,7 @@ startlxde &amp;</screen>
x0vncserver</seg> x0vncserver</seg>
<seg>libvnc.so</seg> <seg>libvnc.so</seg>
<seg>None</seg> <seg>/usr/share/doc/tigervnc-&tigervnc-version;</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
@ -283,7 +305,7 @@ startlxde &amp;</screen>
<varlistentry id="x0vncserver"> <varlistentry id="x0vncserver">
<term><command>x0vncserver</command></term> <term><command>x0vncserver</command></term>
<listitem> <listitem>
<para>is a program to make an X display onm a physical <para>is a program to make an X display on a physical
terminal accessible via TigerVNC or compatible viewers.</para> terminal accessible via TigerVNC or compatible viewers.</para>
<indexterm zone="tigervnc x0vncserver"> <indexterm zone="tigervnc x0vncserver">
<primary sortas="b-x0vncserver">x0vncserver</primary> <primary sortas="b-x0vncserver">x0vncserver</primary>