File inkscape-0.48.0-win32.patch of Package mingw32-inkscape

Overview Repositories Revisions Requests Users Attributes Meta

File inkscape-0.48.0-win32.patch of Package mingw32-inkscape (Revision 13dee1bfa215179a755c08fa8b6d963c)

Currently displaying revision 13dee1bfa215179a755c08fa8b6d963c , Show latest

--- src/inkview.cpp	2010-08-24 17:46:17.000000000 +0200
+++ src/inkview.cpp	2010-08-24 17:50:49.000000000 +0200
@@ -76,6 +76,13 @@
 #define bind_textdomain_codeset(p,c)
 #endif
 
+#ifdef _WIN32
+#include <io.h>
+#include <conio.h>
+#define _WIN32_WINNT 0x0501
+#include <windows.h>
+#endif
+
 extern char *optarg;
 extern int  optind, opterr;
 
@@ -174,6 +181,30 @@
 int
 main (int argc, const char **argv)
 {
+#ifdef _WIN32
+    if (fileno (stdout) != -1 &&
+ 	  _get_osfhandle (fileno (stdout)) != -1)
+	{
+	  /* stdout is fine, presumably redirected to a file or pipe */
+	}
+    else
+    {
+	  typedef BOOL (* WINAPI AttachConsole_t) (DWORD);
+
+	  AttachConsole_t p_AttachConsole =
+	    (AttachConsole_t) GetProcAddress (GetModuleHandle ("kernel32.dll"), "AttachConsole");
+
+	  if (p_AttachConsole != NULL && p_AttachConsole (ATTACH_PARENT_PROCESS))
+      {
+	      freopen ("CONOUT$", "w", stdout);
+	      dup2 (fileno (stdout), 1);
+	      freopen ("CONOUT$", "w", stderr);
+	      dup2 (fileno (stderr), 2);
+
+      }
+	}
+#endif
+
     if (argc == 1) {
 	usage();
     }
--- src/main.cpp	2010-08-24 17:46:17.000000000 +0200
+++ src/main.cpp	2010-08-24 17:57:07.000000000 +0200
@@ -62,6 +62,10 @@
 #undef AND
 #endif
 
+#ifdef AND
+#undef AND
+#endif
+
 #include "macros.h"
 #include "file.h"
 #include "document.h"
@@ -100,6 +104,10 @@
 #include <extension/input.h>
 
 #ifdef WIN32
+#include <io.h>
+#include <conio.h>
+#define _WIN32_WINNT 0x0501
+#include <windows.h>
 #include "registrytool.h"
 #include "extension/internal/win32.h"
 using Inkscape::Extension::Internal::PrintWin32;
@@ -585,6 +593,31 @@
 int
 main(int argc, char **argv)
 {
+#ifdef _WIN32
+    if (fileno (stdout) != -1 &&
+ 	  _get_osfhandle (fileno (stdout)) != -1)
+	{
+	  /* stdout is fine, presumably redirected to a file or pipe */
+	}
+    else
+    {
+	  typedef BOOL (* WINAPI AttachConsole_t) (DWORD);
+
+	  AttachConsole_t p_AttachConsole =
+	    (AttachConsole_t) GetProcAddress (GetModuleHandle ("kernel32.dll"), "AttachConsole");
+
+	  if (p_AttachConsole != NULL && p_AttachConsole (ATTACH_PARENT_PROCESS))
+      {
+	      freopen ("CONOUT$", "w", stdout);
+	      dup2 (fileno (stdout), 1);
+	      freopen ("CONOUT$", "w", stderr);
+	      dup2 (fileno (stderr), 2);
+
+      }
+	}
+#endif
+
+
 #ifdef HAVE_FPSETMASK
     /* This is inherited from Sodipodi code, where it was in #ifdef __FreeBSD__.  It's probably
        safe to remove: the default mask is already 0 in C99, and in current FreeBSD according to
--- src/path-prefix.h	2010-08-24 17:46:16.000000000 +0200
+++ src/path-prefix.h	2010-08-24 17:50:51.000000000 +0200
@@ -42,25 +42,25 @@
 #    define CREATE_PATTERNSDIR    BR_DATADIR( "/create/patterns/vector" )
 #else
 #  ifdef WIN32
-#    define INKSCAPE_APPICONDIR   WIN32_DATADIR("pixmaps")
-#    define INKSCAPE_BINDDIR      WIN32_DATADIR("share\\bind")
-#    define INKSCAPE_EXAMPLESDIR  WIN32_DATADIR("share\\examples")
-#    define INKSCAPE_EXTENSIONDIR WIN32_DATADIR("share\\extensions")
-#    define INKSCAPE_FILTERDIR    WIN32_DATADIR("share\\filters")
-#    define INKSCAPE_GRADIENTSDIR WIN32_DATADIR("share\\gradients")
-#    define INKSCAPE_KEYSDIR      WIN32_DATADIR("share\\keys")
-#    define INKSCAPE_PIXMAPDIR    WIN32_DATADIR("share\\icons")
-#    define INKSCAPE_MARKERSDIR   WIN32_DATADIR("share\\markers")
-#    define INKSCAPE_PALETTESDIR  WIN32_DATADIR("share\\palettes")
-#    define INKSCAPE_PATTERNSDIR  WIN32_DATADIR("share\\patterns")
-#    define INKSCAPE_SCREENSDIR   WIN32_DATADIR("share\\screens")
-#    define INKSCAPE_TUTORIALSDIR WIN32_DATADIR("share\\tutorials")
-#    define INKSCAPE_TEMPLATESDIR WIN32_DATADIR("share\\templates")
-#    define INKSCAPE_UIDIR        WIN32_DATADIR("share\\ui")
+#    define INKSCAPE_APPICONDIR   WIN32_DATADIR("..\\share\\pixmaps")
+#    define INKSCAPE_BINDDIR      WIN32_DATADIR("..\\share\\inkscape\\bind")
+#    define INKSCAPE_EXAMPLESDIR  WIN32_DATADIR("..\\share\\inkscape\\examples")
+#    define INKSCAPE_EXTENSIONDIR WIN32_DATADIR("..\\share\\inkscape\\extensions")
+#    define INKSCAPE_FILTERDIR    WIN32_DATADIR("..\\share\\inkscape\\filters")
+#    define INKSCAPE_GRADIENTSDIR WIN32_DATADIR("..\\share\\inkscape\\gradients")
+#    define INKSCAPE_KEYSDIR      WIN32_DATADIR("..\\share\\inkscape\\keys")
+#    define INKSCAPE_PIXMAPDIR    WIN32_DATADIR("..\\share\\inkscape\\icons")
+#    define INKSCAPE_MARKERSDIR   WIN32_DATADIR("..\\share\\inkscape\\markers")
+#    define INKSCAPE_PALETTESDIR  WIN32_DATADIR("..\\share\\inkscape\\palettes")
+#    define INKSCAPE_PATTERNSDIR  WIN32_DATADIR("..\\share\\inkscape\\patterns")
+#    define INKSCAPE_SCREENSDIR   WIN32_DATADIR("..\\share\\inkscape\\screens")
+#    define INKSCAPE_TUTORIALSDIR WIN32_DATADIR("..\\share\\inkscape\\tutorials")
+#    define INKSCAPE_TEMPLATESDIR WIN32_DATADIR("..\\share\\inkscape\\templates")
+#    define INKSCAPE_UIDIR        WIN32_DATADIR("..\\share\\inkscape\\ui")
 //CREATE V0.1  WIN32 support
-#    define CREATE_GRADIENTSDIR   WIN32_DATADIR("create\\gradients\\gimp")
-#    define CREATE_PALETTESDIR    WIN32_DATADIR("create\\swatches")
-#    define CREATE_PATTERNSDIR    WIN32_DATADIR("create\\patterns\\vector")
+#    define CREATE_GRADIENTSDIR   WIN32_DATADIR("..\\share\\create\\gradients\\gimp")
+#    define CREATE_PALETTESDIR    WIN32_DATADIR("..\\share\\create\\swatches")
+#    define CREATE_PATTERNSDIR    WIN32_DATADIR("..\\share\\create\\patterns\\vector")
 #  elif defined ENABLE_OSX_APP_LOCATIONS
 #    define INKSCAPE_APPICONDIR   "Contents/Resources/pixmaps"
 #    define INKSCAPE_BINDDIR      "Contents/Resources/bind"
--- src/prefix.cpp	2010-08-24 17:46:16.000000000 +0200
+++ src/prefix.cpp	2010-08-24 17:50:51.000000000 +0200
@@ -44,8 +44,10 @@
 #endif /* __cplusplus */
 
 
+#ifndef _WIN32
 #undef NULL
 #define NULL ((void *) 0)
+#endif
 
 #ifdef __GNUC__
     #define br_return_val_if_fail(expr,val) if (!(expr)) {fprintf (stderr, "** BinReloc (%s): assertion %s failed\n", __PRETTY_FUNCTION__, #expr); return val;}
@@ -466,7 +468,7 @@
 
 static Glib::ustring win32_getResourcePath(const Glib::ustring &childPath)
 {
-    Glib::ustring dir = win32_getDataDir();
+    Glib::ustring dir = win32_getExePath();
     if (childPath.size() > 0)
         {
         dir += "\\";

Places

File inkscape-0.48.0-win32.patch of Package mingw32-inkscape (Revision 13dee1bfa215179a755c08fa8b6d963c)

Places