diff options
author | dakkar <dakkar@thenautilus.net> | 2024-09-06 13:19:21 +0100 |
---|---|---|
committer | dakkar <dakkar@thenautilus.net> | 2024-09-06 13:19:21 +0100 |
commit | 909ef372f8a192d0f6581868c731cdadbdb92072 (patch) | |
tree | 142cb15d2630767ef0351aa61690e8bf5f7477ef /x11-libs/wxGTK/files | |
parent | remove fvwm tweaks, upstreamed (diff) | |
download | gentoo-overlay-master.tar.gz gentoo-overlay-master.tar.bz2 gentoo-overlay-master.zip |
Diffstat (limited to 'x11-libs/wxGTK/files')
-rw-r--r-- | x11-libs/wxGTK/files/wxGTK-3.1.3-abi.patch | 31 | ||||
-rw-r--r-- | x11-libs/wxGTK/files/wxGTK-3.1.3-collision.patch | 74 |
2 files changed, 0 insertions, 105 deletions
diff --git a/x11-libs/wxGTK/files/wxGTK-3.1.3-abi.patch b/x11-libs/wxGTK/files/wxGTK-3.1.3-abi.patch deleted file mode 100644 index f064da4..0000000 --- a/x11-libs/wxGTK/files/wxGTK-3.1.3-abi.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git c/src/common/appbase.cpp w/src/common/appbase.cpp -index 186d845..5b5727a 100644 ---- c/src/common/appbase.cpp -+++ w/src/common/appbase.cpp -@@ -850,6 +850,26 @@ bool wxAppConsoleBase::CheckBuildOptions(const char *optionsSignature, - msg.Printf(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), - lib.c_str(), progName.c_str(), prog.c_str()); - -+ int l_off = lib.Find("compiler with C++ ABI "); -+ int p_off = prog.Find("compiler with C++ ABI "); -+ if (l_off != wxNOT_FOUND && p_off != wxNOT_FOUND) { -+ int space; -+ space = lib.find(',', l_off + 22); -+ lib.erase(l_off, space - l_off); -+ space = prog.find(',', p_off + 22); -+ prog.erase(p_off, space - p_off); -+ if (lib == prog) { -+ // The only difference is the ABI version, which apparently only -+ // affect obscure cases. We used to warn here, so at least -+ // there was an indication of what's up if there is a problem -+ // due to ABI incompatibilities, but wxLogWarning() can result -+ // in a pop up dialog with some applications, which is just too -+ // intrusive, so just quietly ignore instead. -+ //wxLogWarning(msg.c_str()); -+ return false; -+ } -+ } -+ - wxLogFatalError(msg.c_str()); - - // normally wxLogFatalError doesn't return diff --git a/x11-libs/wxGTK/files/wxGTK-3.1.3-collision.patch b/x11-libs/wxGTK/files/wxGTK-3.1.3-collision.patch deleted file mode 100644 index add7ff2..0000000 --- a/x11-libs/wxGTK/files/wxGTK-3.1.3-collision.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index dadc0cd..e128da6 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -13804,10 +13804,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ - all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__webkit2_ext___depname) $(__wxrc___depname) - - install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install -- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal -- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) - $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets -- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets) -+ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \ -+ for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \ -+ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done) - $(DYLIB_RPATH_INSTALL) - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx - for f in setup.h $(RCDEFS_H); do \ -@@ -14703,7 +14703,7 @@ install-wxconfig: - $(INSTALL_DIR) $(DESTDIR)$(bindir) - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config - $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config -- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) -+ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE) || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) - - locale_install: - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale -@@ -14711,7 +14711,7 @@ locale_install: - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ - if test -f $(srcdir)/locale/$$l.mo ; then \ -- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ -+ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ - fi ; \ - done - -diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl -index 9c7b419..8e0b2e6 100644 ---- a/build/bakefiles/wx.bkl -+++ b/build/bakefiles/wx.bkl -@@ -137,7 +137,7 @@ - <using module="gettext"/> - <gettext-catalogs id="locale"> - <srcdir>$(SRCDIR)/locale</srcdir> -- <catalog-name>wxstd</catalog-name> -+ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name> - <linguas> - ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk - zh zh_CN zh_TW -diff --git a/src/common/translation.cpp b/src/common/translation.cpp -index 9716294..20d1631 100644 ---- a/src/common/translation.cpp -+++ b/src/common/translation.cpp -@@ -1521,7 +1521,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c - - bool wxTranslations::AddStdCatalog() - { -- if ( !AddCatalog(wxS("wxstd")) ) -+ if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) ) - return false; - - // there may be a catalog with toolkit specific overrides, it is not -diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in -index aa56bf0..6eb05ba 100644 ---- a/utils/wxrc/Makefile.in -+++ b/utils/wxrc/Makefile.in -@@ -119,7 +119,6 @@ distclean: clean - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) - @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) - @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) --@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)) - - @COND_USE_XRC_1@uninstall_wxrc: - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) |