diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*SlackBuild*' -x '*.egg-info' -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x config.rpath -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.png' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in -x poppler-config.h origsrc/poppler-0.6/configure.ac src/poppler-0.6/configure.ac --- origsrc/poppler-0.6/configure.ac 2007-09-03 12:58:48.000000000 -0500 +++ src/poppler-0.6/configure.ac 2007-09-30 15:14:27.171875000 -0500 @@ -26,6 +26,9 @@ win32_libs="" create_shared_lib="" case "$host_os" in + cygwin*) + create_shared_lib="-no-undefined" + ;; mingw|mingw32) win32_libs="-lgdi32" create_shared_lib="-no-undefined" diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*SlackBuild*' -x '*.egg-info' -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x config.rpath -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.png' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in -x poppler-config.h origsrc/poppler-0.6/glib/Makefile.am src/poppler-0.6/glib/Makefile.am --- origsrc/poppler-0.6/glib/Makefile.am 2007-09-03 13:26:45.000000000 -0500 +++ src/poppler-0.6/glib/Makefile.am 2007-09-30 15:14:47.656250000 -0500 @@ -90,7 +90,7 @@ $(FONTCONFIG_LIBS) \ $(cairo_libs) -libpoppler_glib_la_LDFLAGS = -version-info 2:0:0 +libpoppler_glib_la_LDFLAGS = -version-info 2:0:0 @create_shared_lib@ noinst_PROGRAMS = test-poppler-glib diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*SlackBuild*' -x '*.egg-info' -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x config.rpath -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.png' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in -x poppler-config.h origsrc/poppler-0.6/m4/qt.m4 src/poppler-0.6/m4/qt.m4 --- origsrc/poppler-0.6/m4/qt.m4 2007-03-06 16:26:19.000000000 -0600 +++ src/poppler-0.6/m4/qt.m4 2007-09-30 15:17:33.875000000 -0500 @@ -60,7 +60,7 @@ save_CXXFLAGS=$CXXFLAGS save_LIBS=$LIBS CXXFLAGS="$CXXFLAGS -I$qt_incdir" - LIBS="$LIBS $qt_libdir/$qt_test_library" + LIBS="$LIBS -L$qt_libdir -lqt-mt" AC_MSG_CHECKING([if Qt needs -pthread]) AC_TRY_LINK([#include ], [QString s;], [pthread_needed=no], [pthread_needed=yes]) if test "x$pthread_needed" = "xyes"; then @@ -80,7 +80,7 @@ fi $1[]_CXXFLAGS="-I$qt_incdir" - $1[]_LIBS="$qtpthread $qt_libdir/$qt_test_library" + $1[]_LIBS="$qtpthread -L$qt_libdir -lqt-mt" ifelse([$2], , :, [$2]) else ifelse([$3], , [AC_MSG_FAILURE(dnl diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*SlackBuild*' -x '*.egg-info' -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x config.rpath -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.png' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in -x poppler-config.h origsrc/poppler-0.6/poppler/CairoOutputDev.cc src/poppler-0.6/poppler/CairoOutputDev.cc --- origsrc/poppler-0.6/poppler/CairoOutputDev.cc 2007-09-02 11:02:51.000000000 -0500 +++ src/poppler-0.6/poppler/CairoOutputDev.cc 2007-09-30 16:12:57.484375000 -0500 @@ -585,7 +585,9 @@ delete css; } +#ifndef __CYGWIN__ typedef unsigned int uint32_t; +#endif static uint32_t luminocity(uint32_t x) { diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*SlackBuild*' -x '*.egg-info' -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x config.rpath -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.png' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in -x poppler-config.h origsrc/poppler-0.6/qt/Makefile.am src/poppler-0.6/qt/Makefile.am --- origsrc/poppler-0.6/qt/Makefile.am 2007-09-03 13:26:53.000000000 -0500 +++ src/poppler-0.6/qt/Makefile.am 2007-09-30 15:15:05.578125000 -0500 @@ -29,7 +29,7 @@ $(FREETYPE_LIBS) \ $(FONTCONFIG_LIBS) -libpoppler_qt_la_LDFLAGS = -version-info 2:0:0 +libpoppler_qt_la_LDFLAGS = -version-info 2:0:0 @create_shared_lib@ if BUILD_SPLASH_OUTPUT diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*SlackBuild*' -x '*.egg-info' -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x config.rpath -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.png' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in -x poppler-config.h origsrc/poppler-0.6/qt4/src/Makefile.am src/poppler-0.6/qt4/src/Makefile.am --- origsrc/poppler-0.6/qt4/src/Makefile.am 2007-09-03 13:54:46.000000000 -0500 +++ src/poppler-0.6/qt4/src/Makefile.am 2007-09-30 15:15:40.218750000 -0500 @@ -45,5 +45,5 @@ $(top_builddir)/poppler/libpoppler-arthur.la endif -libpoppler_qt4_la_LDFLAGS = -version-info 2:0:0 +libpoppler_qt4_la_LDFLAGS = -version-info 2:0:0 @create_shared_lib@ diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*SlackBuild*' -x '*.egg-info' -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x config.rpath -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.png' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in -x poppler-config.h origsrc/poppler-0.6/test/Makefile.am src/poppler-0.6/test/Makefile.am --- origsrc/poppler-0.6/test/Makefile.am 2007-02-01 14:01:00.000000000 -0600 +++ src/poppler-0.6/test/Makefile.am 2007-09-30 15:16:55.671875000 -0500 @@ -59,8 +59,8 @@ pdf-inspector.cc pdf_inspector_LDADD = \ - $(top_builddir)/poppler/libpoppler.la \ $(top_builddir)/poppler/libpoppler-cairo.la \ + $(top_builddir)/poppler/libpoppler.la \ $(CAIRO_LIBS) \ $(FREETYPE_LIBS) \ $(GTK_TEST_LIBS)