From 3f7720deaaf46584a18dcb9ac25da564627bb626 Mon Sep 17 00:00:00 2001 From: GloriousEggroll Date: Sat, 13 Apr 2019 13:18:06 -0600 Subject: [PATCH] finish 4.6 build fixes --- build/makefile_base.mak | 4 +- game-patches-testing/proton-prep.sh | 5 +- .../proton-restore-unicode.patch | 903 ++++++++++++++++++ 3 files changed, 906 insertions(+), 6 deletions(-) create mode 100644 game-patches-testing/proton-restore-unicode.patch diff --git a/build/makefile_base.mak b/build/makefile_base.mak index 7f7bda150..cddef1495 100644 --- a/build/makefile_base.mak +++ b/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/ diff --git a/game-patches-testing/proton-prep.sh b/game-patches-testing/proton-prep.sh index c98cfb38b..3ef58ac3f 100755 --- a/game-patches-testing/proton-prep.sh +++ b/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 diff --git a/game-patches-testing/proton-restore-unicode.patch b/game-patches-testing/proton-restore-unicode.patch new file mode 100644 index 000000000..ca63fd871 --- /dev/null +++ b/game-patches-testing/proton-restore-unicode.patch @@ -0,0 +1,903 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PKGBUILDS/proton-restore-unicode.patch at 4f957d01396ba0fb44852d3b28ce0cb83e024c0c · Tk-Glitch/PKGBUILDS · GitHub + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Skip to content +
+ + + + + + + + +
+ +
+ +
+ +
+ + + +
+
+
+ + + + + + + + + + +
+
+ + + +

+ + /PKGBUILDS + +

+ +
+ + + + +
+
+
+ + + + + + + + Permalink + + + + + + +
+ + +
+ + Tree: + 4f957d0139 + + + + + + + +
+ +
+ + Find file + + + Copy path + +
+ + + +
+ + Find file + + + Copy path + +
+
+ + + + +
+
+ + + + + proton-tkg: Restore installing wine/unicode.h to please Proton on 0ff… + + + + 4f957d0 + Apr 13, 2019 + +
+ +
+
+ + 1 contributor + + +
+ +

+ Users who have contributed to this file +

+
+ + + +
+
+
+ + + + + +
+ +
+ +
+ 27 lines (25 sloc) + + 709 Bytes +
+ +
+ +
+ Raw + Blame + History +
+ + +
+ + + +
+
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Restore installing wine/unicode.h to please proton
+
diff --git a/include/Makefile.in b/include/Makefile.in
index c478c34..74198af 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -683,6 +683,7 @@ SOURCES = \
wine/itss.idl \
wine/library.h \
wine/svcctl.idl \
+ wine/unicode.h \
wine/winedxgi.idl \
winerror.h \
winevt.h \
diff --git a/tools/make_makefiles b/tools/make_makefiles
index 3936310..111bc8f 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -42,6 +42,7 @@ my %exported_wine_headers = (
"wine/debug.h" => 1,
"wine/exception.h" => 1,
"wine/library.h" => 1,
+ "wine/unicode.h" => 1,
"wine/itss.idl" => 1,
"wine/svcctl.idl" => 1,
);
+ + + +
+ +
+ + + +
+ + +
+ + +
 +
+ + + +
+
+
+ +
+
+ + +
+ + + + + + +
+ + + You can’t perform that action at this time. +
+ + + + + + + + + + + + + + +
+ + + +