--- qemu-2.5.0-rc2/configure.orig	2015-11-27 19:14:33.000000000 +0100
+++ qemu-2.5.0-rc2/configure	2015-12-08 16:56:58.079810200 +0100
@@ -579,7 +579,7 @@
 CYGWIN*)
   mingw32="yes"
   QEMU_CFLAGS="-mno-cygwin $QEMU_CFLAGS"
-  audio_possible_drivers="sdl"
+  audio_possible_drivers="dsound sdl"
   audio_drv_list="sdl"
 ;;
 MINGW32*)
@@ -590,6 +590,7 @@
   else
     audio_drv_list=""
   fi
+  libs_softmmu="-mwindows"
 ;;
 GNU/kFreeBSD)
   bsd="yes"
@@ -4880,7 +4881,7 @@
   version_minor=${rc_version%%.*}
   rc_version=${rc_version#*.}
   version_subminor=${rc_version%%.*}
-  version_micro=0
+  version_micro=${rc_version#*.}
   echo "CONFIG_FILEVERSION=$version_major,$version_minor,$version_subminor,$version_micro" >> $config_host_mak
   echo "CONFIG_PRODUCTVERSION=$version_major,$version_minor,$version_subminor,$version_micro" >> $config_host_mak
   if test "$guest_agent_with_vss" = "yes" ; then
@@ -5101,7 +5102,7 @@
 if test "$gtk" = "yes" ; then
   echo "CONFIG_GTK=y" >> $config_host_mak
   echo "CONFIG_GTKABI=$gtkabi" >> $config_host_mak
-  echo "GTK_CFLAGS=$gtk_cflags" >> $config_host_mak
+  echo "GTK_CFLAGS=$gtk_cflags -DINPUT_NEEDS_ALTGR_FIX" >> $config_host_mak
   if test "$gtk_gl" = "yes" ; then
     echo "CONFIG_GTK_GL=y" >> $config_host_mak
   fi
--- qemu-2.5.0-rc2/Makefile.orig	2015-11-27 19:14:32.000000000 +0100
+++ qemu-2.5.0-rc2/Makefile	2015-12-08 14:02:57.900839700 +0100
@@ -187,7 +187,7 @@
 	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pixman V="$(V)" all,)
 
 pixman/Makefile: $(SRC_PATH)/pixman/configure
-	(cd pixman; CFLAGS="$(CFLAGS) -fPIC $(extra_cflags) $(extra_ldflags)" $(SRC_PATH)/pixman/configure $(AUTOCONF_HOST) --disable-gtk --disable-shared --enable-static)
+	(cd pixman; CFLAGS="$(CFLAGS)  $(extra_cflags) $(extra_ldflags)" $(SRC_PATH)/pixman/configure $(AUTOCONF_HOST) --disable-gtk --disable-shared --enable-static)
 
 $(SRC_PATH)/pixman/configure:
 	(cd $(SRC_PATH)/pixman; autoreconf -v --install)
@@ -226,7 +226,7 @@
 libqemuutil.a: $(util-obj-y)
 
 block-modules = $(foreach o,$(block-obj-m),"$(basename $(subst /,-,$o))",) NULL
-util/module.o-cflags = -D'CONFIG_BLOCK_MODULES=$(block-modules)'
+util/module.o-cflags = -DCONFIG_BLOCK_MODULES=$(block-modules)
 
 ######################################################################
 
@@ -627,11 +627,13 @@
 	makensis $(nsisflags) \
                 $(if $(BUILD_DOCS),-DCONFIG_DOCUMENTATION="y") \
                 $(if $(CONFIG_GTK),-DCONFIG_GTK="y") \
-                -DBINDIR="${INSTDIR}" \
+		-DBINDIR=`cygpath -w "${INSTDIR}"` \
+		-DCONFSUFFIX="/Bios" \
                 $(if $(DLL_PATH),-DDLLDIR="$(DLL_PATH)") \
-                -DSRCDIR="$(SRC_PATH)" \
-                -DOUTFILE="$(INSTALLER)" \
+		-DSRCDIR=`cygpath -w "$(SRC_PATH)"` \
+		-DOUTFILE=`cygpath -w "$(INSTALLER)"` \
                 -DDISPLAYVERSION="$(VERSION)" \
+		`cygpath -w $(SRC_PATH)/qemu.nsi`
                 $(SRC_PATH)/qemu.nsi
 	rm -r ${INSTDIR}
 ifdef SIGNCODE
--- qemu-2.5.0-rc2/po/fr_FR.po.orig	2015-12-08 13:21:47.757099300 +0100
+++ qemu-2.5.0-rc2/po/fr_FR.po	2015-12-08 13:26:29.568469900 +0100
@@ -1,86 +1,85 @@
-# French translation for QEMU.
 # This file is put in the public domain.
 #
 # Aurelien Jarno <aurelien@aurel32.net>, 2013, 2014.
+# Eric Lassauge <lassauge@users.sf.net>, 2014-2015. Still not displaying correctly the accents :-(
 msgid ""
 msgstr ""
-"Project-Id-Version: QEMU 1.4.50\n"
+"Project-Id-Version: QEMU 2.5.0-rc2\n"
 "Report-Msgid-Bugs-To: qemu-devel@nongnu.org\n"
-"POT-Creation-Date: 2015-07-30 07:34+0200\n"
-"PO-Revision-Date: 2014-07-28 23:25+0200\n"
-"Last-Translator: Aurelien Jarno <aurelien@aurel32.net>\n"
+"POT-Creation-Date: 2015-12-08 13:26+0100\n"
+"PO-Revision-Date: 2015-09-14 10:35+0100\n"
+"Last-Translator: Eric Lassauge <lassauge@gmail.com>\n"
 "Language-Team: French <FR@li.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.4\n"
 
-#: ui/gtk.c:260
+#: ui/gtk.c:282
 msgid " - Press Ctrl+Alt+G to release grab"
-msgstr "- Appuyer sur Ctrl+Alt+G pour arrêter la capture"
+msgstr "- Appuyez sur Ctrl+Alt+G pour arreter la capture"
 
-#: ui/gtk.c:264
+#: ui/gtk.c:286
 msgid " [Paused]"
 msgstr " [En pause]"
 
-#: ui/gtk.c:1688
+#: ui/gtk.c:1834
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ui/gtk.c:1694
+#: ui/gtk.c:1840
 msgid "_Reset"
-msgstr "_Réinitialiser"
+msgstr "_Re-initialiser"
 
-#: ui/gtk.c:1697
+#: ui/gtk.c:1843
 msgid "Power _Down"
-msgstr "_Éteindre"
+msgstr "Et_eindre"
 
-#: ui/gtk.c:1703
+#: ui/gtk.c:1849
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ui/gtk.c:1787
+#: ui/gtk.c:1941
 msgid "_Fullscreen"
-msgstr "Mode _plein écran"
+msgstr "Mode _plein ecran"
 
-#: ui/gtk.c:1801
+#: ui/gtk.c:1955
 msgid "Zoom _In"
 msgstr "Zoom _avant"
 
-#: ui/gtk.c:1808
+#: ui/gtk.c:1962
 msgid "Zoom _Out"
-msgstr "_Zoom arrière"
+msgstr "Zoom a_rriere"
 
-#: ui/gtk.c:1815
+#: ui/gtk.c:1969
 msgid "Best _Fit"
-msgstr "Zoom _idéal"
+msgstr "Zoom _ideal"
 
-#: ui/gtk.c:1822
+#: ui/gtk.c:1976
 msgid "Zoom To _Fit"
 msgstr "Zoomer pour a_juster"
 
-#: ui/gtk.c:1828
+#: ui/gtk.c:1982
 msgid "Grab On _Hover"
 msgstr "Capturer en _survolant"
 
-#: ui/gtk.c:1831
+#: ui/gtk.c:1985
 msgid "_Grab Input"
-msgstr "_Capturer les entrées"
+msgstr "_Capturer les entrees"
 
-#: ui/gtk.c:1860
+#: ui/gtk.c:2014
 msgid "Show _Tabs"
 msgstr "Montrer les _onglets"
 
-#: ui/gtk.c:1863
+#: ui/gtk.c:2017
 msgid "Detach Tab"
-msgstr "_Détacher l'onglet"
+msgstr "_Detacher l'onglet"
 
-#: ui/gtk.c:1875
+#: ui/gtk.c:2029
 msgid "_Machine"
 msgstr "_Machine"
 
-#: ui/gtk.c:1880
+#: ui/gtk.c:2034
 msgid "_View"
 msgstr "_Vue"
--- qemu-2.5.0-rc2/qemu.nsi.orig	2015-11-27 19:14:36.000000000 +0100
+++ qemu-2.5.0-rc2/qemu.nsi	2015-12-08 13:21:48.004124000 +0100
@@ -28,6 +28,12 @@
 !ifndef BINDIR
 !define BINDIR nsis.tmp
 !endif
+!ifndef CONFSUFFIX
+!define CONFSUFFIX ""
+!endif
+!ifndef CONFDIR
+!define CONFDIR "${BINDIR}${CONFSUFFIX}"
+!endif
 !ifndef SRCDIR
 !define SRCDIR .
 !endif
@@ -119,13 +125,13 @@
     File "${SRCDIR}\README"
     File "${SRCDIR}\VERSION"
 
-    File "${BINDIR}\*.bmp"
-    File "${BINDIR}\*.bin"
-    File "${BINDIR}\*.dtb"
-    File "${BINDIR}\*.rom"
-    File "${BINDIR}\openbios-*"
+    File "${CONFDIR}\*.bmp"
+    File "${CONFDIR}\*.bin"
+    File "${CONFDIR}\*.dtb"
+    File "${CONFDIR}\*.rom"
+    File "${CONFDIR}\openbios-*"
 
-    File /r "${BINDIR}\keymaps"
+    File /r "${CONFDIR}\keymaps"
 !ifdef CONFIG_GTK
     File /r "${BINDIR}\share"
 !endif
@@ -170,11 +176,12 @@
 !ifdef CONFIG_DOCUMENTATION
 Section "Documentation" SectionDoc
     SetOutPath "$INSTDIR"
-    File "${BINDIR}\qemu-doc.html"
-    File "${BINDIR}\qemu-tech.html"
+    File "${BINDIR}\Doc\qemu-doc.html"
+    File "${BINDIR}\Doc\qemu-tech.html"
+	;; File "${BINDIR}\Doc\*.txt"
     CreateDirectory "$SMPROGRAMS\${PRODUCT}"
-    CreateShortCut "$SMPROGRAMS\${PRODUCT}\User Documentation.lnk" "$INSTDIR\qemu-doc.html" "" "$INSTDIR\qemu-doc.html" 0
-    CreateShortCut "$SMPROGRAMS\${PRODUCT}\Technical Documentation.lnk" "$INSTDIR\qemu-tech.html" "" "$INSTDIR\qemu-tech.html" 0
+    CreateShortCut "$SMPROGRAMS\${PRODUCT}\User Documentation.lnk" "$INSTDIR\Doc\qemu-doc.html" "" "$INSTDIR\Doc\qemu-doc.html" 0
+    CreateShortCut "$SMPROGRAMS\${PRODUCT}\Technical Documentation.lnk" "$INSTDIR\Doc\qemu-tech.html" "" "$INSTDIR\Doc\qemu-tech.html" 0
 SectionEnd
 !endif
 
@@ -208,19 +215,19 @@
     Delete "$INSTDIR\COPYING.LIB"
     Delete "$INSTDIR\README"
     Delete "$INSTDIR\VERSION"
-    Delete "$INSTDIR\*.bmp"
-    Delete "$INSTDIR\*.bin"
-    Delete "$INSTDIR\*.dll"
-    Delete "$INSTDIR\*.dtb"
-    Delete "$INSTDIR\*.rom"
-    Delete "$INSTDIR\openbios-*"
+    Delete "${CONFDIR}\*.bmp"
+    Delete "${CONFDIR}\*.bin"
+    Delete "${CONFDIR}\*.dll"
+    Delete "${CONFDIR}\*.dtb"
+    Delete "${CONFDIR}\*.rom"
+    Delete "${CONFDIR}\openbios-*"
     Delete "$INSTDIR\qemu-img.exe"
     Delete "$INSTDIR\qemu-io.exe"
     Delete "$INSTDIR\qemu.exe"
     Delete "$INSTDIR\qemu-system-*.exe"
-    Delete "$INSTDIR\qemu-doc.html"
-    Delete "$INSTDIR\qemu-tech.html"
-    RMDir /r "$INSTDIR\keymaps"
+    Delete "$INSTDIR\Doc\qemu-doc.html"
+    Delete "$INSTDIR\Doc\qemu-tech.html"
+    RMDir /r "${CONFDIR}\keymaps"
     RMDir /r "$INSTDIR\share"
     ; Remove generated files
     Delete "$INSTDIR\stderr.txt"
--- qemu-2.5.0-rc2/rules.mak.orig	2015-11-27 19:14:36.000000000 +0100
+++ qemu-2.5.0-rc2/rules.mak	2015-12-08 13:41:22.111532400 +0100
@@ -17,7 +17,7 @@
 QEMU_CXXFLAGS = -D__STDC_LIMIT_MACROS $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wold-style-declaration -Wold-style-definition -Wredundant-decls, $(QEMU_CFLAGS))
 
 # Flags for dependency generation
-QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(@D)/$(*F).d
+QEMU_DGFLAGS=""
 
 # Same as -I$(SRC_PATH) -I., but for the nested source/object directories
 QEMU_INCLUDES += -I$(<D) -I$(@D)
@@ -56,7 +56,7 @@
 %.o: %.c
 	$(call quiet-command,$(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) -c -o $@ $<,"  CC    $(TARGET_DIR)$@")
 %.o: %.rc
-	$(call quiet-command,$(WINDRES) -I. -o $@ $<,"  RC    $(TARGET_DIR)$@")
+	$(call quiet-command,$(WINDRES) -I. -o  '$(shell cygpath -w $@)' '$(shell cygpath -w $<)',"  RC    $(TARGET_DIR)$@")
 
 # If we have a CXX we might have some C++ objects, in which case we
 # must link with the C++ compiler, not the plain C compiler.
@@ -71,7 +71,7 @@
 %.lo: %.c
 	$(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($*.o-cflags) -c -o $@ $<,"  lt CC $@")
 %.lo: %.rc
-	$(call quiet-command,$(LIBTOOL) --mode=compile --tag=RC $(WINDRES) -I. -o $@ $<,"lt RC   $(TARGET_DIR)$@")
+	$(call quiet-command,$(LIBTOOL) --mode=compile --tag=RC $(WINDRES) -I. -o '$(shell cygpath -w $@)' '$(shell cygpath -w $<)',"lt RC   $(TARGET_DIR)$@")
 %.lo: %.dtrace
 	$(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC dtrace -o $@ -G -s $<, " lt GEN $(TARGET_DIR)$@")
 
