cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch file that patches patch file leads to recursion issues

Browse Source
This commit is contained in:
Cheng 2023-10-05 08:13:49 +00:00
parent c2980fa75c
commit e5f0e632b1
No known key found for this signature in database
GPG Key ID: 571C3A9C3B9E6FCA
1 changed files with 1 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
to-rho-fork.patch
View File

@ -172,79 +172,4 @@ index 0000000000..f5c4039361
++*.css text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
++*.manifest text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
+\ No newline at end of file
+diff --git a/.gitmodules b/.gitmodules
+index eccca68800..77720f19e5 100644
+--- a/.gitmodules
++++ b/.gitmodules
+@@ -1,32 +1,32 @@
+ [submodule "3rdparty/catch"]
+ path = 3rdparty/catch
+- url = https://github.com/wxWidgets/Catch.git
+- branch = wx
++ url = git@rho.la:~/Catch.git
++ branch = rho-fork
+ [submodule "src/zlib"]
+ path = src/zlib
+- url = https://github.com/wxWidgets/zlib.git
+- branch = wx
++ url = git@rho.la:~/zlib.git
++ branch = rho-fork
+ [submodule "src/png"]
+ path = src/png
+- url = https://github.com/wxWidgets/libpng.git
+- branch = wx
++ url = git@rho.la:~/libpng.git
++ branch = rho-fork
+ [submodule "src/expat"]
+ path = src/expat
+- url = https://github.com/wxWidgets/libexpat.git
+- branch = wx
++ url = git@rho.la:~/libexpat.git
++ branch = rho-fork
+ [submodule "src/tiff"]
+ path = src/tiff
+- url = https://github.com/wxWidgets/libtiff.git
+- branch = wx
++ url = git@rho.la:~/libtiff.git
++ branch = rho-fork
+ [submodule "src/jpeg"]
+ path = src/jpeg
+- url = https://github.com/wxWidgets/libjpeg-turbo.git
+- branch = wx
++ url = git@rho.la:~/libjpeg-turbo.git
++ branch = rho-fork
+ [submodule "3rdparty/pcre"]
+ path = 3rdparty/pcre
+- url = https://github.com/wxWidgets/pcre
+- branch = wx
++ url = git@rho.la:~/pcre
++ branch = rho-fork
+ [submodule "3rdparty/nanosvg"]
+ path = 3rdparty/nanosvg
+- url = https://github.com/wxWidgets/nanosvg
+- branch = wx
++ url = git@rho.la:~/nanosvg
++ branch = rho-fork
+diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h
+index 6a875dc179..4e189a8fab 100644
+--- a/include/wx/msw/setup.h
++++ b/include/wx/msw/setup.h
+@@ -44,7 +44,7 @@
+ // in the version after it completely.
+ //
+ // Recommended setting: 0 (please update your code)
+-#define WXWIN_COMPATIBILITY_3_0 1
++#define WXWIN_COMPATIBILITY_3_0 0
+
+ // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
+ // default system font is used for wxWindow::GetCharWidth/Height() instead of
+@@ -302,7 +302,7 @@
+ //
+ // Recommended setting: 2 if you want to have maximal performance and don't
+ // care about the scenario described above.
+-#define wxUSE_COMPILER_TLS 1
++#define wxUSE_COMPILER_TLS 2
+
+ // ----------------------------------------------------------------------------
+ // Interoperability with the standard libr
\ No newline at end of file