[blfs-book] r11607 - in trunk/BOOK: . introduction/welcome x/installing

bdubbs at higgs.linuxfromscratch.org bdubbs at higgs.linuxfromscratch.org
Fri Aug 9 14:18:59 PDT 2013


Author: bdubbs
Date: Fri Aug  9 14:18:59 2013
New Revision: 11607

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

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/installing/x7app.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent	Fri Aug  9 08:03:25 2013	(r11606)
+++ trunk/BOOK/general.ent	Fri Aug  9 14:18:59 2013	(r11607)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
 <!ENTITY day          "08">                   <!-- Always 2 digits -->
-<!ENTITY month        "08">                   <!-- Always 2 digits -->
+<!ENTITY month        "09">                   <!-- Always 2 digits -->
 <!ENTITY year         "2013">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "August 7th, &year;">
+<!ENTITY releasedate  "August 9th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- version|testing|unstable|development] -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	Fri Aug  9 08:03:25 2013	(r11606)
+++ trunk/BOOK/introduction/welcome/changelog.xml	Fri Aug  9 14:18:59 2013	(r11607)
@@ -44,6 +44,16 @@
 
 -->
     <listitem>
+      <para>August 9th, 2013</para>
+      <itemizedlist>
+         <listitem>
+          <para>[bdubbs] - Update to xprop-1.2.2, xset-1.2.3, and
+          xwd-1.0.6 in Xorg Apps.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>August 8th, 2013</para>
       <itemizedlist>
          <listitem>

Modified: trunk/BOOK/x/installing/x7app.xml
==============================================================================
--- trunk/BOOK/x/installing/x7app.xml	Fri Aug  9 08:03:25 2013	(r11606)
+++ trunk/BOOK/x/installing/x7app.xml	Fri Aug  9 14:18:59 2013	(r11607)
@@ -94,8 +94,8 @@
   <!ENTITY xpr-version                     "1.0.4">
   <!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">
   <!ENTITY xrandr-md5sum                   "52c3de0297bf45be6a189dc2e0515638">
@@ -106,8 +106,8 @@
   <!ENTITY xrefresh-version                "1.0.5">
   <!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">
   <!ENTITY xsetroot-md5sum                 "7211b31ec70631829ebae9460999aa0b">
@@ -115,8 +115,8 @@
   <!ENTITY xvinfo-version                  "1.1.2">
   <!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">
   <!ENTITY xwininfo-md5sum                 "b777bafb674555e48fd8437618270931">
@@ -262,12 +262,21 @@
   pushd $packagedir
   case $packagedir in
     xmodmap-[0-9]* )
-      sed -e 's@#include <X11/Xos.h>@#ifdef HAVE_CONFIG_H\n# include "config.h"\n#endif\n\n&@' \
-          -i {exec,pf,xmodmap}.c
+      line1='#ifdef HAVE_CONFIG_H'
+      line2='#  include "config.h"'
+      line3='#endif'
+      sed -i -e "s@#include <X11/Xos.h>@$line1\n$line2\n$line3\n\n&@" \
+          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&@' \
-          -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&@" sys.c
+      unset line1 line2 line3 line4
     ;;
   esac
   ./configure $XORG_CONFIG



More information about the blfs-book mailing list