commit: 1d84f7117b73db38a95743277bfac9161913ab8c Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Thu May 15 11:51:06 2025 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu May 15 11:51:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d84f711
x11-libs/wxGTK: drop 3.0.4-r5, 3.0.4-r6, 3.0.5.1-r1, 3.0.5.1-r3 Closes: https://bugs.gentoo.org/590126 Closes: https://bugs.gentoo.org/618642 Closes: https://bugs.gentoo.org/769503 Closes: https://bugs.gentoo.org/876613 Closes: https://bugs.gentoo.org/884325 Closes: https://bugs.gentoo.org/889652 Closes: https://bugs.gentoo.org/898592 Closes: https://bugs.gentoo.org/954759 Closes: https://bugs.gentoo.org/954760 Signed-off-by: David Seifert <soap <AT> gentoo.org> x11-libs/wxGTK/Manifest | 6 - .../files/wxGTK-3.0-gtk3-translation-domain.patch | 13 - x11-libs/wxGTK/files/wxGTK-3.0.5-collision.patch | 75 ----- .../files/wxGTK-3.0.5.1-configure-modern-c.patch | 54 ---- .../wxGTK/files/wxGTK-3.0.5.1-excise-autoptr.patch | 322 --------------------- x11-libs/wxGTK/files/wxGTK-configure-tests.patch | 28 -- x11-libs/wxGTK/wxGTK-3.0.4-r5.ebuild | 128 -------- x11-libs/wxGTK/wxGTK-3.0.4-r6.ebuild | 130 --------- x11-libs/wxGTK/wxGTK-3.0.5.1-r1.ebuild | 186 ------------ x11-libs/wxGTK/wxGTK-3.0.5.1-r3.ebuild | 199 ------------- 10 files changed, 1141 deletions(-) diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest index f9c1716ac955..a881375950d7 100644 --- a/x11-libs/wxGTK/Manifest +++ b/x11-libs/wxGTK/Manifest @@ -1,9 +1,3 @@ -DIST wxGTK-3.0.4_p20190713.tar.xz 53640 BLAKE2B 89eabc44660f8f9b19fc850717eb83244a746f2f8c28bcec89fa9ccd1828f103df114bce24406ff14875220de86276f9e51870d58e716f0c94d310707f7eae4c SHA512 44a4e92ccc9c143a0e70e015116e952b0529001a3a1e23193d501826720a505259ead6feaa08de75b4a7a8753f8b16f5cc14e4bff5d15585870066ccd1de53b9 -DIST wxGTK-3.0.5_p20210214.tar.xz 4560 BLAKE2B ac1815e679adfb2c36d74be0a4a9cc32d52e6b0b05a14393334bc5d30a8bc0da1386415a5b59a3f6dc4807d283272d36f033caa55a300c8c30cf0c402554b8bd SHA512 f1e34379b8bf594a68486bb6eccbd93f36dc2aeca37c0a7eb23de81c1c3825396437a65c43ed8d94673131e97414d49449ed51729970bf8b8e4608d36974a335 -DIST wxWidgets-3.0.4-docs-html.tar.bz2 24122986 BLAKE2B ffd38d50e6cb44077f346597863a8dfb1cb5172b9380995082acb23b5b5dae060bc1e3d14307a1146ccd93b5ae9c4fd8fb206346c8d5aced5a535cd3d7f8961a SHA512 2b4cefc98f5f034a8c36237c4979bd02e8b0ed60aaeb31946d8661fb8e5297172cec807e45c96fe2939b012f093950721cda8bf9f750697b50e3741711011ccd -DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce27a96fb22b191d52f30db1f1dc7951defcc220afc4dcb8417cfe23490762c2a25f62164ac21809f73ccf442dd19347 SHA512 c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158 -DIST wxWidgets-3.0.5-docs-html.tar.bz2 23844256 BLAKE2B f5b5bef129302ae1ded7a651e652b127ad9d548a00a498f06a4d4f868dc3bc33411ded2602c04c8329e927550d032bdbe633c2c7d1a7f89265874685d3cb3d9b SHA512 f839e67660f2b08aa28d1596a3b7af2c35f7c2c0505c6e6d45888845397212b3dd71c8d34115321e9a4347b9d92a0ce767bb76defd14c172e51c2a3df96cc3ac -DIST wxWidgets-3.0.5.1.tar.bz2 19739206 BLAKE2B da270cb8e4fc22b8d892ba80fbb4cc71578f642ca07102006f914a80331a254e746de6c91e61b585c0b1ab3abadd17d80a0eaa3efd48a3d412cf7202101abc7a SHA512 0a789fc5e71d414e43f75b5c16076fe8b1bcd7671be0770e4269dcef66d830c1bc74e183f49db270b928862f13472666c283fe2aa98b9006681722e06100725d DIST wxWidgets-3.2.2.1-docs-html.tar.bz2 18109775 BLAKE2B bb5dad886c2ba64feb9ec3be05f2cd4bcfb127d55f0a0af6d0aa59ee8f47663e39e7fcb3c0472cfdda9fbf99f1d32e07ff29604261e168f3b4218b9b5b61abc2 SHA512 9b883e1c611ac78f7b8457ffd8682c614d7653f561215c48e6239b6394cc4c084b34d6c55fe84fb7b76b38189591e94dc4596242f9e8653d2c72ae6f4b3a6293 DIST wxWidgets-3.2.2.1.tar.bz2 27339515 BLAKE2B e761e768dbb32bf76dbabf27aa9feb634760aa214c2d8f85f9b4284700d01390617c275a855fa3ae28481a38233f3a71f8560e5a8a360d7b72ace2603c551327 SHA512 289d61ea2abd75a329aafcbd347ab84b136f31fca01dd902593f661691ecd30a4416286ff501c4257baa6765cf356ade3087eb8609af9a44599cfdc20e2f03a6 DIST wxWidgets-3.2.5-docs-html.tar.bz2 18205089 BLAKE2B 8bf09c0f9698e72e425a4e4fcbd57498851c93f02dca33fadcd785e04f3927807ff65e8b7dbecaadde64b2bf7653e950a93c5d522ff4e27a8e3baaa85ef6c692 SHA512 cc80c827c4f8607ef38e435eb7fd5dab9fcad5e93ab81bca262d212f5a061b85093d1bc1a1bdc82a7422c4744b6fdd5c82f3142b6a497e85067f571ce9513f5e diff --git a/x11-libs/wxGTK/files/wxGTK-3.0-gtk3-translation-domain.patch b/x11-libs/wxGTK/files/wxGTK-3.0-gtk3-translation-domain.patch deleted file mode 100644 index 3b449baedb47..000000000000 --- a/x11-libs/wxGTK/files/wxGTK-3.0-gtk3-translation-domain.patch +++ /dev/null @@ -1,13 +0,0 @@ -Modify AddStdCatalog to use the versioned wxstd30-gtk3.mo. - ---- a/src/common/translation.cpp -+++ b/src/common/translation.cpp -@@ -1458,7 +1458,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c - - bool wxTranslations::AddStdCatalog() - { -- if ( !AddCatalog(wxS("wxstd")) ) -+ if ( !AddCatalog(wxS("wxstd30-gtk3")) ) - return false; - - // there may be a catalog with toolkit specific overrides, it is not diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.5-collision.patch b/x11-libs/wxGTK/files/wxGTK-3.0.5-collision.patch deleted file mode 100644 index 69531cc33aa4..000000000000 --- a/x11-libs/wxGTK/files/wxGTK-3.0.5-collision.patch +++ /dev/null @@ -1,75 +0,0 @@ -Prevent file collisions between multiple installed SLOTs. - - - Don't install wxwin.m4. It is installed with app-eselect/eselect-wxwidgets. - - Version the bakefile preset filenames. Unversioned symlinks to these files - are handled by eselect. - - Version wx-config and wxrc. The unversioned forms are wrapper scripts - installed with eselect-wxwidgets. - - Version wxstd.mo and modify AddStdCatalog to use it. - ---- a/Makefile.in -+++ b/Makefile.in -@@ -15213,10 +15213,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) $(__cocoa_res___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 $(__cocoa_res_install___depname) -- $(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 \ -@@ -16101,7 +16101,7 @@ install-wxconfig: - $(INSTALL_DIR) $(DESTDIR)$(bindir) - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config - $(INSTALL_SCRIPT) 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 -@@ -16109,7 +16109,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 - ---- 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 ---- a/src/common/translation.cpp -+++ b/src/common/translation.cpp -@@ -1458,7 +1458,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 ---- a/utils/wxrc/Makefile.in -+++ b/utils/wxrc/Makefile.in -@@ -125,7 +125,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) diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.5.1-configure-modern-c.patch b/x11-libs/wxGTK/files/wxGTK-3.0.5.1-configure-modern-c.patch deleted file mode 100644 index 6512c6329efb..000000000000 --- a/x11-libs/wxGTK/files/wxGTK-3.0.5.1-configure-modern-c.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://github.com/wxWidgets/wxWidgets/commit/da4b42688a6cd5444eefb91bf40183d88203ffca -https://bugs.gentoo.org/874441 ---- a/configure -+++ b/configure -@@ -19586,6 +19586,7 @@ else - /* end confdefs.h. */ - - #include <stdio.h> -+ #include <stdlib.h> - - int main() - { -@@ -22300,6 +22301,7 @@ else - - #include <zlib.h> - #include <stdio.h> -+ #include <stdlib.h> - - int main() - { -@@ -22422,6 +22424,7 @@ else - - #include <png.h> - #include <stdio.h> -+ #include <stdlib.h> - - int main() - { ---- a/configure.in -+++ b/configure.in -@@ -1482,6 +1482,7 @@ case "${host}" in - dnl Check the gcc version macro. - [ - #include <stdio.h> -+ #include <stdlib.h> - - int main() - { -@@ -2439,6 +2440,7 @@ if test "$wxUSE_ZLIB" != "no" ; then - [ - #include <zlib.h> - #include <stdio.h> -+ #include <stdlib.h> - - int main() - { -@@ -2507,6 +2509,7 @@ if test "$wxUSE_LIBPNG" != "no" ; then - [ - #include <png.h> - #include <stdio.h> -+ #include <stdlib.h> - - int main() - { diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.5.1-excise-autoptr.patch b/x11-libs/wxGTK/files/wxGTK-3.0.5.1-excise-autoptr.patch deleted file mode 100644 index e03f64632f2b..000000000000 --- a/x11-libs/wxGTK/files/wxGTK-3.0.5.1-excise-autoptr.patch +++ /dev/null @@ -1,322 +0,0 @@ -Direct replacement of auto_ptr, equivalent to parts of upstream commits: -https://github.com/wxWidgets/wxWidgets/commit/b8c9cd35288a5c94f88ea83bf8c9ee644f99ece1 -https://github.com/wxWidgets/wxWidgets/commit/11a5728b327d5f16ef284d737f6329d38ae4d4b1 -made by diffing new-er upstream version with fixes included and current file -diff --git a/tests/archive/archivetest.cpp b/tests/archive/archivetest.cpp -index fa122d1..845ee0b 100644 ---- a/tests/archive/archivetest.cpp -+++ b/tests/archive/archivetest.cpp -@@ -32,7 +32,6 @@ - #include <sys/stat.h> - - using std::string; --using std::auto_ptr; - - - // Check whether member templates can be used -@@ -559,7 +558,7 @@ TestEntry& ArchiveTestCase<ClassFactoryT>::Add(const char *name, - template <class ClassFactoryT> - void ArchiveTestCase<ClassFactoryT>::CreateArchive(wxOutputStream& out) - { -- auto_ptr<OutputStreamT> arc(m_factory->NewStream(out)); -+ wxScopedPtr<OutputStreamT> arc(m_factory->NewStream(out)); - TestEntries::iterator it; - - OnCreateArchive(*arc); -@@ -587,7 +586,7 @@ void ArchiveTestCase<ClassFactoryT>::CreateArchive(wxOutputStream& out) - - if ((choices & 2) || testEntry.IsText()) { - // try PutNextEntry(EntryT *pEntry) -- auto_ptr<EntryT> entry(m_factory->NewEntry()); -+ wxScopedPtr<EntryT> entry(m_factory->NewEntry()); - entry->SetName(name, wxPATH_UNIX); - if (setIsDir) - entry->SetIsDir(); -@@ -701,8 +700,8 @@ template <class ClassFactoryT> - void ArchiveTestCase<ClassFactoryT>::ModifyArchive(wxInputStream& in, - wxOutputStream& out) - { -- auto_ptr<InputStreamT> arcIn(m_factory->NewStream(in)); -- auto_ptr<OutputStreamT> arcOut(m_factory->NewStream(out)); -+ wxScopedPtr<InputStreamT> arcIn(m_factory->NewStream(in)); -+ wxScopedPtr<OutputStreamT> arcOut(m_factory->NewStream(out)); - EntryT *pEntry; - - const wxString deleteName = wxT("bin/bin1000"); -@@ -714,7 +713,7 @@ void ArchiveTestCase<ClassFactoryT>::ModifyArchive(wxInputStream& in, - arcOut->CopyArchiveMetaData(*arcIn); - - while ((pEntry = arcIn->GetNextEntry()) != NULL) { -- auto_ptr<EntryT> entry(pEntry); -+ wxScopedPtr<EntryT> entry(pEntry); - OnSetNotifier(*entry); - wxString name = entry->GetName(wxPATH_UNIX); - -@@ -759,7 +758,7 @@ void ArchiveTestCase<ClassFactoryT>::ModifyArchive(wxInputStream& in, - - // try adding a new entry - TestEntry& testEntry = Add(newName.mb_str(), newData); -- auto_ptr<EntryT> newentry(m_factory->NewEntry()); -+ wxScopedPtr<EntryT> newentry(m_factory->NewEntry()); - newentry->SetName(newName); - newentry->SetDateTime(testEntry.GetDateTime()); - newentry->SetSize(testEntry.GetLength()); -@@ -782,7 +781,7 @@ void ArchiveTestCase<ClassFactoryT>::ExtractArchive(wxInputStream& in) - typedef std::list<EntryPtr> Entries; - typedef typename Entries::iterator EntryIter; - -- auto_ptr<InputStreamT> arc(m_factory->NewStream(in)); -+ wxScopedPtr<InputStreamT> arc(m_factory->NewStream(in)); - int expectedTotal = m_testEntries.size(); - EntryPtr entry; - Entries entries; -@@ -991,7 +990,7 @@ void ArchiveTestCase<ClassFactoryT>::TestIterator(wxInputStream& in) - typedef std::list<EntryT*> ArchiveCatalog; - typedef typename ArchiveCatalog::iterator CatalogIter; - -- auto_ptr<InputStreamT> arc(m_factory->NewStream(in)); -+ wxScopedPtr<InputStreamT> arc(m_factory->NewStream(in)); - size_t count = 0; - - #ifdef WXARC_MEMBER_TEMPLATES -@@ -1003,7 +1002,7 @@ void ArchiveTestCase<ClassFactoryT>::TestIterator(wxInputStream& in) - #endif - - for (CatalogIter it = cat.begin(); it != cat.end(); ++it) { -- auto_ptr<EntryT> entry(*it); -+ wxScopedPtr<EntryT> entry(*it); - count += m_testEntries.count(entry->GetName(wxPATH_UNIX)); - } - -@@ -1020,7 +1019,7 @@ void ArchiveTestCase<ClassFactoryT>::TestPairIterator(wxInputStream& in) - typedef std::map<wxString, EntryT*> ArchiveCatalog; - typedef typename ArchiveCatalog::iterator CatalogIter; - -- auto_ptr<InputStreamT> arc(m_factory->NewStream(in)); -+ wxScopedPtr<InputStreamT> arc(m_factory->NewStream(in)); - size_t count = 0; - - #ifdef WXARC_MEMBER_TEMPLATES -@@ -1032,7 +1031,7 @@ void ArchiveTestCase<ClassFactoryT>::TestPairIterator(wxInputStream& in) - #endif - - for (CatalogIter it = cat.begin(); it != cat.end(); ++it) { -- auto_ptr<EntryT> entry(it->second); -+ wxScopedPtr<EntryT> entry(it->second); - count += m_testEntries.count(entry->GetName(wxPATH_UNIX)); - } - -@@ -1049,7 +1048,7 @@ void ArchiveTestCase<ClassFactoryT>::TestSmartIterator(wxInputStream& in) - typedef typename ArchiveCatalog::iterator CatalogIter; - typedef wxArchiveIterator<InputStreamT, Ptr<EntryT> > Iter; - -- auto_ptr<InputStreamT> arc(m_factory->NewStream(in)); -+ wxScopedPtr<InputStreamT> arc(m_factory->NewStream(in)); - - #ifdef WXARC_MEMBER_TEMPLATES - ArchiveCatalog cat((Iter)*arc, Iter()); -@@ -1080,7 +1079,7 @@ void ArchiveTestCase<ClassFactoryT>::TestSmartPairIterator(wxInputStream& in) - typedef wxArchiveIterator<InputStreamT, - std::pair<wxString, Ptr<EntryT> > > PairIter; - -- auto_ptr<InputStreamT> arc(m_factory->NewStream(in)); -+ wxScopedPtr<InputStreamT> arc(m_factory->NewStream(in)); - - #ifdef WXARC_MEMBER_TEMPLATES - ArchiveCatalog cat((PairIter)*arc, PairIter()); -@@ -1108,8 +1107,8 @@ void ArchiveTestCase<ClassFactoryT>::ReadSimultaneous(TestInputStream& in) - - // create two archive input streams - TestInputStream in2(in); -- auto_ptr<InputStreamT> arc(m_factory->NewStream(in)); -- auto_ptr<InputStreamT> arc2(m_factory->NewStream(in2)); -+ wxScopedPtr<InputStreamT> arc(m_factory->NewStream(in)); -+ wxScopedPtr<InputStreamT> arc2(m_factory->NewStream(in2)); - - // load the catalog - #ifdef WXARC_MEMBER_TEMPLATES -@@ -1201,7 +1200,7 @@ protected: - void CreateArchive(wxOutputStream& out); - void ExtractArchive(wxInputStream& in); - -- auto_ptr<wxArchiveClassFactory> m_factory; // factory to make classes -+ wxScopedPtr<wxArchiveClassFactory> m_factory; // factory to make classes - int m_options; // test options - }; - -@@ -1241,7 +1240,7 @@ void CorruptionTestCase::runTest() - - void CorruptionTestCase::CreateArchive(wxOutputStream& out) - { -- auto_ptr<wxArchiveOutputStream> arc(m_factory->NewStream(out)); -+ wxScopedPtr<wxArchiveOutputStream> arc(m_factory->NewStream(out)); - - arc->PutNextDirEntry(wxT("dir")); - arc->PutNextEntry(wxT("file")); -@@ -1250,8 +1249,8 @@ void CorruptionTestCase::CreateArchive(wxOutputStream& out) - - void CorruptionTestCase::ExtractArchive(wxInputStream& in) - { -- auto_ptr<wxArchiveInputStream> arc(m_factory->NewStream(in)); -- auto_ptr<wxArchiveEntry> entry(arc->GetNextEntry()); -+ wxScopedPtr<wxArchiveInputStream> arc(m_factory->NewStream(in)); -+ wxScopedPtr<wxArchiveEntry> entry(arc->GetNextEntry()); - - while (entry.get() != NULL) { - char buf[1024]; -@@ -1259,7 +1258,6 @@ void CorruptionTestCase::ExtractArchive(wxInputStream& in) - while (arc->IsOk()) - arc->Read(buf, sizeof(buf)); - -- auto_ptr<wxArchiveEntry> next(arc->GetNextEntry()); -- entry = next; -+ entry.reset(arc->GetNextEntry()); - } - } -diff --git a/tests/archive/archivetest.h b/tests/archive/archivetest.h -index 7a1a306..37a083c 100644 ---- a/tests/archive/archivetest.h -+++ b/tests/archive/archivetest.h -@@ -13,7 +13,7 @@ - - #include "wx/archive.h" - #include "wx/wfstream.h" -- -+#include "wx/scopedptr.h" - - /////////////////////////////////////////////////////////////////////////////// - // Bit flags for options for the tests -@@ -213,7 +213,7 @@ protected: - - typedef std::map<wxString, TestEntry*> TestEntries; - TestEntries m_testEntries; // test data -- std::auto_ptr<ClassFactoryT> m_factory; // factory to make classes -+ wxScopedPtr<ClassFactoryT> m_factory; // factory to make classes - int m_options; // test options - wxDateTime m_timeStamp; // timestamp to give test entries - int m_id; // select between the possibilites -diff --git a/tests/archive/ziptest.cpp b/tests/archive/ziptest.cpp -index 3e9cff3..dc3fef5 100644 ---- a/tests/archive/ziptest.cpp -+++ b/tests/archive/ziptest.cpp -@@ -22,7 +22,6 @@ - #include "wx/zipstrm.h" - - using std::string; --using std::auto_ptr; - - - /////////////////////////////////////////////////////////////////////////////// -@@ -186,7 +185,7 @@ void ZipPipeTestCase::runTest() - TestInputStream in(out, m_id % ((m_options & PipeIn) ? 4 : 3)); - wxZipInputStream zip(in); - -- auto_ptr<wxZipEntry> entry(zip.GetNextEntry()); -+ wxScopedPtr<wxZipEntry> entry(zip.GetNextEntry()); - CPPUNIT_ASSERT(entry.get() != NULL); - - if ((m_options & PipeIn) == 0) -diff --git a/tests/net/socket.cpp b/tests/net/socket.cpp -index acd91ae..7e27fc4 100644 ---- a/tests/net/socket.cpp -+++ b/tests/net/socket.cpp -@@ -28,10 +28,11 @@ - #include "wx/url.h" - #include "wx/sstream.h" - #include "wx/evtloop.h" -+#include "wx/scopedptr.h" - #include <memory> - --typedef std::auto_ptr<wxSockAddress> wxSockAddressPtr; --typedef std::auto_ptr<wxSocketClient> wxSocketClientPtr; -+typedef wxScopedPtr<wxSockAddress> wxSockAddressPtr; -+typedef wxScopedPtr<wxSocketClient> wxSocketClientPtr; - - static wxString gs_serverHost(wxGetenv("WX_TEST_SERVER")); - -@@ -257,7 +258,7 @@ void SocketTestCase::UrlTest() - - wxURL url("http://"; + gs_serverHost); - -- const std::auto_ptr<wxInputStream> in(url.GetInputStream()); -+ const wxScopedPtr<wxInputStream> in(url.GetInputStream()); - CPPUNIT_ASSERT( in.get() ); - - wxStringOutputStream out; -diff --git a/tests/streams/largefile.cpp b/tests/streams/largefile.cpp -index 9c6c481..59fca24 100644 ---- a/tests/streams/largefile.cpp -+++ b/tests/streams/largefile.cpp -@@ -33,6 +33,7 @@ - - #include "wx/filename.h" - #include "wx/wfstream.h" -+#include "wx/scopedptr.h" - - #ifdef __WINDOWS__ - #include "wx/msw/wrapwin.h" -@@ -51,7 +52,6 @@ - #define fileno _fileno - #endif - --using std::auto_ptr; - - - /////////////////////////////////////////////////////////////////////////////// -@@ -120,7 +120,7 @@ void LargeFileTest::runTest() - - // write a large file - { -- auto_ptr<wxOutputStream> out(MakeOutStream(tmpfile.m_name)); -+ wxScopedPtr<wxOutputStream> out(MakeOutStream(tmpfile.m_name)); - - // write 'A's at [ 0x7fffffbf, 0x7fffffff [ - pos = 0x7fffffff - size; -@@ -154,7 +154,7 @@ void LargeFileTest::runTest() - - // read the large file back - { -- auto_ptr<wxInputStream> in(MakeInStream(tmpfile.m_name)); -+ wxScopedPtr<wxInputStream> in(MakeInStream(tmpfile.m_name)); - char buf[size]; - - if (haveLFS) { -@@ -218,7 +218,7 @@ protected: - - wxInputStream *LargeFileTest_wxFile::MakeInStream(const wxString& name) const - { -- auto_ptr<wxFileInputStream> in(new wxFileInputStream(name)); -+ wxScopedPtr<wxFileInputStream> in(new wxFileInputStream(name)); - CPPUNIT_ASSERT(in->IsOk()); - return in.release(); - } -@@ -250,7 +250,7 @@ protected: - - wxInputStream *LargeFileTest_wxFFile::MakeInStream(const wxString& name) const - { -- auto_ptr<wxFFileInputStream> in(new wxFFileInputStream(name)); -+ wxScopedPtr<wxFFileInputStream> in(new wxFFileInputStream(name)); - CPPUNIT_ASSERT(in->IsOk()); - return in.release(); - } -diff --git a/wxWidgets-3.0.5.1/src/stc/scintilla/src/Editor.cxx.old b/wxWidgets-3.0.5.1/src/stc/scintilla/src/Editor.cxx -index 2081df2..a8c8572 100644 ---- a/src/stc/scintilla/src/Editor.cxx -+++ b/src/stc/scintilla/src/Editor.cxx -@@ -41,6 +41,7 @@ - #include "Selection.h" - #include "PositionCache.h" - #include "Editor.h" -+#include "wx/scopedptr.h" - - #ifdef SCI_NAMESPACE - using namespace Scintilla; -@@ -5706,7 +5707,7 @@ long Editor::FindText( - - Sci_TextToFind *ft = reinterpret_cast<Sci_TextToFind *>(lParam); - int lengthFound = istrlen(ft->lpstrText); -- std::auto_ptr<CaseFolder> pcf(CaseFolderForEncoding()); -+ wxScopedPtr<CaseFolder> pcf(CaseFolderForEncoding()); - int pos = pdoc->FindText(ft->chrg.cpMin, ft->chrg.cpMax, ft->lpstrText, - (wParam & SCFIND_MATCHCASE) != 0, - (wParam & SCFIND_WHOLEWORD) != 0, diff --git a/x11-libs/wxGTK/files/wxGTK-configure-tests.patch b/x11-libs/wxGTK/files/wxGTK-configure-tests.patch deleted file mode 100644 index efbb2d7c55bf..000000000000 --- a/x11-libs/wxGTK/files/wxGTK-configure-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/configure b/configure -index 0f3c4c9..92c84f3 100755 ---- a/configure -+++ b/configure -@@ -1368,6 +1368,7 @@ enable_dependency_tracking - enable_precomp_headers - with_cppunit_prefix - with_cppunit_exec_prefix -+enable_tests - ' - ac_precious_vars='build_alias - host_alias -@@ -40955,8 +40956,13 @@ fi - - fi - -- -- -+# explicit override to enable or disable tests -+if test "${enable_tests+set}" = set; then -+ SUBDIRS="$SUBDIRS tests" -+fi -+if test "${disable_tests+set}" = set; then -+ SUBDIRS="${SUBDIRS% tests}" -+fi - - - for subdir in $SUBDIRS; do diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r5.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r5.ebuild deleted file mode 100644 index 25342b1f2fa1..000000000000 --- a/x11-libs/wxGTK/wxGTK-3.0.4-r5.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-minimal flag-o-matic - -DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" -HOMEPAGE="https://wxwidgets.org/"; -SRC_URI=" - https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2 - https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz - doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )" -S="${WORKDIR}/wxWidgets-${PV}" - -LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" -SLOT="3.0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="+X doc debug gstreamer libnotify opengl pch sdl tiff" - -RDEPEND=" - dev-libs/expat[${MULTILIB_USEDEP}] - sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) - X? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] - media-libs/libpng:=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - x11-libs/gtk+:2[${MULTILIB_USEDEP}] - x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] - x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - x11-libs/pango[${MULTILIB_USEDEP}] - gstreamer? ( - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] - ) - libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] ) - opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) - tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] ) - )" -DEPEND=" - ${RDEPEND} - opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) - X? ( x11-base/xorg-proto )" -BDEPEND="virtual/pkgconfig" -PDEPEND=">=app-eselect/eselect-wxwidgets-20131230" - -PATCHES=( - "${WORKDIR}"/wxGTK-3.0.4_p20190713/ - "${FILESDIR}"/${PN}-3.0.5-collision.patch - "${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878 -) - -multilib_src_configure() { - # Workaround for bug #915154 - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - - local myconf=( - # X independent options - --with-zlib=sys - --with-expat=sys - --enable-compat28 - $(use_with sdl) - - # PCHes are unstable and are disabled in-tree where possible - # See bug #504204 - # Commits 8c4774042b7fdfb08e525d8af4b7912f26a2fdce, fb809aeadee57ffa24591e60cfb41aecd4823090 - $(use_enable pch precomp-headers) - ) - - # debug in >=2.9 - # there is no longer separate debug libraries (gtk2ud) - # wxDEBUG_LEVEL=1 is the default and we will leave it enabled - # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. - # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. - # http://docs.wxwidgets.org/3.0/overview_debugging.html - # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c - use debug && myconf+=( --enable-debug=max ) - - # wxGTK options - # --enable-graphics_ctx - needed for webkit, editra - # --without-gnomevfs - bug #203389 - if use X; then - myconf+=( - --enable-gui - --enable-graphics_ctx - --with-gtkprint - --with-libpng=sys - --with-libxpm=sys - --with-libjpeg=sys - --without-gnomevfs - --disable-webview - $(use_enable gstreamer mediactrl) - $(use_with libnotify) - $(use_with opengl) - $(use_with tiff libtiff sys) - ) - else - # wxBase options - myconf+=( --disable-gui ) - fi - - ECONF_SOURCE="${S}" econf "${myconf[@]}" -} - -multilib_src_install_all() { - cd docs || die - dodoc changes.txt readme.txt - newdoc base/readme.txt base_readme.txt - newdoc gtk/readme.txt gtk_readme.txt - - use doc && HTML_DOCS=( "${WORKDIR}"/wxWidgets-${PV}-docs-html/. ) - einstalldocs - - # Stray windows locale file, causes collisions - rm -f "${ED}"/usr/share/locale/it/LC_MESSAGES/wxmsw.mo || die -} - -pkg_postinst() { - has_version app-eselect/eselect-wxwidgets && - eselect wxwidgets update -} - -pkg_postrm() { - has_version app-eselect/eselect-wxwidgets && - eselect wxwidgets update -} diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r6.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r6.ebuild deleted file mode 100644 index c9f723cab089..000000000000 --- a/x11-libs/wxGTK/wxGTK-3.0.4-r6.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-minimal flag-o-matic - -DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" -HOMEPAGE="https://wxwidgets.org/"; -SRC_URI=" - https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2 - https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz - doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )" -S="${WORKDIR}/wxWidgets-${PV}" - -LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" -SLOT="3.0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="+X doc debug gstreamer libnotify opengl pch sdl tiff" - -RDEPEND=" - dev-libs/expat[${MULTILIB_USEDEP}] - sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) - X? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] - media-libs/libpng:=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - x11-libs/gtk+:2[${MULTILIB_USEDEP}] - x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] - x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - x11-libs/pango[${MULTILIB_USEDEP}] - gstreamer? ( - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] - ) - libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] ) - opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) - tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] ) - )" -DEPEND=" - ${RDEPEND} - opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) - X? ( x11-base/xorg-proto )" -BDEPEND="virtual/pkgconfig" -PDEPEND=">=app-eselect/eselect-wxwidgets-20131230" - -PATCHES=( - "${WORKDIR}"/wxGTK-3.0.4_p20190713/ - "${FILESDIR}"/${PN}-3.0.5-collision.patch - "${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878 - "${FILESDIR}"/${PN}-3.0.5.1-configure-modern-c.patch - "${FILESDIR}"/${PN}-3.0.5.1-excise-autoptr.patch -) - -multilib_src_configure() { - # Workaround for bug #915154 - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - - local myconf=( - # X independent options - --with-zlib=sys - --with-expat=sys - --enable-compat28 - $(use_with sdl) - - # PCHes are unstable and are disabled in-tree where possible - # See bug #504204 - # Commits 8c4774042b7fdfb08e525d8af4b7912f26a2fdce, fb809aeadee57ffa24591e60cfb41aecd4823090 - $(use_enable pch precomp-headers) - ) - - # debug in >=2.9 - # there is no longer separate debug libraries (gtk2ud) - # wxDEBUG_LEVEL=1 is the default and we will leave it enabled - # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. - # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. - # http://docs.wxwidgets.org/3.0/overview_debugging.html - # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c - use debug && myconf+=( --enable-debug=max ) - - # wxGTK options - # --enable-graphics_ctx - needed for webkit, editra - # --without-gnomevfs - bug #203389 - if use X; then - myconf+=( - --enable-gui - --enable-graphics_ctx - --with-gtkprint - --with-libpng=sys - --with-libxpm=sys - --with-libjpeg=sys - --without-gnomevfs - --disable-webview - $(use_enable gstreamer mediactrl) - $(use_with libnotify) - $(use_with opengl) - $(use_with tiff libtiff sys) - ) - else - # wxBase options - myconf+=( --disable-gui ) - fi - - ECONF_SOURCE="${S}" econf "${myconf[@]}" -} - -multilib_src_install_all() { - cd docs || die - dodoc changes.txt readme.txt - newdoc base/readme.txt base_readme.txt - newdoc gtk/readme.txt gtk_readme.txt - - use doc && HTML_DOCS=( "${WORKDIR}"/wxWidgets-${PV}-docs-html/. ) - einstalldocs - - # Stray windows locale file, causes collisions - rm -f "${ED}"/usr/share/locale/it/LC_MESSAGES/wxmsw.mo || die -} - -pkg_postinst() { - has_version app-eselect/eselect-wxwidgets && - eselect wxwidgets update -} - -pkg_postrm() { - has_version app-eselect/eselect-wxwidgets && - eselect wxwidgets update -} diff --git a/x11-libs/wxGTK/wxGTK-3.0.5.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.5.1-r1.ebuild deleted file mode 100644 index 63425cd19269..000000000000 --- a/x11-libs/wxGTK/wxGTK-3.0.5.1-r1.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal flag-o-matic - -WXSUBVERSION=${PV}-gtk3 # 3.0.5.1-gtk3 -WXVERSION=${WXSUBVERSION%.*} # 3.0.5 -WXRELEASE=${WXVERSION%.*}-gtk3 # 3.0-gtk3 -WXRELEASE_NODOT=${WXRELEASE//./} # 30-gtk3 - -DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" -HOMEPAGE="https://wxwidgets.org/"; -SRC_URI=" - https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2 - https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.5_p20210214.tar.xz - doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${WXVERSION}/wxWidgets-${WXVERSION}-docs-html.tar.bz2 )" -S="${WORKDIR}/wxWidgets-${PV}" - -LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" -SLOT="${WXRELEASE}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="+X doc debug gstreamer libnotify opengl pch sdl test tiff webkit" -REQUIRED_USE="test? ( tiff ) tiff? ( X )" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=app-eselect/eselect-wxwidgets-20131230 - dev-libs/expat[${MULTILIB_USEDEP}] - sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) - X? ( - >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}] - media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] - media-libs/libpng:0=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - x11-libs/cairo[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[${MULTILIB_USEDEP}] - x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] - x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - x11-libs/pango[${MULTILIB_USEDEP}] - gstreamer? ( - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] - ) - libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] ) - opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) - tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] ) - webkit? ( net-libs/webkit-gtk:4 ) - )" -DEPEND="${RDEPEND} - opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) - X? ( x11-base/xorg-proto )" -BDEPEND=" - test? ( >=dev-util/cppunit-1.8.0 ) - >=app-eselect/eselect-wxwidgets-20131230 - virtual/pkgconfig" - -PATCHES=( - "${WORKDIR}"/wxGTK-3.0.5_p20210214/ - "${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch - "${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878 - "${FILESDIR}"/${PN}-configure-tests.patch - "${FILESDIR}"/${PN}-3.0.5.1-configure-modern-c.patch -) - -src_prepare() { - default - - # Versionating - sed -i \ - -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\ - -e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\ - -e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\ - -e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \ - -e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}.mo:" \ - -e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}.mo:" \ - Makefile.in tests/Makefile.in || die - - sed -i \ - -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\ - utils/wxrc/Makefile.in || die - - sed -i \ - -e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \ - -e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \ - -e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \ - -e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \ - configure || die -} - -multilib_src_configure() { - # Workaround for bug #915154 - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - - # X independent options - local myeconfargs=( - --with-zlib=sys - --with-expat=sys - --enable-compat28 - $(use_with sdl) - - # PCHes are unstable and are disabled in-tree where possible - # See bug #504204 - # Commits 8c4774042b7fdfb08e525d8af4b7912f26a2fdce, fb809aeadee57ffa24591e60cfb41aecd4823090 - $(use_enable pch precomp-headers) - - # Don't hard-code libdir's prefix for wx-config - --libdir='${prefix}'/$(get_libdir) - ) - - # debug in >=2.9 - # there is no longer separate debug libraries (gtk2ud) - # wxDEBUG_LEVEL=1 is the default and we will leave it enabled - # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. - # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. - # http://docs.wxwidgets.org/3.0/overview_debugging.html - # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c - use debug && myeconfargs+=( --enable-debug=max ) - - # wxGTK options - # --enable-graphics_ctx - needed for webkit, editra - # --without-gnomevfs - bug #203389 - use X && myeconfargs+=( - --enable-graphics_ctx - --with-gtkprint - --enable-gui - --with-gtk=3 - --with-libpng=sys - --with-libjpeg=sys - --without-gnomevfs - $(use_enable gstreamer mediactrl) - $(multilib_native_use_enable webkit webview) - $(use_with libnotify) - $(use_with opengl) - $(use_with tiff libtiff sys) - $(use_enable test tests) - ) - - # wxBase options - ! use X && myeconfargs+=( --disable-gui ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - emake -C tests - (cd tests && ./test) || die -} - -multilib_src_install_all() { - cd docs || die - dodoc changes.txt readme.txt - newdoc base/readme.txt base_readme.txt - newdoc gtk/readme.txt gtk_readme.txt - - use doc && HTML_DOCS=( "${WORKDIR}"/wxWidgets-${WXVERSION}-docs-html/. ) - einstalldocs - - # Stray windows locale file, bug #650118 - rm -f "${ED}"/usr/share/locale/it/LC_MESSAGES/wxmsw30-gtk3.mo || die - - # Unversioned links - rm "${ED}"/usr/bin/wx-config || die - use X && { rm "${ED}"/usr/bin/wxrc || die; } - - # version bakefile presets - pushd "${ED}"/usr/share/bakefile/presets >/dev/null || die - local f - for f in wx*; do - mv "${f}" "${f/wx/wx30gtk3}" || die - done - popd >/dev/null || die -} - -pkg_postinst() { - has_version -b app-eselect/eselect-wxwidgets \ - && eselect wxwidgets update -} - -pkg_postrm() { - has_version -b app-eselect/eselect-wxwidgets \ - && eselect wxwidgets update -} diff --git a/x11-libs/wxGTK/wxGTK-3.0.5.1-r3.ebuild b/x11-libs/wxGTK/wxGTK-3.0.5.1-r3.ebuild deleted file mode 100644 index 34b22fca4906..000000000000 --- a/x11-libs/wxGTK/wxGTK-3.0.5.1-r3.ebuild +++ /dev/null @@ -1,199 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal flag-o-matic - -WXSUBVERSION=${PV}-gtk3 # 3.0.5.1-gtk3 -WXVERSION=${WXSUBVERSION%.*} # 3.0.5 -WXRELEASE=${WXVERSION%.*}-gtk3 # 3.0-gtk3 -WXRELEASE_NODOT=${WXRELEASE//./} # 30-gtk3 - -DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" -HOMEPAGE="https://wxwidgets.org/"; -SRC_URI=" - https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2 - https://dev.gentoo.org/~leio/distfiles/wxGTK-${WXVERSION}_p20210214.tar.xz - doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${WXVERSION}/wxWidgets-${WXVERSION}-docs-html.tar.bz2 )" -S="${WORKDIR}/wxWidgets-${PV}" - -LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" -SLOT="${WXRELEASE}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+X doc debug gstreamer libnotify opengl pch sdl test tiff webkit" -REQUIRED_USE="test? ( tiff ) tiff? ( X )" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=app-eselect/eselect-wxwidgets-20131230 - dev-libs/expat[${MULTILIB_USEDEP}] - sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) - X? ( - >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}] - media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] - media-libs/libpng:0=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - x11-libs/cairo[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[${MULTILIB_USEDEP}] - x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] - x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - x11-libs/pango[${MULTILIB_USEDEP}] - gstreamer? ( - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] - ) - libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] ) - opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) - tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] ) - webkit? ( net-libs/webkit-gtk:4 ) - )" -DEPEND="${RDEPEND} - opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) - X? ( x11-base/xorg-proto )" -BDEPEND=" - test? ( >=dev-util/cppunit-1.8.0 ) - >=app-eselect/eselect-wxwidgets-20131230 - virtual/pkgconfig" - -PATCHES=( - "${WORKDIR}"/wxGTK-3.0.5_p20210214/ - "${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch - "${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878 - "${FILESDIR}"/${PN}-configure-tests.patch - "${FILESDIR}"/${PN}-3.0.5.1-configure-modern-c.patch - "${FILESDIR}"/${PN}-3.0.5.1-excise-autoptr.patch - -) - -src_prepare() { - default - - # Versionating - sed -i \ - -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\ - -e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\ - -e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\ - -e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \ - -e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}.mo:" \ - -e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}.mo:" \ - Makefile.in tests/Makefile.in || die - - sed -i \ - -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\ - utils/wxrc/Makefile.in || die - - sed -i \ - -e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \ - -e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \ - -e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \ - -e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \ - configure || die -} - -multilib_src_configure() { - # Workaround for bug #915154 - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - - # X independent options - local myeconfargs=( - --with-zlib=sys - --with-expat=sys - --enable-compat28 - $(use_with sdl) - - # PCHes are unstable and are disabled in-tree where possible - # See bug #504204 - # Commits 8c4774042b7fdfb08e525d8af4b7912f26a2fdce, fb809aeadee57ffa24591e60cfb41aecd4823090 - $(use_enable pch precomp-headers) - - # Don't hard-code libdir's prefix for wx-config - --libdir='${prefix}'/$(get_libdir) - ) - - # debug in >=2.9 - # there is no longer separate debug libraries (gtk2ud) - # wxDEBUG_LEVEL=1 is the default and we will leave it enabled - # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. - # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. - # http://docs.wxwidgets.org/3.0/overview_debugging.html - # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c - use debug && myeconfargs+=( --enable-debug=max ) - - # wxGTK options - # --enable-graphics_ctx - needed for webkit, editra - # --without-gnomevfs - bug #203389 - use X && myeconfargs+=( - --enable-graphics_ctx - --with-gtkprint - --enable-gui - --with-gtk=3 - --with-libpng=sys - --with-libjpeg=sys - --without-gnomevfs - $(use_enable gstreamer mediactrl) - $(multilib_native_use_enable webkit webview) - $(use_with libnotify) - $(use_with opengl) - $(use_with tiff libtiff sys) - $(use_enable test tests) - ) - - # wxBase options - ! use X && myeconfargs+=( --disable-gui ) - - # wxWidgets installs a configuration file with a reference to EGREP. - # Autoconf discovers these programs via full paths, which is - # unnecessary and fails if a build happened on a merged-usr system - # but is being used on a split-usr system. Bug #927920. - export ac_cv_path_SED="sed" - export ac_cv_path_EGREP="grep -E" - export ac_cv_path_EGREP_TRADITIONAL="grep -E" - export ac_cv_path_FGREP="grep -F" - export ac_cv_path_GREP="grep" - export ac_cv_path_lt_DD="dd" - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - emake -C tests - (cd tests && ./test) || die -} - -multilib_src_install_all() { - cd docs || die - dodoc changes.txt readme.txt - newdoc base/readme.txt base_readme.txt - newdoc gtk/readme.txt gtk_readme.txt - - use doc && HTML_DOCS=( "${WORKDIR}"/wxWidgets-${WXVERSION}-docs-html/. ) - einstalldocs - - # Stray windows locale file, bug #650118 - rm -f "${ED}"/usr/share/locale/it/LC_MESSAGES/wxmsw30-gtk3.mo || die - - # Unversioned links - rm "${ED}"/usr/bin/wx-config || die - use X && { rm "${ED}"/usr/bin/wxrc || die; } - - # version bakefile presets - pushd "${ED}"/usr/share/bakefile/presets >/dev/null || die - local f - for f in wx*; do - mv "${f}" "${f/wx/wx30gtk3}" || die - done - popd >/dev/null || die -} - -pkg_postinst() { - has_version -b app-eselect/eselect-wxwidgets \ - && eselect wxwidgets update -} - -pkg_postrm() { - has_version -b app-eselect/eselect-wxwidgets \ - && eselect wxwidgets update -}
