Changeset 9eb5bbe for x

Timestamp:

08/09/2013 09:18:59 PM (11 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

c766cdc2

Parents:

b6518af

Message:

Update to xprop-1.2.2, xset-1.2.3, and xwd-1.0.6 in Xorg Apps

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

File:

• x/installing/x7app.xml (modified) (4 diffs)

x/installing/x7app.xml

@@ -95 +95 @@
   <!ENTITY xpr-md5sum                      "6101f04731ffd40803df80eca274ec4b">
 
-  <!ENTITY xprop-version                   "1.2.1">
-  <!ENTITY xprop-md5sum                    "d5529dc8d811efabd136ca2d8e857deb">
+  <!ENTITY xprop-version                   "1.2.2">
+  <!ENTITY xprop-md5sum                    "fae3d2fda07684027a643ca783d595cc">
 
   <!ENTITY xrandr-version                  "1.4.1">
@@ -107 +107 @@
   <!ENTITY xrefresh-md5sum                 "a896382bc53ef3e149eaf9b13bc81d42">
 
-  <!ENTITY xset-version                    "1.2.2">
-  <!ENTITY xset-md5sum                     "d44e0057d6722b25d5a314e82e0b7e7c">
+  <!ENTITY xset-version                    "1.2.3">
+  <!ENTITY xset-md5sum                     "dcd227388b57487d543cab2fd7a602d7">
 
   <!ENTITY xsetroot-version                "1.1.1">
@@ -116 +116 @@
   <!ENTITY xvinfo-md5sum                   "1fbd65e81323a8c0a4b5e24db0058405">
 
-  <!ENTITY xwd-version                     "1.0.5">
-  <!ENTITY xwd-md5sum                      "2113126f9ac9c02bb8547c112c5d037e">
+  <!ENTITY xwd-version                     "1.0.6">
+  <!ENTITY xwd-md5sum                      "6b5d48464c5f366e91efd08b62b12d94">
 
   <!ENTITY xwininfo-version                "1.1.3">
@@ -263 +263 @@
   case $packagedir in
     xmodmap-[0-9]* )
-      sed -e 's@#include &lt;X11/Xos.h&gt;@#ifdef HAVE_CONFIG_H\n# include "config.h"\n#endif\n\n&amp;@' \
-          -i {exec,pf,xmodmap}.c
+      line1='#ifdef HAVE_CONFIG_H'
+      line2='#  include "config.h"'
+      line3='#endif'
+      sed -i -e "s@#include &lt;X11/Xos.h&gt;@$line1\n$line2\n$line3\n\n&amp;@" \
+          exec.c pf.c xmodmap.c
+      unset line1 line2 line3
     ;;
     luit-[0-9]* )
-      sed -e 's@#ifdef HAVE_CONFIG_H@#ifdef _XOPEN_SOURCE\n#undef _XOPEN_SOURCE\n#define _XOPEN_SOURCE 600\n#endif\n\n&amp;@' \
-          -i sys.c
+      line1="#ifdef _XOPEN_SOURCE"
+      line2="#  undef _XOPEN_SOURCE"
+      line3="#  define _XOPEN_SOURCE 600"
+      line4="#endif"
+ 
+      sed -i -e "s@#ifdef HAVE_CONFIG_H@$line1\n$line2#$line3\n$line4\n\n&amp;@" sys.c
+      unset line1 line2 line3 line4
     ;;
   esac