rpms/inkscape/F-8 inkscape-0.45.1-gtkprint.patch, 1.1, 1.2 inkscape.spec, 1.38, 1.39

[Denis Leroy (denis)]

Author: denis

Update of /cvs/pkgs/rpms/inkscape/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5861

Modified Files:
	inkscape-0.45.1-gtkprint.patch inkscape.spec 
Log Message:
Updated gtkprint patch to restore eps export (#424411)

inkscape-0.45.1-gtkprint.patch:

Index: inkscape-0.45.1-gtkprint.patch
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-8/inkscape-0.45.1-gtkprint.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- inkscape-0.45.1-gtkprint.patch	2 Dec 2007 14:46:53 -0000	1.1
+++ inkscape-0.45.1-gtkprint.patch	8 Jan 2008 13:37:10 -0000	1.2
@@ -13,6 +13,23 @@
  #include <glibmm/i18n.h>
  #include "display/nr-arena-item.h"
  #include "display/canvas-bpath.h"
+@@ -59,6 +59,7 @@
+ #include <unit-constants.h>
+ 
+ #include "ps.h"
++#include "inkscape.h"
+ #include "extension/system.h"
+ #include "extension/print.h"
+ 
+@@ -74,6 +75,8 @@
+ 
+ using namespace std;
+ 
++extern gboolean inkscape_app_use_gui( Inkscape::Application const *app );
++
+ namespace Inkscape {
+ namespace Extension {
+ namespace Internal {
 @@ -102,6 +104,59 @@
      return;
  }
@@ -147,7 +164,16 @@
              osf = Inkscape::IO::fopen_utf8name(fn, "w+");
              if (!osf) {
                  fprintf(stderr, "inkscape: fopen(%s): %s\n",
-@@ -582,12 +659,23 @@
+@@ -581,6 +584,8 @@
+ unsigned int
+ PrintPS::finish(Inkscape::Extension::Print *mod)
+ {
++    gboolean use_gui = inkscape_app_use_gui(INKSCAPE);
++
+     if (!_stream) return 0;
+ 
+     if (_bitmap) {
+@@ -582,12 +659,25 @@
         {
             while((c = fgetc(_stream))!=EOF) fputc(c, _begin_stream);
         }
@@ -157,12 +183,14 @@
      }
  
 +#ifdef HAVE_GTK_UNIX_PRINT
-+    /* redirect output to new print dialog */
-+    fseek(_stream, 0, SEEK_SET);
-+    Glib::ustring output = _tmpfilename;
-+    unix_print_dialog(output.c_str(),"job name");
-+    unlink(output.c_str());
-+    /* end redirected new print dialog */
++    if (use_gui) {
++        /* redirect output to new print dialog */
++        fseek(_stream, 0, SEEK_SET);
++        Glib::ustring output = _tmpfilename;
++        unix_print_dialog(output.c_str(),"job name");
++        unlink(output.c_str());
++        /* end redirected new print dialog */
++    }
 +#endif
 +
      /* fixme: should really use pclose for popen'd streams */


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-8/inkscape.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- inkscape.spec	2 Dec 2007 14:46:53 -0000	1.38
+++ inkscape.spec	8 Jan 2008 13:37:10 -0000	1.39
@@ -2,7 +2,7 @@
 
 Name:           inkscape
 Version:        0.45.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -134,6 +134,9 @@
 
 
 %changelog
+* Tue Jan  8 2008 Denis Leroy <denis at poolshark.org> - 0.45.1-5
+- Updated gtkprint patch to restore eps export
+
 * Sun Dec 02 2007 Lubomir Kundrak <lkundrak at redhat.com> - 0.45.1-4
 - Added missing dependencies for modules (#301881)