finish 4.6 build fixes

build/makefile_base.mak

@@ -666,7 +666,7 @@ $(STEAMEXE_CONFIGURE_FILES): $(STEAMEXE_SYN) $(MAKEFILE_DEP) | $(STEAMEXE_OBJ) $
 		cp ../$(STEAMEXE_SYN)/Makefile . && \
 		echo >> ./Makefile 'SRCDIR := ../$(STEAMEXE_SYN)' && \
 		echo >> ./Makefile 'vpath % $$(SRCDIR)' && \
-		echo >> ./Makefile 'steam_exe_LDFLAGS := -m32 -lsteam_api $$(steam_exe_LDFLAGS)'
+		echo >> ./Makefile 'steam_exe_LDFLAGS := -m32 -fpermissive -lsteam_api $$(steam_exe_LDFLAGS)'
 
 ## steam goals
 STEAMEXE_TARGETS = steam steam_configure
@@ -680,7 +680,7 @@ steam_configure: $(STEAMEXE_CONFIGURE_FILES)
 
 steam: SHELL = $(CONTAINER_SHELL32)
 steam: $(STEAMEXE_CONFIGURE_FILES) | $(WINE_BUILDTOOLS32) $(filter $(MAKECMDGOALS),wine64 wine32 wine)
-	+env PATH="$(abspath $(TOOLS_DIR32))/bin:$(PATH)" LDFLAGS="-m32" CXXFLAGS="-m32 -Wno-attributes $(COMMON_FLAGS) -g" CFLAGS="-m32 $(COMMON_FLAGS) -g" \
+	+env PATH="$(abspath $(TOOLS_DIR32))/bin:$(PATH)" LDFLAGS="-m32 -fpermissive" CXXFLAGS="-m32 -fpermissive -Wno-attributes $(COMMON_FLAGS) -g" CFLAGS="-m32 -fpermissive $(COMMON_FLAGS) -g" \
 		$(MAKE) -C $(STEAMEXE_OBJ)
 	[ x"$(STRIP)" = x ] || $(STRIP) $(STEAMEXE_OBJ)/steam.exe.so
 	mkdir -pv $(DST_DIR)/lib/wine/

game-patches-testing/proton-prep.sh

@@ -26,9 +26,6 @@
     git reset --hard HEAD
     git clean -xdf
 
-    #revert 0ffb1535517301d28c7c004eac639a9a0cc26c00 because steam needs it
-    git revert --no-commit 0ffb1535517301d28c7c004eac639a9a0cc26c00
-
     echo "system tray fix for kde plasma"
     patch -Np1 < ../game-patches-testing/plasma_systray_fix.patch
 
@@ -72,7 +69,7 @@
 
     # this is needed for wine 4.5+
     patch -Np1 < ../game-patches-testing/esync-no_kernel_obj_list.patch
-
+    patch -Np1 < ../game-patches-testing/proton-restore-unicode.patch
     patch -Np1 < ../game-patches-testing/valve-gnutls.patch
     patch -Np1 < ../game-patches-testing/valve-proton-sdl-joy.patch
     patch -Np1 < ../game-patches-testing/valve-hide-prefix-update-window.patch