Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:dataman64bit
mingw64-poppler
poppler-0.14.1-pdftoabw.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File poppler-0.14.1-pdftoabw.patch of Package mingw64-poppler
diff -Naur poppler-0.14.1.orig/configure.ac poppler-0.14.1/configure.ac --- poppler-0.14.1.orig/configure.ac 2010-07-16 10:42:51.372008235 +0200 +++ poppler-0.14.1/configure.ac 2010-07-16 10:48:56.564008435 +0200 @@ -54,6 +54,8 @@ ;; esac +AM_CONDITIONAL(OS_WIN32, test "x$os_win32" = "xyes") + AC_SUBST(win32_libs) AC_SUBST(create_shared_lib) AC_SUBST(auto_import_flags) diff -Naur poppler-0.14.1.orig/utils/Makefile.am poppler-0.14.1/utils/Makefile.am --- poppler-0.14.1.orig/utils/Makefile.am 2010-07-16 10:42:51.392010941 +0200 +++ poppler-0.14.1/utils/Makefile.am 2010-07-16 10:43:03.696009662 +0200 @@ -32,6 +32,10 @@ pdftoabw_LDADD = $(LDADD) $(ABIWORD_LIBS) +if OS_WIN32 +pdftoabw_LDFLAGS = -mwindows +endif + pdftoabw_binary = pdftoabw endif diff -Naur poppler-0.14.1.orig/utils/pdftoabw.cc poppler-0.14.1/utils/pdftoabw.cc --- poppler-0.14.1.orig/utils/pdftoabw.cc 2010-07-16 10:42:51.392010941 +0200 +++ poppler-0.14.1/utils/pdftoabw.cc 2010-07-16 10:45:41.836003834 +0200 @@ -21,6 +21,16 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifdef _WIN32 +#ifdef DATADIR +#undef DATADIR +#endif +#include <io.h> +#include <conio.h> +#define _WIN32_WINNT 0x0501 +#include <windows.h> +#endif + #include "config.h" #include <poppler-config.h> #include <stdio.h> @@ -103,6 +113,30 @@ char * outpName; xmlDocPtr XMLdoc = NULL; +#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 + // parse args ok = parseArgs(argDesc, &argc, argv); if (!ok || argc < 2 || argc > 3 || printVersion || printHelp) { @@ -187,10 +221,10 @@ error: // clean up - if(globalParams) delete globalParams; + if(XMLdoc) xmlFreeDoc(XMLdoc); if(doc) delete doc; + if(globalParams) delete globalParams; delete fileName; - if(XMLdoc) xmlFreeDoc(XMLdoc); if(abwOut) delete abwOut; err0: // check for memory leaks
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor