r4641 - in trunk: BOOK BOOK/introduction/welcome BOOK/pst/ps patches

djensen at linuxfromscratch.org djensen at linuxfromscratch.org
Tue Jun 21 08:17:12 PDT 2005


Author: djensen
Date: 2005-06-21 09:17:11 -0600 (Tue, 21 Jun 2005)
New Revision: 4641

Added:
   trunk/patches/gsview-4.7-pstotext-1.patch
Removed:
   trunk/patches/gsview-4.6-lang-1.patch
   trunk/patches/gsview-4.6-pstotext-1.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/pst/ps/gsview.xml
Log:
Update to GSview-4.7

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2005-06-21 00:58:09 UTC (rev 4640)
+++ trunk/BOOK/general.ent	2005-06-21 15:17:11 UTC (rev 4641)
@@ -505,7 +505,7 @@
 <!ENTITY a2ps-version                 "4.13b">
 <!ENTITY enscript-version             "1.6.4">
 <!ENTITY psutils-version              "p17">
-<!ENTITY gsview-version               "4.6">
+<!ENTITY gsview-version               "4.7">
 <!ENTITY xpdf-version                 "3.00pl3">
 <!ENTITY fop-version                  "0.20.5">
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-06-21 00:58:09 UTC (rev 4640)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-06-21 15:17:11 UTC (rev 4641)
@@ -25,6 +25,10 @@
   <itemizedlist>
 
     <listitem>
+      <para>Jun 21th, 2005 [djensen]: Updated to GSview-4.7.</para>
+    </listitem>
+
+    <listitem>
       <para>Jun 20th, 2005 [djensen]: Updated to Freetype-2.1.10.</para>
     </listitem>
 

Modified: trunk/BOOK/pst/ps/gsview.xml
===================================================================
--- trunk/BOOK/pst/ps/gsview.xml	2005-06-21 00:58:09 UTC (rev 4640)
+++ trunk/BOOK/pst/ps/gsview.xml	2005-06-21 15:17:11 UTC (rev 4641)
@@ -6,10 +6,10 @@
 
   <!ENTITY gsview-download-http "http://gd.tuwien.ac.at/publishing/ghostscript/ghostgum/gsview-&gsview-version;.tar.gz">
   <!ENTITY gsview-download-ftp  "ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsview-&gsview-version;.tar.gz">
-  <!ENTITY gsview-md5sum        "35cb5e421faca49eb70c426354e41ba8">
-  <!ENTITY gsview-size          "895 KB">
-  <!ENTITY gsview-buildsize     "19 MB">
-  <!ENTITY gsview-time          "0.19 SBU">
+  <!ENTITY gsview-md5sum        "ce6288cc8597d6b918498d6d02654bb7">
+  <!ENTITY gsview-size          "910 KB">
+  <!ENTITY gsview-buildsize     "11 MB">
+  <!ENTITY gsview-time          "0.1 SBU">
 ]>
 
 <sect1 id="gsview" xreflabel="GSview-&gsview-version;">
@@ -60,10 +60,6 @@
         <para>Required Patch: <ulink
         url="&patch-root;/gsview-&gsview-version;-pstotext-1.patch"/></para>
       </listitem>
-      <listitem>
-        <para>Required Patch: <ulink
-        url="&patch-root;/gsview-&gsview-version;-lang-1.patch"/></para>
-      </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">GSview Dependencies</bridgehead>
@@ -87,7 +83,7 @@
     script with your browser's executable file name
     substituted for <replaceable>[browser]</replaceable>:</para>
 
-<screen><userinput>sed -i s/netscape/<replaceable>[browser]</replaceable>/ srcunx/gvxreg.c</userinput></screen>
+<screen><userinput>sed -i 's:netscape:<replaceable>[browser]</replaceable>:' srcunx/gvxreg.c</userinput></screen>
 
     <para>Install <application>GSview</application> by running the following
     commands:</para>
@@ -95,7 +91,6 @@
 <screen><userinput>sed 's|GSVIEW_ROOT=/usr/local|GSVIEW_ROOT=/usr|' \
     srcunx/unx.mak > Makefile &&
 patch -Np1 -i ../gsview-&gsview-version;-pstotext-1.patch &&
-patch -Np1 -i ../gsview-&gsview-version;-lang-1.patch &&
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -140,7 +135,7 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>epstool, gsview, and gsview-help</seg>
+        <seg>gsview, and gsview-help</seg>
         <seg>None</seg>
         <seg>/etc/gsview, /usr/share/doc/gsview-&gsview-version;</seg>
       </seglistitem>
@@ -151,16 +146,6 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="epstool">
-        <term><command>epstool</command></term>
-        <listitem>
-          <para>is a tool for extracting preview bitmaps in EPS files.</para>
-          <indexterm zone="gsview epstool">
-            <primary sortas="b-epstool">epstool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="gsview-prog">
         <term><command>gsview</command></term>
         <listitem>