--- qemu-2.5.0-rc2/ui/gtk.c.orig	2015-11-27 19:14:37.000000000 +0100
+++ qemu-2.5.0-rc2/ui/gtk.c	2015-12-08 13:21:48.170140600 +0100
@@ -55,6 +55,12 @@
 #include "sysemu/char.h"
 #include "qom/object.h"
 
+#ifdef _WIN32
+#ifndef MAPVK_VK_TO_VSC
+#define MAPVK_VK_TO_VSC     0
+#endif
+#endif
+
 #define MAX_VCS 10
 #define VC_WINDOW_X_MIN  320
 #define VC_WINDOW_Y_MIN  240
@@ -172,6 +178,11 @@
     bool modifier_pressed[ARRAY_SIZE(modifier_keycode)];
     bool has_evdev;
     bool ignore_keys;
+#if defined(INPUT_NEEDS_ALTGR_FIX)
+    /* win32 alt-gr handling */
+    bool l_ctrl_down;
+    bool r_alt_down;
+#endif
 };
 
 static void gd_grab_pointer(VirtualConsole *vc, const char *reason);
@@ -985,12 +996,28 @@
 
 #ifdef GDK_WINDOWING_WIN32
     if (GDK_IS_WIN32_DISPLAY(dpy)) {
+        /*
+           testing for right ctrl and right alt and give corresponding code.
+           for all other keystrokes, scan code is given by MapVirtualKey.
+           (MapVirtualKey maps same code for left and right ctrl and alt keys)
+         */
+        switch (gdk_keycode) {
+        case 0xa3: // r-ctrl
+            qemu_keycode = 0x9d;
+            break;
+        case 0xa5: // r-alt
+            qemu_keycode = 0xb8;
+            break;
+        default:
         qemu_keycode = MapVirtualKey(gdk_keycode, MAPVK_VK_TO_VSC);
+            /* FIXME: is following check still needed? */
         switch (qemu_keycode) {
         case 103:   /* alt gr */
             qemu_keycode = 56 | SCANCODE_GREY;
             break;
         }
+            break;
+        }
         return qemu_keycode;
     }
 #endif
