File epdfview-0.1.7-windows.patch of Package mingw32-epdfview

Overview Repositories Revisions Requests Users Attributes Meta

File epdfview-0.1.7-windows.patch of Package mingw32-epdfview (Revision 3b192c9fa1d7cc0b2445d1bb7a45812f)

Currently displaying revision 3b192c9fa1d7cc0b2445d1bb7a45812f , Show latest

--- src/IJob.cxx (revision 325)
+++ src/IJob.cxx (revision 344)
@@ -18,4 +18,5 @@
 #include "epdfview.h"
 #include <unistd.h>
+#include <stdlib.h>
 
 using namespace ePDFView;
@@ -61,5 +62,9 @@
         }
     }
+#ifdef _WIN32
+    _sleep(0);
+#else
     sleep(0);
+#endif
 }
 
--- src/main.cxx (revision 325)
+++ src/main.cxx (revision 344)
@@ -23,4 +23,11 @@
 #include "epdfview.h"
 #include <MainView.h>
+
+#ifdef _WIN32
+#include <io.h>
+#include <conio.h>
+#define _WIN32_WINNT 0x0500
+#include <windows.h>
+#endif
 
 using namespace ePDFView;
@@ -50,4 +57,29 @@
 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
+
     // Enable NLS.
     setlocale (LC_ALL, "");
--- src/Makefile.am (revision 222)
+++ src/Makefile.am (revision 344)
@@ -59,5 +59,5 @@
 
 libshell_cxxflags = -I$(top_srcdir)/src/gtk $(GTK2_CFLAGS)
-libshell_ldadd = $(GTK2_LIBS) $(top_builddir)/src/gtk/libshell-gtk.a
+libshell_ldadd = $(top_builddir)/src/gtk/libshell-gtk.a $(GTK2_LIBS)
 
 epdfview_CXXFLAGS =	\
@@ -70,6 +70,8 @@
 	libepdfview.a	\
 	$(GLIB_LIBS)	\
-	$(libshell_ldadd)	\
-	$(POPPLER_LIBS)
+	$(POPPLER_LIBS)	\
+	$(libshell_ldadd)
+
+epdfview_LDFLAGS =
 
 if cups_printing
@@ -88,2 +90,6 @@
 endif
 
+if OS_WIN32
+epdfview_LDFLAGS += -mwindows
+endif
+
--- configure.ac (revision 325)
+++ configure.ac (revision 344)
@@ -6,4 +6,5 @@
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
+AC_CANONICAL_HOST
 
 dnl Parameters.
@@ -54,10 +55,27 @@
 fi
 
-EPDFVIEW_PATH_CUPS([CUPS], [have_cups=yes])
-AM_CONDITIONAL(cups_printing, test "x$have_cups" = "xyes")
-if test "x$have_cups" = "xyes"; then
-    AC_SUBST([CUPS_CFLAGS])
-    AC_SUBST([CUPS_LIBS])
-    AC_DEFINE([HAVE_CUPS], [1], [Define to 1 if you have the CUPS API library.])
+AC_MSG_CHECKING([for native Win32])
+case "$host" in
+  *-*-mingw*)
+    os_win32=yes
+    ;;
+  *)
+    os_win32=no
+    ;;
+esac
+AC_MSG_RESULT([$os_win32])
+
+AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"])
+
+if test "$os_win32" != "yes"; then
+  EPDFVIEW_PATH_CUPS([CUPS], [have_cups=yes])
+  AM_CONDITIONAL(cups_printing, test "x$have_cups" = "xyes")
+  if test "x$have_cups" = "xyes"; then
+      AC_SUBST([CUPS_CFLAGS])
+      AC_SUBST([CUPS_LIBS])
+      AC_DEFINE([HAVE_CUPS], [1], [Define to 1 if you have the CUPS API library.])
+  fi
+else
+  AM_CONDITIONAL(cups_printing, false)
 fi

Places

File epdfview-0.1.7-windows.patch of Package mingw32-epdfview (Revision 3b192c9fa1d7cc0b2445d1bb7a45812f)

Places