cvs commit: patches/gsview gsview-4.4-gvx-1.patch gsview-4.6-lang-1.patch gsview-4.6-pstotext-1.patch gsview-4.4-gvx.patch gsview-4.6-lang.patch gsview-4.6-pstotext.patch

jim at linuxfromscratch.org jim at linuxfromscratch.org
Fri Jun 4 15:15:21 PDT 2004


jim         04/06/04 16:15:21

  Added:       gsview   gsview-4.4-gvx-1.patch gsview-4.6-lang-1.patch
                        gsview-4.6-pstotext-1.patch
  Removed:     gsview   gsview-4.4-gvx.patch gsview-4.6-lang.patch
                        gsview-4.6-pstotext.patch
  Log:
  Naming Scheme Update
  
  Revision  Changes    Path
  1.1                  patches/gsview/gsview-4.4-gvx-1.patch
  
  Index: gsview-4.4-gvx-1.patch
  ===================================================================
  Submitted By: Igor Zivkovic <igor at linuxfromscratch dot org>
  Date: 2003-09-23
  Initial Package Version: 4.4
  Origin: blfs.book newsgroup, posted by A. Drosos <drososa at otenet dot gr>
  Description: Fixes gsview segmentation fault.
  
  --- gsview-4.4/srcunx/gvx.c.orig	2003-02-18 11:08:08.000000000 +0000
  +++ gsview-4.4/srcunx/gvx.c	2003-09-23 21:06:13.000000000 +0000
  @@ -1857,7 +1857,7 @@
       char lang[MAXSTR];
       char *p;
       memset(lang, 0, sizeof(lang));
  -    strncpy(lang, getenv("LANG"), sizeof(lang)-1);
  +    strncpy(lang, (getenv("LANG") == 0) ? "C" : getenv("LANG"),sizeof(lang)-1);
       p = strchr(lang, '.');
       if (p && ((strcmp(p, ".UTF-8") == 0) || (strcmp(p, ".utf8") == 0))) {
   	*p = '\0';	/* remove UTF-8 */
  
  
  
  1.1                  patches/gsview/gsview-4.6-lang-1.patch
  
  Index: gsview-4.6-lang-1.patch
  ===================================================================
  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.
  
  --- 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[] = {
  
  
  
  1.1                  patches/gsview/gsview-4.6-pstotext-1.patch
  
  Index: gsview-4.6-pstotext-1.patch
  ===================================================================
  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.
  
  --- 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 */
   }
  
  
  



More information about the patches mailing list