diff --git a/.gitignore b/.gitignore
index e69de29..bcf4664 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/wxWidgets-2.8.12.tar.gz
diff --git a/mingw-wxWidgets.spec b/mingw-wxWidgets.spec
new file mode 100644
index 0000000..7fb6dd5
--- /dev/null
+++ b/mingw-wxWidgets.spec
@@ -0,0 +1,201 @@
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
+%define __debug_install_post %{_mingw32_debug_install_post}
+
+%global mingw_pkg_name wxWidgets
+
+Summary:       MinGW port of the wxWidgets GUI library
+Name:          mingw-%{mingw_pkg_name}
+Version:       2.8.12
+Release:       3%{?dist}
+License:       wxWidgets
+
+Group:         Development/Libraries
+URL:           http://wxwidgets.org
+Source:        http://prdownloads.sourceforge.net/wxwindows/wxWidgets-%{version}.tar.gz
+Patch0:        mingw-wxwidgets.patch
+Patch1:        mingw-wxwidgets-png.patch
+BuildArch:     noarch
+BuildRequires: mingw32-gcc-c++
+BuildRequires: mingw32-expat
+BuildRequires: mingw32-libjpeg
+BuildRequires: mingw32-libpng
+BuildRequires: mingw32-libtiff
+BuildRequires: mingw32-zlib
+
+%description
+wxWidgets is the C++ cross-platform GUI library, offering classes for all
+common GUI controls as well as a comprehensive set of helper classes for most
+common application tasks, ranging from networking to HTML display and image
+manipulation.
+
+# Mingw32
+%package -n mingw32-%{mingw_pkg_name}
+Summary:		%{summary}
+
+%description -n mingw32-%{mingw_pkg_name}
+wxWidgets is the C++ cross-platform GUI library, offering classes for all
+common GUI controls as well as a comprehensive set of helper classes for most
+common application tasks, ranging from networking to HTML display and image
+manipulation.
+
+%package -n mingw32-%{mingw_pkg_name}-static
+Summary:  Static libraries for mingw32-%{mingw_pkg_name} development
+Group:    Development/Libraries
+Requires: mingw32-%{mingw_pkg_name} = %{version}-%{release}
+
+%description -n mingw32-%{mingw_pkg_name}-static
+The mingw32-%{mingw_pkg_name}-static package contains static library for
+mingw32-%{mingw_pkg_name} development.
+
+%{?_mingw32_debug_package}
+
+%prep
+%setup -q -n wxWidgets-%{version}
+%patch0 -p0 -b .mingw32
+%patch1 -p0 -b .png14
+
+#==========================================
+%build
+#========= Shared Libraries ==========
+mkdir obj-shared
+cd obj-shared
+%_mingw32_configure --enable-shared \
+  --with-msw \
+  --with-sdl \
+  --enable-unicode \
+  --enable-optimise \
+  --with-regex=builtin \
+  --disable-rpath \
+  --without-subdirs
+
+make %{?_smp_mflags}
+cd ..
+#========= Static Libraries ==========
+mkdir obj-static
+cd obj-static
+%_mingw32_configure --disable-shared \
+  --with-msw \
+  --with-sdl \
+  --enable-unicode \
+  --enable-optimise \
+  --with-regex=builtin \
+  --disable-rpath \
+  --without-subdirs
+
+#TODO verify this doesn't overwrite anything from the shared build
+make %{?_smp_mflags}
+cd ..
+
+#==========================================
+%install
+make install -C obj-shared DESTDIR=$RPM_BUILD_ROOT
+make install -C obj-static DESTDIR=$RPM_BUILD_ROOT
+if ls $RPM_BUILD_ROOT%{_mingw32_libdir}/*.dll ; then
+  mv $RPM_BUILD_ROOT%{_mingw32_libdir}/*.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
+else
+  echo "No shared libraries found."
+fi
+
+# we need to modify the absolute wx-config link to be relative or rpm complains
+# (and our package wouldn't be relocatable)
+wx_config_filename=$(basename $RPM_BUILD_ROOT%{_mingw32_libdir}/wx/config/%{_mingw32_target}-*-release-[0-9]*)
+ln -sf ../lib/wx/config/$wx_config_filename $RPM_BUILD_ROOT%{_mingw32_bindir}/wx-config
+
+# remove bakefiles for now until we have a working bakefile setup for mingw32
+rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/bakefile
+
+
+%files -n mingw32-%{mingw_pkg_name}
+%doc docs/licence.txt docs/licendoc.txt docs/lgpl.txt docs/gpl.txt
+%{_mingw32_bindir}/wx-config
+%{_mingw32_bindir}/wxbase28u_gcc_custom.dll
+%{_mingw32_bindir}/wxbase28u_net_gcc_custom.dll
+%{_mingw32_bindir}/wxbase28u_xml_gcc_custom.dll
+%{_mingw32_bindir}/wxmsw28u_adv_gcc_custom.dll
+%{_mingw32_bindir}/wxmsw28u_aui_gcc_custom.dll
+%{_mingw32_bindir}/wxmsw28u_core_gcc_custom.dll
+%{_mingw32_bindir}/wxmsw28u_html_gcc_custom.dll
+%{_mingw32_bindir}/wxmsw28u_qa_gcc_custom.dll
+%{_mingw32_bindir}/wxmsw28u_richtext_gcc_custom.dll
+%{_mingw32_bindir}/wxmsw28u_xrc_gcc_custom.dll
+%{_mingw32_includedir}/wx-2.8
+%{_mingw32_libdir}/libwx_baseu-2.8-%{_mingw32_target}.dll.a
+%{_mingw32_libdir}/libwx_baseu_net-2.8-%{_mingw32_target}.dll.a
+%{_mingw32_libdir}/libwx_baseu_xml-2.8-%{_mingw32_target}.dll.a
+%{_mingw32_libdir}/libwx_mswu_adv-2.8-%{_mingw32_target}.dll.a
+%{_mingw32_libdir}/libwx_mswu_aui-2.8-%{_mingw32_target}.dll.a
+%{_mingw32_libdir}/libwx_mswu_core-2.8-%{_mingw32_target}.dll.a
+%{_mingw32_libdir}/libwx_mswu_html-2.8-%{_mingw32_target}.dll.a
+%{_mingw32_libdir}/libwx_mswu_qa-2.8-%{_mingw32_target}.dll.a
+%{_mingw32_libdir}/libwx_mswu_richtext-2.8-%{_mingw32_target}.dll.a
+%{_mingw32_libdir}/libwx_mswu_xrc-2.8-%{_mingw32_target}.dll.a
+%dir %{_mingw32_libdir}/wx
+%dir %{_mingw32_libdir}/wx/config
+%{_mingw32_libdir}/wx/config/%{_mingw32_target}-msw-unicode-release-2.8
+%dir %{_mingw32_libdir}/wx/include
+%{_mingw32_libdir}/wx/include/%{_mingw32_target}-msw-unicode-release-2.8
+%{_mingw32_datadir}/aclocal/wxwin.m4
+#{_mingw32_datadir}/bakefile
+#{_mingw32_datadir}/bakefile/presets
+#{_mingw32_datadir}/bakefile/presets/wx.bkl
+#{_mingw32_datadir}/bakefile/presets/wx_unix.bkl
+#{_mingw32_datadir}/bakefile/presets/wx_win32.bkl
+
+%files -n mingw32-%{mingw_pkg_name}-static
+%{_mingw32_libdir}/libwx_baseu-2.8-%{_mingw32_target}.a
+%{_mingw32_libdir}/libwx_baseu_net-2.8-%{_mingw32_target}.a
+%{_mingw32_libdir}/libwx_baseu_xml-2.8-%{_mingw32_target}.a
+%{_mingw32_libdir}/libwx_mswu_adv-2.8-%{_mingw32_target}.a
+%{_mingw32_libdir}/libwx_mswu_aui-2.8-%{_mingw32_target}.a
+%{_mingw32_libdir}/libwx_mswu_core-2.8-%{_mingw32_target}.a
+%{_mingw32_libdir}/libwx_mswu_html-2.8-%{_mingw32_target}.a
+%{_mingw32_libdir}/libwx_mswu_qa-2.8-%{_mingw32_target}.a
+%{_mingw32_libdir}/libwx_mswu_richtext-2.8-%{_mingw32_target}.a
+%{_mingw32_libdir}/libwx_mswu_xrc-2.8-%{_mingw32_target}.a
+%{_mingw32_libdir}/libwxregexu-2.8-%{_mingw32_target}.a
+%{_mingw32_libdir}/wx/config/%{_mingw32_target}-msw-unicode-release-static-2.8
+%{_mingw32_libdir}/wx/include/%{_mingw32_target}-msw-unicode-release-static-2.8
+
+
+%changelog
+* Mon May 23 2011 Thomas Sailer <t.sailer@alumni.ethz.ch> - 2.8.12-3
+- transition to new package naming scheme
+
+* Thu May  5 2011 Thomas Sailer <t.sailer@alumni.ethz.ch> - 2.8.12-2
+- include license file
+
+* Wed May  4 2011 Thomas Sailer <t.sailer@alumni.ethz.ch> - 2.8.12-1
+- update to 2.8.12
+- remove buildroot, defattr, clean
+
+* Tue Apr 19 2011 Thomas Sailer <t.sailer@alumni.ethz.ch> - 2.8.11-1
+- update to 2.8.11
+
+* Tue Sep 8 2009 Michael Ansel <michael.ansel@gmail.com> - 2.8.10-1
+- update to 2.8.10
+
+* Tue Sep 8 2009 Michael Ansel <michael.ansel@gmail.com> - 2.8.9-3
+- Adjust to Fedora packaging guidelines
+
+* Wed Aug 26 2009 Michael Ansel <michael.ansel@gmail.com> - 2.8.9-2
+- update for Fedora 11 (mingw -> mingw32)
+- use mingw32 macros
+- add static subpackage
+
+* Thu Dec 18 2008 Keiichi Takahashi <bitwalk@users.soureforge.net> - 2.8.9-1
+- update to 2.8.9
+
+* Tue Aug 12 2008 Keiichi Takahashi <bitwalk@users.soureforge.net> - 2.8.8-1
+- update to 2.8.8
+
+* Sat Mar 15 2008 Keiichi Takahashi <bitwalk@users.soureforge.net> - 2.8.7-2
+- rebuilt with current libraries.
+- add BuildPrereq and Requires more explicitly.
+
+* Thu Feb 28 2008 Keiichi Takahashi <bitwalk@users.soureforge.net> - 2.8.7-1
+- initial release
+
diff --git a/mingw-wxwidgets-png.patch b/mingw-wxwidgets-png.patch
new file mode 100644
index 0000000..088651c
--- /dev/null
+++ b/mingw-wxwidgets-png.patch
@@ -0,0 +1,28 @@
+--- configure.orig	2011-05-04 15:55:52.000000000 +0200
++++ configure	2011-05-04 15:57:31.000000000 +0200
+@@ -26379,13 +26379,13 @@
+ 
+ 
+             if test "$ac_cv_header_png_h" = "yes"; then
+-                echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
+-echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6
++                echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng14" >&5
++echo $ECHO_N "checking for png_sig_cmp in -lpng14... $ECHO_C" >&6
+ if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpng -lz -lm $LIBS"
++LIBS="-lpng14 -lz -lm $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -26443,7 +26443,7 @@
+ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5
+ echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6
+ if test $ac_cv_lib_png_png_sig_cmp = yes; then
+-  PNG_LINK=" -lpng -lz"
++  PNG_LINK=" -lpng14 -lz"
+ fi
+ 
+             fi
diff --git a/mingw-wxwidgets.patch b/mingw-wxwidgets.patch
new file mode 100644
index 0000000..e510ec5
--- /dev/null
+++ b/mingw-wxwidgets.patch
@@ -0,0 +1,533 @@
+--- configure.xx	2011-04-19 17:06:13.000000000 +0200
++++ configure	2011-04-19 17:07:46.000000000 +0200
+@@ -26627,519 +26627,7 @@
+             else
+                                 wxUSE_LIBJPEG=sys
+ 
+-                if test "$wxUSE_MSW" = 1; then
+-                                                                                                    echo "$as_me:$LINENO: checking for boolean" >&5
+-echo $ECHO_N "checking for boolean... $ECHO_C" >&6
+-if test "${ac_cv_type_boolean+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <windows.h>
+-
+-int
+-main ()
+-{
+-if ((boolean *) 0)
+-  return 0;
+-if (sizeof (boolean))
+-  return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_type_boolean=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_type_boolean=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_boolean" >&5
+-echo "${ECHO_T}$ac_cv_type_boolean" >&6
+-if test $ac_cv_type_boolean = yes; then
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_BOOLEAN 1
+-_ACEOF
+-
+-
+-                            echo "$as_me:$LINENO: checking for boolean" >&5
+-echo $ECHO_N "checking for boolean... $ECHO_C" >&6
+-if test "${ac_cv_type_boolean+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-                                    #undef HAVE_BOOLEAN
+-                                    #include <stdio.h>
+-                                    #include <jpeglib.h>
+-
+-
+-int
+-main ()
+-{
+-if ((boolean *) 0)
+-  return 0;
+-if (sizeof (boolean))
+-  return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_type_boolean=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_type_boolean=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_boolean" >&5
+-echo "${ECHO_T}$ac_cv_type_boolean" >&6
+-
+-echo "$as_me:$LINENO: checking size of boolean" >&5
+-echo $ECHO_N "checking size of boolean... $ECHO_C" >&6
+-if test "${ac_cv_sizeof_boolean+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test "$ac_cv_type_boolean" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+-  if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-                                    #undef HAVE_BOOLEAN
+-                                    #include <stdio.h>
+-                                    #include <jpeglib.h>
+-
+-
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (boolean))) >= 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_lo=0 ac_mid=0
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-                                    #undef HAVE_BOOLEAN
+-                                    #include <stdio.h>
+-                                    #include <jpeglib.h>
+-
+-
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (boolean))) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_hi=$ac_mid; break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-                                    #undef HAVE_BOOLEAN
+-                                    #include <stdio.h>
+-                                    #include <jpeglib.h>
+ 
+-
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (boolean))) < 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_hi=-1 ac_mid=-1
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-                                    #undef HAVE_BOOLEAN
+-                                    #include <stdio.h>
+-                                    #include <jpeglib.h>
+-
+-
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (boolean))) >= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_lo=$ac_mid; break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo= ac_hi=
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-                                    #undef HAVE_BOOLEAN
+-                                    #include <stdio.h>
+-                                    #include <jpeglib.h>
+-
+-
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (boolean))) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_hi=$ac_mid
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) ac_cv_sizeof_boolean=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (boolean), 77
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (boolean), 77
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
+-esac
+-else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-                                    #undef HAVE_BOOLEAN
+-                                    #include <stdio.h>
+-                                    #include <jpeglib.h>
+-
+-
+-long longval () { return (long) (sizeof (boolean)); }
+-unsigned long ulongval () { return (long) (sizeof (boolean)); }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    exit (1);
+-  if (((long) (sizeof (boolean))) < 0)
+-    {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (boolean))))
+-	exit (1);
+-      fprintf (f, "%ld\n", i);
+-    }
+-  else
+-    {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (boolean))))
+-	exit (1);
+-      fprintf (f, "%lu\n", i);
+-    }
+-  exit (ferror (f) || fclose (f) != 0);
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_sizeof_boolean=`cat conftest.val`
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (boolean), 77
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (boolean), 77
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-fi
+-rm -f conftest.val
+-else
+-  ac_cv_sizeof_boolean=0
+-fi
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_boolean" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_boolean" >&6
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_BOOLEAN $ac_cv_sizeof_boolean
+-_ACEOF
+-
+-
+-                            cat >>confdefs.h <<_ACEOF
+-#define wxHACK_BOOLEAN wxInt`expr 8 \* $ac_cv_sizeof_boolean`
+-_ACEOF
+-
+-
+-fi
+-
+-                fi
+             fi
+         fi
+     fi
+--- ./src/common/imagjpeg.cpp.xx	2011-04-19 17:20:03.000000000 +0200
++++ ./src/common/imagjpeg.cpp	2011-04-19 17:20:26.000000000 +0200
+@@ -46,7 +46,7 @@
+ }
+ 
+ #ifndef HAVE_WXJPEG_BOOLEAN
+-typedef boolean wxjpeg_boolean;
++typedef jpeg_boolean wxjpeg_boolean;
+ #endif
+ 
+ #include "wx/filefn.h"