openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File gv-3.5.8.dif of Package gv (Revision 069b6705706dc3ce14b89a21cda632af)

Currently displaying revision 069b6705706dc3ce14b89a21cda632af , Show latest

--- .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)

Places

File gv-3.5.8.dif of Package gv (Revision 069b6705706dc3ce14b89a21cda632af)

Places