Changeset 4d91a5b0

Timestamp:

01/22/2023 01:41:48 AM (15 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

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

Children:

a3a6dfc

Parents:

60a2f00

Message:

Update to libXpm-3.5.15 (Xorg Library).

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• x/installing/x7lib.xml (modified) (6 diffs)

introduction/welcome/changelog.xml

@@ -43 +43 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to libXpm-3.5.15 (Xorg Library). Fixes
+          <ulink url="&blfs-ticket-root;17523">#17523</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[pierre] - Update to plasma-wayland-protocols-1.10. Fixes
           <ulink url="&blfs-ticket-root;17535">#17535</ulink>.</para>

x/installing/x7lib.xml

@@ -38 +38 @@
   <!ENTITY libXmu-md5sum                   "ed52d396115fbc4d05300762aab79685">
 
-  <!ENTITY libXpm-version                  "3.5.14">
-  <!ENTITY libXpm-md5sum                   "8001c7e6d2727609da2a78d8e08a2977">
+  <!ENTITY libXpm-version                  "3.5.15">
+  <!ENTITY libXpm-md5sum                   "b3c58c94e284fd6940d3615e660a0007">
 
   <!ENTITY libXaw-version                  "1.0.14">
@@ -176 +176 @@
       <xref linkend="fop"/>,
       <xref linkend="Links"/>,
-      <xref linkend="lynx"/>, and
+      <xref linkend="lynx"/>, 
+      <ulink url="https://github.com/vapier/ncompress">ncompress</ulink> (for some tests), and
       <ulink url="&w3m-url;">W3m</ulink> (to generate additional PDF or text
       documentation for the libXfont package).
@@ -266 +267 @@
     <para>
       BLFS developers have confirmed that <application>libX11</application>,
-      <application>libXt</application>, <application>libXmu</application>, and
+      <application>libXt</application>, <application>libXmu</application>, 
+      <application>libXpm</application>, and
       <application>libxshmfence</application> are distributed with working test
       suites.
@@ -296 +298 @@
                   --with-appdefaultdir=/etc/X11/app-defaults
     ;;
+
+    libXpm-[0-9]* )
+      sed -i '/TestAll.*TRUE/s|^|//|' test/TestAllFiles.h
+      ./configure $XORG_CONFIG $docdir --disable-open-zfile
+    ;;
     <!--
     libX11-* )
@@ -301 +308 @@
                   - -disable-thread-safety-constructor
     ;;-->
-
     * )
       ./configure $XORG_CONFIG $docdir
     ;;
   esac
+
   make
   #make check 2>&amp;1 | tee ../$packagedir-make_check.log
@@ -330 +337 @@
     </para>
 -->
-<!--
-    <para>
-      <command>sed ... src/xftfreetype.c include/X11/Xft/XftCompat.h</command>:
-      Add fixes for changes in recent glibc headers.
-    </para>
--->
+
+    <para>
+      <command>sed ... test/TestAllFiles.h</command>:
+      Fix a test file to work without the optional <command>compress</command> 
+      program.
+    </para>
+
+    <para>
+      <parameter>--disable-open-zfile</parameter>: Allow 
+      <application>libXpm</application> to build without the 
+      optional <command>compress</command> command present.
+    </para>
 
     <para>