diff --git a/.gitattributes b/.gitattributes index bf16a71493..3906385f47 100644 --- a/.gitattributes +++ b/.gitattributes @@ -24,7 +24,6 @@ *.h.in eol=lf *.m4 eol=lf -*.sh eol=lf configure.in eol=lf Makefile.am eol=lf Makefile.in eol=lf @@ -44,3 +43,19 @@ build/upmake -diff .gitignore export-ignore .gitmodules export-ignore appveyor.yml export-ignore + +* text=auto eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +.gitignore text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +.gitattributes text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +.gitmodules text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.sh text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.c text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.cpp text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.h text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.txt text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.html text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.htm text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.md text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.pandoc text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.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 b1d20d927c..39e6d5cebf 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 @@ -303,7 +303,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 library. @@ -348,7 +348,7 @@ // // Recommended setting: 1 unless compatibility with the official wxWidgets // build and/or the existing code is a concern. -#define wxUSE_STD_CONTAINERS 0 +#define wxUSE_STD_CONTAINERS 1 // Use standard C++ streams if 1 instead of wx streams in some places. If // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the @@ -388,7 +388,7 @@ // // Recommended setting: 0 to remain compatible with the official builds of // wxWidgets. -#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL +#define wxUSE_STD_STRING_CONV_IN_WXSTRING 1 // ---------------------------------------------------------------------------- // non GUI features selection @@ -550,7 +550,7 @@ // Default is 1. // // Recommended setting: 1 -#define wxUSE_DIALUP_MANAGER 1 +#define wxUSE_DIALUP_MANAGER 0 // Compile in classes for run-time DLL loading and function calling. // Required by wxUSE_DIALUP_MANAGER. diff --git a/to-rho-fork.patch b/to-rho-fork.patch new file mode 100644 index 0000000000..571e1976bd --- /dev/null +++ b/to-rho-fork.patch @@ -0,0 +1,135 @@ +diff --git a/.gitattributes b/.gitattributes +index bf16a71493..3906385f47 100644 +--- a/.gitattributes ++++ b/.gitattributes +@@ -24,7 +24,6 @@ + + *.h.in eol=lf + *.m4 eol=lf +-*.sh eol=lf + configure.in eol=lf + Makefile.am eol=lf + Makefile.in eol=lf +@@ -44,3 +43,19 @@ build/upmake -diff + .gitignore export-ignore + .gitmodules export-ignore + appveyor.yml export-ignore ++ ++* text=auto eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 ++.gitignore text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 ++.gitattributes text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 ++.gitmodules text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 ++*.sh text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 ++*.c text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 ++*.cpp text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 ++*.h text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 ++*.txt text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 ++*.html text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 ++*.htm text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 ++*.md text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 ++*.pandoc text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 ++*.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 library. +@@ -347,7 +347,7 @@ + // + // Recommended setting: 1 unless compatibility with the official wxWidgets + // build and/or the existing code is a concern. +-#define wxUSE_STD_CONTAINERS 0 ++#define wxUSE_STD_CONTAINERS 1 + + // Use standard C++ streams if 1 instead of wx streams in some places. If + // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the +@@ -387,7 +387,7 @@ + // + // Recommended setting: 0 to remain compatible with the official builds of + // wxWidgets. +-#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL ++#define wxUSE_STD_STRING_CONV_IN_WXSTRING 1 + + // ---------------------------------------------------------------------------- + // non GUI features selection +@@ -550,7 +550,7 @@ + // Default is 1. + // + // Recommended setting: 1 +-#define wxUSE_DIALUP_MANAGER 1 ++#define wxUSE_DIALUP_MANAGER 0 + + // Compile in classes for run-time DLL loading and function calling. + // Required by wxUSE_DIALUP_MANAGER.