pool/gv
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gv?expand=0&rev=5

Browse Source
This commit is contained in:
OBS User unknown 2008-03-28 16:21:39 +00:00 committed by Git OBS Bridge
parent de5eca3f7c
commit 0dedaecb0e
18 changed files with 5629 additions and 2870 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

305
gv-3.5.8-bzip2.patch
View File

@ -1,305 +0,0 @@
gv (the successor to Tim Theisen's ghostview) by default can uncompress gziped
files on the fly. This patch allows to also uncompress bzip2-compressed files
on the fly.
Compressed input can't be read from a pipe, the input must be seekable. The
name of the compressed file is irrelevant, detection is by magic file ID. gv
can't read from stdin.
gv only allows to specify one program to handle the decompression, it might
make more sense to extend this to two, but it's also possible to use a short
shell script to handle both bzip2 and gzip decompression, which is what
gv_uncompress does.
Volker Kuhlmann <VolkerKuhlmann@gmx.de>, 22 Aug 2003
// Just extended to use bzip2 after the detection of bzip2 magic
// without the usage of an extern script.
// <werner@suse.de>
--- source/Imakefile
+++ source/Imakefile Fri Aug 22 16:13:35 2003
@@ -320,7 +320,8 @@
@echo "GV.gsSafer: True" >> $(GV_INTERN_RES_DAT)
@echo "GV.gsQuiet: True" >> $(GV_INTERN_RES_DAT)
@echo "GV.gsArguments:" >> $(GV_INTERN_RES_DAT)
- @echo "GV.uncompressCommand: gzip -d -c %s > %s" >> $(GV_INTERN_RES_DAT)
+ @echo "GV.uncompressCommand: gzip -d -c %s > %s" >> $(GV_INTERN_RES_DAT)
+ @echo "GV.bunzip2Command: bzip2 -d -c %s > %s" >> $(GV_INTERN_RES_DAT)
@echo "GV.printCommand: $(PRINT_COMMAND)" >> $(GV_INTERN_RES_DAT)
clean::
--- source/callbacks.c
+++ source/callbacks.c Fri Aug 22 15:49:25 2003
@@ -1271,6 +1271,7 @@
GV_XtFree(gv_miscmenu_entries_res);
GV_XtFree(gv_print_command);
GV_XtFree(gv_uncompress_command);
+ GV_XtFree(gv_bunzip2_command);
GV_XtFree(gv_gs_interpreter);
GV_XtFree(gv_gs_cmd_scan_pdf);
GV_XtFree(gv_gs_cmd_conv_pdf);
--- source/doc_misc.c
+++ source/doc_misc.c Fri Aug 22 16:04:43 2003
@@ -49,7 +49,7 @@
/*##################################################################*/
int
-doc_scanFile(fPP,docP,filename,filename_raw,filename_dscP,cmd_scan_pdf,filename_uncP,cmd_uncompress,scanstyle)
+doc_scanFile(fPP,docP,filename,filename_raw,filename_dscP,cmd_scan_pdf,filename_uncP,cmd_uncompress,cmd_bunzip2,scanstyle)
FILE ** fPP;
Document *docP;
String filename;
@@ -58,6 +58,7 @@
String cmd_scan_pdf;
String *filename_uncP;
String cmd_uncompress;
+ String cmd_bunzip2;
int scanstyle;
{
Document d;
@@ -67,7 +68,7 @@
d = (Document)NULL;
ret = 0;
if (*fPP && filename)
- d = psscan(fPP,filename,filename_raw,filename_dscP,cmd_scan_pdf,filename_uncP,cmd_uncompress,scanstyle);
+ d = psscan(fPP,filename,filename_raw,filename_dscP,cmd_scan_pdf,filename_uncP,cmd_uncompress,cmd_bunzip2,scanstyle);
if (d) {
d->labels_useful=0;
d->structured =0;
--- source/doc_misc.h
+++ source/doc_misc.h Fri Aug 22 15:51:37 2003
@@ -38,6 +38,7 @@
String,
String*,
String,
+ String,
int /* scanstyle */
#endif
);
--- source/file.c
+++ source/file.c Fri Aug 22 15:49:25 2003
@@ -376,6 +376,7 @@
while (*ext) { *ext = tolower(*ext); ext++; }
if (!strncmp(mext,".gz",3)) ext = "";
else if (!strncmp(mext,".z",2)) ext = "";
+ else if (!strncmp(mext,".bz2",4)) ext = "";
else if (!strncmp(mext,".ps",3)) ext = ".ps";
else if (!strncmp(mext,".pdf",4)) ext = ".pdf";
else ext = e;
--- source/main.c
+++ source/main.c Fri Aug 22 15:49:25 2003
@@ -348,6 +348,7 @@
main_setGhostscriptResources(gv_database);
main_setInternResource(gv_database,&gv_print_command,"printCommand");
main_setInternResource(gv_database,&gv_uncompress_command,"uncompressCommand");
+ main_setInternResource(gv_database,&gv_bunzip2_command,"bunzip2Command");
gv_user_defaults_file = resource_userDefaultsFile();
gv_screen = XtScreen(toplevel);
--- source/main_globals.h
+++ source/main_globals.h Fri Aug 22 15:49:25 2003
@@ -128,6 +128,7 @@
EXTERN String gv_user_defaults_file;
EXTERN String gv_print_command; /* command used to print doc, usually "lpr" */
EXTERN String gv_uncompress_command; /* command used to uncompress a file */
+EXTERN String gv_bunzip2_command; /* command used to bunzip2 a file */
EXTERN int gv_print_kills_file; /* whether the print symbiont removes the file after printing */
EXTERN int gv_exiting; /* flag set when exiting gv */
EXTERN String gv_dirs;
--- source/main_resources.h
+++ source/main_resources.h Fri Aug 22 15:58:27 2003
@@ -89,6 +89,7 @@
DECLARE_STRING(scales)
DECLARE_STRING(printCommand)
DECLARE_STRING(uncompressCommand)
+DECLARE_STRING(bunzip2Command)
DECLARE_STRING(gsInterpreter)
DECLARE_STRING(gsCmdScanPDF)
--- source/misc.c
+++ source/misc.c Fri Aug 22 15:49:25 2003
@@ -952,7 +952,7 @@
gv_filename,
gv_filename_raw,
&gv_filename_dsc,gv_gs_cmd_scan_pdf,
- &gv_filename_unc,gv_uncompress_command,
+ &gv_filename_unc,gv_uncompress_command,gv_bunzip2_command,
gv_scanstyle);
{
int m;
--- source/options_setup.c
+++ source/options_setup.c Fri Aug 22 15:49:25 2003
@@ -71,7 +71,7 @@
static Widget eyeGuideToggle,reverseScrollingToggle,confirmPrintToggle,autoCenterToggle;
static Widget pixmapToggle,miscLabel;
static Widget confirmLabel,confirmButton,confirmMenu,showTitleToggle;
-static Widget print_command,scales,uncompress,screenSize,medias,magmenu,miscmenu;
+static Widget print_command,scales,uncompress,bunzip2,screenSize,medias,magmenu,miscmenu;
static String confirm_quit_styles[4] = { "Never","When processing","Always", NULL };
@@ -117,6 +117,8 @@
widgets_setText(print_command, gv_print_command);
SMESSAGE(gv_uncompress_command)
widgets_setText(uncompress,gv_uncompress_command);
+ SMESSAGE(gv_bunzip2_command)
+ widgets_setText(bunzip2,gv_bunzip2_command);
SMESSAGE(gv_scales_res)
s = options_squeezeMultiline(gv_scales_res);
widgets_setText(scales,s);
@@ -178,6 +180,7 @@
}
options_textApply(uncompress,NULL,&gv_uncompress_command);
+ options_textApply(bunzip2,NULL,&gv_bunzip2_command);
options_textApply(print_command,NULL,&gv_print_command);
options_textApply(magmenu,NULL,&gv_magmenu_entries_res);
magmenu_freeMagMenuEntries(gv_magmenu_entries);
@@ -312,6 +315,8 @@
++argn;
options_setArg(&(argi[argn]),&(argv[argn]),s_uncompressCommand ,gv_class,widgets_getText(uncompress));
++argn;
+ options_setArg(&(argi[argn]),&(argv[argn]),s_bunzip2Command ,gv_class,widgets_getText(bunzip2));
+ ++argn;
options_setArg(&(argi[argn]),&(argv[argn]),s_confirmPrint ,gv_class ,SwitchIsSet(confirmPrintToggle) ? t : f);
++argn;
options_setArg(&(argi[argn]),&(argv[argn]),s_reverseScrolling ,gv_class ,SwitchIsSet(reverseScrollingToggle) ? t : f);
@@ -405,6 +410,7 @@
magmenu = widgets_createLabeledTextField("magmenu", optionControl);
medias = widgets_createLabeledTextField("medias", optionControl);
uncompress = widgets_createLabeledLineTextField("uncompress", optionControl);
+ bunzip2 = widgets_createLabeledLineTextField("bunzip2", optionControl);
print_command = widgets_createLabeledLineTextField("printCommand", optionControl);
scales = widgets_createLabeledTextField("scales", optionControl);
screenSize = widgets_createLabeledLineTextField("screenSize", optionControl);
--- source/ps.c
+++ source/ps.c Fri Aug 22 16:11:14 2003
@@ -353,7 +353,7 @@
/*###########################################################*/
struct document *
-psscan(fileP,filename,filename_raw,filename_dscP,cmd_scan_pdf,filename_uncP,cmd_uncompress,scanstyle)
+psscan(fileP,filename,filename_raw,filename_dscP,cmd_scan_pdf,filename_uncP,cmd_uncompress,cmd_bunzip2,scanstyle)
FILE **fileP;
char *filename;
char *filename_raw;
@@ -361,6 +361,7 @@
char *cmd_scan_pdf;
char **filename_uncP;
char *cmd_uncompress;
+ char *cmd_bunzip2;
int scanstyle;
{
FILE *file;
@@ -404,18 +405,27 @@
int ignore_dsc; /* Derived from scanstyle.
If set the document structure will be ignored.
*/
+ char *run_uncompress = NULL;
BEGINMESSAGE(psscan)
if (cmd_uncompress) {
- char b[2];
- if (!(fread(b, sizeof(char),2, *fileP) == 2)
- || b[0] != '\037' || (b[1] != '\235' && b[1] != '\213')) {
+ char b[4];
+ /* 0x1F9D, 0x1F8B = gzip */
+ #define is_gzip (b[0] == '\037' && (b[1] == '\235' || b[1] == '\213'))
+ /* "BZ" = bzip2; should we skip the test in b[3]? */
+ #define is_bzip2 (b[0] == 'B' && b[1] == 'Z' \
+ && (b[3] >= 48) && (b[3] <=57) )
+ if (fread(b, sizeof(char),4, *fileP) != 4) { /* I/O error */
rewind(*fileP);
- cmd_uncompress=NULL;
+ } else {
+ if (is_gzip)
+ run_uncompress=cmd_uncompress;
+ if (is_bzip2)
+ run_uncompress=cmd_bunzip2;
}
}
- if (cmd_uncompress) {
+ if (run_uncompress) {
struct document *retval = NULL;
FILE *tmpfile = (FILE*)NULL;
char *filename_unc;
@@ -425,7 +435,7 @@
filename_unc=file_getTmpFilename(NULL,filename_raw);
quoted_filename = quote_filename(filename);
quoted_filename_unc = quote_filename(filename_unc);
- sprintf(cmd,cmd_uncompress,quoted_filename,quoted_filename_unc);
+ sprintf(cmd,run_uncompress,quoted_filename,quoted_filename_unc);
GV_XtFree(quoted_filename);
GV_XtFree(quoted_filename_unc);
INFMESSAGE(is compressed)
@@ -449,7 +459,7 @@
if (!tmpfile) goto unc_exec_failed;
fclose(*fileP);
*fileP = tmpfile;
- retval = psscan(fileP,filename_unc,filename_raw,filename_dscP,cmd_scan_pdf,NULL,NULL,scanstyle);
+ retval = psscan(fileP,filename_unc,filename_raw,filename_dscP,cmd_scan_pdf,NULL,NULL,NULL,scanstyle);
#if 0
if (!retval) {
sprintf(s,"333 Scanning\n%s\nfailed.",filename_unc);
@@ -548,7 +558,7 @@
if (!tmpfile) goto scan_exec_failed;
fclose(*fileP);
*fileP = tmpfile;
- retval = psscan(fileP,filename_dsc,filename_raw,filename_dscP,cmd_scan_pdf,NULL,NULL,scanstyle);
+ retval = psscan(fileP,filename_dsc,filename_raw,filename_dscP,cmd_scan_pdf,NULL,NULL,NULL,scanstyle);
if (!retval) {
sprintf(s,"Scanning\n%s\nfailed.",filename_dsc);
goto scan_failed;
--- source/ps.h
+++ source/ps.h Fri Aug 22 16:10:21 2003
@@ -116,6 +116,7 @@
char *,
char **,
char *,
+ char *,
int /* scanstyle */
#endif
);
--- source/save.c
+++ source/save.c Fri Aug 22 16:00:03 2003
@@ -270,7 +270,7 @@
String s = GV_XtNewString(src_filename);
s = file_getUsefulName(s);
INFMESSAGE(scanning document)
- doc_scanFile(&src_file,&src_doc,src_filename,s,NULL,NULL,NULL,NULL,scanstyle);
+ doc_scanFile(&src_file,&src_doc,src_filename,s,NULL,NULL,NULL,NULL,NULL,scanstyle);
if (src_doc) {
INFMESSAGE(calling pscopydoc)
pscopydoc(save_file,src_filename,src_doc,pagelist);
--- source/gv_misc_res.dat
+++ source/gv_misc_res.dat 2003-08-25 12:35:43.000000000 +0000
@@ -349,6 +349,7 @@
GV*eyeGuide.label: Scrolling Eye Guide
GV*confirmPrint.label: Confirm Printing
GV*uncompressLabel.label: Uncompress
+GV*bunzip2Label.label: Bunzip2
GV*autoCenter.label: Auto Center
GV*printCommandLabel.label: Print Command
GV*scratchDirLabel.label: Scratch Directory
--- source/gv_layout_res.dat
+++ source/gv_layout_res.dat 2003-08-25 12:46:04.000000000 +0000
@@ -283,6 +283,8 @@
printCommandLabel<+[1]*>\
$bs\
uncompressLabel<+[1]*>\
+ $bs\
+ bunzip2Label<+[1]*>\
}\
$s\
|v{\
@@ -291,6 +293,8 @@
printCommandFrame<+[2]-100%*>\
$s\
uncompressFrame<+[2]-100%*>\
+ $s\
+ bunzip2Frame<+[2]-100%*>\
}\
}\
}\

916
gv-3.5.8-deb.patch
View File

@ -1,916 +0,0 @@
--- gv-3.5.8.orig/source/Imakefile
+++ gv-3.5.8/source/Imakefile
@@ -311,8 +311,8 @@
@echo "!########## gv_intern_res.dat (generated by makefile)" >> $(GV_INTERN_RES_DAT)
@echo "" >> $(GV_INTERN_RES_DAT)
@echo "GV.gsInterpreter: gs" >> $(GV_INTERN_RES_DAT)
- @echo "GV.gsCmdScanPDF: gs -dNODISPLAY -dQUIET -sPDFname=%s -sDSCname=%s pdf2dsc.ps -c quit" >> $(GV_INTERN_RES_DAT)
- @echo "GV.gsCmdConvPDF: gs -dNODISPLAY -dQUIET $(PS_LEVEL) -dNOPAUSE -sPSFile=%s %s -c quit" >> $(GV_INTERN_RES_DAT)
+ @echo "GV.gsCmdScanPDF: pdf2dsc %pdf %dsc" >> $(GV_INTERN_RES_DAT)
+ @echo "GV.gsCmdConvPDF: pdf2ps $(PS_LEVEL) %pdf %ps" >> $(GV_INTERN_RES_DAT)
@echo "GV.gsX11Device: -sDEVICE=x11" >> $(GV_INTERN_RES_DAT)
@echo "GV.gsX11AlphaDevice: -dNOPLATFONTS -sDEVICE=x11alpha" >> $(GV_INTERN_RES_DAT)
@echo "GV.gsSafer: True" >> $(GV_INTERN_RES_DAT)
--- gv-3.5.8.orig/source/ps.c
+++ gv-3.5.8/source/ps.c
@@ -417,10 +417,15 @@
struct document *retval = NULL;
FILE *tmpfile = (FILE*)NULL;
char *filename_unc;
+ char *quoted_filename, *quoted_filename_unc;
char cmd[512];
char s[512];
filename_unc=file_getTmpFilename(NULL,filename_raw);
- sprintf(cmd,cmd_uncompress,filename,filename_unc);
+ quoted_filename = quote_filename(filename);
+ quoted_filename_unc = quote_filename(filename_unc);
+ sprintf(cmd,cmd_uncompress,quoted_filename,quoted_filename_unc);
+ GV_XtFree(quoted_filename);
+ GV_XtFree(quoted_filename_unc);
INFMESSAGE(is compressed)
INFSMESSAGE(uncompress command,cmd)
if (ps_system(cmd) || file_fileIsNotUseful(filename_unc)) {
@@ -488,10 +493,35 @@
struct document *retval = NULL;
FILE *tmpfile = (FILE*)NULL;
char *filename_dsc;
+ char *quoted_filename, *quoted_filename_dsc;
+ char *pdfpos;
+ char *dscpos;
char cmd[512];
char s[512];
- filename_dsc=file_getTmpFilename(NULL,filename_raw);
- sprintf(cmd,cmd_scan_pdf,filename,filename_dsc);
+ filename_dsc=file_getTmpFilename(NULL,filename_raw);
+ quoted_filename = quote_filename(filename);
+ quoted_filename_dsc = quote_filename(filename_dsc);
+ if ((pdfpos = strstr(cmd_scan_pdf,"%pdf")) &&
+ (dscpos = strstr(cmd_scan_pdf,"%dsc"))) {
+ cmd[0] = '\0';
+ if (pdfpos < dscpos) {
+ strncat(cmd,cmd_scan_pdf,(pdfpos-cmd_scan_pdf));
+ strcat(cmd,quoted_filename);
+ strncat(cmd,pdfpos+4,(dscpos-pdfpos-4));
+ strcat(cmd,quoted_filename_dsc);
+ strcat(cmd,dscpos+4);
+ } else {
+ strncat(cmd,cmd_scan_pdf,(dscpos-cmd_scan_pdf));
+ strcat(cmd,quoted_filename_dsc);
+ strncat(cmd,dscpos+4,(pdfpos-dscpos-4));
+ strcat(cmd,quoted_filename);
+ strcat(cmd,pdfpos+4);
+ }
+ } else {
+ sprintf(cmd,cmd_scan_pdf,quoted_filename,quoted_filename_dsc);
+ }
+ GV_XtFree(quoted_filename);
+ GV_XtFree(quoted_filename_dsc);
INFMESSAGE(is PDF)
INFSMESSAGE(scan command,cmd)
#ifdef VMS
--- gv-3.5.8.orig/source/misc.c
+++ gv-3.5.8/source/misc.c
@@ -1154,7 +1154,7 @@
misc_setSensitive(w_printAllPages , show_printAllPages , (gv_psfile != NULL));
misc_setSensitive(w_checkFile , show_checkFile , (gv_filename != NULL));
misc_setSensitive(w_updateFile , show_updateFile , (gv_filename != NULL));
- misc_setSensitive(w_showThisPage , show_showThisPage , (gv_filename != NULL));
+ misc_setSensitive(w_showThisPage , show_showThisPage , (gv_psfile != NULL));
misc_setSensitive(w_prevPage , show_prevPage , (toc_text != NULL));
misc_setSensitive(w_nextPage , show_nextPage , (gv_filename != NULL));
misc_setSensitive(w_toggleCurrentPage , show_toggleCurrentPage , (toc_text != NULL));
@@ -1168,7 +1168,7 @@
XtSetSensitive(saveAllEntry, (gv_psfile != NULL));
XtSetSensitive(saveMarkedEntry, (toc_text != NULL));
XtSetSensitive(nextEntry, (gv_filename != NULL));
- XtSetSensitive(redisplayEntry, (gv_filename != NULL));
+ XtSetSensitive(redisplayEntry, (gv_psfile != NULL));
XtSetSensitive(prevEntry, (toc_text != NULL));
XtSetSensitive(currentEntry, (toc_text != NULL));
XtSetSensitive(oddEntry, (toc_text != NULL));
@@ -1717,4 +1717,52 @@
XtDestroyWidget(toplevel);
ENDMESSAGE(catch_Xerror)
return 0;
+}
+
+/*############################################################*/
+/* quote_filename */
+/* Quotes special characters in filenames */
+/* (taken from bash sources) */
+/*############################################################*/
+
+char *
+quote_filename (string)
+ char *string;
+{
+ int c;
+ char *result, *r, *s;
+
+ BEGINMESSAGE(quote_filename)
+
+ result = (char*) GV_XtMalloc((2 * strlen (string) + 1) * sizeof(char));
+
+ for (r = result, s = string; s && (c = *s); s++)
+ {
+ switch (c)
+ {
+ case ' ': case '\t': case '\n': /* IFS white space */
+ case '\'': case '"': case '\\': /* quoting chars */
+ case '|': case '&': case ';': /* shell metacharacters */
+ case '(': case ')': case '<': case '>':
+ case '!': case '{': case '}': /* reserved words */
+ case '*': case '[': case '?': case ']': /* globbing chars */
+ case '^':
+ case '$': case '`': /* expansion chars */
+ *r++ = '\\';
+ *r++ = c;
+ break;
+ case '#': /* comment char */
+ if (s == string)
+ *r++ = '\\';
+ /* FALLTHROUGH */
+ default:
+ *r++ = c;
+ break;
+ }
+ }
+ *r = '\0';
+
+ ENDMESSAGE(quote_filename)
+
+ return (result);
}
--- gv-3.5.8.orig/source/callbacks.c
+++ gv-3.5.8/source/callbacks.c
@@ -870,7 +870,7 @@
char *s;
BEGINMESSAGE(cb_page)
- if (gv_psfile && client_data) {
+ if (gv_filename && client_data) {
s = (char*)client_data;
if (*s=='-' || *s=='+') {
k = 1;
--- gv-3.5.8.orig/source/misc.h
+++ gv-3.5.8/source/misc.h
@@ -115,6 +115,12 @@
#endif
);
+extern char * quote_filename (
+#if NeedFunctionPrototypes
+ char*
+#endif
+);
+
#endif /* _GV_MISC_H_ */
--- gv-3.5.8.orig/source/file.c
+++ gv-3.5.8/source/file.c
@@ -145,6 +145,25 @@
}
/*############################################################*/
+/* file_assureDirectory */
+/*############################################################*/
+
+void
+file_assureDirectory(to,from)
+ char *to;
+ char *from;
+{
+ int len;
+ BEGINMESSAGE(file_assureDirectory)
+ strcpy(to,from);
+# ifndef VMS
+ len = strlen(to);
+ if (to[len-1] != '/') { to[len] = '/'; to[len+1] = '\0'; }
+# endif
+ ENDMESSAGE(file_assureDirectory)
+}
+
+/*############################################################*/
/* file_getTmpFilename */
/* provide some temporary file name */
/*############################################################*/
@@ -164,11 +183,13 @@
BEGINMESSAGE(file_getTmpFilename)
- if (!baseDirectory) baseDirectory = app_res.scratch_dir;
- strcpy(tmpDirBuf,baseDirectory);
- pos = file_locateFilename(tmpDirBuf);
- if (pos) { ++pos; *pos='\0'; }
- else strcpy(tmpDirBuf,app_res.scratch_dir);
+ pos = NULL;
+ if (baseDirectory) {
+ strcpy(tmpDirBuf,baseDirectory);
+ pos = file_locateFilename(tmpDirBuf);
+ }
+ if (pos) *pos='\0';
+ else file_assureDirectory(tmpDirBuf,app_res.scratch_dir);
if (!baseFilename) baseFilename= ".";
strcpy(tmpNameBuf,baseFilename);
--- gv-3.5.8.orig/source/save.c
+++ gv-3.5.8/source/save.c
@@ -112,17 +112,19 @@
String print_filename;
{
String error=NULL;
+ char *print_quoted_filename;
char *c,*p;
Cardinal m,n;
String printfail=GV_ERROR_PRINT_FAIL;
BEGINMESSAGE(print_file)
+ print_quoted_filename = quote_filename(print_filename);
p = GV_XtNewString(print_command);
n=0;
c=p;
while ((c=strstr(c,"%s"))) { c+=2; n++; }
- m = (strlen(p)+(n>0?n:1)*strlen(print_filename)+5)*sizeof(char);
+ m = (strlen(p)+(n>0?n:1)*strlen(print_quoted_filename)+5)*sizeof(char);
c = (char*) GV_XtMalloc(m);
if (n>0) {
char *e,*s;
@@ -133,13 +135,13 @@
if (s) *s='\0';
strcat(c,e);
if (s) {
- strcat(c,print_filename);
+ strcat(c,print_quoted_filename);
e=s+2;
}
else s=NULL;
}
} else {
- sprintf(c, "%s %s",p,print_filename);
+ sprintf(c, "%s %s",p,print_quoted_filename);
}
INFSMESSAGE(printing:,c)
if (SYSTEM_FAILED_ON(c)) {
@@ -149,6 +151,7 @@
}
GV_XtFree(c);
GV_XtFree(p);
+ GV_XtFree(print_quoted_filename);
ENDMESSAGE(print_file)
return(error);
}
@@ -198,6 +201,9 @@
char proc_name[256];
char *error=NULL;
char *pos;
+ char *pdfpos;
+ char *pspos;
+ char *quoted_src_fn, *quoted_conv_fn;
BEGINMESSAGE(save_forkPDFToPSConversion)
@@ -205,7 +211,30 @@
strcpy(proc_name,pos);
strcat(proc_name," conversion");
- sprintf(command,gv_gs_cmd_conv_pdf,sd->conv_fn,sd->src_fn);
+ quoted_src_fn = quote_filename(sd->src_fn);
+ quoted_conv_fn = quote_filename(sd->conv_fn);
+ if ((pdfpos = strstr(gv_gs_cmd_conv_pdf,"%pdf")) &&
+ (pspos = strstr(gv_gs_cmd_conv_pdf,"%ps"))) {
+ command[0] = '\0';
+ if (pdfpos < pspos) {
+ strncat(command,gv_gs_cmd_conv_pdf,(pdfpos-gv_gs_cmd_conv_pdf));
+ strcat(command,quoted_src_fn);
+ strncat(command,pdfpos+4,(pspos-pdfpos-4));
+ strcat(command,quoted_conv_fn);
+ strcat(command,pspos+3);
+ } else {
+ strncat(command,gv_gs_cmd_conv_pdf,(pspos-gv_gs_cmd_conv_pdf));
+ strcat(command,quoted_conv_fn);
+ strncat(command,pspos+3,(pdfpos-pspos-3));
+ strcat(command,quoted_src_fn);
+ strcat(command,pdfpos+4);
+ }
+ } else {
+ sprintf(command,gv_gs_cmd_conv_pdf,quoted_conv_fn,quoted_src_fn);
+ }
+ GV_XtFree(quoted_src_fn);
+ GV_XtFree(quoted_conv_fn);
+
INFSMESSAGE(starting conversion:,command)
process_fork(proc_name,command,save_forkPDFToPSConversionDone,(XtPointer)sd);
ENDMESSAGE(save_forkPDFToPSConversion)
--- gv-3.5.8.orig/source/process.c
+++ gv-3.5.8/source/process.c
@@ -272,8 +272,7 @@
pid = fork();
if (pid == 0) { /* child */
- int argc=0;
- char *argv[20];
+ char *argv[3];
char *c;
INFMESSAGE(child process)
@@ -286,15 +285,10 @@
*/
system(c);
#else
- while (isspace(*c)) c++;
- while (*c) {
- argv[argc++] = c;
- while (*c && !isspace(*c)) c++;
- if (*c) *c++ = '\0';
- while (isspace(*c)) c++;
- SMESSAGE(argv[argc-1])
- }
- argv[argc] = NULL;
+ argv[0] = "sh";
+ argv[1] = "-c";
+ argv[2] = c;
+ argv[3] = NULL;
INFMESSAGE(spawning conversion process)
/*
--- gv-3.5.8.orig/source/miscmenu.c
+++ gv-3.5.8/source/miscmenu.c
@@ -60,7 +60,7 @@
static MiscMenuEntryStruct miscmenu_entries[] = {
{ "update",cb_checkFile,(XtPointer)CHECK_FILE_DATE,2 },
- { "redisplay",cb_redisplay,NULL,2 },
+ { "redisplay",cb_redisplay,NULL,3 },
{ "toggle_current" , cb_setPageMark, (XtPointer)(SPM_CURRENT|SPM_TOGGLE),1 },
{ "toggle_even" , cb_setPageMark, (XtPointer)(SPM_EVEN|SPM_TOGGLE),1 },
{ "toggle_odd" , cb_setPageMark, (XtPointer)(SPM_ODD|SPM_TOGGLE),1 },
--- gv-3.5.8.orig/source/options_fs.c
+++ gv-3.5.8/source/options_fs.c
@@ -105,7 +105,6 @@
Widget w;
XtPointer client_data, call_data;
{
- BEGINMESSAGE(options_fs_cb_apply)
Arg args[5];
Cardinal n;
static Boolean s_scratch_dir = False;
--- gv-3.5.8.orig/debian/gv.doc-base
+++ gv-3.5.8/debian/gv.doc-base
@@ -0,0 +1,9 @@
+Document: gv
+Title: GV Manual - A PostScript and PDF viewer
+Author: Johannes Plass
+Abstract: Users manual for GV, a PostScript and PDF viewer.
+Section: Apps/Viewers
+
+Format: HTML
+Index: /usr/doc/gv/gv.html
+Files: /usr/doc/gv/*.html
--- gv-3.5.8.orig/debian/changelog
+++ gv-3.5.8/debian/changelog
@@ -0,0 +1,237 @@
+gv (1:3.5.8-15) unstable; urgency=low
+
+ * Corrected weird error in preinst (closes: Bug#47044)
+
+ -- Marco Pistore <pistore@debian.org> Tue, 12 Oct 1999 02:01:30 +0200
+
+gv (1:3.5.8-14) unstable; urgency=low
+
+ * Corrected the upstream URL in the copyright file (closes: Bug#41667)
+ * Now mime informations are handled via the update-mime approach
+ (closes: Bug#43331)
+ * Changed my email address to pistore@debian.org
+
+ -- Marco Pistore <pistore@debian.org> Wed, 6 Oct 1999 23:12:30 +0200
+
+gv (1:3.5.8-13) unstable; urgency=low
+
+ * Readded menu entry (closes: Bug#41216)
+
+ -- Marco Pistore <pistore@di.unipi.it> Fri, 16 Jul 1999 02:03:04 +0200
+
+gv (1:3.5.8-12) unstable; urgency=low
+
+ * Corrected the doc-base control file (closes: Bug#31771)
+ * Removed explicit dwww support: doc-base supplies it
+ (closes: Bug#31772)
+
+ -- Marco Pistore <pistore@di.unipi.it> Tue, 6 Jul 1999 22:38:32 +0200
+
+gv (1:3.5.8-11) unstable; urgency=low
+
+ * Special characters of filenames are now quoted in the commands that
+ print, decompress and deal with PDF files (added function
+ quote_filename to file misc.c; modified files source/save.c and
+ source/ps.c) (closes: Bug#30738)
+ * Removed double quotes from commands that print, decompress and deal
+ with PDF files: they are no more needed (modified files config.Unix
+ and source/Imakefile)
+ * Added support for doc-base (closes Bug#31152)
+
+ -- Marco Pistore <pistore@di.unipi.it> Sat, 2 Jan 1999 22:08:25 +0100
+
+gv (1:3.5.8-10) unstable; urgency=low
+
+ * Changed scratch dir from ~ to /tmp in file config.Unix
+ (closes: Bug#30520).
+ * Changed print command in file config.Unix: the file name is
+ now quoted and gv prints also files with spaces (closes: Bug#30738).
+ * Changed command for uncompressing .gz files and for managing
+ PDF files in source/Imakefile so that the involved file names
+ are quoted (closes: Bug#30514).
+ * Modified ps.c, so that strings %dsc and %pdf can appear in the command
+ that extract the structure from PDF files. Changed the default command to
+ 'pdf2dsc "%pdf" "%dsc"'.
+ * Changed the default command that converts PDF files into PS files
+ to 'pdf2ps "%pdf" "%ps"'.
+ * Added support for quoted strings in function process_fork in file
+ process.c.
+ * Now forward scrolling is allowed also when gv is called from a pipe:
+ modified file callbacks.c (closes: Bug#28382, Bug#29706).
+ * Redisplay is disabled for non-(gv_psfile) execution: modified
+ files misc.c and miscmenu.c.
+
+ -- Marco Pistore <pistore@di.unipi.it> Sat, 19 Dec 1998 23:36:13 +0100
+
+gv (1:3.5.8-9) unstable frozen; urgency=low
+
+ * Rewritten description in control file (now PDF support is
+ provided also by GNU gs, not only by Aladdin gs). For the same
+ reason, removed Suggests: gs-aladdin.
+ * Modified save.c, so that strings %ps and %pdf can appear in the command
+ that converts PDF files into PS files. Changed the default command to
+ "pdf2ps %pdf %ps" that works both with gs 4 and with gs 5.
+ (Closes: Bug:#30255)
+
+ -- Marco Pistore <pistore@di.unipi.it> Mon, 7 Dec 1998 18:43:45 +0100
+
+gv (1:3.5.8-8) unstable; urgency=low
+
+ * Scratch dir back to ~/
+ * Now a "/" is automatically added to the end of the default scratch dir
+ if it is not present (so, if you set the scartch directory to
+ /tmp, the scratch files are saved into "/tmp/", not into "/"):
+ modified "source/file.c". (Closes: Bug#23055)
+
+ -- Marco Pistore <pistore@di.unipi.it> Wed, 17 Jun 1998 00:08:51 +0200
+
+gv (1:3.5.8-7) unstable frozen; urgency=low
+
+ * I forgot to upload previous version also to FROZEN!
+ BRIAN, please include this in HAMM, since it avoids a conflict
+ the BO version of fvwm-common.
+
+ -- Marco Pistore <pistore@di.unipi.it> Sun, 5 Apr 1998 19:17:58 +0200
+
+gv (1:3.5.8-6) unstable; urgency=low
+
+ * Added "Replaces: fvwm-common (<< 2.0.46-BETA-2)".
+ File /usr/X11R6/include/X11/pixmaps/mini-gv.xpm is present both in gv
+ and in old versions of package fvwm-common (for instance, the one in
+ debian 1.3). The "Replaces: fvwm-common" allows to install the package
+ without the --force-overwrite flag. See Packaging 8.5.1 (thanks James).
+
+ -- Marco Pistore <pistore@di.unipi.it> Fri, 3 Apr 1998 22:11:04 +0200
+
+gv (1:3.5.8-5) unstable frozen; urgency=low
+
+ * New maintainer
+ * Typos in package description fixed (closes Bug#18925)
+ * Scartch dir is now /tmp (closes Bug#18728)
+ * Address of FSF corrected (lintian bug)
+ * Man and doc files have now mode 644 (lintian bug)
+ * -rpath (for xaw3d) has been removed: all works perfectly well also
+ without it
+ * Small changes in the rules file
+
+ -- Marco Pistore <pistore@di.unipi.it> Wed, 25 Mar 1998 11:20:51 +0100
+
+gv (1:3.5.8-4) unstable; urgency=low
+
+ * Hech. I forgot the epock so dpkg will replace the `.1' version. One more go.
+
+ -- Karl M. Hegbloom <karlheg@inetarena.com> Tue, 9 Dec 1997 03:36:49 -0800
+
+gv (3.5.8-3) unstable; urgency=low
+
+ * Really fix the depends on xaw3dg using a shlibs.local file.
+ fixes bug #15514
+
+ -- Karl M. Hegbloom <karlheg@inetarena.com> Tue, 9 Dec 1997 02:42:19 -0800
+
+gv (3.5.8-2) unstable; urgency=low
+
+ * Increment version number so that it will upgrade the non-maintainer version
+ `-.1' that should have been `-0.1'.
+
+ -- Karl M. Hegbloom <karlheg@inetarena.com> Mon, 24 Nov 1997 12:51:57 -0800
+
+gv (3.5.8-1) unstable; urgency=low
+
+ * I've closed a bunch of outstanding bug reports, many of which should
+ have been closed earlier.
+ * Depend on `xaw3dg' (several bugs, merged, 13986)
+
+ -- Karl M. Hegbloom <karlheg@inetarena.com> Sat, 22 Nov 1997 22:59:39 -0800
+
+gv (3.5.8-.1) unstable; urgency=low
+
+ * Non-maintainer release
+ * Latest version - Pristine sources.
+ * compiled with xlib6g, and libc6
+
+ -- Karl M. Hegbloom <karlheg@inetarena.com> Wed, 1 Oct 1997 11:02:22 -0700
+
+gv (3.4.3-1.1) unstable; urgency=low
+
+ * Non-maintainer release, compiled with xlib6g.
+
+ -- Karl M. Hegbloom <karlheg@inetarena.com> Tue, 30 Sep 1997 17:06:16 -0700
+
+gv (3.4.3-1) unstable; urgency=low
+
+ * new upstream release including heavy improvements in look and feel as
+ well as several major improvements of the PostScript preprocessor and
+ several new features.
+ * this version can no longer be used with standard Athena Widgets. This
+ release uses (and depends on) the shared Xaw3d library. By using the
+ -rpath option, the library has to be installed, but doesn't have to be
+ used as replacement for Xaw. It would be possible to link it
+ statically against Xaw3d (still dynamically linking all the rest).
+ If there are enough requests for this, I'll change the package to do
+ this.
+ For people compiling from source, simply use the other definition of
+ XAWLIB in config.Unix for the static version.
+ Note that the standard symlinks in /usr/X11R6/lib/Xaw3d may be
+ incorrect. You should check them first if you want to compile gv with
+ shared libXaw3d.
+
+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Sun, 27 Apr 1997 02:05:17 +0200
+
+gv (2.9.4-2) frozen unstable; urgency=low
+
+ * fixed typo
+ * uploaded to frozen
+
+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Fri, 18 Apr 1997 01:01:13 +0200
+
+gv (2.9.4-1) unstable; urgency=low
+
+ * new upstream release
+ * fixed prerm script (Bug# 7857)
+ * added menu entries
+ * added direct access to HTML docs according to Webstandard via menu.
+
+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Sat, 5 Apr 1997 13:06:04 +020
+0
+
+gv (2.7b6-1) unstable; urgency=low
+
+ * fixed bug 6718 (wrong MIME viewer installation)
+ * fixed bug 7228 (app-default problem)
+ * converted to new debian standard version 2.1.2.2
+ * new upstream release
+
+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Thu, 20 Feb 1997 01:04:29 +0100
+
+gv (2.7b5-3) unstable; urgency=low
+
+ * fixed bug 4700 (gv not stripped)
+ * added mime type application/ghostview
+ * added Provides: postscript-viewer, pdf-viewer
+ * finally found all functions using private Xaw code and eliminated
+ them. Now there is just one gv package for both standard and 3D Athena
+ Widgets. fixed control files for this.
+
+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Thu, 17 Oct 1996 22:56:53 +0200
+
+gv (2.7b5-2) unstable; urgency=low
+
+ * fixed install-mime entry in postinst
+ * fixed app-defaults file for 2d gv
+
+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Sat, 5 Oct 1996 10:48:54 +0200
+
+gv (2.7b5-1) unstable; urgency=LOW
+
+ * First Debian release of the gv PostScript/PDF viewer.
+ several changes had to be made in order to support
+ standard Athena Widgets as well as Xaw3d.
+ * Regretfully there is currently no way to make a binary supporting
+ both kinds at the same time.
+
+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Sat, 5 Oct 1996 10:48:08 +0200
+
+Local Variables:
+mode: debian-changelog
+End:
--- gv-3.5.8.orig/debian/rules
+++ gv-3.5.8/debian/rules
@@ -0,0 +1,71 @@
+#!/usr/bin/make -f
+# X?Emacs, -*- makefile -*- mode, please. Thank you.
+
+INSTALL=install
+INSTDATA=$(INSTALL) -o root -g root -m 644 -c
+INSTDIR=$(INSTALL) -d
+INSTPROG=$(INSTALL) -o root -g root -m 755 -c
+
+package=gv
+version=3.5.8
+
+define checkdir
+ test -f config.Unix -a -f debian/rules
+endef
+
+build:
+ $(checkdir)
+ -rm -f build
+ xmkmf -a
+ make
+ touch build
+
+clean: checkroot
+ $(checkdir)
+ -rm -f build
+ -make clean
+ -rm -rf debian/tmp
+ -rm -f `find . -name Makefile -print`
+ -rm -f debian/files debian/substvars
+ -rm -f `find . \( -name \*~ -o -name \*.bak \) -print`
+
+binary-indep: checkroot build
+ $(checkdir)
+
+binary-arch: checkroot build
+ $(checkdir)
+ $(INSTDIR) debian/tmp/DEBIAN
+ $(INSTPROG) debian/{preinst,postinst,prerm,postrm} debian/tmp/DEBIAN
+ $(INSTDIR) debian/tmp/usr/doc/gv
+ make install install.man INSTMANFLAGS="-m 644" DESTDIR=$(shell pwd)/debian/tmp
+ $(INSTDATA) debian/changelog debian/tmp/usr/doc/$(package)/changelog.Debian
+ $(INSTDATA) CHANGES debian/tmp/usr/doc/$(package)/changelog
+ gzip -9v debian/tmp/usr/doc/$(package)/* debian/tmp/usr/X11R6/man/man1/*
+ make install.doc INSTMANFLAGS="-m 644" GV_DOCDIR=$(shell pwd)/debian/tmp/usr/doc/$(package)
+ $(INSTDATA) debian/copyright debian/tmp/usr/doc/$(package)
+ $(INSTDIR) debian/tmp/usr/X11R6/include/X11/pixmaps
+ $(INSTDATA) debian/gv_icon.xpm debian/mini-gv.xpm debian/tmp/usr/X11R6/include/X11/pixmaps
+ $(INSTDIR) debian/tmp/usr/lib/menu
+ $(INSTDATA) debian/gv.menu debian/tmp/usr/lib/menu/gv
+ $(INSTDIR) debian/tmp/usr/share debian/tmp/usr/share/doc-base
+ $(INSTDATA) debian/gv.doc-base debian/tmp/usr/share/doc-base/gv
+ $(INSTDIR) debian/tmp/usr/lib/mime debian/tmp/usr/lib/mime/packages
+ $(INSTDATA) debian/gv.mime debian/tmp/usr/lib/mime/packages/gv
+ strip debian/tmp/usr/X11R6/bin/gv
+ dpkg-shlibdeps source/gv
+ dpkg-gencontrol
+ chown -R root.root debian/tmp
+ chmod -R g-ws debian/tmp
+ dpkg --build debian/tmp ..
+
+# generic targets:
+binary: binary-indep binary-arch
+
+source diff:
+ @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
+checkroot:
+ $(checkdir)
+ test root = "`whoami`"
+
+.PHONY: binary binary-arch binary-indep clean checkroot
--- gv-3.5.8.orig/debian/gv.menu
+++ gv-3.5.8/debian/gv.menu
@@ -0,0 +1,2 @@
+?package(gv):needs="x11" section="Apps/Viewers" title="GV" icon="mini-gv.xpm" \
+ command="/usr/bin/X11/gv"
--- gv-3.5.8.orig/debian/postinst
+++ gv-3.5.8/debian/postinst
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+if [ -x /usr/sbin/update-mime ]; then
+ update-mime
+fi
+
+if [ -x /usr/bin/update-menus ] ; then
+ update-menus
+fi
+
+if [ -x /usr/sbin/install-docs ]; then
+ install-docs -i /usr/share/doc-base/gv
+fi
+
+exit 0
+
+
--- gv-3.5.8.orig/debian/preinst
+++ gv-3.5.8/debian/preinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ -x /usr/sbin/install-mime ] && [ "$1" = "upgrade" ] && \
+ `dpkg --compare-versions $2 lt 1:3.5.8-14` ; then
+ echo "Removing old MIME information..."
+ install-mime --remove --package=gv
+fi
+
+exit 0
--- gv-3.5.8.orig/debian/control
+++ gv-3.5.8/debian/control
@@ -0,0 +1,26 @@
+Source: gv
+Section: text
+Priority: optional
+Maintainer: Marco Pistore <pistore@debian.org>
+Standards-Version: 2.4.0.0
+
+Package: gv
+Architecture: any
+Provides: postscript-viewer, pdf-viewer
+Priority: optional
+Replaces: gv-2d, gv-3d, fvwm-common (<< 2.0.46-BETA-2)
+Conflicts: gv-2d, gv-3d
+Depends: gs, ${shlibs:Depends}
+Description: A PostScript and PDF viewer for X using 3d Athena Widgets
+ `gv' is a comfortable viewer of PostScript and PDF files for the X
+ Window System.
+ .
+ It uses the `ghostscript' PostScript(tm) interpreter and is based
+ on the classic X front-end for `gs', `ghostview'. It is more
+ comfortable and more powerful than `ghostview'.
+ .
+ Some features as e.g. PDF files or anti-aliasing are only supported
+ if a recent ghostscript (4.0 or later) is installed. With
+ anti-aliasing turned on, the text is very crisp and readable, with no
+ `stepping' on the slants at all.
+
--- gv-3.5.8.orig/debian/copyright
+++ gv-3.5.8/debian/copyright
@@ -0,0 +1,40 @@
+ This is Debian/GNU Linux's prepackaged version of the PostScript
+ viewer `gv'. `gv' is a front-end to `gs', so you need this as well.
+
+ The original package was put together by Helmut Geyer
+ <Helmut.Geyer@iwr.uni-heidelberg.de> from the sources obtained from
+
+ iphthf.physik.uni-mainz.de:/pub/gv/unix/.
+
+ This release was put together by Marco Pistore <pistore@debian.org>,
+ from sources obtained at the same site,
+
+ iphthf.physik.uni-mainz.de:/pub/gv/unix/gv-3.5.8.tar.gz
+
+ This program bears a GNU version 2 copyright, as well as the
+ following notice, which is displayed by the [File | Copyright] menu,
+ compiled in from "source/gv_copyright.dat".
+
+!
+!** Copyright (C) 1995, 1996, 1997 Johannes Plass
+!
+! This program is free software; you can redistribute it and/or modify
+! it under the terms of the GNU General Public License as published by
+! the Free Software Foundation; either version 2 of the License, or
+! (at your option) any later version.
+!
+! This program is distributed in the hope that it will be useful,
+! but WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+! GNU General Public License for more details.
+!
+! You should have received a copy of the GNU General Public License
+! along with this program; if not, write to the Free Software
+! Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+! MA 02111-1307, USA.
+!
+! Author: Johannes Plass (plass@thep.physik.uni-mainz.de)
+! Department of Physics
+! Johannes Gutenberg-University
+! Mainz, Germany
+!
--- gv-3.5.8.orig/debian/mini-gv.xpm
+++ gv-3.5.8/debian/mini-gv.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * mini_gv_xpm[] = {
+/* width height num_colors chars_per_pixel */
+"16 14 3 1",
+/* colors */
+" s None c None",
+". c black",
+"X c White",
+/* pixels */
+" .... ",
+" .XXXX. ",
+" .XXXXXX. ",
+" .XXXXXX. ",
+" ..X.XX.X... ",
+" .XXX.XX.X.XX. ",
+" .XXXXXXXXXXX. ",
+" .XXXXXXXXX. ",
+" .XXXXXXX. ",
+" .XXXXXXX. ",
+" .XXXXXXX. ",
+" .XXXXXXXXX. ",
+" .XXX.XXX.XXX. ",
+" .... ... .. "};
--- gv-3.5.8.orig/debian/prerm
+++ gv-3.5.8/debian/prerm
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ -x /usr/sbin/install-docs ]; then
+ install-docs -r gv
+fi
+
+exit 0
+
--- gv-3.5.8.orig/debian/postrm
+++ gv-3.5.8/debian/postrm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ -x /usr/bin/update-menus ] ; then
+ update-menus
+fi
+
+if [ -x /usr/sbin/update-mime ]; then
+ update-mime
+fi
--- gv-3.5.8.orig/debian/shlibs.local
+++ gv-3.5.8/debian/shlibs.local
@@ -0,0 +1 @@
+libXaw3d 6 xaw3dg (>= 1.3-6)
--- gv-3.5.8.orig/debian/gv.mime
+++ gv-3.5.8/debian/gv.mime
@@ -0,0 +1,5 @@
+application/postscript; /usr/bin/X11/gv %s; test=test -n "$DISPLAY"; description=postscript
+application/ghostview; /usr/bin/X11/gv %s; test=test -n "$DISPLAY"
+application/pdf; /usr/bin/X11/gv %s; test=test -n "$DISPLAY"
+
+
--- gv-3.5.8.orig/debian/gv_icon.xpm
+++ gv-3.5.8/debian/gv_icon.xpm
@@ -0,0 +1,59 @@
+/* XPM */
+static char * gv_icon_xpm[] = {
+/* width height num_colors chars_per_pixel */
+"50 50 3 1",
+/* colors */
+" c None",
+". c black",
+"X c white",
+/* pixels */
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ...... ",
+" ..XXXX... ",
+" ..XXXXXXX.. ",
+" ..XXXXXXXXX. ",
+" ..XXXXXXXXXX. ",
+" ..XXXXXXXXXX. ",
+" ..XXXXXXXXX.. ",
+" ...XXXXXXX.. ",
+" .... ..XXXXXX.. ",
+" ..X.. ...XXXXX. .... ",
+" ...XX. ..XXXXX. ..XX.. ",
+" ...XX... .XXXXXX. ..XXXX. ",
+" ...XXX.....XXXXXXX.. ..XXX... ",
+" ...XXXXXXXXXXXXXXX....XXX.. ",
+" ....XXXXXXXXXXXXXXXXXXX.. ",
+" ...XXXXXXXXXXXXXXXXX.. ",
+" ...XXXXXXXXXXXXXXX.. ",
+" ...XXXXXXXXXXXXX.. ",
+" ..XXXXXXXXXXXXX.. ",
+" ...XXXXXXXXXXX.. ",
+" ...XXXXXXXXXX.. ",
+" ..XXXXXXXXXX. ",
+" ...XXXXXXXX.. ",
+" ...XXXXXXX. ",
+" ..XXXXXXX.. ",
+" ...XXXXXX.. ",
+" ...XXXXXX. ",
+" ...XXXXXX.. .. ",
+" ...XXXXX....... ",
+" ...XXXXXX....X. ",
+" ...XXXXXXXXX.. ",
+" ....XXXXXX.. ",
+" .......... ",
+" ....... ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "};

40
gv-3.5.8-gcc4.patch
View File

@ -1,40 +0,0 @@
--- source/misc.c
+++ source/misc.c 2005-04-13 16:48:09.631599707 +0000
@@ -1479,6 +1479,7 @@
XtSetValues(pagemediaButton, args, ONE);
out:
ENDMESSAGE(set_pagemediaButton_label)
+ return; /* For stupid compilers like gcc4 */
}
/*------------------------------------------------------------*/
--- source/ps.c
+++ source/ps.c 2005-04-13 16:53:53.003469239 +0000
@@ -163,7 +163,8 @@
static char *readline PT((FileData, char **, long *, unsigned int *));
static char *gettextline PT((char *));
-static char *gettext PT((char *,char **));
+#define gettext(a, b) _gettext(a, b)
+static char *_gettext PT((char *,char **));
static int blank PT((char *));
static char *pscopyuntil PT((FileData,FILE *,long,long,char *));
--- source/signal.c
+++ source/signal.c 2005-04-13 16:54:16.178883017 +0000
@@ -39,6 +39,7 @@
# include <sys/stat.h>
# include <unistd.h>
#endif
+#include <stdlib.h>
#include "paths.h"
#include INC_X11(Intrinsic.h)
@@ -55,6 +56,7 @@
#endif
#include "types.h"
+#include "config.h"
#include "callbacks.h"
#include "d_memdebug.h"
#include "main_resources.h"