@@ -1066,6 +1093,30 @@
         }
     }
 
+#if defined(INPUT_NEEDS_ALTGR_FIX)
+    /* Windows maps altgr key to l-ctrl + r-alt.
+       For proper handling in the guest, only r-alt is to be sent.
+       This is done by sending a fake "ctrl up" event when appropriate. */
+    switch (qemu_keycode) {
+    case 0x1d: /* l-ctrl */
+        if (!s->l_ctrl_down && s->r_alt_down) {
+            /* fake ctrl up already sent */
+            return TRUE;
+        }
+        s->l_ctrl_down = (key->type == GDK_KEY_PRESS);
+        break;
+    case 0xb8: /* r-alt */
+        if (s->l_ctrl_down && !s->r_alt_down &&
+                key->type == GDK_KEY_PRESS) {
+            /* sending fake "ctrl up" event */
+            qemu_input_event_send_key_number(vc->gfx.dcl.con, 0x1d, FALSE);
+            s->l_ctrl_down = FALSE;
+        }
+        s->r_alt_down = (key->type == GDK_KEY_PRESS);
+        break;
+    }
+#endif
+
     qemu_input_event_send_key_number(vc->gfx.dcl.con, qemu_keycode,
                                      key->type == GDK_KEY_PRESS);
 
