| Newsgroups |
gmane.linux.lfs.beyond.book |
| Message-ID |
<178147629982.27434.15811515948642511903@rivendell.linuxfromscratch.org> |
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch trunk
in repository blfs.
The following commit(s) were added to refs/heads/trunk by this push:
new ab8e49aff0 Update to tigervnc-1.16.2 and revert to fltk-1.3.11
ab8e49aff0 is described below
commit ab8e49aff049afbc278f3e4514a62bf32da57c50
Author: Bruce Dubbs <[email protected]>
AuthorDate: Sun Jun 14 17:31:26 2026 -0500
Update to tigervnc-1.16.2 and revert to fltk-1.3.11
---
introduction/welcome/changelog.xml | 8 +++++
packages.ent | 4 +--
x/lib/fltk.xml | 72 ++++++++++++++------------------------
xsoft/other/tigervnc.xml | 38 +++++++++-----------
4 files changed, 53 insertions(+), 69 deletions(-)
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 42d28e0a99..c7a31ddb4f 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -42,6 +42,14 @@
<listitem>
<para>June 14th, 2026</para>
<itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Update to tigervnc-1.16.2. Fixes
+ <ulink url="&blfs-ticket-root;23044">#23044</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Revert fltk to version 1.3.11 for compatibility
+ with vncviewer (in tigervnc).</para>
+ </listitem>
<listitem>
<para>[pierre] - Update to bind{,-utils}-9.20.23 (Security Update).
Fixes <ulink url="&blfs-ticket-root;23332">#23332</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 2a3983fbc4..9f21f1f43c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -898,7 +898,7 @@
<!--<!ENTITY clutter-gst-version "3.0.27">-->
<!--<!ENTITY clutter-gtk-version "1.8.4">-->
<!ENTITY colord-gtk-version "0.3.1">
-<!ENTITY fltk-version "1.4.5">
+<!ENTITY fltk-version "1.3.11">
<!ENTITY freeglut-version "3.8.0">
<!ENTITY gdk-pixbuf-dir "2.44">
<!ENTITY gdk-pixbuf-version "&gdk-pixbuf-dir;.6">
@@ -1143,7 +1143,7 @@
<!ENTITY rox-filer-version "2.11">
<!ENTITY rxvt-unicode-version "9.31">
<!ENTITY thunderbird-version "140.11.0">
-<!ENTITY tigervnc-version "1.16.0">
+<!ENTITY tigervnc-version "1.16.2">
<!ENTITY transmission-version "4.1.2">
<!ENTITY xarchiver-version "0.5.4.26">
<!ENTITY xdg-utils-version "1.2.1">
diff --git a/x/lib/fltk.xml b/x/lib/fltk.xml
index 32bb7c34ec..97cf58686f 100644
--- a/x/lib/fltk.xml
+++ b/x/lib/fltk.xml
@@ -7,10 +7,10 @@
<!-- Watch directory when updating -->
<!ENTITY fltk-download-http "https://github.com/fltk/fltk/releases/download/release-&fltk-version;/fltk-&fltk-version;-source.tar.gz">
<!ENTITY fltk-download-ftp " ">
- <!ENTITY fltk-md5sum "8308c6bb9ebc8580807a3834be4fcf54">
- <!ENTITY fltk-size "8.9 MB">
- <!ENTITY fltk-buildsize "229 MB (add 104 MB for documentation)">
- <!ENTITY fltk-time "0.4 SBU (Using parallelism=4)">
+ <!ENTITY fltk-md5sum "75b2fd1aa2433e13abcbb311043eaee0">
+ <!ENTITY fltk-size "5.3 MB">
+ <!ENTITY fltk-buildsize "73 MB">
+ <!ENTITY fltk-time "0.2 SBU (Using parallelism=4)">
]>
<sect1 id="fltk" xreflabel="FLTK-&fltk-version;">
@@ -68,7 +68,7 @@
</para>
</listitem>
</itemizedlist>
-
+<!--
<bridgehead renderas="sect3">Additional Downloads</bridgehead>
<itemizedlist spacing="compact">
<listitem>
@@ -78,7 +78,7 @@
</para>
</listitem>
</itemizedlist>
-
+-->
<bridgehead renderas="sect3">FLTK Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
@@ -88,7 +88,6 @@
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
- <xref linkend="glu"/>,
<xref linkend="hicolor-icon-theme"/>,
<xref linkend="libjpeg"/>, and
<xref linkend="libpng"/>
@@ -98,7 +97,8 @@
<para role="optional">
<xref linkend="alsa-lib"/>,
<xref linkend="desktop-file-utils"/>,
- <xref linkend="doxygen"/>, and
+ <xref linkend="doxygen"/>,
+ <xref linkend="mesa"/>, and
<xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
</para>
@@ -119,26 +119,22 @@
commands:
</para>
-<screen><userinput>mkdir build &&
-cd build &&
+<screen><userinput>sed -i -e '/cat./d' documentation/Makefile &&
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
- -D FLTK_BUILD_SHARED_LIBS=ON \
- -D CMAKE_BUILD_TYPE=Release \
- -G "Ninja" .. &&
-ninja</userinput></screen>
+./configure --prefix=/usr --enable-shared &&
+make</userinput></screen>
<para>
If you wish to create the API documentation, issue:
</para>
-<screen remap="doc"><userinput>ninja documentation/html</userinput></screen>
+<screen remap="doc"><userinput>make -C documentation html</userinput></screen>
<para>
The tests for the package are interactive. To execute the tests, run
- <command>bin/test/unittests</command>. In addition, there are about 110
+ <command>test/unittests</command>. In addition, there are about 70
other executable test programs in the <filename
- class='directory'>bin/test</filename> directory that can be run
+ class='directory'>test</filename> directory that can be run
individually.
</para>
@@ -147,33 +143,24 @@ ninja</userinput></screen>
As the &root; user:
</para>
-<screen role="root"><userinput>ninja install &&
-rm -vf /usr/lib/libfltk*.a</userinput></screen>
-
- <para>
- If you have built the documentation, install it as the &root; user:
- </para>
-
-<screen role="root"
- remap="doc"><userinput>install -vdm 755 /usr/share/doc/fltk-&fltk-version; &&
-cp -Rv documentation/html /usr/share/doc/fltk-&fltk-version;</userinput></screen>
+<screen role="root"><userinput>make docdir=/usr/share/doc/fltk-&fltk-version; install &&
+rm -fv /usr/lib/libfltk*.a</userinput></screen>
<para>
- Otherwise, if you downloaded the optional html documentation,
- install it as the &root; user:
+ If desired, install some example games built as a part of the tests,
+ extra documentation and example programs. As the &root; user:
</para>
-<screen role="root"><userinput>install -vdm 755 /usr/share/doc/fltk-&fltk-version; &&
-tar -C /usr/share/doc/fltk-&fltk-version; --strip-components=4 -xf ../../fltk-&fltk-version;-docs-html.tar.gz</userinput></screen>
-
+<screen role="root" remap="doc"><userinput>make -C test docdir=/usr/share/doc/fltk-1.3.9 install-linux &&
+make -C documentation docdir=/usr/share/doc/fltk-1.3.9 install-linux</userinput></screen>
</sect2>
<sect2 role="commands">
<title>Command Explanations</title>
<para>
- <parameter>-D FLTK_BUILD_SHARED_LIBS=ON</parameter>: Build and install
- shared libraries in addition to static ones.
+ <command>sed ... documentation/Makefile</command>: Avoid installing
+ pages in <filename class='directory'>/usr/share/man/cat*</filename>.
</para>
</sect2>
@@ -191,11 +178,7 @@ tar -C /usr/share/doc/fltk-&fltk-version; --strip-components=4 -xf ../../fltk-&f
blocks,
checkers,
fltk-config,
- fltk-options,
- fltk-options-shared,
- fluid,
- fluid-shared,
- glpuzzle, and
+ fluid, and
sudoku
</seg>
<seg>
@@ -206,7 +189,6 @@ tar -C /usr/share/doc/fltk-&fltk-version; --strip-components=4 -xf ../../fltk-&f
</seg>
<seg>
/usr/include/FL,
- /usr/share/fltk, and
/usr/share/doc/fltk-&fltk-version; (optional)
</seg>
</seglistitem>
@@ -265,7 +247,7 @@ tar -C /usr/share/doc/fltk-&fltk-version; --strip-components=4 -xf ../../fltk-&f
</indexterm>
</listitem>
</varlistentry>
-
+<!--
<varlistentry id="fltk-options-shared">
<term><command>fltk-options-shared</command></term>
<listitem>
@@ -278,7 +260,7 @@ tar -C /usr/share/doc/fltk-&fltk-version; --strip-components=4 -xf ../../fltk-&f
</indexterm>
</listitem>
</varlistentry>
-
+-->
<varlistentry id="fluid">
<term><command>fluid</command></term>
<listitem>
@@ -290,7 +272,7 @@ tar -C /usr/share/doc/fltk-&fltk-version; --strip-components=4 -xf ../../fltk-&f
</indexterm>
</listitem>
</varlistentry>
-
+<!--
<varlistentry id="fluid-shared">
<term><command>fluid-shared</command></term>
<listitem>
@@ -315,7 +297,7 @@ tar -C /usr/share/doc/fltk-&fltk-version; --strip-components=4 -xf ../../fltk-&f
</indexterm>
</listitem>
</varlistentry>
-
+-->
<varlistentry id="sudoku">
<term><command>sudoku</command></term>
<listitem>
diff --git a/xsoft/other/tigervnc.xml b/xsoft/other/tigervnc.xml
index 9ed336fb78..52720d9b00 100644
--- a/xsoft/other/tigervnc.xml
+++ b/xsoft/other/tigervnc.xml
@@ -6,11 +6,10 @@
<!ENTITY tigervnc-download-http "https://github.com/TigerVNC/tigervnc/archive/v&tigervnc-version;/tigervnc-&tigervnc-version;.tar.gz">
<!ENTITY tigervnc-download-ftp " ">
- <!ENTITY tigervnc-md5sum "1164ecb53cd7163f350887df7a215554">
+ <!ENTITY tigervnc-md5sum "61c6b4af2bc925c7ef4110b8a52d3d2f">
<!ENTITY tigervnc-size "2.1 MB">
- <!ENTITY tigervnc-buildsize "152 MB">
- <!ENTITY tigervnc-time "0.5 SBU (Using parallelism=4)">
- <!--<!ENTITY tigervnc-xorg-version "21.1.13">-->
+ <!ENTITY tigervnc-buildsize "154 MB">
+ <!ENTITY tigervnc-time "0.6 SBU (Using parallelism=4)">
]>
<sect1 id="tigervnc" xreflabel="tigervnc-&tigervnc-version;">
@@ -156,12 +155,6 @@
<screen><userinput remap="pre">patch -Np1 -i ../tigervnc-&tigervnc-version;-configuration_fixes-1.patch</userinput></screen>
- <para>
- Now, make the package consistent with fltk-1.4.1 and later:
- </para>
-
-<screen><userinput remap="pre">sed -i "/FL_MINOR_VERSION/s/3/4/" CMakeLists.txt</userinput></screen>
-
<para>
Next, adapt to nettle-4 and higher:
</para>
@@ -182,11 +175,6 @@ tar -xf ../xorg-server-&xorg-server-version;.tar.xz \
pushd unix/xserver &&
patch -Np1 -i ../xserver21.patch &&
-
- sed -e '/sha.h/s/sha/sha1/' \
- -e '/sha1/a #include <nettle/version.h>' \
- -e 's/ctx, 20/ctx/' \
- -i os/xsha1.c &&
popd &&
# Build viewer
@@ -255,15 +243,17 @@ popd</userinput></screen>
</para>
<para>
- Now, as the <systemitem class="username">root</systemitem> user:
+ Now, as the &root; user:
</para>
-<screen role="root"><userinput>#Install viewer
+<screen role="root"><userinput># Install viewer
make install &&
mv /usr/share/doc/tigervnc /usr/share/doc/tigervnc-&tigervnc-version;
-#Install server
-( cd unix/xserver/hw/vnc && make install ) &&
+# Install server
+( cd unix/xserver/hw/vnc && make install ) &&
+cp unix/vncserver/[email protected] /usr/lib/systemd/system/ &&
+install -m755 unix/vncserver/vncsession-start /usr/libexec/ &&
[ -e /usr/bin/Xvnc ] || ln -svf $XORG_PREFIX/bin/Xvnc /usr/bin/Xvnc</userinput></screen>
@@ -312,7 +302,7 @@ mv /usr/share/doc/tigervnc /usr/share/doc/tigervnc-&tigervnc-version;
<para revision='sysv'>
To restore the previous behavior, install the additional downloaded
- files as the <systemitem class="username">root</systemitem> user:</para>
+ files as the &root; user:</para>
<screen role="root" revision='sysv'><userinput>install -m755 --owner=root ../vncserver /usr/bin &&
cp ../vncserver.1 /usr/share/man/man1</userinput></screen>
@@ -370,7 +360,7 @@ startlxqt &</screen>
<para revision="systemd">
First, install a rudimentary Xsession file so that the VNC server
- can initialize X sessions properly:
+ can initialize X sessions properly. As the &root; user:
</para>
<screen role="root" revision="systemd"><userinput>install -vdm755 /etc/X11/tigervnc &&
@@ -383,7 +373,11 @@ install -v -m755 ../Xsession /etc/X11/tigervnc</userinput></screen>
<!-- For example: :1=renodr will assign 'renodr' to :1 -->
</para>
-<screen role="root" revision="systemd"><userinput>echo ":1=$(whoami)" >> /etc/tigervnc/vncserver.users</userinput></screen>
+<screen revision="systemd"><userinput>ME=$(echo :1=$(whoami))</userinput></screen>
+
+ <para revision="systemd">Then as the &root; user:</para>
+
+<screen role="root" revision="systemd"><userinput>bash -c "echo $ME >> /etc/tigervnc/vncserver.users"</userinput></screen>
<para revision="systemd">
Next, set up a configuration file to tell
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
--
http://lists.linuxfromscratch.org/sympa/info/blfs-book
Unsubscribe: See the above information page