28
gv-3.5.8-sec2.patch
View File

@ -1,28 +0,0 @@
--- source/ps.c
+++ source/ps.c 2006-11-09 17:37:07.000000000 +0000
@@ -1423,6 +1423,10 @@
quoted=1;
line++;
while (*line && !(*line == ')' && level == 0 )) {
+ if (cp - text >= PSLINELENGTH - 2) {
+ ENDMESSAGE(gettext)
+ return NULL;
+ }
if (*line == '\\') {
if (*(line+1) == 'n') {
*cp++ = '\n';
@@ -1477,8 +1481,13 @@
}
}
} else {
- while (*line && !(*line == ' ' || *line == '\t' || *line == '\n'))
+ while (*line && !(*line == ' ' || *line == '\t' || *line == '\n')) {
+ if (cp - text >= PSLINELENGTH - 2) {
+ ENDMESSAGE(gettext)
+ return NULL;
+ }
*cp++ = *line++;
+ }
}
*cp = '\0';
if (next_char) *next_char = line;

697
gv-3.5.8-security.patch
View File

@ -1,697 +0,0 @@
--- gv-3.5.8/source/Imakefile.security Fri Sep 20 13:54:53 2002
+++ gv-3.5.8/source/Imakefile Fri Sep 20 13:55:18 2002
@@ -63,6 +63,7 @@
resource.c\
save.c\
scale.c\
+ secscanf.c\
signal.c\
version.c\
widgets_misc.c\
@@ -106,6 +107,7 @@
resource.o\
save.o\
scale.o\
+ secscanf.o\
signal.o\
version.o\
widgets_misc.o\
--- gv-3.5.8/source/ps.c.security Fri Sep 20 13:54:53 2002
+++ gv-3.5.8/source/ps.c Fri Sep 20 13:54:53 2002
@@ -93,6 +93,8 @@
#define memset(a,b,c) bzero(a,c)
#endif
+extern int sec_scanf(const char *, const char *, ...);
+
/* length calculates string length at compile time */
/* can only be used with character constants */
#define length(a) (sizeof((a))-1)
@@ -483,7 +485,7 @@
doc = (struct document *) PS_malloc(sizeof(struct document));
CHECK_MALLOCED(doc);
memset(doc, 0, sizeof(struct document));
- sscanf(line, "%*s %s", text);
+ sec_sscanf(line, "%*s %s", text, sizeof(text));
/*###jp###*/
/*doc->epsf = iscomment(text, "EPSF-");*/
doc->epsf = iscomment(text, "EPSF");
@@ -576,7 +578,7 @@
} else if (doc->date == NULL && iscomment(line+2, "CreationDate:")) {
doc->date = gettextline(line+length("%%CreationDate:"));
} else if (bb_set == NONE && iscomment(line+2, "BoundingBox:")) {
- sscanf(line+length("%%BoundingBox:"), "%s", text);
+ sec_sscanf(line+length("%%BoundingBox:"), "%s", text, sizeof(text));
if (strcmp(text, "(atend)") == 0) {
bb_set = ATEND;
} else {
@@ -608,7 +610,7 @@
}
} else if (orientation_set == NONE &&
iscomment(line+2, "Orientation:")) {
- sscanf(line+length("%%Orientation:"), "%s", text);
+ sec_sscanf(line+length("%%Orientation:"), "%s", text, sizeof(text));
if (strcmp(text, "(atend)") == 0) {
orientation_set = ATEND;
} else if (strcmp(text, "Portrait") == 0) {
@@ -619,7 +621,7 @@
orientation_set = 1;
}
} else if (page_order_set == NONE && iscomment(line+2, "PageOrder:")) {
- sscanf(line+length("%%PageOrder:"), "%s", text);
+ sec_sscanf(line+length("%%PageOrder:"), "%s", text, sizeof(text));
if (strcmp(text, "(atend)") == 0) {
page_order_set = ATEND;
} else if (strcmp(text, "Ascend") == 0) {
@@ -633,7 +635,7 @@
page_order_set = 1;
}
} else if (pages_set == NONE && iscomment(line+2, "Pages:")) {
- sscanf(line+length("%%Pages:"), "%s", text);
+ sec_sscanf(line+length("%%Pages:"), "%s", text, sizeof(text));
if (strcmp(text, "(atend)") == 0) {
pages_set = ATEND;
} else {
@@ -853,7 +855,7 @@
/* Do nothing */
} else if (doc->default_page_orientation == NONE &&
iscomment(line+2, "PageOrientation:")) {
- sscanf(line+length("%%PageOrientation:"), "%s", text);
+ sec_sscanf(line+length("%%PageOrientation:"), "%s", text, sizeof(text));
if (strcmp(text, "Portrait") == 0) {
doc->default_page_orientation = PORTRAIT;
} else if (strcmp(text, "Landscape") == 0) {
@@ -975,7 +977,7 @@
/* Do nothing */
} else if (doc->default_page_orientation == NONE &&
iscomment(line+2, "PageOrientation:")) {
- sscanf(line+length("%%PageOrientation:"), "%s", text);
+ sec_sscanf(line+length("%%PageOrientation:"), "%s", text, sizeof(text));
if (strcmp(text, "Portrait") == 0) {
doc->default_page_orientation = PORTRAIT;
} else if (strcmp(text, "Landscape") == 0) {
@@ -1112,7 +1114,7 @@
/* Do nothing */
} else if (doc->pages[doc->numpages].orientation == NONE &&
iscomment(line+2, "PageOrientation:")) {
- sscanf(line+length("%%PageOrientation:"), "%s", text);
+ sec_sscanf(line+length("%%PageOrientation:"), "%s", text, sizeof(text));
if (strcmp(text, "Portrait") == 0) {
doc->pages[doc->numpages].orientation = PORTRAIT;
} else if (strcmp(text, "Landscape") == 0) {
@@ -1144,7 +1146,7 @@
PS_free(cp);
} else if ((page_bb_set == NONE || page_bb_set == ATEND) &&
iscomment(line+2, "PageBoundingBox:")) {
- sscanf(line+length("%%PageBoundingBox:"), "%s", text);
+ sec_sscanf(line+length("%%PageBoundingBox:"), "%s", text, sizeof(text));
if (strcmp(text, "(atend)") == 0) {
page_bb_set = ATEND;
} else {
@@ -1258,14 +1260,14 @@
}
} else if (orientation_set == ATEND &&
iscomment(line+2, "Orientation:")) {
- sscanf(line+length("%%Orientation:"), "%s", text);
+ sec_sscanf(line+length("%%Orientation:"), "%s", text, sizeof(text));
if (strcmp(text, "Portrait") == 0) {
doc->orientation = PORTRAIT;
} else if (strcmp(text, "Landscape") == 0) {
doc->orientation = LANDSCAPE;
}
} else if (page_order_set == ATEND && iscomment(line+2, "PageOrder:")) {
- sscanf(line+length("%%PageOrder:"), "%s", text);
+ sec_sscanf(line+length("%%PageOrder:"), "%s", text, sizeof(text));
if (strcmp(text, "Ascend") == 0) {
doc->pageorder = ASCEND;
} else if (strcmp(text, "Descend") == 0) {
@@ -1819,7 +1821,7 @@
INFMESSAGE(encountered "BeginData:")
if (FD_LINE_LEN > 100) FD_BUF[100] = '\0';
text[0] = '\0';
- if (sscanf(line+length("%%BeginData:"), "%d %*s %s", &num, text) >= 1) {
+ if (sec_sscanf(line+length("%%BeginData:"), "%d %*s %s", &num, text, sizeof(text)) >= 1) {
if (strcmp(text, "Lines") == 0) {
INFIMESSAGE(number of lines to skip:,num)
while (num) {
@@ -1918,7 +1920,7 @@
INFMESSAGE(encountered "BeginData:")
if (FD_LINE_LEN > 100) FD_BUF[100] = '\0';
text[0] = '\0';
- if (sscanf(line+length("%%BeginData:"), "%d %*s %s", &num, text) >= 1) {
+ if (sec_sscanf(line+length("%%BeginData:"), "%d %*s %s", &num, text, sizeof(text)) >= 1) {
if (strcmp(text, "Lines") == 0) {
INFIMESSAGE(number of lines:,num)
while (num) {
@@ -2015,7 +2017,7 @@
PS_free(comment);
continue;
}
- sscanf(comment+length("%%Pages:"), "%s", text);
+ sec_sscanf(comment+length("%%Pages:"), "%s", text, sizeof(text));
if (strcmp(text, "(atend)") == 0) {
fputs(comment, dest_file);
pages_atend = True;
--- gv-3.5.8/source/secscanf.c.security Fri Sep 20 13:54:53 2002
+++ gv-3.5.8/source/secscanf.c Fri Sep 20 13:54:53 2002
@@ -0,0 +1,540 @@
+/*
+ * Secure sscanf - sscanf with an additional size argument for string
+ * arguments. All format specifiers should work as in the standard
+ * scanf - except for those writing to a string buffer provided by the
+ * caller. These specifiers take an additional argument of type size_t
+ * that specifies the size of the buffer.
+ *
+ * Copyright (C) 2002, Olaf Kirch <okir@suse.de>
+ */
+
+#define _GNU_SOURCE
+
+#include <sys/param.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <ctype.h>
+
+enum {
+ CONV_ANY,
+ CONV_STR,
+ CONV_NUM,
+ CONV_INTEGER,
+ CONV_FLOAT,
+ CONV_POINTER,
+};
+
+enum {
+ SIZE_ANY,
+ SIZE_SHORT,
+ SIZE_LONG,
+ SIZE_QUAD,
+};
+
+union scan_value {
+ const char * v_string;
+ long long v_signed;
+ unsigned long long v_integer;
+ long double v_double;
+ void * v_pointer;
+};
+
+
+static int process_number(union scan_value *vp, const char **sp, char fmt);
+static int process_char_class(const char **, const char **, int);
+
+static inline int
+set_conv_type(int *type, int new_type)
+{
+ switch (*type) {
+ case CONV_ANY:
+ break;
+ case CONV_NUM:
+ if (new_type == CONV_INTEGER
+ || new_type == CONV_FLOAT
+ || new_type == CONV_POINTER)
+ break;
+ /* fallthru */
+ default:
+ if (*type != new_type)
+ return 0;
+ break;
+ }
+
+ *type = new_type;
+ return 1;
+}
+
+int
+sec_sscanf(const char *s, const char *fmt, ...)
+{
+ const char *begin = s;
+ int num_fields = 0, fmt_empty = 1;
+ va_list ap;
+
+ va_start(ap, fmt);
+ while (*fmt) {
+ union scan_value value;
+ const char *pre_space_skip,
+ *value_begin;
+ int assign = 1, allocate = 0,
+ conv_type = CONV_ANY,
+ conv_size = SIZE_ANY,
+ field_width = -1,
+ nul_terminated = 1;
+ char c;
+
+ c = *fmt++;
+ if (isspace(c)) {
+ while (isspace(*s))
+ s++;
+ continue;
+ }
+
+ fmt_empty = 0;
+ if (c != '%') {
+ if (c != *s)
+ goto stop;
+ s++;
+ continue;
+ }
+
+ /* Each % directive implicitly skips white space
+ * except for the %c case */
+ pre_space_skip = s;
+ while (isspace(*s))
+ s++;
+
+ while (1) {
+ int type = CONV_ANY, size = SIZE_ANY;
+
+ switch (*fmt) {
+ case '*':
+ assign = 0;
+ break;
+ case 'a':
+ type = CONV_STR;
+ allocate = 1;
+ break;
+ case 'h':
+ type = CONV_INTEGER;
+ size = SIZE_SHORT;
+ break;
+ case 'l':
+ type = CONV_NUM;
+ size = SIZE_LONG;
+ break;
+ case 'L':
+ case 'q':
+ type = CONV_NUM;
+ size = SIZE_QUAD;
+ break;
+ case '0': case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8': case '9':
+ field_width = strtol(fmt, (char **) &fmt, 10);
+ fmt--;
+ break;
+ default:
+ goto flags_done;
+ }
+
+ if (!set_conv_type(&conv_type, type))
+ goto stop;
+
+ if (size != SIZE_ANY) {
+ if (size == SIZE_LONG && conv_size == SIZE_LONG)
+ conv_size = SIZE_QUAD;
+ else
+ conv_size = size;
+ }
+
+ fmt++;
+ }
+
+ flags_done:
+ value_begin = s;
+
+ switch (*fmt++) {
+ case '%':
+ if (*s == '\0')
+ goto eof;
+ if (*s != '%')
+ goto stop;
+ continue;
+ case '[':
+ value.v_string = s;
+ if (!set_conv_type(&conv_type, CONV_STR)
+ || !process_char_class(&fmt, &s, field_width))
+ goto stop;
+ break;
+ case 's':
+ value.v_string = s;
+ if (!set_conv_type(&conv_type, CONV_STR))
+ goto stop;
+ while (*s && !isspace(*s) && field_width-- != 0)
+ s++;
+ break;
+ case 'c':
+ if (!set_conv_type(&conv_type, CONV_STR))
+ goto stop;
+ value.v_string = s = value_begin = pre_space_skip;
+
+ if (field_width < 0)
+ s++;
+ else while (*s && field_width--)
+ s++;
+ nul_terminated = 0;
+ break;
+ case 'd':
+ case 'i':
+ case 'o':
+ case 'u':
+ case 'x':
+ case 'X':
+ if (!set_conv_type(&conv_type, CONV_INTEGER)
+ || !process_number(&value, &s, fmt[-1]))
+ goto stop;
+ break;
+ case 'p':
+ if (!set_conv_type(&conv_type, CONV_POINTER)
+ || !process_number(&value, &s, fmt[-1]))
+ goto stop;
+ break;
+ case 'f':
+ case 'g':
+ case 'e':
+ case 'E':
+ if (!set_conv_type(&conv_type, CONV_FLOAT)
+ || !process_number(&value, &s, fmt[-1]))
+ goto stop;
+ break;
+ case 'n':
+ if (!set_conv_type(&conv_type, CONV_INTEGER))
+ goto stop;
+ value.v_signed = (s - begin);
+ break;
+ default:
+ goto stop;
+ }
+
+ /* We've consumed what we need to consume. Now copy */
+ if (!assign)
+ continue;
+
+ /* Make sure we've consumed at least *something* */
+ if (s == value_begin)
+ goto eof;
+
+ /* Deal with a conversion flag */
+ if (conv_type == CONV_STR && allocate) {
+ value.v_pointer = strndup(value.v_string, s - value.v_string);
+ conv_type = CONV_POINTER;
+ allocate = 0;
+ }
+
+ switch (conv_type) {
+ case CONV_STR:
+ {
+ const char *string = value.v_string;
+ char *buf;
+ size_t size;
+
+ if (string == NULL)
+ goto stop;
+ buf = va_arg(ap, char *);
+ size = va_arg(ap, size_t) - nul_terminated;
+ if (size > s - string)
+ size = s - string;
+ strncpy(buf, string, size);
+ if (nul_terminated)
+ buf[size] = '\0';
+ }
+ break;
+
+ case CONV_POINTER:
+ {
+ void **ptr;
+
+ ptr = va_arg(ap, void **);
+ *ptr = value.v_pointer;
+ }
+ break;
+ case CONV_INTEGER:
+ {
+ void *ptr;
+
+ ptr = va_arg(ap, void *);
+ switch (conv_size) {
+ case SIZE_SHORT:
+ *(short *) ptr = value.v_integer;
+ break;
+ case SIZE_ANY:
+ *(int *) ptr = value.v_integer;
+ break;
+ case SIZE_LONG:
+ *(long *) ptr = value.v_integer;
+ break;
+ case SIZE_QUAD:
+ *(long long *) ptr = value.v_integer;
+ break;
+ default:
+ goto stop;
+ }
+ }
+ break;
+ case CONV_FLOAT:
+ {
+ void *ptr;
+
+ ptr = va_arg(ap, void *);
+ switch (conv_size) {
+ case SIZE_ANY:
+ *(float *) ptr = value.v_double;
+ break;
+ case SIZE_LONG:
+ *(double *) ptr = value.v_double;
+ break;
+ case SIZE_QUAD:
+ *(long double *) ptr = value.v_double;
+ break;
+ default:
+ goto stop;
+ }
+ }
+ break;
+ default:
+ goto stop;
+ }
+
+ num_fields++;
+ }
+
+stop: return num_fields;
+
+eof: if (num_fields)
+ return num_fields;
+ return EOF;
+}
+
+static int
+process_number(union scan_value *vp, const char **sp, char fmt)
+{
+ const char *s = *sp;
+
+ switch (fmt) {
+ case 'd':
+ vp->v_signed = strtoll(s, (char **) sp, 10);
+ break;
+ case 'i':
+ vp->v_signed = strtoll(s, (char **) sp, 0);
+ break;
+ case 'o':
+ vp->v_integer = strtoull(s, (char **) sp, 8);
+ break;
+ case 'u':
+ vp->v_integer = strtoull(s, (char **) sp, 10);
+ break;
+ case 'x':
+ case 'X':
+ vp->v_integer = strtoull(s, (char **) sp, 16);
+ break;
+ case 'p':
+ vp->v_pointer = (void *) strtoull(s, (char **) sp, 0);
+ break;
+ case 'f':
+ case 'g':
+ case 'e':
+ case 'E':
+ vp->v_double = strtold(s, (char **) sp);
+ break;
+ default:
+ return 0;
+ }
+
+ return 1;
+}
+
+static int
+process_char_class(const char **fmt, const char **sp, int width)
+{
+ unsigned char *s, c, prev_char = 0;
+ unsigned char table[255];
+ int val = 1;
+
+ s = (unsigned char *) *fmt;
+ if (*s == '^') {
+ memset(table, 1, sizeof(table));
+ val = 0;
+ s++;
+ } else {
+ memset(table, 0, sizeof(table));
+ val = 1;
+ }
+ /* First character in set is closing bracket means add it to the
+ * set of characters */
+ if ((c = *s) == ']') {
+ table[c] = val;
+ prev_char = c;
+ s++;
+ }
+
+ /* Any other closing bracket finishes off the set */
+ while ((c = *s++) != ']') {
+ if (prev_char) {
+ if (c == '-' && *s != '\0' && *s != ']') {
+ c = *s++;
+ } else {
+ //table[prev_char] = val;
+ prev_char = '\0';
+ }
+ }
+
+ if (c == '\0')
+ return 0;
+
+ if (prev_char) {
+ while (prev_char < c)
+ table[prev_char++] = val;
+ }
+ table[c] = val;
+ prev_char = c;
+ }
+ *fmt = (char *) s;
+
+#if 0
+ {
+ int n;
+
+ printf("char class=");
+ for (n = 0; n < 255; n++)
+ if (table[n])
+ printf(isprint(n)? "%c" : "\\%03o", n);
+ printf("\n");
+ }
+#endif
+
+ s = (unsigned char *) *sp;
+ while ((c = *s) != '\0' && table[c] && width--)
+ s++;
+
+ *sp = (char *) s;
+ return 1;
+}
+
+#ifdef TEST
+static int verify(const char *fmt, const char *s);
+static int verify_s(const char *fmt, const char *s);
+
+enum { S, I, L, F, D, P };
+
+int
+main(int argc, char **argv)
+{
+ verify("%d %d", "12 13");
+ verify("%d-%d", "12 13");
+ verify("%d-%d", "12-13");
+ verify("%u %u", "12 13");
+ verify("%o %o", "12 13");
+ verify("%x %x", "12 13");
+ verify("%X %X", "12 13");
+ verify("%hd %hd", "12 13");
+ verify("%ld %ld", "12 13");
+ verify("%lld %lld", "12 13");
+ verify("%Ld %Ld", "12 13");
+ verify("%qd %qd", "12 13");
+ verify("%f %f", "12 13");
+ verify("%lf %lf", "12 13");
+ verify("%Lf %Lf", "12 13");
+ verify("%qf %qf", "12 13");
+ verify("%*d-%d", "12-13");
+ verify("%*s %d", "12 13");
+ verify("%p", "0xdeadbeef");
+ verify("%*[a-e] %x", "deadbeef feeb");
+ verify("%*[a-f] %x", "deadbeef feeb");
+ verify("%*[^g-z] %x", "deadbeef feeb");
+ verify("%*[^ g-z] %x", "deadbeef feeb");
+ verify("%*[^ g-z-] %x", "dead-beef feeb");
+ verify("%*5s %d", "toast123 456");
+ verify("", "lalla");
+ verify("%u", "");
+
+ verify_s("%s", "aa bb");
+ verify_s("%s %s", "aa bb");
+ verify_s("%[a-z] %s", "aa bb");
+ verify_s("%c %s", "aa bb");
+ verify_s("%2c %s", " aa bb");
+ verify_s("%20c %s", " aa bb");
+
+ return 0;
+}
+
+static int
+verify(const char *fmt, const char *s)
+{
+ union scan_value vals[5], vals_ref[5], *v;
+ int n, m;
+
+ memset(vals, 0xe5, sizeof(vals));
+ memset(vals_ref, 0xe5, sizeof(vals_ref));
+
+ v = vals;
+ n = sec_sscanf(s, fmt, v + 0, v + 1, v + 2, v + 3, v + 4);
+
+ v = vals_ref;
+ m = sscanf(s, fmt, v + 0, v + 1, v + 2, v + 3, v + 4);
+
+ if (m != n) {
+ printf("FAILED: fmt=\"%s\"\n"
+ " str=\"%s\"\n"
+ " sec_scanf returns %d, sscanf returns %d\n",
+ fmt, s, n, m);
+ return 0;
+ }
+
+ if (memcmp(vals, vals_ref, sizeof(vals))) {
+ printf("FAILED: fmt=\"%s\"\n"
+ " str=\"%s\"\n"
+ " data differs!\n",
+ fmt, s);
+ printf("0x%Lx != 0x%Lx\n", vals[0].v_integer, vals_ref[0].v_integer);
+ return 0;
+ }
+
+ return 1;
+}
+
+static int
+verify_s(const char *fmt, const char *s)
+{
+ char buf[3][256], buf_ref[3][256];
+ int n, m;
+
+ memset(buf, 0xe5, sizeof(buf));
+ memset(buf_ref, 0xe5, sizeof(buf_ref));
+
+ n = sec_sscanf(s, fmt, buf, sizeof(buf[0]), buf + 1, sizeof(buf[1]), buf + 2, sizeof(buf[2]));
+
+ m = sscanf(s, fmt, buf_ref, buf_ref + 1, buf_ref + 2);
+
+ if (m != n) {
+ printf("FAILED: fmt=\"%s\"\n"
+ " str=\"%s\"\n"
+ " sec_scanf returns %d, sscanf returns %d\n",
+ fmt, s, n, m);
+ return 0;
+ }
+
+ if (memcmp(buf, buf_ref, sizeof(buf))) {
+ printf("FAILED: fmt=\"%s\"\n"
+ " str=\"%s\"\n"
+ " data differs!\n",
+ fmt, s);
+ printf("%s != %s\n", buf[0], buf_ref[0]);
+ return 0;
+ }
+
+ return 1;
+}
+#endif

226
gv-3.5.8.dif
View File

@ -1,226 +0,0 @@
--- .pkgextract
+++ .pkgextract 2006-02-28 15:49:27.000000000 +0100
@@ -0,0 +1,2 @@
+patch -p1 -s --suffix=".debian" < ../gv-3.5.8-deb.patch
+patch -p1 -s --suffix=".secure" < ../gv-3.5.8-security.patch
--- Imakefile
+++ Imakefile 2006-02-28 15:49:27.000000000 +0100
@@ -1,7 +1,3 @@
-#ifndef XCOMM
-#define XCOMM #
-#endif
-
XCOMM
XCOMM Imakefile
XCOMM
--- NOTE
+++ NOTE 2006-02-28 15:49:27.000000000 +0100
@@ -0,0 +1,48 @@
+
+**
+** Copyright (C) 1995, 1996, 1997 Johannes Plass
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+**
+** Author: Johannes Plass (plass@dipmza.physik.uni-mainz.de)
+** Department of Physic
+** Johannes Gutenberg-University
+** Mainz, Germany
+**
+
+GV is real based on ghostview 1.5 by Tim Theisen:
+
+ * Ghostview.c -- Ghostview widget.
+ * Copyright (C) 1992 Timothy O. Theisen
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Author: Tim Theisen Systems Programmer
+ * Internet: tim@cs.wisc.edu Department of Computer Sciences
+ * UUCP: uwvax!tim University of Wisconsin-Madison
+ * Phone: (608)262-0438 1210 West Dayton Street
+ * FAX: (608)262-9777 Madison, WI 53706
--- config.Unix
+++ config.Unix 2006-02-28 15:49:27.000000000 +0100
@@ -32,16 +32,22 @@
XCOMM --------------------------------------------------------------------
XCOMM Destination directories.
XCOMM --------------------------------------------------------------------
- GV_BINDIR = /usr/local/bin/
- GV_DOCDIR = /usr/local/doc/gv/
- GV_LIBDIR = /usr/local/lib/gv/
- GV_MANDIR = /usr/local/man/man1/
+ SHAREDIR ?= $(LIBDIR)
+ GV_BINDIR = $(BINDIR)/
+ GV_DOCDIR = /usr/share/doc/packages/gv/
+ GV_LIBDIR = $(SHAREDIR)/gv/
+ GV_MANDIR = $(MANPATH)/man1/
+
+XCOMM --------------------------------------------------------------------
+XCOMM --- Don not use private functions of Xaw or Xaw3d
+XCOMM --------------------------------------------------------------------
+XCOMM #define USE_STANDARD_XAW
XCOMM --------------------------------------------------------------------
XCOMM --- The name of the Xaw3d library.
XCOMM --------------------------------------------------------------------
XCOMM XAWLIB = -lXaw
- XAWLIB = -lXaw3d
+XAWLIB = -lXaw3d
XCOMM --------------------------------------------------------------------
XCOMM As far as the Xaw3d header files are concerned it is by
@@ -57,6 +63,7 @@
XCOMM ln -s /home/aaa/Xaw3d Xaw3d
XCOMM --------------------------------------------------------------------
XCOMM XAW3D_HEADERS = -I/home/aaa/Xaw3d
+XAW3D_HEADERS = -I/usr/include
XCOMM --------------------------------------------------------------------
XCOMM Print Command
@@ -100,7 +107,7 @@
XCOMM --------------------------------------------------------------------
XCOMM --- Use gv's own Motif like scrollbar.
XCOMM --------------------------------------------------------------------
-#define USE_SCROLLBAR_CODE
+XCOMM #define USE_SCROLLBAR_CODE
XCOMM --------------------------------------------------------------------
XCOMM --- Compile style files into the executable.
@@ -121,6 +128,7 @@
XCOMM CCOPTIONS = -ansi -pedantic -Wall
XCOMM CDEBUGFLAGS =
XCOMM LDPOSTLIB =
+CCOPTIONS = -O2 -pipe
XCOMM ####################################################################
XCOMM ##### Architecture specific settings
--- source/Ghostview.c
+++ source/Ghostview.c 2006-02-28 15:49:27.000000000 +0100
@@ -1325,7 +1325,15 @@
}
argv[argc++] = "-dNOPAUSE";
if (gvw->ghostview.quiet) argv[argc++] = "-dQUIET";
- if (gvw->ghostview.safer) argv[argc++] = "-dSAFER";
+ if (gvw->ghostview.safer) {
+ argv[argc++] = "-dSAFER";
+# ifdef ALLOW_PDF
+ /* The file created by pdf2dsc opens the original
+ pdf file with the read operator. */
+ if (gv_filename_dsc && (!gvw->ghostview.filename || !strcmp(gvw->ghostview.filename,"-")))
+ argv[argc++] = "-dDELAYSAFER";
+ }
+# endif
if (gvw->ghostview.arguments) {
cptr = arguments = GV_XtNewString(gvw->ghostview.arguments);
while (isspace(*cptr)) cptr++;
--- source/Imakefile
+++ source/Imakefile 2006-02-28 15:49:27.000000000 +0100
@@ -213,7 +213,7 @@
#endif /* InstallProgram */
MANDIR=$(GV_MANDIR)
-ComplexProgramTarget(gv)
+ComplexProgramTargetNoMan(gv)
InstallNonExec($(GV_SYSTEM_AD),$(GV_LIBDIR))
InstallNonExec($(GV_USER_AD),$(GV_LIBDIR))
InstallNonExec($(GV_CLASS_AD),$(GV_LIBDIR))
--- source/gv_misc_res.dat
+++ source/gv_misc_res.dat 2006-02-28 15:49:27.000000000 +0100
@@ -50,7 +50,7 @@
GV*Scrollbar.pointerColor: black
GV*Scrollbar.pointerColorBackground: White
GV*Scrollbar.scrollbarBackground: gray71
-GV*Scrollbar.foreground: gray78
+GV*Scrollbar.foreground: gray65
GV*optionsetupPopup*Text*Scrollbar.background:gray71
GV*optionfsPopup*Text*Scrollbar.background:gray71
--- source/misc.c
+++ source/misc.c 2006-02-28 15:49:27.000000000 +0100
@@ -1435,7 +1435,8 @@
else if ( no == O_LANDSCAPE) w = landscapeEntry;
else if ( no == O_UPSIDEDOWN) w = upsidedownEntry;
else w = seascapeEntry;
- set_newBitmapIfChanged(w,bitmap);
+ if (w)
+ set_newBitmapIfChanged(w,bitmap);
if (gv_swap_landscape != gv_swap_landscape_old)
widgets_setSelectedBitmap(swapEntry,gv_swap_landscape);
@@ -1467,12 +1468,15 @@
Widget w;
if (pagemediaEntry[media_id]) w = pagemediaEntry[media_id];
else w = pagemediaEntry[media_id-1];
+ if (!w)
+ goto out;
XtSetArg(args[0], XtNlabel, &s);
XtGetValues(w, args, ONE);
}
else s = "?";
XtSetArg(args[0], XtNlabel, s);
XtSetValues(pagemediaButton, args, ONE);
+out:
ENDMESSAGE(set_pagemediaButton_label)
}
@@ -1541,7 +1545,8 @@
else bitmap = app_res.selected_bitmap;
if (pagemediaEntry[gv_pagemedia]) w = pagemediaEntry[gv_pagemedia];
else w = pagemediaEntry[gv_pagemedia-1];
- set_newBitmapIfChanged(w,bitmap);
+ if (w)
+ set_newBitmapIfChanged(w,bitmap);
}
if (gv_pagemedia_auto != gv_pagemedia_auto_old) widgets_setSelectedBitmap(autoMediaEntry,gv_pagemedia_auto);
--- source/paths.h
+++ source/paths.h 2006-02-28 15:49:27.000000000 +0100
@@ -34,9 +34,9 @@
# define INC_XMU(aaa) <XMU_DIRECTORY/aaa>
# define INC_XAW(aaa) <XAW_DIRECTORY/aaa>
#else
-# define INC_X11(aaa) <X11/##aaa##>
-# define INC_XMU(aaa) <X11/Xmu/##aaa##>
-# define INC_XAW(aaa) <X11/Xaw3d/##aaa##>
+# define INC_X11(aaa) <X11/aaa>
+# define INC_XMU(aaa) <X11/Xmu/aaa>
+# define INC_XAW(aaa) <X11/Xaw3d/aaa>
#endif
#endif /* _PATHS_H_ */
--- source/process.c
+++ source/process.c 2006-02-28 15:50:00.000000000 +0100
@@ -272,7 +272,7 @@
pid = fork();
if (pid == 0) { /* child */
- char *argv[3];
+ char *argv[4];
char *c;
INFMESSAGE(child process)

3
gv-3.5.8.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0a96115c3f9bb76cbb851b94570cef726f1c597f5683f9cf95e8b016a66d67e1
size 314416

885
gv-3.5.8-I18N-mb.patch → gv-3.6.3-I18N-mb.patch
View File

File diff suppressed because it is too large Load Diff

103
gv-3.6.3-bzip2.patch Normal file
View File

@ -0,0 +1,103 @@
--- configure.ac
+++ configure.ac 2008-03-27 14:41:36.332982541 +0100
@@ -49,6 +49,25 @@ dnl Search for libraries
AC_CHECK_LIB(m, sqrt)
AC_CHECK_LIB(fl, yywrap)
+#
+# Check for zlib and libbz2 libraries to use this together
+# with SuSE's libzio to open compressed info files.
+#
+AC_CHECK_HEADER(zlib.h,[
+ for lib in z gz
+ do
+ AC_CHECK_LIB($lib, gzopen, [LIBS="$LIBS -l$lib" ; break])
+ done])
+AC_CHECK_HEADER(bzlib.h,[
+ for lib in bz2 bzip2
+ do
+ AC_CHECK_LIB($lib, BZ2_bzopen, [LIBS="$LIBS -l$lib" ; break])
+ done])
+AC_CHECK_HEADER(zio.h,[
+ AC_CHECK_LIB(zio, fzopen, [LIBS="$LIBS -lzio" ; AC_DEFINE(HAVE_ZIO)])
+ ])
+
+
AC_PATH_XTRA()
AC_CHECK_LIB(X11, XOpenDisplay, , , $X_LIBS)
AC_CHECK_LIB(ICE, main, , , $X_LIBS)
@@ -229,4 +248,4 @@ AM_CONDITIONAL(USE_MEMDEBUG_CODE, test x
dnl Generate output files
-AC_OUTPUT(Makefile doc/version.texi lib/Makefile src/Makefile doc/Makefile)
\ No newline at end of file
+AC_OUTPUT(Makefile doc/version.texi lib/Makefile src/Makefile doc/Makefile)
--- src/ac_config.h.in
+++ src/ac_config.h.in 2008-03-27 14:43:32.755968935 +0100
@@ -142,3 +142,6 @@
/* Define to rpl_ if the getopt replacement functions and variables should be
used. */
#undef __GETOPT_PREFIX
+
+/* Define to 1 if you have libzio for opening compressed info files */
+#undef HAVE_ZIO
--- src/ps.c
+++ src/ps.c 2008-03-27 15:33:19.813097964 +0100
@@ -65,8 +65,15 @@
#include <stdio.h>
#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include <string.h>
+#include <ac_config.h>
+
+#ifdef HAVE_ZIO
+# include <zio.h>
+#endif
#ifndef SEEK_SET
#define SEEK_SET 0
@@ -93,7 +100,7 @@ extern Media *gv_medias;
#define memset(a,b,c) bzero(a,c)
#endif
-extern int sec_scanf(const char *, const char *, ...);
+extern int sec_sscanf(const char *, const char *, ...);
/* We use this helper function for providing proper */
/* case and colon :-) insensitive DSC matching */
@@ -388,6 +395,7 @@ psscan(fileP,filename,filename_raw,filen
cmd_uncompress=NULL;
}
}
+#ifndef HAVE_ZIO
if (cmd_uncompress) {
struct document *retval = NULL;
FILE *tmpfile = (FILE*)NULL;
@@ -441,6 +449,23 @@ unc_ok:
*filename_uncP = (char*)GV_XtNewString(filename_unc);
goto unc_ok;
}
+#else
+ if (cmd_uncompress) {
+ FILE *zfile = fzopen(filename, "r");
+ INFMESSAGE(is compressed)
+ if (!zfile) {
+ char s[512];
+ sprintf(s,"Uncompressing of\n%s\nfailed.",filename);
+ NotePopupShowMessage(s);
+ ENDMESSAGE(psscan)
+ return(NULL);
+ }
+ fclose(*fileP);
+ *fileP = zfile;
+ cmd_uncompress = NULL;
+ *filename_uncP = NULL;
+ }
+#endif
respect_eof = (scanstyle & SCANSTYLE_IGNORE_EOF) ? 0 : 1;
ignore_dsc = (scanstyle & SCANSTYLE_IGNORE_DSC) ? 1 : 0;

3645
gv-3.6.3-deb.patch Normal file
View File

File diff suppressed because it is too large Load Diff

136
intptr_t.patch → gv-3.6.3-intptr_t.patch
View File

@ -1,14 +1,14 @@
--- gv-3.5.8/source/FileSel.c 1997-06-07 00:00:00.000000000 +0200
+++ gv-3.5.8.new/source/FileSel.c 2004-04-30 16:35:07.317969358 +0200
@@ -35,6 +35,7 @@
--- src/FileSel.c
+++ src/FileSel.c 2008-03-27 17:10:04.806005718 +0100
@@ -40,6 +40,7 @@
#include <stdlib.h> /* for malloc etc.*/
#include <ctype.h> /* for toupper */
#include <stdio.h>
+#include <stdint.h>
#ifdef VMS
# include <unixio.h> /* for chdir etc. */
@@ -1085,9 +1086,9 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -1045,9 +1046,9 @@ static void FS_listAction(w, event, para
if (!scrolling) {
int entry = VlistEntryOfPosition(list,(int)event->xbutton.y);
if (entry >=0 && entry < VlistEntries(list)) {
@ -21,39 +21,39 @@
}
}
}
@@ -1753,7 +1754,7 @@
@@ -1660,7 +1661,7 @@ TopDirSelectionProc(w, client_data, call
XtPointer client_data, call_data;
{
FS_WIDGET XtParent(XtParent(XtParent(XtParent(w))));
- int item = (int) call_data;
+ int item = (intptr_t) call_data;
+ intptr_t item = (intptr_t) call_data;
char newpath[FS_MAXNAMLEN];
BEGINMESSAGE(TopDirSelectionProc)
@@ -1799,7 +1800,7 @@
@@ -1706,7 +1707,7 @@ CurDirSelectionProc(w, client_data, call
{
FS_WIDGET XtParent(XtParent(XtParent(XtParent(w))));
char name[10];
- int item = (int) call_data;
+ int item = (intptr_t) call_data;
+ intptr_t item = (intptr_t) call_data;
BEGINMESSAGE(CurDirSelectionProc)
@@ -1841,7 +1842,7 @@
@@ -1748,7 +1749,7 @@ SubDirSelectionProc(w, client_data, call
Widget w;
XtPointer client_data, call_data;
{
- int item = (int)call_data;
+ int item = (intptr_t)call_data;
+ intptr_t item = (intptr_t)call_data;
FS_WIDGET XtParent(XtParent(XtParent(XtParent(w))));
char newpath[FS_MAXNAMLEN];
@@ -1946,14 +1947,14 @@
@@ -1845,14 +1846,14 @@ SMESSAGE(XtName(p))
{
Widget clip=NULL,aaa=NULL,scroll=NULL;
FS_WIDGET p;
- int style = (int)client_data;
+ int style = (intptr_t)client_data;
+ intptr_t style = (intptr_t)client_data;
if (s[0] == 'c') { clip = FS_CURCLIP; aaa = FS_CURAAA; scroll = FS_CURSCROLL; }
else if (s[0] == 's') { clip = FS_SUBCLIP; aaa = FS_SUBAAA; scroll = FS_SUBSCROLL; }
else style=0;
@ -65,9 +65,9 @@
else y = (int)(-*((float*)call_data) * aaa->core.height);
ClipWidgetSetCoordinates(clip, x, y);
} else if (style == SCROLL_CLIPREPORT) {
--- gv-3.5.8/source/actions.c 1997-06-21 00:00:00.000000000 +0200
+++ gv-3.5.8.new/source/actions.c 2004-04-30 16:35:07.317969358 +0200
@@ -36,6 +36,7 @@
--- src/actions.c
+++ src/actions.c 2004-04-30 16:35:07.000000000 +0200
@@ -40,6 +40,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
@ -75,7 +75,7 @@
#include "paths.h"
#include INC_X11(Intrinsic.h)
@@ -897,7 +898,7 @@
@@ -897,7 +898,7 @@ action_setPageMark(w, event, params, num
else if (!strcmp(params[1],mark)) spm=spm|SPM_MARK;
else spm=spm|SPM_UNMARK;
@ -84,7 +84,7 @@
ENDMESSAGE(action_setPageMark)
}
@@ -945,7 +946,7 @@
@@ -945,7 +946,7 @@ action_setScale(w, event, params, num_pa
if (i<0) i = (-i)|SCALE_MIN;
i |= SCALE_REL;
}
@ -93,7 +93,7 @@
ENDMESSAGE(action_setScale)
}
@@ -971,7 +972,7 @@
@@ -971,7 +972,7 @@ action_setOrientation(w, event, params,
return;
}
o = doc_convStringToDocOrient(params[0]);
@ -102,7 +102,7 @@
ENDMESSAGE(action_setOrientation)
}
@@ -999,7 +1000,7 @@
@@ -999,7 +1000,7 @@ action_setPagemedia(w, event, params, nu
}
m = doc_convStringToPageMedia(doc,params[0]);
@ -111,9 +111,9 @@
ENDMESSAGE(action_setPagemedia)
}
--- gv-3.5.8/source/callbacks.c 2004-04-30 16:29:44.124745274 +0200
+++ gv-3.5.8.new/source/callbacks.c 2004-04-30 16:35:07.318969151 +0200
@@ -36,6 +36,7 @@
--- src/callbacks.c
+++ src/callbacks.c 2008-03-27 17:13:48.466712393 +0100
@@ -40,6 +40,7 @@
#include <stdlib.h>
#include <time.h>
#include <ctype.h>
@ -121,36 +121,38 @@
#ifndef BUFSIZ
# define BUFSIZ 1024
@@ -150,8 +151,8 @@
@@ -152,9 +153,9 @@ cb_newtocScrollbar(w, client_data, call_
BEGINMESSAGE(cb_newtocScrollbar)
x = (int) newtocControl->core.x;
- if (((int)client_data)==1) {
- int dy = (int)call_data;
- y = (int) newtocControl->core.y - dy;
+ if (((intptr_t)client_data)==1) {
+ int dy = (intptr_t)call_data;
y = (int) newtocControl->core.y - dy;
+ intptr_t dy = (intptr_t)call_data;
+ y = (int)((intptr_t) newtocControl->core.y - dy);
} else {
float *percent = (float *) call_data;
@@ -260,7 +261,7 @@
y = (int)(-*percent * newtocControl->core.height);
@@ -262,7 +263,7 @@ void cb_useBackingPixmap(w, client_data,
Widget w;
XtPointer client_data, call_data;
{
- int i = (int)client_data;
+ int i = (intptr_t)client_data;
+ intptr_t i = (intptr_t)client_data;
BEGINMESSAGE(cb_useBackingPixmap)
if (i&1) {
@@ -364,7 +365,7 @@
@@ -366,7 +367,7 @@ cb_checkFile(w, client_data, call_data)
int changed;
BEGINMESSAGE(cb_checkFile)
- changed = check_file(((int)client_data));
+ changed = check_file(((intptr_t)client_data));
if (changed==1) show_page(current_page,NULL);
ENDMESSAGE(cb_checkFile)
}
@@ -386,7 +387,7 @@
if (changed==1)
{
cb_stopInterpreter(page,NULL,NULL);
@@ -392,7 +393,7 @@ static void watch_file (client_data, idp
BEGINMESSAGE(watch_file)
/* notification after timeout */
@ -159,7 +161,7 @@
if (!file_fileIsNotUseful(gv_filename)) {
int error;
String s;
@@ -506,7 +507,7 @@
@@ -509,7 +510,7 @@ cb_print(w, client_data, call_data)
return;
}
@ -168,7 +170,7 @@
pagelist=get_pagelist(&gv_print_mode);
if (pagelist) GV_XtFree(pagelist);
if (gv_print_mode==PAGE_MODE_INVALID) {
@@ -624,7 +625,7 @@
@@ -627,7 +628,7 @@ cb_save(w, client_data, call_data)
BEGINMESSAGE(cb_save)
@ -177,8 +179,12 @@
pagelist=get_pagelist(&gv_save_mode);
if (pagelist) GV_XtFree(pagelist);
if (gv_save_mode==PAGE_MODE_INVALID) {
@@ -708,7 +709,7 @@
int type;
@@ -708,10 +709,10 @@ cb_doSave(w, client_data, call_data)
String name;
String error=NULL;
char *pagelist;
- int type;
+ intptr_t type;
BEGINMESSAGE(cb_doSave)
- if (client_data) type = (int)client_data;
@ -186,7 +192,7 @@
else type = FILE_TYPE_PS;
name = XawFileSelectionGetPath(FileSel);
@@ -929,7 +930,7 @@
@@ -932,7 +933,7 @@ cb_positionPage(w, client_data, call_dat
cow = (int)control->core.width;
coh = (int)control->core.height;
@ -195,54 +201,58 @@
if (!center) have_pagepos=misc_restorePagePosition(&px,&py);
if (app_res.auto_center == True) center = True;
@@ -970,7 +971,7 @@
@@ -973,7 +974,7 @@ cb_setPageMark(w, client_data, call_data
Widget w;
XtPointer client_data, call_data;
{
- int r=(int)client_data;
+ int r=(intptr_t)client_data;
+ intptr_t r = (intptr_t)client_data;
int entry=XawVlistInvalid,change=XawVlistInvalid;
BEGINMESSAGE(cb_setPageMark)
@@ -1023,7 +1024,7 @@
@@ -1026,10 +1027,10 @@ cb_setScale(w, client_data, call_data)
Widget w;
XtPointer client_data, call_data;
{
- int i=(int)client_data;
+ int i=(intptr_t)client_data;
+ intptr_t i=(intptr_t)client_data;
BEGINMESSAGE(cb_setScale)
i = scale_checkScaleNum(gv_scales,i);
@@ -1048,7 +1049,7 @@
- i = scale_checkScaleNum(gv_scales,i);
+ i = scale_checkScaleNum(gv_scales, (int)i);
if (i>=0) {
if (i&SCALE_BAS) gv_scale_base = i&SCALE_VAL;
else gv_scale = i&SCALE_VAL;
@@ -1051,7 +1052,7 @@ cb_setOrientation(w, client_data, call_d
Widget w;
XtPointer client_data, call_data;
{
- int o = (int) client_data;
+ int o = (intptr_t) client_data;
+ intptr_t o = (intptr_t) client_data;
int changed = 1;
BEGINMESSAGE(cb_setOrientation)
@@ -1094,7 +1095,7 @@
@@ -1097,7 +1098,7 @@ cb_setPagemedia(w, client_data, call_dat
Widget w;
XtPointer client_data, call_data;
{
- int media = (int)client_data;
+ int media = (intptr_t)client_data;
+ intptr_t media = (intptr_t)client_data;
int media_bbox = doc ? doc->nummedia : 0;
BEGINMESSAGE(cb_setPagemedia)
--- gv-3.5.8/source/main.c 2004-04-30 16:33:43.972188696 +0200
+++ gv-3.5.8.new/source/main.c 2004-04-30 16:36:16.194740767 +0200
--- src/main.c
+++ src/main.c 2004-04-30 16:36:16.000000000 +0200
@@ -72,6 +72,8 @@
# include <unistd.h>
#endif
#include <sys/stat.h>
#include <unistd.h>
+#include <stdint.h>
+
#include "types.h"
#include "actions.h"
#include "callbacks.h"
@@ -1038,8 +1040,8 @@
@@ -1349,8 +1351,8 @@ void main_createScaleMenu()
have_line=True;
}
scaleEntry[i] = XtCreateManagedWidget(gv_scales[i]->name, smeBSBObjectClass,scaleMenu,args,n);
@ -253,9 +263,9 @@
}
ENDMESSAGE(main_createScaleMenu)
}
--- gv-3.5.8/source/misc.c 1997-06-21 00:00:00.000000000 +0200
+++ gv-3.5.8.new/source/misc.c 2004-04-30 16:35:07.370958411 +0200
@@ -64,6 +64,7 @@
--- src/misc.c
+++ src/misc.c 2004-04-30 16:35:07.000000000 +0200
@@ -65,6 +65,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@ -263,7 +273,7 @@
#ifndef SEEK_SET
# define SEEK_SET 0
@@ -1647,7 +1648,7 @@
@@ -1555,7 +1556,7 @@ void misc_buildPagemediaMenu()
if (doc && doc->nummedia) {
for (i = 0; i < doc->nummedia; i++) {
pagemediaEntry[i] = XtCreateManagedWidget(doc->media[i].name,smeBSBObjectClass, pagemediaMenu,NULL,(Cardinal)0);
@ -272,7 +282,7 @@
}
w = XtCreateManagedWidget("line", smeLineObjectClass, pagemediaMenu,NULL,(Cardinal)0);
}
@@ -1657,7 +1658,7 @@
@@ -1565,7 +1566,7 @@ void misc_buildPagemediaMenu()
if (!(gv_medias[i]->used)) continue;
pagemediaEntry[i+num_doc_media] =
XtCreateManagedWidget(gv_medias[i]->name,smeBSBObjectClass, pagemediaMenu,NULL,(Cardinal)0);
@ -281,9 +291,9 @@
}
{
Boolean b = (doc_mediaIsOk(doc,current_page,num_doc_media) ? True : False);
--- gv-3.5.8/source/options_gv.c 1997-06-07 00:00:00.000000000 +0200
+++ gv-3.5.8.new/source/options_gv.c 2004-04-30 16:35:07.374957585 +0200
@@ -35,6 +35,7 @@
--- src/options_gv.c
+++ src/options_gv.c 2004-04-30 16:35:07.000000000 +0200
@@ -40,6 +40,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@ -291,7 +301,7 @@
#include "paths.h"
#include INC_X11(Intrinsic.h)
@@ -251,7 +252,7 @@
@@ -252,7 +253,7 @@ static void options_gv_cb_apply(w, clien
k = gv_pagemedia;
gv_pagemedia_auto = 0;
i = doc_convStringToPageMedia(doc,app_res.default_pagemedia);
@ -300,7 +310,7 @@
if ((j != gv_pagemedia_auto) || (k != gv_pagemedia)) redisplay = True;
}
s_media = True;
@@ -276,7 +277,7 @@
@@ -277,7 +278,7 @@ static void options_gv_cb_apply(w, clien
j = gv_orientation_auto;
k = gv_orientation;
gv_orientation_auto = 0;

940
gv-3.6.3-security.patch Normal file
View File

@ -0,0 +1,940 @@
--- src/Makefile.am
+++ src/Makefile.am 2008-03-27 14:10:24.644359171 +0100
@@ -123,6 +123,7 @@ gv_SOURCES = Aaa.c \
save.h \
scale.c \
scale.h \
+ secscanf.c \
gv_signal.c \
gv_signal.h \
version.c \
--- src/Makefile.in
+++ src/Makefile.in 2008-03-27 14:18:31.898867989 +0100
@@ -79,13 +79,13 @@ am__gv_SOURCES_DIST = Aaa.c Aaa_bison.c
options_gs.c options_gs.h options_gv.c options_gv.h \
options_setup.c options_setup.h paths.h process.c process.h \
popup.c popup.h ps.c ps.h resource.c resource.h save.c save.h \
- scale.c scale.h gv_signal.c gv_signal.h version.c version.h \
- versionp.h widgets_misc.c widgets_misc.h zoom.c zoom.h stdc.h \
- Aaa_intern.h Aaa.h AaaP.h d_memdebug.h d_aaa_xtmem.h \
- d_fs_xtmem.h d_gv_mem.h d_gv_xtmem.h d_proc_xtmem.h d_ps_mem.h \
- d_ps_xtmem.h gv_message.h types.h Scrollbar.c Scrollbar.h \
- ScrollbarP.h setenv.c setenv.h getenv.c d_mem.c d_mem.h \
- d_xtmem.c d_xtmem.h
+ scale.c scale.h secscanf.c gv_signal.c gv_signal.h version.c \
+ version.h versionp.h widgets_misc.c widgets_misc.h zoom.c \
+ zoom.h stdc.h Aaa_intern.h Aaa.h AaaP.h d_memdebug.h \
+ d_aaa_xtmem.h d_fs_xtmem.h d_gv_mem.h d_gv_xtmem.h \
+ d_proc_xtmem.h d_ps_mem.h d_ps_xtmem.h gv_message.h types.h \
+ Scrollbar.c Scrollbar.h ScrollbarP.h setenv.c setenv.h \
+ getenv.c d_mem.c d_mem.h d_xtmem.c d_xtmem.h
@USE_SCROLLBAR_CODE_TRUE@am__objects_1 = Scrollbar.$(OBJEXT)
@USE_SETENV_CODE_TRUE@am__objects_2 = setenv.$(OBJEXT) \
@USE_SETENV_CODE_TRUE@ getenv.$(OBJEXT)
@@ -103,9 +103,9 @@ am_gv_OBJECTS = Aaa.$(OBJEXT) Aaa_bison.
options_fs.$(OBJEXT) options_gs.$(OBJEXT) options_gv.$(OBJEXT) \
options_setup.$(OBJEXT) process.$(OBJEXT) popup.$(OBJEXT) \
ps.$(OBJEXT) resource.$(OBJEXT) save.$(OBJEXT) scale.$(OBJEXT) \
- gv_signal.$(OBJEXT) version.$(OBJEXT) widgets_misc.$(OBJEXT) \
- zoom.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
- $(am__objects_3)
+ secscanf.$(OBJEXT) gv_signal.$(OBJEXT) version.$(OBJEXT) \
+ widgets_misc.$(OBJEXT) zoom.$(OBJEXT) $(am__objects_1) \
+ $(am__objects_2) $(am__objects_3)
gv_OBJECTS = $(am_gv_OBJECTS)
gv_LDADD = $(LDADD)
gv_DEPENDENCIES = $(top_srcdir)/lib/libgnu.a
@@ -261,8 +261,8 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-dist_pkglib_DATA = gv_system.ad gv_user.ad gv_class.ad gv_spartan.dat gv_user_res.dat gv_copyright.dat gv_widgetless.dat
-appdefaultsdir = /etc/X11/app-defaults
+dist_pkglib_DATA = gv_system.ad gv_user.ad gv_class.ad gv_spartan.dat gv_user_res.dat gv_copyright.dat
+appdefaultsdir = $(pkglibdir)
appdefaults_DATA = GV
EXTRA_DIST = ad2c gv_font_res.dat gv_layout_res.dat gv_misc_res.dat Aaa_bison.yacc \
gv_current.xbm gv_doc.xbm gv_empty.xbm gv_even.xbm gv_icon.xbm gv_odd.xbm \
@@ -303,9 +303,9 @@ gv_SOURCES = Aaa.c Aaa_bison.c Aaa_bison
options_gs.c options_gs.h options_gv.c options_gv.h \
options_setup.c options_setup.h paths.h process.c process.h \
popup.c popup.h ps.c ps.h resource.c resource.h save.c save.h \
- scale.c scale.h gv_signal.c gv_signal.h version.c version.h \
- versionp.h widgets_misc.c widgets_misc.h zoom.c zoom.h \
- message.h stdc.h Aaa_intern.h Aaa.h AaaP.h d_memdebug.h \
+ scale.c scale.h secscanf.c gv_signal.c gv_signal.h version.c \
+ version.h versionp.h widgets_misc.c widgets_misc.h zoom.c \
+ zoom.h message.h stdc.h Aaa_intern.h Aaa.h AaaP.h d_memdebug.h \
d_aaa_xtmem.h d_fs_xtmem.h d_gv_mem.h d_gv_xtmem.h \
d_proc_xtmem.h d_ps_mem.h d_ps_xtmem.h gv_message.h types.h \
$(am__append_1) $(am__append_2) $(am__append_3)
@@ -436,6 +436,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resource.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/save.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scale.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secscanf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setenv.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/widgets_misc.Po@am__quote@
@@ -746,7 +747,7 @@ $(srcdir)/gv_make_res.dat :
@echo "GV.useBackingPixmap: $(USE_BACKING_PIXMAP)" >> $(srcdir)/gv_make_res.dat
@echo "GV*dirs: Home\n\\" >> $(srcdir)/gv_make_res.dat
@echo " Tmp\n\\" >> $(srcdir)/gv_make_res.dat
- @echo " /usr/share/doc\n\\" >> $(srcdir)/gv_make_res.dat
+ @echo " /usr/doc\n\\" >> $(srcdir)/gv_make_res.dat
@echo " /usr/local/doc" >> $(srcdir)/gv_make_res.dat
@echo "GV*filter: no .*" >> $(srcdir)/gv_make_res.dat
@echo "GV*filters: None\n\\" >> $(srcdir)/gv_make_res.dat
--- src/ps.c
+++ src/ps.c 2008-03-27 14:20:04.186703895 +0100
@@ -93,6 +93,10 @@ extern Media *gv_medias;
#define memset(a,b,c) bzero(a,c)
#endif
+extern int sec_sscanf(const char *, const char *, ...);
+
+
+
/* We use this helper function for providing proper */
/* case and colon :-) insensitive DSC matching */
static int dsc_strncmp(s1, s2, n)
@@ -464,7 +468,7 @@ unc_ok:
doc = (struct document *) PS_malloc(sizeof(struct document));
CHECK_MALLOCED(doc);
memset(doc, 0, sizeof(struct document));
- sscanf(line, "%*s %256s", text);
+ sec_sscanf(line, "%*s %256s", text);
/*###jp###*/
/*doc->epsf = iscomment(text, "EPSF-");*/
doc->epsf = iscomment(text, "EPSF");
@@ -560,11 +564,11 @@ scan_ok:
} else if (doc->date == NULL && iscomment(line+2, "CreationDate:")) {
doc->date = gettextline(line+length("%%CreationDate:"));
} else if (bb_set == NONE && iscomment(line+2, "BoundingBox:")) {
- sscanf(line+length("%%BoundingBox:"), "%256s", text);
+ sec_sscanf(line+length("%%BoundingBox:"), "%256s", text);
if (strcmp(text, "(atend)") == 0) {
bb_set = ATEND;
} else {
- if (sscanf(line+length("%%BoundingBox:"), "%d %d %d %d",
+ if (sec_sscanf(line+length("%%BoundingBox:"), "%d %d %d %d",
&(doc->boundingbox[LLX]),
&(doc->boundingbox[LLY]),
&(doc->boundingbox[URX]),
@@ -572,7 +576,7 @@ scan_ok:
bb_set = 1;
else {
float fllx, flly, furx, fury;
- if (sscanf(line+length("%%BoundingBox:"), "%f %f %f %f",
+ if (sec_sscanf(line+length("%%BoundingBox:"), "%f %f %f %f",
&fllx, &flly, &furx, &fury) == 4) {
bb_set = 1;
doc->boundingbox[LLX] = fllx;
@@ -592,7 +596,7 @@ scan_ok:
}
} else if (orientation_set == NONE &&
iscomment(line+2, "Orientation:")) {
- sscanf(line+length("%%Orientation:"), "%256s", text);
+ sec_sscanf(line+length("%%Orientation:"), "%256s", text);
if (strcmp(text, "(atend)") == 0) {
orientation_set = ATEND;
} else if (strcmp(text, "Portrait") == 0) {
@@ -603,7 +607,7 @@ scan_ok:
orientation_set = 1;
}
} else if (page_order_set == NONE && iscomment(line+2, "PageOrder:")) {
- sscanf(line+length("%%PageOrder:"), "%256s", text);
+ sec_sscanf(line+length("%%PageOrder:"), "%256s", text);
if (strcmp(text, "(atend)") == 0) {
page_order_set = ATEND;
} else if (strcmp(text, "Ascend") == 0) {
@@ -617,11 +621,11 @@ scan_ok:
page_order_set = 1;
}
} else if (pages_set == NONE && iscomment(line+2, "Pages:")) {
- sscanf(line+length("%%Pages:"), "%256s", text);
+ sec_sscanf(line+length("%%Pages:"), "%256s", text);
if (strcmp(text, "(atend)") == 0) {
pages_set = ATEND;
} else {
- switch (sscanf(line+length("%%Pages:"), "%d %d",
+ switch (sec_sscanf(line+length("%%Pages:"), "%d %d",
&maxpages, &i)) {
case 2:
if (page_order_set == NONE) {
@@ -653,7 +657,7 @@ scan_ok:
doc->media[0].name = ps_gettext(line+length("%%DocumentMedia:"),
&next_char);
if (doc->media[0].name != NULL) {
- if (sscanf(next_char, "%f %f", &w, &h) == 2) {
+ if (sec_sscanf(next_char, "%f %f", &w, &h) == 2) {
doc->media[0].width = w + 0.5;
doc->media[0].height = h + 0.5;
}
@@ -674,7 +678,7 @@ scan_ok:
doc->media[doc->nummedia].name = ps_gettext(line+length("%%+"),
&next_char);
if (doc->media[doc->nummedia].name != NULL) {
- if (sscanf(next_char, "%f %f", &w, &h) == 2) {
+ if (sec_sscanf(next_char, "%f %f", &w, &h) == 2) {
doc->media[doc->nummedia].width = w + 0.5;
doc->media[doc->nummedia].height = h + 0.5;
}
@@ -837,7 +841,7 @@ scan_ok:
/* Do nothing */
} else if (doc->default_page_orientation == NONE &&
iscomment(line+2, "PageOrientation:")) {
- sscanf(line+length("%%PageOrientation:"), "%256s", text);
+ sec_sscanf(line+length("%%PageOrientation:"), "%256s", text);
if (strcmp(text, "Portrait") == 0) {
doc->default_page_orientation = PORTRAIT;
} else if (strcmp(text, "Landscape") == 0) {
@@ -856,7 +860,7 @@ scan_ok:
PS_free(cp);
} else if (page_bb_set == NONE &&
iscomment(line+2, "PageBoundingBox:")) {
- if (sscanf(line+length("%%PageBoundingBox:"), "%d %d %d %d",
+ if (sec_sscanf(line+length("%%PageBoundingBox:"), "%d %d %d %d",
&(doc->default_page_boundingbox[LLX]),
&(doc->default_page_boundingbox[LLY]),
&(doc->default_page_boundingbox[URX]),
@@ -864,7 +868,7 @@ scan_ok:
page_bb_set = 1;
else {
float fllx, flly, furx, fury;
- if (sscanf(line+length("%%PageBoundingBox:"), "%f %f %f %f",
+ if (sec_sscanf(line+length("%%PageBoundingBox:"), "%f %f %f %f",
&fllx, &flly, &furx, &fury) == 4) {
page_bb_set = 1;
doc->default_page_boundingbox[LLX] = fllx;
@@ -959,7 +963,7 @@ scan_ok:
/* Do nothing */
} else if (doc->default_page_orientation == NONE &&
iscomment(line+2, "PageOrientation:")) {
- sscanf(line+length("%%PageOrientation:"), "%256s", text);
+ sec_sscanf(line+length("%%PageOrientation:"), "%256s", text);
if (strcmp(text, "Portrait") == 0) {
doc->default_page_orientation = PORTRAIT;
} else if (strcmp(text, "Landscape") == 0) {
@@ -982,7 +986,7 @@ scan_ok:
PS_free(cp);
} else if (page_bb_set == NONE &&
iscomment(line+2, "PageBoundingBox:")) {
- if (sscanf(line+length("%%PageBoundingBox:"), "%d %d %d %d",
+ if (sec_sscanf(line+length("%%PageBoundingBox:"), "%d %d %d %d",
&(doc->default_page_boundingbox[LLX]),
&(doc->default_page_boundingbox[LLY]),
&(doc->default_page_boundingbox[URX]),
@@ -990,7 +994,7 @@ scan_ok:
page_bb_set = 1;
else {
float fllx, flly, furx, fury;
- if (sscanf(line+length("%%PageBoundingBox:"), "%f %f %f %f",
+ if (sec_sscanf(line+length("%%PageBoundingBox:"), "%f %f %f %f",
&fllx, &flly, &furx, &fury) == 4) {
page_bb_set = 1;
doc->default_page_boundingbox[LLX] = fllx;
@@ -1058,7 +1062,7 @@ newpage:
CHECK_MALLOCED(doc->pages);
}
label = ps_gettext(line+length("%%Page:"), &next_char);
- if (sscanf(next_char, "%d", &thispage) != 1) thispage = 0;
+ if (sec_sscanf(next_char, "%d", &thispage) != 1) thispage = 0;
if (nextpage == 1) {
ignore = thispage != 1;
}
@@ -1096,7 +1100,7 @@ continuepage:
/* Do nothing */
} else if (doc->pages[doc->numpages].orientation == NONE &&
iscomment(line+2, "PageOrientation:")) {
- sscanf(line+length("%%PageOrientation:"), "%256s", text);
+ sec_sscanf(line+length("%%PageOrientation:"), "%256s", text);
if (strcmp(text, "Portrait") == 0) {
doc->pages[doc->numpages].orientation = PORTRAIT;
} else if (strcmp(text, "Landscape") == 0) {
@@ -1128,11 +1132,11 @@ continuepage:
PS_free(cp);
} else if ((page_bb_set == NONE || page_bb_set == ATEND) &&
iscomment(line+2, "PageBoundingBox:")) {
- sscanf(line+length("%%PageBoundingBox:"), "%256s", text);
+ sec_sscanf(line+length("%%PageBoundingBox:"), "%256s", text);
if (strcmp(text, "(atend)") == 0) {
page_bb_set = ATEND;
} else {
- if (sscanf(line+length("%%PageBoundingBox:"), "%d %d %d %d",
+ if (sec_sscanf(line+length("%%PageBoundingBox:"), "%d %d %d %d",
&(doc->pages[doc->numpages].boundingbox[LLX]),
&(doc->pages[doc->numpages].boundingbox[LLY]),
&(doc->pages[doc->numpages].boundingbox[URX]),
@@ -1142,7 +1146,7 @@ continuepage:
}
else {
float fllx, flly, furx, fury;
- if (sscanf(line+length("%%PageBoundingBox:"),
+ if (sec_sscanf(line+length("%%PageBoundingBox:"),
"%f %f %f %f",
&fllx, &flly, &furx, &fury) == 4) {
if (page_bb_set == NONE) page_bb_set = 1;
@@ -1193,7 +1197,7 @@ continuepage:
/* Do nothing */
} else if (iscomment(line+2, "Page:")) {
PS_free(ps_gettext(line+length("%%Page:"), &next_char));
- if (sscanf(next_char, "%d", &thispage) != 1) thispage = 0;
+ if (sec_sscanf(next_char, "%d", &thispage) != 1) thispage = 0;
if (!ignore && thispage == nextpage) {
if (doc->numpages > 0) {
doc->pages[doc->numpages-1].end = position;
@@ -1220,13 +1224,13 @@ continuepage:
doc->begintrailer = position;
section_len = line_len;
} else if (bb_set == ATEND && iscomment(line+2, "BoundingBox:")) {
- if (sscanf(line+length("%%BoundingBox:"), "%d %d %d %d",
+ if (sec_sscanf(line+length("%%BoundingBox:"), "%d %d %d %d",
&(doc->boundingbox[LLX]),
&(doc->boundingbox[LLY]),
&(doc->boundingbox[URX]),
&(doc->boundingbox[URY])) != 4) {
float fllx, flly, furx, fury;
- if (sscanf(line+length("%%BoundingBox:"), "%f %f %f %f",
+ if (sec_sscanf(line+length("%%BoundingBox:"), "%f %f %f %f",
&fllx, &flly, &furx, &fury) == 4) {
doc->boundingbox[LLX] = fllx;
doc->boundingbox[LLY] = flly;
@@ -1244,14 +1248,14 @@ continuepage:
}
} else if (orientation_set == ATEND &&
iscomment(line+2, "Orientation:")) {
- sscanf(line+length("%%Orientation:"), "%256s", text);
+ sec_sscanf(line+length("%%Orientation:"), "%256s", text);
if (strcmp(text, "Portrait") == 0) {
doc->orientation = PORTRAIT;
} else if (strcmp(text, "Landscape") == 0) {
doc->orientation = LANDSCAPE;
}
} else if (page_order_set == ATEND && iscomment(line+2, "PageOrder:")) {
- sscanf(line+length("%%PageOrder:"), "%256s", text);
+ sec_sscanf(line+length("%%PageOrder:"), "%256s", text);
if (strcmp(text, "Ascend") == 0) {
doc->pageorder = ASCEND;
} else if (strcmp(text, "Descend") == 0) {
@@ -1260,7 +1264,7 @@ continuepage:
doc->pageorder = SPECIAL;
}
} else if (pages_set == ATEND && iscomment(line+2, "Pages:")) {
- if (sscanf(line+length("%%Pages:"), "%*u %d", &i) == 1) {
+ if (sec_sscanf(line+length("%%Pages:"), "%*u %d", &i) == 1) {
if (page_order_set == NONE) {
if (i == -1) doc->pageorder = DESCEND;
else if (i == 0) doc->pageorder = SPECIAL;
@@ -1286,7 +1290,7 @@ continuepage:
preread = 0;
if (DSCcomment(line) && iscomment(line+2, "Page:")) {
PS_free(ps_gettext(line+length("%%Page:"), &next_char));
- if (sscanf(next_char, "%d", &thispage) != 1) thispage = 0;
+ if (sec_sscanf(next_char, "%d", &thispage) != 1) thispage = 0;
if (!ignore && thispage == nextpage) {
if (doc->numpages > 0) {
doc->pages[doc->numpages-1].end = position;
@@ -1825,7 +1829,7 @@ static char * readline (fd, lineP, posit
INFMESSAGE(encountered "BeginData:")
if (FD_LINE_LEN > 100) FD_BUF[100] = '\0';
text[0] = '\0';
- if (sscanf(line+length("%%BeginData:"), "%d %*s %100s", &num, text) >= 1) {
+ if (sec_sscanf(line+length("%%BeginData:"), "%d %*s %100s", &num, text) >= 1) {
if (strcmp(text, "Lines") == 0) {
INFIMESSAGE(number of lines to skip:,num)
while (num) {
@@ -1849,7 +1853,7 @@ static char * readline (fd, lineP, posit
else if IS_BEGIN("Binary:") {
int num;
INFMESSAGE(encountered "BeginBinary:")
- if (sscanf(line+length("%%BeginBinary:"), "%d", &num) == 1) {
+ if (sec_sscanf(line+length("%%BeginBinary:"), "%d", &num) == 1) {
int read_chunk_size = LINE_CHUNK_SIZE;
INFIMESSAGE(number of chars to skip:,num)
while (num>0) {
@@ -1924,7 +1928,7 @@ pscopyuntil(fd, to, begin, end, comment)
INFMESSAGE(encountered "BeginData:")
if (FD_LINE_LEN > 100) FD_BUF[100] = '\0';
text[0] = '\0';
- if (sscanf(line+length("%%BeginData:"), "%d %*s %100s", &num, text) >= 1) {
+ if (sec_sscanf(line+length("%%BeginData:"), "%d %*s %100s", &num, text) >= 1) {
if (strcmp(text, "Lines") == 0) {
INFIMESSAGE(number of lines:,num)
while (num) {
@@ -1947,7 +1951,7 @@ pscopyuntil(fd, to, begin, end, comment)
else if IS_BEGIN("Binary:") {
int num;
INFMESSAGE(encountered "BeginBinary:")
- if (sscanf(line+length("%%BeginBinary:"), "%d", &num) == 1) {
+ if (sec_sscanf(line+length("%%BeginBinary:"), "%d", &num) == 1) {
int read_chunk_size = LINE_CHUNK_SIZE;
INFIMESSAGE(number of chars:,num)
while (num>0) {
@@ -2021,12 +2025,12 @@ pscopydoc(dest_file,src_filename,d,pagel
PS_free(comment);
continue;
}
- sscanf(comment+length("%%Pages:"), "%256s", text);
+ sec_sscanf(comment+length("%%Pages:"), "%256s", text);
if (strcmp(text, "(atend)") == 0) {
fputs(comment, dest_file);
pages_atend = True;
} else {
- switch (sscanf(comment+length("%%Pages:"), "%*d %d", &i)) {
+ switch (sec_sscanf(comment+length("%%Pages:"), "%*d %d", &i)) {
case 1:
fprintf(dest_file, "%%%%Pages: %d %d\n", pages, i);
break;
@@ -2061,7 +2065,7 @@ pscopydoc(dest_file,src_filename,d,pagel
PS_free(comment);
continue;
}
- switch (sscanf(comment+length("%%Pages:"), "%*d %d", &i)) {
+ switch (sec_sscanf(comment+length("%%Pages:"), "%*d %d", &i)) {
case 1:
fprintf(dest_file, "%%%%Pages: %d %d\n", pages, i);
break;
--- src/secscanf.c
+++ src/secscanf.c 2002-09-20 13:54:53.000000000 +0200
@@ -0,0 +1,540 @@
+/*
+ * Secure sscanf - sscanf with an additional size argument for string
+ * arguments. All format specifiers should work as in the standard
+ * scanf - except for those writing to a string buffer provided by the
+ * caller. These specifiers take an additional argument of type size_t
+ * that specifies the size of the buffer.
+ *
+ * Copyright (C) 2002, Olaf Kirch <okir@suse.de>
+ */
+
+#define _GNU_SOURCE
+
+#include <sys/param.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <ctype.h>
+
+enum {
+ CONV_ANY,
+ CONV_STR,
+ CONV_NUM,
+ CONV_INTEGER,
+ CONV_FLOAT,
+ CONV_POINTER,
+};
+
+enum {
+ SIZE_ANY,
+ SIZE_SHORT,
+ SIZE_LONG,
+ SIZE_QUAD,
+};
+
+union scan_value {
+ const char * v_string;
+ long long v_signed;
+ unsigned long long v_integer;
+ long double v_double;
+ void * v_pointer;
+};
+
+
+static int process_number(union scan_value *vp, const char **sp, char fmt);
+static int process_char_class(const char **, const char **, int);
+
+static inline int
+set_conv_type(int *type, int new_type)
+{
+ switch (*type) {
+ case CONV_ANY:
+ break;
+ case CONV_NUM:
+ if (new_type == CONV_INTEGER
+ || new_type == CONV_FLOAT
+ || new_type == CONV_POINTER)
+ break;
+ /* fallthru */
+ default:
+ if (*type != new_type)
+ return 0;
+ break;
+ }
+
+ *type = new_type;
+ return 1;
+}
+
+int
+sec_sscanf(const char *s, const char *fmt, ...)
+{
+ const char *begin = s;
+ int num_fields = 0, fmt_empty = 1;
+ va_list ap;
+
+ va_start(ap, fmt);
+ while (*fmt) {
+ union scan_value value;
+ const char *pre_space_skip,
+ *value_begin;
+ int assign = 1, allocate = 0,
+ conv_type = CONV_ANY,
+ conv_size = SIZE_ANY,
+ field_width = -1,
+ nul_terminated = 1;
+ char c;
+
+ c = *fmt++;
+ if (isspace(c)) {
+ while (isspace(*s))
+ s++;
+ continue;
+ }
+
+ fmt_empty = 0;
+ if (c != '%') {
+ if (c != *s)
+ goto stop;
+ s++;
+ continue;
+ }
+
+ /* Each % directive implicitly skips white space
+ * except for the %c case */
+ pre_space_skip = s;
+ while (isspace(*s))
+ s++;
+
+ while (1) {
+ int type = CONV_ANY, size = SIZE_ANY;
+
+ switch (*fmt) {
+ case '*':
+ assign = 0;
+ break;
+ case 'a':
+ type = CONV_STR;
+ allocate = 1;
+ break;
+ case 'h':
+ type = CONV_INTEGER;
+ size = SIZE_SHORT;
+ break;
+ case 'l':
+ type = CONV_NUM;
+ size = SIZE_LONG;
+ break;
+ case 'L':
+ case 'q':
+ type = CONV_NUM;
+ size = SIZE_QUAD;
+ break;
+ case '0': case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8': case '9':
+ field_width = strtol(fmt, (char **) &fmt, 10);
+ fmt--;
+ break;
+ default:
+ goto flags_done;
+ }
+
+ if (!set_conv_type(&conv_type, type))
+ goto stop;
+
+ if (size != SIZE_ANY) {
+ if (size == SIZE_LONG && conv_size == SIZE_LONG)
+ conv_size = SIZE_QUAD;
+ else
+ conv_size = size;
+ }
+
+ fmt++;
+ }
+
+ flags_done:
+ value_begin = s;
+
+ switch (*fmt++) {
+ case '%':
+ if (*s == '\0')
+ goto eof;
+ if (*s != '%')
+ goto stop;
+ continue;
+ case '[':
+ value.v_string = s;
+ if (!set_conv_type(&conv_type, CONV_STR)
+ || !process_char_class(&fmt, &s, field_width))
+ goto stop;
+ break;
+ case 's':
+ value.v_string = s;
+ if (!set_conv_type(&conv_type, CONV_STR))
+ goto stop;
+ while (*s && !isspace(*s) && field_width-- != 0)
+ s++;
+ break;
+ case 'c':
+ if (!set_conv_type(&conv_type, CONV_STR))
+ goto stop;
+ value.v_string = s = value_begin = pre_space_skip;
+
+ if (field_width < 0)
+ s++;
+ else while (*s && field_width--)
+ s++;
+ nul_terminated = 0;
+ break;
+ case 'd':
+ case 'i':
+ case 'o':
+ case 'u':
+ case 'x':
+ case 'X':
+ if (!set_conv_type(&conv_type, CONV_INTEGER)
+ || !process_number(&value, &s, fmt[-1]))
+ goto stop;
+ break;
+ case 'p':
+ if (!set_conv_type(&conv_type, CONV_POINTER)
+ || !process_number(&value, &s, fmt[-1]))
+ goto stop;
+ break;
+ case 'f':
+ case 'g':
+ case 'e':
+ case 'E':
+ if (!set_conv_type(&conv_type, CONV_FLOAT)
+ || !process_number(&value, &s, fmt[-1]))
+ goto stop;
+ break;
+ case 'n':
+ if (!set_conv_type(&conv_type, CONV_INTEGER))
+ goto stop;
+ value.v_signed = (s - begin);
+ break;
+ default:
+ goto stop;
+ }
+
+ /* We've consumed what we need to consume. Now copy */
+ if (!assign)
+ continue;
+
+ /* Make sure we've consumed at least *something* */
+ if (s == value_begin)
+ goto eof;
+
+ /* Deal with a conversion flag */
+ if (conv_type == CONV_STR && allocate) {
+ value.v_pointer = strndup(value.v_string, s - value.v_string);
+ conv_type = CONV_POINTER;
+ allocate = 0;
+ }
+
+ switch (conv_type) {
+ case CONV_STR:
+ {
+ const char *string = value.v_string;
+ char *buf;
+ size_t size;
+
+ if (string == NULL)
+ goto stop;
+ buf = va_arg(ap, char *);
+ size = va_arg(ap, size_t) - nul_terminated;
+ if (size > s - string)
+ size = s - string;
+ strncpy(buf, string, size);
+ if (nul_terminated)
+ buf[size] = '\0';
+ }
+ break;
+
+ case CONV_POINTER:
+ {
+ void **ptr;
+
+ ptr = va_arg(ap, void **);
+ *ptr = value.v_pointer;
+ }
+ break;
+ case CONV_INTEGER:
+ {
+ void *ptr;
+
+ ptr = va_arg(ap, void *);
+ switch (conv_size) {
+ case SIZE_SHORT:
+ *(short *) ptr = value.v_integer;
+ break;
+ case SIZE_ANY:
+ *(int *) ptr = value.v_integer;
+ break;
+ case SIZE_LONG:
+ *(long *) ptr = value.v_integer;
+ break;
+ case SIZE_QUAD:
+ *(long long *) ptr = value.v_integer;
+ break;
+ default:
+ goto stop;
+ }
+ }
+ break;
+ case CONV_FLOAT:
+ {
+ void *ptr;
+
+ ptr = va_arg(ap, void *);
+ switch (conv_size) {
+ case SIZE_ANY:
+ *(float *) ptr = value.v_double;
+ break;
+ case SIZE_LONG:
+ *(double *) ptr = value.v_double;
+ break;
+ case SIZE_QUAD:
+ *(long double *) ptr = value.v_double;
+ break;
+ default:
+ goto stop;
+ }
+ }
+ break;
+ default:
+ goto stop;
+ }
+
+ num_fields++;
+ }
+
+stop: return num_fields;
+
+eof: if (num_fields)
+ return num_fields;
+ return EOF;
+}
+
+static int
+process_number(union scan_value *vp, const char **sp, char fmt)
+{
+ const char *s = *sp;
+
+ switch (fmt) {
+ case 'd':
+ vp->v_signed = strtoll(s, (char **) sp, 10);
+ break;
+ case 'i':
+ vp->v_signed = strtoll(s, (char **) sp, 0);
+ break;
+ case 'o':
+ vp->v_integer = strtoull(s, (char **) sp, 8);
+ break;
+ case 'u':
+ vp->v_integer = strtoull(s, (char **) sp, 10);
+ break;
+ case 'x':
+ case 'X':
+ vp->v_integer = strtoull(s, (char **) sp, 16);
+ break;
+ case 'p':
+ vp->v_pointer = (void *) strtoull(s, (char **) sp, 0);
+ break;
+ case 'f':
+ case 'g':
+ case 'e':
+ case 'E':
+ vp->v_double = strtold(s, (char **) sp);
+ break;
+ default:
+ return 0;
+ }
+
+ return 1;
+}
+
+static int
+process_char_class(const char **fmt, const char **sp, int width)
+{
+ unsigned char *s, c, prev_char = 0;
+ unsigned char table[255];
+ int val = 1;
+
+ s = (unsigned char *) *fmt;
+ if (*s == '^') {
+ memset(table, 1, sizeof(table));
+ val = 0;
+ s++;
+ } else {
+ memset(table, 0, sizeof(table));
+ val = 1;
+ }
+ /* First character in set is closing bracket means add it to the
+ * set of characters */
+ if ((c = *s) == ']') {
+ table[c] = val;
+ prev_char = c;
+ s++;
+ }
+
+ /* Any other closing bracket finishes off the set */
+ while ((c = *s++) != ']') {
+ if (prev_char) {
+ if (c == '-' && *s != '\0' && *s != ']') {
+ c = *s++;
+ } else {
+ //table[prev_char] = val;
+ prev_char = '\0';
+ }
+ }
+
+ if (c == '\0')
+ return 0;
+
+ if (prev_char) {
+ while (prev_char < c)
+ table[prev_char++] = val;
+ }
+ table[c] = val;
+ prev_char = c;
+ }
+ *fmt = (char *) s;
+
+#if 0
+ {
+ int n;
+
+ printf("char class=");
+ for (n = 0; n < 255; n++)
+ if (table[n])
+ printf(isprint(n)? "%c" : "\\%03o", n);
+ printf("\n");
+ }
+#endif
+
+ s = (unsigned char *) *sp;
+ while ((c = *s) != '\0' && table[c] && width--)
+ s++;
+
+ *sp = (char *) s;
+ return 1;
+}
+
+#ifdef TEST
+static int verify(const char *fmt, const char *s);
+static int verify_s(const char *fmt, const char *s);
+
+enum { S, I, L, F, D, P };
+
+int
+main(int argc, char **argv)
+{
+ verify("%d %d", "12 13");
+ verify("%d-%d", "12 13");
+ verify("%d-%d", "12-13");
+ verify("%u %u", "12 13");
+ verify("%o %o", "12 13");
+ verify("%x %x", "12 13");
+ verify("%X %X", "12 13");
+ verify("%hd %hd", "12 13");
+ verify("%ld %ld", "12 13");
+ verify("%lld %lld", "12 13");
+ verify("%Ld %Ld", "12 13");
+ verify("%qd %qd", "12 13");
+ verify("%f %f", "12 13");
+ verify("%lf %lf", "12 13");
+ verify("%Lf %Lf", "12 13");
+ verify("%qf %qf", "12 13");
+ verify("%*d-%d", "12-13");
+ verify("%*s %d", "12 13");
+ verify("%p", "0xdeadbeef");
+ verify("%*[a-e] %x", "deadbeef feeb");
+ verify("%*[a-f] %x", "deadbeef feeb");
+ verify("%*[^g-z] %x", "deadbeef feeb");
+ verify("%*[^ g-z] %x", "deadbeef feeb");
+ verify("%*[^ g-z-] %x", "dead-beef feeb");
+ verify("%*5s %d", "toast123 456");
+ verify("", "lalla");
+ verify("%u", "");
+
+ verify_s("%s", "aa bb");
+ verify_s("%s %s", "aa bb");
+ verify_s("%[a-z] %s", "aa bb");
+ verify_s("%c %s", "aa bb");
+ verify_s("%2c %s", " aa bb");
+ verify_s("%20c %s", " aa bb");
+
+ return 0;
+}
+
+static int
+verify(const char *fmt, const char *s)
+{
+ union scan_value vals[5], vals_ref[5], *v;
+ int n, m;
+
+ memset(vals, 0xe5, sizeof(vals));
+ memset(vals_ref, 0xe5, sizeof(vals_ref));
+
+ v = vals;
+ n = sec_sscanf(s, fmt, v + 0, v + 1, v + 2, v + 3, v + 4);
+
+ v = vals_ref;
+ m = sscanf(s, fmt, v + 0, v + 1, v + 2, v + 3, v + 4);
+
+ if (m != n) {
+ printf("FAILED: fmt=\"%s\"\n"
+ " str=\"%s\"\n"
+ " sec_scanf returns %d, sscanf returns %d\n",
+ fmt, s, n, m);
+ return 0;
+ }
+
+ if (memcmp(vals, vals_ref, sizeof(vals))) {
+ printf("FAILED: fmt=\"%s\"\n"
+ " str=\"%s\"\n"
+ " data differs!\n",
+ fmt, s);
+ printf("0x%Lx != 0x%Lx\n", vals[0].v_integer, vals_ref[0].v_integer);
+ return 0;
+ }
+
+ return 1;
+}
+
+static int
+verify_s(const char *fmt, const char *s)
+{
+ char buf[3][256], buf_ref[3][256];
+ int n, m;
+
+ memset(buf, 0xe5, sizeof(buf));
+ memset(buf_ref, 0xe5, sizeof(buf_ref));
+
+ n = sec_sscanf(s, fmt, buf, sizeof(buf[0]), buf + 1, sizeof(buf[1]), buf + 2, sizeof(buf[2]));
+
+ m = sscanf(s, fmt, buf_ref, buf_ref + 1, buf_ref + 2);
+
+ if (m != n) {
+ printf("FAILED: fmt=\"%s\"\n"
+ " str=\"%s\"\n"
+ " sec_scanf returns %d, sscanf returns %d\n",
+ fmt, s, n, m);
+ return 0;
+ }
+
+ if (memcmp(buf, buf_ref, sizeof(buf))) {
+ printf("FAILED: fmt=\"%s\"\n"
+ " str=\"%s\"\n"
+ " data differs!\n",
+ fmt, s);
+ printf("%s != %s\n", buf[0], buf_ref[0]);
+ return 0;
+ }
+
+ return 1;
+}
+#endif

32
settitle.patch → gv-3.6.3-settitle.patch
View File

@ -1,8 +1,8 @@
--- gv-3.5.8.orig/source/callbacks.c 1997-06-21 00:00:00.000000000 +0200
+++ gv-3.5.8/source/callbacks.c 2004-04-30 22:59:00.768199359 +0200
@@ -63,6 +63,11 @@
# include <unistd.h>
#endif
--- src/callbacks.c
+++ src/callbacks.c 2004-04-30 22:59:01.000000000 +0200
@@ -62,6 +62,11 @@
#include <sys/stat.h>
#include <unistd.h>
+#include <locale.h>
+#include <langinfo.h>
@ -12,7 +12,7 @@
#include "types.h"
#include "actions.h"
#include "callbacks.h"
@@ -96,6 +101,82 @@
@@ -95,6 +100,82 @@ static char* open_directory = NULL;
/* cb_showTitle */
/*############################################################*/
@ -95,7 +95,7 @@
void
cb_showTitle(w, client_data, call_data)
Widget w;
@@ -129,6 +210,8 @@
@@ -124,6 +205,8 @@ cb_showTitle(w, client_data, call_data)
} else {
t = s = GV_XtNewString(versionIdentification[0]);
}
@ -104,9 +104,9 @@
n=0;
XtSetArg(args[n], XtNtitle, s); n++;
XtSetArg(args[n], XtNiconName, t); n++;
--- gv-3.5.8.orig/source/main.c 1997-06-21 00:00:00.000000000 +0200
+++ gv-3.5.8/source/main.c 2004-04-30 22:50:20.957594901 +0200
@@ -908,6 +908,7 @@
--- src/main.c
+++ src/main.c 2004-04-30 22:50:21.000000000 +0200
@@ -1226,6 +1226,7 @@ int main(argc, argv)
INFMESSAGE(mapping toplevel)
XtMapWidget(toplevel);
@ -114,14 +114,14 @@
}
INFMESSAGE(waiting for events now)
--- gv-3.5.8.orig/source/misc.c 1997-06-21 00:00:00.000000000 +0200
+++ gv-3.5.8/source/misc.c 2004-04-30 22:50:20.962593868 +0200
@@ -980,7 +980,7 @@
--- src/misc.c
+++ src/misc.c 2008-03-27 17:16:44.877346759 +0100
@@ -932,7 +932,7 @@ setup_ghostview()
gv_pagemedia = m;
}
}
- cb_showTitle(NULL,NULL,NULL);
+ cb_showTitle(toplevel,NULL,NULL);
if (show_title) {
if (doc && doc->title) {
buttonlabel = doc->title;
if (show_date) {
if (doc && doc->date) {

177
gv-3.6.3.dif Normal file
View File

@ -0,0 +1,177 @@
--- .pkgextract
+++ .pkgextract 2006-02-28 15:49:27.000000000 +0100
@@ -0,0 +1 @@
+patch -p1 -b -s --suffix=".debian" < ../gv-3.6.3-deb.patch
--- NOTE
+++ NOTE 2008-03-27 13:49:41.452894000 +0100
@@ -0,0 +1,52 @@
+
+**
+** Copyright (C) 1995, 1996, 1997 Johannes Plass
+** Copyright (C) 2004 Jose E. Marchesi
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+**
+** Author: Johannes Plass (plass@dipmza.physik.uni-mainz.de)
+** Department of Physic
+** Johannes Gutenberg-University
+** Mainz, Germany
+**
+** Jose E. Marchesi (jemarch@gnu.org)
+** GNU Project
+**
+
+GV is real based on ghostview 1.5 by Tim Theisen:
+
+ * Ghostview.c -- Ghostview widget.
+ * Copyright (C) 1992 Timothy O. Theisen
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Author: Tim Theisen Systems Programmer
+ * Internet: tim@cs.wisc.edu Department of Computer Sciences
+ * UUCP: uwvax!tim University of Wisconsin-Madison
+ * Phone: (608)262-0438 1210 West Dayton Street
+ * FAX: (608)262-9777 Madison, WI 53706
--- src/Ghostview.c
+++ src/Ghostview.c 2008-03-27 13:50:57.606662000 +0100
@@ -1419,6 +1419,12 @@ StartInterpreter(w)
if (gvw->ghostview.safer)
{
argv[argc++] = "-dSAFER";
+# ifdef ALLOW_PDF
+ /* The file created by pdf2dsc opens the original
+ pdf file with the read operator. */
+ if (gv_filename_dsc && (!gvw->ghostview.filename || !strcmp(gvw->ghostview.filename,"-")))
+ argv[argc++] = "-dDELAYSAFER";
+# endif
}
if (gvw->ghostview.arguments) {
--- src/Makefile.am
+++ src/Makefile.am 2008-03-27 17:36:23.280458747 +0100
@@ -6,9 +6,9 @@
# File distribution
bin_PROGRAMS = gv
-dist_pkglib_DATA = gv_system.ad gv_user.ad gv_class.ad gv_spartan.dat gv_user_res.dat gv_copyright.dat
+dist_pkglib_DATA = gv_system.ad gv_user.ad gv_class.ad gv_spartan.dat gv_user_res.dat gv_copyright.dat gv_widgetless.dat
-appdefaultsdir = $(pkglibdir)
+appdefaultsdir = $(datadir)/X11/app-defaults
appdefaults_DATA = GV
@@ -172,7 +172,7 @@ $(srcdir)/gv_user.ad : $(srcdir)/gv_user
@echo "! gv_user.ad" >> $(srcdir)/gv_user.ad
@echo "! User specific application defaults for gv" >> $(srcdir)/gv_user.ad
@echo "! Copyright (C) 1995, 1996, 1997 Johannes Plass" >> $(srcdir)/gv_user.ad
- @echo "! Copyright (C) 2004,2005,2006,2007 José E. Marchesi" >> $(srcdir)/gv_user.ad
+ @echo "! Copyright (C) 2004,2005,2006,2007 Jose E. Marchesi" >> $(srcdir)/gv_user.ad
@echo "!" >> $(srcdir)/gv_user.ad
@cat $(srcdir)/gv_user_res.dat >> $(srcdir)/gv_user.ad
@cat $(srcdir)/gv_intern_res_unix.dat >> $(srcdir)/gv_user.ad
@@ -215,7 +215,7 @@ $(srcdir)/gv_class.ad : $(srcdir)/gv_fon
@echo "! gv_class.ad" >> $(srcdir)/gv_class.ad
@echo "! Application class defaults for gv" >> $(srcdir)/gv_class.ad
@echo "! Copyright (C) 1995, 1996, 1997 Johannes Plass" >> $(srcdir)/gv_class.ad
- @echo "! Copyright (C) 2004,2005,2006,2007 José E. Marchesi" >> $(srcdir)/gv_class.ad
+ @echo "! Copyright (C) 2004,2005,2006,2007 Jose E. Marchesi" >> $(srcdir)/gv_class.ad
@echo "!" >> $(srcdir)/gv_class.ad
@echo "" >> $(srcdir)/gv_class.ad
@cat $(srcdir)/gv_user_res.dat >> $(srcdir)/gv_class.ad
@@ -236,7 +236,7 @@ $(srcdir)/gv_make_res.dat :
@echo "GV.useBackingPixmap: $(USE_BACKING_PIXMAP)" >> $(srcdir)/gv_make_res.dat
@echo "GV*dirs: Home\n\\" >> $(srcdir)/gv_make_res.dat
@echo " Tmp\n\\" >> $(srcdir)/gv_make_res.dat
- @echo " /usr/doc\n\\" >> $(srcdir)/gv_make_res.dat
+ @echo " /usr/share/doc\n\\" >> $(srcdir)/gv_make_res.dat
@echo " /usr/local/doc" >> $(srcdir)/gv_make_res.dat
@echo "GV*filter: no .*" >> $(srcdir)/gv_make_res.dat
@echo "GV*filters: None\n\\" >> $(srcdir)/gv_make_res.dat
--- src/gv_misc_res.dat
+++ src/gv_misc_res.dat 2006-02-28 15:49:27.000000000 +0100
@@ -50,7 +50,7 @@ GV*Scrollbar.background: gray78
GV*Scrollbar.pointerColor: black
GV*Scrollbar.pointerColorBackground: White
GV*Scrollbar.scrollbarBackground: gray71
-GV*Scrollbar.foreground: gray78
+GV*Scrollbar.foreground: gray65
GV*optionsetupPopup*Text*Scrollbar.background:gray71
GV*optionfsPopup*Text*Scrollbar.background:gray71
--- src/misc.c
+++ src/misc.c 2006-02-28 15:49:27.000000000 +0100
@@ -1337,7 +1337,8 @@ set_new_orientation(pagenumber)
else if ( no == O_LANDSCAPE) w = landscapeEntry;
else if ( no == O_UPSIDEDOWN) w = upsidedownEntry;
else w = seascapeEntry;
- set_newBitmapIfChanged(w,bitmap);
+ if (w)
+ set_newBitmapIfChanged(w,bitmap);
if (gv_swap_landscape != gv_swap_landscape_old)
widgets_setSelectedBitmap(swapEntry,gv_swap_landscape);
@@ -1369,13 +1370,17 @@ set_pagemediaButton_label(media_id)
Widget w;
if (pagemediaEntry[media_id]) w = pagemediaEntry[media_id];
else w = pagemediaEntry[media_id-1];
+ if (!w)
+ goto out;
XtSetArg(args[0], XtNlabel, &s);
XtGetValues(w, args, ONE);
}
else s = "?";
XtSetArg(args[0], XtNlabel, s);
XtSetValues(pagemediaButton, args, ONE);
+out:
ENDMESSAGE(set_pagemediaButton_label)
+ return;
}
/*------------------------------------------------------------*/
@@ -1443,7 +1448,8 @@ set_new_pagemedia(pagenumber)
else bitmap = app_res.selected_bitmap;
if (pagemediaEntry[gv_pagemedia]) w = pagemediaEntry[gv_pagemedia];
else w = pagemediaEntry[gv_pagemedia-1];
- set_newBitmapIfChanged(w,bitmap);
+ if (w)
+ set_newBitmapIfChanged(w,bitmap);
}
if (gv_pagemedia_auto != gv_pagemedia_auto_old) widgets_setSelectedBitmap(autoMediaEntry,gv_pagemedia_auto);
--- src/ps.c
+++ src/ps.c 2008-03-27 18:28:32.973306228 +0100
@@ -75,6 +75,8 @@
#define BUFSIZ 1024
#endif
#include <ctype.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include "paths.h"
#include INC_X11(Intrinsic.h)

3
gv-3.6.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1ab4f25aaabee9a1a79d68fb9d1a5b17bef2719ddb67eda86ea8b851ec7dc7c3
size 390970

49
gv.changes
View File

@ -1,3 +1,52 @@
-------------------------------------------------------------------
Thu Mar 27 19:01:38 CET 2008 - werner@suse.de
- Update to gv 3.6.3
* gv is now able to work with latest ghostscript: gs 8.57
* The bug causing the version not to figure in the manual has been
fixed.
* The SIGINT signal is now masked (ignored) by gv.
* gv no more segfaults when reading a configuration file as produced by
State -> Setup Options -> Save
* gv should compile in non-GNU system that doesnt have glib2. The
`getopt' gnulib module has been imported to fix this.
* gv now correctly adjust the page index window after PAGE-UP and
PAGE-DOWN events.
* gv is now able to open files with minus character beginning
filenames.
* X resources related bugs has been fixed. gv is now able to get
resources from the display database, user file, gv system database
and command line doing the Right Thing (TM).
* gv is now able to correctly understand DocumentMedia and other DSC
directives that uses postscript strings. It was not possible with
previous versions due to a bug in the postscript names scanning
routine.
* New set of command line arguments. This solves the horrid bug on
gv 3.6.0 that made such release nearly unusable. See the
documentation for details about the new argument list.
* The "Reopen" entry on the File menu has been renamed to "Reload" in
order to be coherent with the "Reload" button.
* The distributed package structure have been fixed, now conforming a
legal GNU source package.
* The delete key now work as expected, that is, it deletes the next
character rather the last character when typed on text entries.
* Dot files are not shown by default on file selection forms.
* If you try to open an empty file you get a coherent error
message.
* New manual page
* The gs command used for PDF to PostScript conversion has been fixed to allow
document saving.
* New configuration/compilation/installation using GNU Autotools
* Documentation is now distributed in texinfo format.
* "Redisplay" button has been renamed to "Reload".
* Some GNU standard command line arguments are supported now:
--help, --usage and --version.
* Antialiasing is now used by default.
* Solved bug #11014: gv is capable to open files with spaces (or other
harm character) in the filename.
- Use Debain patch
- Port our patches to this version
-------------------------------------------------------------------
Sun Jan 13 17:51:44 CET 2008 - coolo@suse.de

293
gv.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package gv (Version 3.5.8)
# spec file for package gv (Version 3.6.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -10,45 +10,57 @@
# norootforbuild
Name: gv
BuildRequires: update-desktop-files xaw3d-devel xorg-x11 xorg-x11-devel
BuildRequires: update-desktop-files xorg-x11 xorg-x11-devel
%if %suse_version > 1020
BuildRequires: xaw3d-devel
%else
BuildRequires: xaw3d
%endif
%if %suse_version < 1100
BuildRequires: desktop-data-SuSE
%endif
License: GPL v2 or later
Group: Productivity/Publishing/PS
PreReq: %install_info_prereq
Requires: ghostscript_x11
Conflicts: gs_serv gs_vga
# NOTE: We don't want this dependency and desktop-data-SuSE is in all
# desktop selections.
#Requires: desktop-data-SuSE
AutoReqProv: on
Url: http://wwwthep.physik.uni-mainz.de/~plass/gv/
Url: http://www.gnu.org/software/gv/
Summary: A Program to View PostScript Files
Version: 3.5.8
Release: 1300
Source0: gv-3.5.8.tar.bz2
Version: 3.6.3
Release: 1
Source0: gv-3.6.3.tar.bz2
Source1: gv.desktop
Source2: gv.png
Patch0: gv-3.5.8-deb.patch
Patch1: gv-3.5.8.dif
Patch2: gv-3.5.8-security.patch
Patch3: gv-3.5.8-bzip2.patch
Patch0: gv-3.6.3-deb.patch
Patch1: gv-3.6.3.dif
Patch2: gv-3.6.3-security.patch
Patch3: gv-3.6.3-bzip2.patch
# I18N patch originally from:
# http://www.on.cs.keio.ac.jp/~yasu/jp_xaw.html
# http://www.on.cs.keio.ac.jp/~yasu/linux/Xaw/gv-3.5.8-I18N-mb.patch
# changed a little bit for SuSE:
Patch4: gv-3.5.8-I18N-mb.patch
Patch5: intptr_t.patch
Patch6: settitle.patch
Patch7: gv-3.5.8-gcc4.patch
Patch8: gv-3.5.8-sec2.patch
Patch4: gv-3.6.3-I18N-mb.patch
Patch5: gv-3.6.3-intptr_t.patch
Patch6: gv-3.6.3-settitle.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
%if "%_exec_prefix" == "/usr/X11R6"
%global _mandir %{_exec_prefix}/man
%define _x11lib %{_exec_prefix}/%{_lib}
%define _x11data %{_exec_prefix}/lib/X11
%define _appdefdir %{_x11data}/app-defaults
%define _x11inc %{_x11_prefix}/include
%else
%define _x11lib %{_libdir}
%define _x11data %{_datadir}/X11
%define _appdefdir %{_x11data}/app-defaults
%define _x11inc %{_includedir}
%endif
%description
@ -61,119 +73,194 @@ Authors:
--------
Tim Theisen <tim@cs.wisc.edu>
Johannes Plass <plass@dipmza.physik.uni-mainz.de>
José E. Marchesi <jemarch@gnu.org>
%prep
%setup -n gv-3.5.8
%patch0 -p 1 -b .deb
%patch1
%patch2 -p1 -b .sec
%patch3 -p0 -b .bzip2
%patch4 -p1 -b .I18N-mb
%patch5 -p1 -b .intptr_t
%patch6 -p1 -b .settitle
%patch7 -p0 -b .gcc4
%patch8 -p0 -b .sec2
%setup
echo >> src/Makefile.am
%patch0 -p1 -b .deb
%patch1 -p0
%patch2 -p0 -b .sec
# fzopen from libzio does not work due ftell()
#patch3 -p0 -b .bzip2
#
%patch4 -p0 -b .I18N-mb
%patch5 -p0 -b .intptr_t
%patch6 -p0 -b .settitle
%build
xmkmf -a
make CCOPTIONS="$RPM_OPT_FLAGS"
autoreconf -fis
sed -ri 's@[[:blank:]]*-(R|rpath)[[:blank:]]*\$[[:alpha:]_]+@@g' configure
chmod 755 configure
CC=gcc
CFLAGS="$RPM_OPT_FLAGS"
LDFLAGS="-Wl,-z,defs"
cflags ()
{
local flag=$1; shift
case "${RPM_OPT_FLAGS}" in
*${flag}*) return
esac
if test -n "$1" && gcc -Werror $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then
local var=$1; shift
eval $var=\${$var:+\$$var\ }$flag
fi
if test -n "$1" && g++ -Werror $flag -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1 ; then
local var=$1; shift
eval $var=\${$var:+\$$var\ }$flag
fi
}
cflags -std=gnu89 CFLAGS
cflags -fno-strict-aliasing CFLAGS
cflags -Wno-unused CFLAGS
cflags -Wno-unprototyped-calls CFLAGS
cflags -pipe CFLAGS
export CC CFLAGS LDFLAGS
./configure --prefix=%{_prefix} \
--mandir=%{_mandir} \
--infodir=%{_infodir} \
--with-x \
--x-includes=%{_x11inc} \
--x-libraries=%{_x11lib}\
--enable-backing-pixmap \
--disable-memmove-code \
--disable-setenv-code \
--with-default-papersize=a4
make pkglibdir='%{_x11data}/gv'
%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
make DESTDIR=%{buildroot} install.man
make DESTDIR=%{buildroot} install.doc
mkdir %{buildroot}
make DESTDIR=%{buildroot} pkglibdir='%{_x11data}/gv' install
make DESTDIR=%{buildroot} pkglibdir='%{_x11data}/gv' install-info
make DESTDIR=%{buildroot} pkglibdir='%{_x11data}/gv' install-man
make -C src DESTDIR=%{buildroot} pkglibdir='%{_x11data}/gv' install-nls
mkdir -p %{buildroot}/%{_defaultdocdir}/gv
install -m 0444 NOTE %{buildroot}/%{_defaultdocdir}/gv/Copyright
# add font settings to app-defaults:
for i in $(find %{buildroot}%{_x11data} -type f -name "GV")
do
cat source/gv_font_res-I18N_mb.dat >> ${i}
cat src/gv_font_res-I18N_mb.dat >> ${i}
chmod 0644 ${i}
done
# japanese app-defaults:
mkdir -p %{buildroot}%{_x11data}/{ja,ja_JP.SJIS,ja_JP.UTF-8}/app-defaults
mv %{buildroot}%{_x11data}/ja_JP.eucJP/app-defaults/GV \
%{buildroot}%{_x11data}/ja/app-defaults/GV
iconv -f EUC-JP -t SJIS < %{buildroot}%{_x11data}/ja/app-defaults/GV \
mkdir -p %{buildroot}%{_x11data}/{ja_JP.SJIS,ja_JP.EUC-JP}/app-defaults
iconv -f UTF-8 -t SJIS < %{buildroot}%{_x11data}/ja_JP.UTF-8/app-defaults/GV \
> %{buildroot}%{_x11data}/ja_JP.SJIS/app-defaults/GV
iconv -f EUC-JP -t UTF-8 < %{buildroot}%{_x11data}/ja/app-defaults/GV \
> %{buildroot}%{_x11data}/ja_JP.UTF-8/app-defaults/GV
iconv -f UTF-8 -t EUC-JP < %{buildroot}%{_x11data}/ja_JP.UTF-8/app-defaults/GV \
> %{buildroot}%{_x11data}/ja_JP.EUC-JP/app-defaults/GV
mkdir -p %{buildroot}%{_x11data}/ko_KR.EUC-KR/app-defaults
iconv -f UTF-8 -t EUC-KR < %{buildroot}%{_x11data}/ko_KR.UTF-8/app-defaults/GV \
> %{buildroot}%{_x11data}/ko_KR.EUC-KR/app-defaults/GV
%suse_update_desktop_file -i gv Office Viewer
%post
%install_info --info-dir=.%{_infodir} .%{_infodir}/gv.info.gz
%postun
%install_info_delete --info-dir=.%{_infodir} .%{_infodir}/gv.info.gz
%files
%defattr(-,root,root)
/usr/share/applications/gv.desktop
/usr/share/pixmaps/gv.png
%{_datadir}/applications/gv.desktop
%{_datadir}/pixmaps/gv.png
%dir %{_x11data}/gv/
%config %{_x11data}/gv/gv_system.ad
%config %{_x11data}/gv/gv_user.ad
%config %{_x11data}/gv/gv_class.ad
%config %{_x11data}/gv/*.ad
%config %{_x11data}/gv/*.dat
%config %{_appdefdir}/GV
%dir %{_x11data}/??
%dir %{_x11data}/??_*
%dir %{_x11data}/*/app-defaults
%config %{_x11data}/ja*/app-defaults/GV
%config %{_x11data}/*/app-defaults/GV
%{_bindir}/gv
%doc %{_mandir}/man1/gv.1x.gz
%docdir %{_defaultdocdir}/gv/
%doc %{_mandir}/man1/gv.1.gz
%doc %{_infodir}/gv.info.gz
%dir %{_defaultdocdir}/gv
%docdir %{_defaultdocdir}/gv
%{_defaultdocdir}/gv/Copyright
%doc %{_defaultdocdir}/gv/gs.interface.gz
%doc %{_defaultdocdir}/gv/gv-faq.txt.gz
%doc %{_defaultdocdir}/gv/key-bindings.txt.gz
%doc %{_defaultdocdir}/gv/comments.doc.gz
%doc %{_defaultdocdir}/gv/gv.ps.gz
%doc %{_defaultdocdir}/gv/gv-1.html
%doc %{_defaultdocdir}/gv/gv-10.html
%doc %{_defaultdocdir}/gv/gv-11.html
%doc %{_defaultdocdir}/gv/gv-12.html
%doc %{_defaultdocdir}/gv/gv-13.html
%doc %{_defaultdocdir}/gv/gv-2.html
%doc %{_defaultdocdir}/gv/gv-3.html
%doc %{_defaultdocdir}/gv/gv-4.html
%doc %{_defaultdocdir}/gv/gv-5.html
%doc %{_defaultdocdir}/gv/gv-6.html
%doc %{_defaultdocdir}/gv/gv-7.html
%doc %{_defaultdocdir}/gv/gv-8.html
%doc %{_defaultdocdir}/gv/gv-9.html
%doc %{_defaultdocdir}/gv/gv-faq.html
%doc %{_defaultdocdir}/gv/gv.html
%dir %{_defaultdocdir}/gv/
%changelog
* Sun Jan 13 2008 - coolo@suse.de
* Thu Mar 27 2008 werner@suse.de
- Update to gv 3.6.3
* gv is now able to work with latest ghostscript: gs 8.57
* The bug causing the version not to figure in the manual has been
fixed.
* The SIGINT signal is now masked (ignored) by gv.
* gv no more segfaults when reading a configuration file as produced by
State -> Setup Options -> Save
* gv should compile in non-GNU system that doesnt have glib2. The
`getopt' gnulib module has been imported to fix this.
* gv now correctly adjust the page index window after PAGE-UP and
PAGE-DOWN events.
* gv is now able to open files with minus character beginning
filenames.
* X resources related bugs has been fixed. gv is now able to get
resources from the display database, user file, gv system database
and command line doing the Right Thing (TM).
* gv is now able to correctly understand DocumentMedia and other DSC
directives that uses postscript strings. It was not possible with
previous versions due to a bug in the postscript names scanning
routine.
* New set of command line arguments. This solves the horrid bug on
gv 3.6.0 that made such release nearly unusable. See the
documentation for details about the new argument list.
* The "Reopen" entry on the File menu has been renamed to "Reload" in
order to be coherent with the "Reload" button.
* The distributed package structure have been fixed, now conforming a
legal GNU source package.
* The delete key now work as expected, that is, it deletes the next
character rather the last character when typed on text entries.
* Dot files are not shown by default on file selection forms.
* If you try to open an empty file you get a coherent error
message.
* New manual page
* The gs command used for PDF to PostScript conversion has been fixed to allow
document saving.
* New configuration/compilation/installation using GNU Autotools
* Documentation is now distributed in texinfo format.
* "Redisplay" button has been renamed to "Reload".
* Some GNU standard command line arguments are supported now:
--help, --usage and --version.
* Antialiasing is now used by default.
* Solved bug #11014: gv is capable to open files with spaces (or other
harm character) in the filename.
- Use Debain patch
- Port our patches to this version
* Sun Jan 13 2008 coolo@suse.de
- remove desktop-data from buildrequires
* Thu Jul 05 2007 - coolo@suse.de
* Thu Jul 05 2007 coolo@suse.de
- put desktop file and icon into the package
* Fri Jun 01 2007 - dmueller@suse.de
* Fri Jun 01 2007 dmueller@suse.de
- fix buildrequires
* Fri Nov 17 2006 - werner@suse.de
* Fri Nov 17 2006 werner@suse.de
- Corrected version of last fix (bug #219454)
* Thu Nov 09 2006 - werner@suse.de
* Thu Nov 09 2006 werner@suse.de
- Avoid buffer overflow in gv gettext() (bug #219454)
* Thu Aug 24 2006 - werner@suse.de
* Thu Aug 24 2006 werner@suse.de
- Check for existence of gv.png
* Wed Aug 02 2006 - werner@suse.de
* Wed Aug 02 2006 werner@suse.de
- Make it build with X11R7
* Tue Feb 28 2006 - werner@suse.de
* Tue Feb 28 2006 werner@suse.de
- Fix range of array subscript (bug #154109)
* Wed Jan 25 2006 - mls@suse.de
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Tue Nov 29 2005 - sbrabec@suse.cz
* Tue Nov 29 2005 sbrabec@suse.cz
- Don't package icon already present in desktop-data-SuSE.
Cleans rpm -V output.
* Tue Jun 07 2005 - meissner@suse.de
* Tue Jun 07 2005 meissner@suse.de
- Use RPM_OPT_FLAGS.
* Mon May 23 2005 - mfabian@suse.de
* Mon May 23 2005 mfabian@suse.de
- Bugzilla #85410: improve default fontsets to make it work better
with the recent changes in the XLC_LOCALE files in Xorg.
Japanese should look nicer now and warning messages should
usually disappear.
* Mon Apr 18 2005 - werner@suse.de
* Mon Apr 18 2005 werner@suse.de
- Set DELAYSAFER for dsc file of the pdf within a pipe (bug #78322)
* Wed Apr 13 2005 - werner@suse.de
* Wed Apr 13 2005 werner@suse.de
- Add a return after label even for void functions for stupid gcc4
* Wed Nov 17 2004 - werner@suse.de
* Wed Nov 17 2004 werner@suse.de
- Add gv.png pixmap to file list
* Mon Jun 28 2004 - mfabian@suse.de
* Mon Jun 28 2004 mfabian@suse.de
- add "-*-*-Medium-R-*--16-*-*-*-*-*-*-*" to all fontsets as a
fallback to suppress useless warnings if
"-*-*-Medium-R-*--14-*-*-*-*-*-*-*" or other sizes are not
@ -184,9 +271,9 @@ iconv -f EUC-JP -t UTF-8 < %{buildroot}%{_x11data}/ja/app-defaults/GV \
In 16 pixel, there are fonts for all common encodings already
in the basic X11 packages, therefore 16 pixel should
always work as a fallback.
* Fri May 28 2004 - adrian@suse.de
* Fri May 28 2004 adrian@suse.de
- add "Office" to Categories to match the menu definition (#41338)
* Fri Apr 30 2004 - mfabian@suse.de
* Fri Apr 30 2004 mfabian@suse.de
- Bugzilla #39594: add gv-3.5.8-I18N-mb.patch to support the
display of multibyte file names.
- intptr_t.patch: fix compiler warnings
@ -194,48 +281,48 @@ iconv -f EUC-JP -t UTF-8 < %{buildroot}%{_x11data}/ja/app-defaults/GV \
- fix display of file names in the window title and icons by
setting _NET_WM_NAME and _NET_WM_ICON_NAME properties
(thanks a lot to Marcus Schaefer <ms@suse.de> for help).
* Thu Apr 29 2004 - werner@suse.de
* Thu Apr 29 2004 werner@suse.de
- correct category for desktop file: "PostScript Viewer"
-> "Viewer".
* Tue Apr 06 2004 - werner@suse.de
* Tue Apr 06 2004 werner@suse.de
- Add desktop entry
* Sat Jan 10 2004 - adrian@suse.de
* Sat Jan 10 2004 adrian@suse.de
- add %%defattr
* Mon Aug 25 2003 - werner@suse.de
* Mon Aug 25 2003 werner@suse.de
- Fix menu entry for bunzip2 label
* Fri Aug 22 2003 - werner@suse.de
* Fri Aug 22 2003 werner@suse.de
- Uncompress bzip2 files on the fly, patch based on
Volker Kuhlmann's patch (bug #29260)
* Tue Apr 15 2003 - coolo@suse.de
* Tue Apr 15 2003 coolo@suse.de
- use BuildRoot
* Mon Mar 10 2003 - werner@suse.de
* Mon Mar 10 2003 werner@suse.de
- Fix sigsegv in case of unkown paper size.
* Fri Nov 08 2002 - werner@suse.de
* Fri Nov 08 2002 werner@suse.de
- Remove XCOMM definition to make new cpp happy
* Fri Sep 20 2002 - okir@suse.de
* Fri Sep 20 2002 okir@suse.de
- added security patch to address buffer overflows
* Tue Sep 17 2002 - ro@suse.de
* Tue Sep 17 2002 ro@suse.de
- removed bogus self-provides
* Mon Jan 14 2002 - schwab@suse.de
* Mon Jan 14 2002 schwab@suse.de
- Fix use of token concatenation.
* Fri Jun 22 2001 - ro@suse.de
* Fri Jun 22 2001 ro@suse.de
- use ComplexProgramTargetNoMan
* Fri Oct 06 2000 - kukuk@suse.de
* Fri Oct 06 2000 kukuk@suse.de
- change group tag
- Remove bogus xshared requires, rpm will handle this correct
* Wed May 24 2000 - kukuk@suse.de
* Wed May 24 2000 kukuk@suse.de
- Use /usr/share/doc/packages
* Mon Jan 24 2000 - werner@suse.de
* Mon Jan 24 2000 werner@suse.de
- Add Debian patch 15 for gv 3.5.8
- Use RPM_OPT_FLAGS
* Mon Sep 20 1999 - ro@suse.de
* Mon Sep 20 1999 ro@suse.de
- added Requires ghostscript_x11
* Mon Sep 13 1999 - bs@suse.de
* Mon Sep 13 1999 bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
* Wed Oct 15 1997 - werner@suse.de
* Wed Oct 15 1997 werner@suse.de
- New version: 3.5.8
- This version is usable only with Xaw3d
* Thu Feb 13 1997 - werner@suse.de
* Fri Feb 14 1997 werner@suse.de
- New package with gv version 2_7_6
- Remove call of Xaw/Xaw3d private function ...
now we can use Xaw or Xaw3d or Xaw95.

21
gv.test
View File

@ -1,21 +0,0 @@
Testform für GV
===============
15.10.1997: Version 3.5.8
Maintainer: werner
Vorraussetzungen:
=================
X, gs und xaw3d müssen installiert sein.
Starten:
========
gv mit einem PostScript-File als Argument aufrufen.
Ergebnisse:
===========
Hmmm --- das hängt vom PostScript-File ab :-)