@@ -2046,9 +2097,18 @@
 
     /* LC_MESSAGES only. See early_gtk_display_init() for details */
     setlocale(LC_MESSAGES, "");
+#ifdef CONFIG_WIN32
+    char *execdirname = qemu_get_exec_dir();
+    char *dirname = g_strdup_printf("%s\\share\\locale",execdirname);
+    bindtextdomain("qemu", dirname);
+    g_free(dirname);
+    g_free(execdirname);
+#else
     bindtextdomain("qemu", CONFIG_QEMU_LOCALEDIR);
+#endif
     textdomain("qemu");
 
+	
     window_display = gtk_widget_get_display(s->window);
     s->null_cursor = gdk_cursor_new_for_display(window_display,
                                                 GDK_BLANK_CURSOR);
--- qemu-2.5.0-rc2/ui/Makefile.objs.orig	2015-11-27 19:14:37.000000000 +0100
+++ qemu-2.5.0-rc2/ui/Makefile.objs	2015-12-08 13:21:48.225146100 +0100
@@ -16,6 +16,7 @@
 common-obj-$(CONFIG_VNC) += $(vnc-obj-y)
 common-obj-$(CONFIG_GTK) += gtk.o x_keymap.o
 
+ifeq ($(CONFIG_SDL),y)
 ifeq ($(CONFIG_SDLABI),1.2)
 sdl.mo-objs := sdl.o sdl_zoom.o
 endif
@@ -26,6 +27,7 @@
 endif
 endif
 sdl.mo-cflags := $(SDL_CFLAGS)
+endif
 
 ifeq ($(CONFIG_OPENGL),y)
 common-obj-y += shader.o
--- qemu-2.5.0-rc2/ui/vnc-enc-tight.c.orig	2015-11-27 19:14:37.000000000 +0100
+++ qemu-2.5.0-rc2/ui/vnc-enc-tight.c	2015-12-08 13:21:48.331156700 +0100
@@ -50,6 +50,8 @@
 #include "vnc-enc-tight.h"
 #include "vnc-palette.h"
 
+typedef unsigned int uint;
+
 /* Compression level stuff. The following array contains various
    encoder parameters for each of 10 compression levels (0..9).
    Last three parameters correspond to JPEG quality levels (0..9). */
--- qemu-2.5.0-rc2/version.rc.orig	2015-11-27 19:14:37.000000000 +0100
+++ qemu-2.5.0-rc2/version.rc	2015-12-08 13:21:48.400163600 +0100
@@ -1,6 +1,7 @@
 #include <winver.h>
 #include "config-host.h"
 
+500 ICON "qemu.ico"
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION CONFIG_FILEVERSION
 PRODUCTVERSION CONFIG_PRODUCTVERSION