Changeset 0b664be0 for xsoft

Timestamp:

10/16/2021 01:00:57 PM (3 years ago)

Author:

Ken Moffat <ken@…>

Branches:

11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

c99889d9

Parents:

580ce98 (diff), 97b8038 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

Location:

xsoft/other

Files:

• balsa.xml (modified) (1 diff)
• hexchat.xml (modified) (1 diff)
• tigervnc.xml (modified) (1 diff)

xsoft/other/balsa.xml

@@ -78 +78 @@
       <xref linkend="gmime3"/>,
       <xref linkend="gpgme"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="libnotify"/>, and
-      <xref linkend="rarian"/>
+      <xref linkend="gtk3"/>, and
+      <xref linkend="libnotify"/>
+      <!--<xref linkend="rarian"/>-->
     </para>
 

xsoft/other/hexchat.xml

@@ -8 +8 @@
   <!ENTITY hexchat-download-http "https://dl.hexchat.net/hexchat/hexchat-&hexchat-version;.tar.xz">
   <!ENTITY hexchat-download-ftp  " ">
-  <!ENTITY hexchat-md5sum        "9f04c48f011b646b91d03c5776fce776">
-  <!ENTITY hexchat-size          "1.2 MB">
+  <!ENTITY hexchat-md5sum        "ecf5133c369bbc88df064f8506867fb6">
+  <!ENTITY hexchat-size          "1.3 MB">
   <!ENTITY hexchat-buildsize     "21 MB">
   <!ENTITY hexchat-time          "0.1 SBU (using parallelism=4)">

xsoft/other/tigervnc.xml

@@ -159 +159 @@
     </para>
 
-<screen><userinput># Put code in place
+<screen revision="sysv"><userinput># Put code in place
+mkdir -p unix/xserver &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
+cmake -G "Unix Makefiles"         \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
+      -DINSTALL_SYSTEMD_UNITS=OFF \
+      -Wno-dev . &amp;&amp;
+make &amp;&amp;
+
+# Build server
+pushd unix/xserver &amp;&amp;
+  autoreconf -fiv  &amp;&amp;
+
+  CPPFLAGS="-I/usr/include/drm"       \
+  ./configure $XORG_CONFIG            \
+      --disable-xwayland    --disable-dri        --disable-dmx         \
+      --disable-xorg        --disable-xnest      --disable-xvfb        \
+      --disable-xwin        --disable-xephyr     --disable-kdrive      \
+      --disable-devel-docs  --disable-config-hal --disable-config-udev \
+      --disable-unit-tests  --disable-selective-werror                 \
+      --disable-static      --enable-dri3                              \
+      --without-dtrace      --enable-dri2        --enable-glx          \
+      --with-pic &amp;&amp;
+  make  &amp;&amp;
+popd</userinput></screen>
+
+<screen revision="systemd"><userinput># Put code in place
 mkdir -p unix/xserver &amp;&amp;
 tar -xf ../xorg-server-&tigervnc-xorg-version;.tar.bz2 \