Deleted: trunk/patches/gsview-4.6-lang-1.patch
===================================================================
--- trunk/patches/gsview-4.6-lang-1.patch	2005-06-21 00:58:09 UTC (rev 4640)
+++ trunk/patches/gsview-4.6-lang-1.patch	2005-06-21 15:17:11 UTC (rev 4641)
@@ -1,120 +0,0 @@
-Submitted By: BLFS Book <blfs-book at linuxfromscratch dot org>
-Date: 2004-02-01
-Initial Package Version: 4.6
-Origin: http://www.ghostscript.com/
-Description: Some languages have the wrong characters in dialog boxes.
-             This patch fixes the problem.
-
-$LastChangedBy$
-$Date$
-
---- gsview-4.6/en/gvxlang.c.orig	2004-02-02 00:32:11.000000000 +0000
-+++ gsview-4.6/en/gvxlang.c	2004-02-02 00:34:14.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "gvx.h"
- #include "gvxres.h"
- #include "gvxlang.h"
--#include "en/gvclang.h"
-+#include "gvclang.h"
- 
- /* string table ids must be in order since we use a binary search */
- STRING_ENTRY string_en[] = {
---- gsview-4.6/ct/gvxlang.c.orig	2004-02-02 00:32:23.000000000 +0000
-+++ gsview-4.6/ct/gvxlang.c	2004-02-02 00:34:14.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "gvx.h"
- #include "gvxres.h"
- #include "gvxlang.h"
--#include "ct/gvclang.h"
-+#include "gvclang.h"
- 
- /* string table ids must be in order since we use a binary search */
- STRING_ENTRY string_ct[] = {
---- gsview-4.6/de/gvxlang.c.orig	2004-02-02 00:32:33.000000000 +0000
-+++ gsview-4.6/de/gvxlang.c	2004-02-02 00:34:14.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "gvx.h"
- #include "gvxres.h"
- #include "gvxlang.h"
--#include "de/gvclang.h"
-+#include "gvclang.h"
- 
- /* string table ids must be in order since we use a binary search */
- STRING_ENTRY string_de[] = {
---- gsview-4.6/es/gvxlang.c.orig	2004-02-02 00:32:44.000000000 +0000
-+++ gsview-4.6/es/gvxlang.c	2004-02-02 00:34:14.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "gvx.h"
- #include "gvxres.h"
- #include "gvxlang.h"
--#include "es/gvclang.h"
-+#include "gvclang.h"
- 
- /* string table ids must be in order since we use a binary search */
- STRING_ENTRY string_es[] = {
---- gsview-4.6/fr/gvxlang.c.orig	2004-02-02 00:33:08.000000000 +0000
-+++ gsview-4.6/fr/gvxlang.c	2004-02-02 00:34:14.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "gvx.h"
- #include "gvxres.h"
- #include "gvxlang.h"
--#include "fr/gvclang.h"
-+#include "gvclang.h"
- 
- /* string table ids must be in order since we use a binary search */
- STRING_ENTRY string_fr[] = {
---- gsview-4.6/it/gvxlang.c.orig	2004-02-02 00:33:17.000000000 +0000
-+++ gsview-4.6/it/gvxlang.c	2004-02-02 00:34:14.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "gvx.h"
- #include "gvxres.h"
- #include "gvxlang.h"
--#include "it/gvclang.h"
-+#include "gvclang.h"
- 
- /* string table ids must be in order since we use a binary search */
- STRING_ENTRY string_it[] = {
---- gsview-4.6/nl/gvxlang.c.orig	2004-02-02 00:33:27.000000000 +0000
-+++ gsview-4.6/nl/gvxlang.c	2004-02-02 00:34:14.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "gvx.h"
- #include "gvxres.h"
- #include "gvxlang.h"
--#include "nl/gvclang.h"
-+#include "gvclang.h"
- 
- /* string table ids must be in order since we use a binary search */
- STRING_ENTRY string_nl[] = {
---- gsview-4.6/ru/gvxlang.c.orig	2004-02-02 00:33:39.000000000 +0000
-+++ gsview-4.6/ru/gvxlang.c	2004-02-02 00:34:14.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "gvx.h"
- #include "gvxres.h"
- #include "gvxlang.h"
--#include "ru/gvclang.h"
-+#include "gvclang.h"
- 
- /* string table ids must be in order since we use a binary search */
- STRING_ENTRY string_ru[] = {
---- gsview-4.6/se/gvxlang.c.orig	2004-02-02 00:33:51.000000000 +0000
-+++ gsview-4.6/se/gvxlang.c	2004-02-02 00:34:14.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "gvx.h"
- #include "gvxres.h"
- #include "gvxlang.h"
--#include "se/gvclang.h"
-+#include "gvclang.h"
- 
- /* string table ids must be in order since we use a binary search */
- STRING_ENTRY string_se[] = {
---- gsview-4.6/sk/gvxlang.c.orig	2004-02-02 00:34:01.000000000 +0000
-+++ gsview-4.6/sk/gvxlang.c	2004-02-02 00:34:14.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "gvx.h"
- #include "gvxres.h"
- #include "gvxlang.h"
--#include "sk/gvclang.h"
-+#include "gvclang.h"
- 
- /* string table ids must be in order since we use a binary search */
- STRING_ENTRY string_sk[] = {

Deleted: trunk/patches/gsview-4.6-pstotext-1.patch
===================================================================
--- trunk/patches/gsview-4.6-pstotext-1.patch	2005-06-21 00:58:09 UTC (rev 4640)
+++ trunk/patches/gsview-4.6-pstotext-1.patch	2005-06-21 15:17:11 UTC (rev 4641)
@@ -1,59 +0,0 @@
-Submitted By: BLFS Book <blfs-book at linuxfromscratch dot org>
-Date: 2004-02-01
-Initial Package Version: 4.6
-Origin: http://www.ghostscript.com/
-Description: Fixes text extracting.
-
-$LastChangedBy$
-$Date$
-
---- gsview-4.6/srcunx/gvxdll.c.orig	2004-02-02 00:29:53.000000000 +0000
-+++ gsview-4.6/srcunx/gvxdll.c	2004-02-02 00:30:05.000000000 +0000
-@@ -410,13 +410,13 @@
- 
- int pstotext_pid = 0;
- 
--gint check_pstotext(gpointer data)
-+static void pstotext_sighandler(int num)
- {
-     int rc = 0;
-     int status = 0;
- 
-     if (pstotext_pid == 0)
--	return FALSE;	/* pstotext not running, remove timer */
-+	return; 	/* pstotext not running */
- 
-     /* check if pstotext has exited */
-     if ( (rc = waitpid(pstotext_pid, &status, WNOHANG)) > 0 ) {
-@@ -450,9 +450,10 @@
- 	    unlink(psfile.text_name);
- 	    psfile.text_name[0] = '\0';
- 	}
--	return FALSE;	/* remove timer */
-+	return;
-     }
--    return TRUE;	/* keep checking */
-+    if (rc)
-+	perror("pstotext_sighandler: waitpid error, ");
- }
- 
- /* start pstotext and wait for it to terminate */
-@@ -547,6 +548,8 @@
-     }
- 
-     pstotext_pid = fork();
-+
-+    signal(SIGCHLD, pstotext_sighandler);
-     if (pstotext_pid == 0) {
- 	/* replace child process with prog */
- 	if (execvp(nargv[0], nargv) == -1) {
-@@ -558,8 +561,7 @@
-     }
-     else {
- 	/* parent */
--	/* Check every second if pstotext has finished */
--	gtk_timeout_add(1000, check_pstotext, (gpointer)pstotext_pid);
-+	/* pstotext_sighandler will tell us when it finishes */
-     } 
-     return 0;	/* all is well */
- }

Added: trunk/patches/gsview-4.7-pstotext-1.patch
===================================================================
--- trunk/patches/gsview-4.7-pstotext-1.patch	2005-06-21 00:58:09 UTC (rev 4640)
+++ trunk/patches/gsview-4.7-pstotext-1.patch	2005-06-21 15:17:11 UTC (rev 4641)
@@ -0,0 +1,59 @@
+Submitted By: BLFS Book <blfs-book at linuxfromscratch dot org>
+Date: 2004-02-01
+Initial Package Version: 4.6
+Origin: http://www.ghostscript.com/
+Description: Fixes text extracting.
+
+$LastChangedBy: djensen $
+$Date: 2005-06-21 09:17:17 -0500 (Tue, 21 Jun 2005) $
+
+--- gsview-4.6/srcunx/gvxdll.c.orig	2004-02-02 00:29:53.000000000 +0000
++++ gsview-4.6/srcunx/gvxdll.c	2004-02-02 00:30:05.000000000 +0000
+@@ -410,13 +410,13 @@
+ 
+ int pstotext_pid = 0;
+ 
+-gint check_pstotext(gpointer data)
++static void pstotext_sighandler(int num)
+ {
+     int rc = 0;
+     int status = 0;
+ 
+     if (pstotext_pid == 0)
+-	return FALSE;	/* pstotext not running, remove timer */
++	return; 	/* pstotext not running */
+ 
+     /* check if pstotext has exited */
+     if ( (rc = waitpid(pstotext_pid, &status, WNOHANG)) > 0 ) {
+@@ -450,9 +450,10 @@
+ 	    unlink(psfile.text_name);
+ 	    psfile.text_name[0] = '\0';
+ 	}
+-	return FALSE;	/* remove timer */
++	return;
+     }
+-    return TRUE;	/* keep checking */
++    if (rc)
++	perror("pstotext_sighandler: waitpid error, ");
+ }
+ 
+ /* start pstotext and wait for it to terminate */
+@@ -547,6 +548,8 @@
+     }
+ 
+     pstotext_pid = fork();
++
++    signal(SIGCHLD, pstotext_sighandler);
+     if (pstotext_pid == 0) {
+ 	/* replace child process with prog */
+ 	if (execvp(nargv[0], nargv) == -1) {
+@@ -558,8 +561,7 @@
+     }
+     else {
+ 	/* parent */
+-	/* Check every second if pstotext has finished */
+-	gtk_timeout_add(1000, check_pstotext, (gpointer)((size_t)pstotext_pid));
++	/* pstotext_sighandler will tell us when it finishes */
+     } 
+     return 0;	/* all is well */
+ }




More information about the blfs-book mailing list