File inkscape-0.47-win32.patch of Package mingw64-inkscape

Overview Repositories Revisions Requests Users Attributes Meta

File inkscape-0.47-win32.patch of Package mingw64-inkscape (Revision c0866dd614e4e7807b17a125a5a1a922)

Currently displaying revision c0866dd614e4e7807b17a125a5a1a922 , Show latest

--- src/color-profile.cpp	2009-11-16 18:29:45.000000000 +0100
+++ src/color-profile.cpp	2009-12-07 19:14:07.000000000 +0100
@@ -34,7 +34,7 @@
 #include "dom/util/digest.h"
 
 #ifdef WIN32
-#include <Icm.h>
+#include <icm.h>
 #endif // WIN32
 
 using Inkscape::ColorProfile;
--- src/dialogs/export.cpp	2009-11-16 18:29:31.000000000 +0100
+++ src/dialogs/export.cpp	2009-12-07 19:14:07.000000000 +0100
@@ -62,7 +62,7 @@
 
 #ifdef WIN32
 #include <windows.h>
-#include <COMMDLG.h>
+#include <commdlg.h>
 #include <gdk/gdkwin32.h>
 #endif
 
--- src/main.cpp	2009-12-07 20:43:39.000000000 +0100
+++ src/main.cpp	2009-12-07 20:35:24.000000000 +0100
@@ -56,6 +56,10 @@
 
 #include "gc-core.h"
 
+#ifdef AND
+#undef AND
+#endif
+
 #include "macros.h"
 #include "file.h"
 #include "document.h"
@@ -108,6 +112,11 @@
 
 #endif // WIN32
 
+#include <io.h>
+#include <conio.h>
+#define _WIN32_WINNT 0x0501
+#include <windows.h>
+
 #include "extension/init.h"
 
 #include <glibmm/i18n.h>
@@ -551,6 +560,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/inkview.cpp	2009-11-16 18:29:46.000000000 +0100
+++ src/inkview.cpp	2009-12-07 22:54:25.000000000 +0100
@@ -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/Makefile.am	2009-11-16 21:39:28.000000000 +0100
+++ src/Makefile.am	2009-12-07 20:41:21.000000000 +0100
@@ -88,7 +88,8 @@
 
 if PLATFORM_WIN32
 win32_sources = winmain.cpp registrytool.cpp registrytool.h
-win32ldflags = -lcomdlg32
+win32ldflags = -lcomdlg32 -lmscms
+mwindows = -mwindows
 endif 
 
 if INKJAR
@@ -214,10 +215,11 @@
 
 inkscape_SOURCES += main.cpp $(win32_sources)
 inkscape_LDADD = $(all_libs)
-inkscape_LDFLAGS = --export-dynamic $(kdeldflags)
+inkscape_LDFLAGS = --export-dynamic $(kdeldflags) $(mwindows)
 
 inkview_SOURCES += inkview.cpp $(win32_sources)
 inkview_LDADD = $(all_libs)
+inkview_LDFLAGS = $(mwindow) 
 
 # ################################################
 #  VERSION REPORTING
--- src/Makefile.in	2009-12-07 20:43:56.000000000 +0100
+++ src/Makefile.in	2009-12-07 20:41:30.000000000 +0100
@@ -1470,6 +1470,8 @@
 am_inkview_OBJECTS = inkview.$(OBJEXT) $(am__objects_6)
 inkview_OBJECTS = $(am_inkview_OBJECTS)
 inkview_DEPENDENCIES = $(am__DEPENDENCIES_3)
+inkview_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(inkview_LDFLAGS) \
+	$(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -2427,7 +2429,8 @@
 #
 # ################################################
 @PLATFORM_WIN32_TRUE@win32_sources = winmain.cpp registrytool.cpp registrytool.h
-@PLATFORM_WIN32_TRUE@win32ldflags = -lcomdlg32
+@PLATFORM_WIN32_TRUE@win32ldflags = -lcomdlg32 -lmscms
+@PLATFORM_WIN32_TRUE@mwindows = -mwindows
 @INKJAR_TRUE@inkjar_dir = inkjar
 @INKJAR_TRUE@inkjar_libs = inkjar/libinkjar.a
 dom_libdom_a_SOURCES = \
@@ -2885,8 +2888,9 @@
 # this should speed up the build
 libinkscape_a_SOURCES = $(ink_common_sources)
 inkscape_LDADD = $(all_libs)
-inkscape_LDFLAGS = --export-dynamic $(kdeldflags)
+inkscape_LDFLAGS = --export-dynamic $(kdeldflags) $(mwindows)
 inkview_LDADD = $(all_libs)
+inkview_LDFLAGS = $(mwindow) 
 
 # ################################################
 #  VERSION REPORTING
@@ -4631,7 +4635,7 @@
 	$(inkscape_LINK) $(inkscape_OBJECTS) $(inkscape_LDADD) $(LIBS)
 inkview$(EXEEXT): $(inkview_OBJECTS) $(inkview_DEPENDENCIES) 
 	@rm -f inkview$(EXEEXT)
-	$(CXXLINK) $(inkview_OBJECTS) $(inkview_LDADD) $(LIBS)
+	$(inkview_LINK) $(inkview_OBJECTS) $(inkview_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
--- src/path-prefix.h	2009-11-16 18:29:45.000000000 +0100
+++ src/path-prefix.h	2009-12-07 19:14:07.000000000 +0100
@@ -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	2009-11-16 18:29:45.000000000 +0100
+++ src/prefix.cpp	2009-12-07 20:18:30.000000000 +0100
@@ -51,8 +51,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;}
@@ -472,7 +474,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 += "\\";
--- src/registrytool.cpp	2009-11-16 18:29:45.000000000 +0100
+++ src/registrytool.cpp	2009-12-07 20:36:21.000000000 +0100
@@ -27,6 +27,7 @@
 
 #include <windows.h>
 #include <string>
+#include <stdio.h>
 
 #include "registrytool.h"
 
--- src/ui/dialog/filedialogimpl-win32.cpp	2009-11-16 18:29:40.000000000 +0100
+++ src/ui/dialog/filedialogimpl-win32.cpp	2009-12-07 20:08:04.000000000 +0100
@@ -1373,10 +1373,10 @@
     if(_preview_bitmap_image)    // Is the image a pixbuf?
     {
         // Set the transformation
-        const Matrix matrix = {
+        const Matrix matrix(
             scaleFactor, 0,
             0, scaleFactor,
-            svgX, svgY };
+            svgX, svgY);
         context->set_matrix (matrix);
 
         // Render the image

Places

File inkscape-0.47-win32.patch of Package mingw64-inkscape (Revision c0866dd614e4e7807b17a125a5a1a922)

Places