commit: a9e3756de249e709bc29ef602f2c099b88163c22 Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> AuthorDate: Sun May 8 22:34:58 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri May 13 20:03:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9e3756d
dev-util/codeblocks: cleanup old 17.12-r*, <=20.03-r3 Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/codeblocks/Manifest | 3 - dev-util/codeblocks/codeblocks-17.12-r303.ebuild | 86 ---------------------- dev-util/codeblocks/codeblocks-17.12-r304.ebuild | 83 --------------------- dev-util/codeblocks/codeblocks-20.03-r1.ebuild | 76 ------------------- dev-util/codeblocks/codeblocks-20.03-r2.ebuild | 77 ------------------- dev-util/codeblocks/codeblocks-20.03-r3.ebuild | 76 ------------------- .../codeblocks-17.12-fix-crash-on-copypaste.patch | 20 ----- .../codeblocks-20.03_gcc11_compatibility.patch | 12 --- 8 files changed, 433 deletions(-) diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest index 2c6b6a8da73e..86c03b3b4a25 100644 --- a/dev-util/codeblocks/Manifest +++ b/dev-util/codeblocks/Manifest @@ -1,8 +1,5 @@ -DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224 SHA512 78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c -DIST codeblocks-17.12_update_astyle_plugin_to_v3.1.patch.xz 3712 BLAKE2B 4a5f75c18b365030a08196dcb2808d8f42d8adf9442552d372cb3923629d9d5b74c98c77557f0af46965bb875543cc6f221a5197fa2b4dba12409225c6cc61d9 SHA512 b216f2659b8ce2a22fd2f9af456af71328b40428510b75f0bb36cec4695d28bbd3133b7385614a84862c2ab5c560d314cc8153ddab09019410e179f5d337669b DIST codeblocks-20.03-codecompletion-symbolbrowser-update.tar.xz 52572 BLAKE2B 4752a84f5471f68f2c1044df6c6c3c25dd61f03e916bfcff1d091fe66aec8911cd02c7d824431dd307267d00af209cfd0b614528fe091a2d3c4bccbc688e83ef SHA512 acd79ffeed03023ac5e33fd685942f5593d0f7bc488b1d53e6c502618b980d565b1f2bc479da4de869ad2e839e263ddbff2a8847ef39b822aab69b87d5cd01a8 DIST codeblocks-20.03-fortran-update-v1.7.tar.xz 12092 BLAKE2B df59ca9e00765f39f64d889ed22af61db8c2bb5f217dbda64d325327be8ef1ce318bc0b2538dd19ee911d84fccb6693f6e287f4d084e8243b34777f464ba5e61 SHA512 aec8062bbf0cd524b683ba9f2f6befec0bfb9f9b1f8ea61ffb679cf449f4ece20502f4fda101ab559151616fc7d7826e308a6468634502930f09ea3a8590c359 DIST codeblocks-20.03-fortran-update-v1.8.tar.xz 43672 BLAKE2B c30f64a7211debd72ee0274067f7443c71ce25e348bfb1474a6dbd1cb86b330537ceb56e96eebdd02f88a93dc0526fb7bced678be799bc8d2437c00f5effd1e8 SHA512 0651d1abb08bfd9eb42f9eca0b9b4c702180b31fac2c08240d2447940c9b21601c3baadc3933ac4080e49c834aaacad716375aa4a40c06d336f000e0d59f962a DIST codeblocks-20.03-fortran.tar.xz 15828 BLAKE2B 3ad1be0ecdc61759edcbb12065a0d8065e5c4571bfdd99bcf6ad8cbda82f64def8ad7121770fe780c1837d06d58edb0209d2ab3b966ecd133c5d46f79c0cbb4e SHA512 06a9a87e560914ae49895843321c26581409e9213265d20476c9c4a8ad2dd9ff63cffdb416e7494bd74ce4a11578f11ef387dd851b1394a50baade8491caaa17 DIST codeblocks-20.03.tar.xz 11799264 BLAKE2B cdaca38e26e0f1bf12e774cf737e0b6647f070d07f0ca5bec97926528a3511ecb8b3306fb6af473729384a5fe22d4870db8ca988895d619a1e7e2a1d9de2a41f SHA512 f97c1a02d31f0be4dc08b1f19b57bd0d3cba375ab5f33ab91b2a2df7817018f5b3e3063ed07199a3970644f1caa7c7e511db2034c73264f5f4963046d65b0097 -DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b SHA512 f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1 diff --git a/dev-util/codeblocks/codeblocks-17.12-r303.ebuild b/dev-util/codeblocks/codeblocks-17.12-r303.ebuild deleted file mode 100644 index 6c32f926facd..000000000000 --- a/dev-util/codeblocks/codeblocks-17.12-r303.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.0-gtk3" - -inherit autotools wxwidgets xdg-utils - -DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE" -HOMEPAGE="https://codeblocks.org/"; -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz -https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz -https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz"; - -# USE="fortran" enables FortranProject plugin (v1.5) -# that is delivered with Code::Blocks 17.12 source code. -# https://sourceforge.net/projects/fortranproject -# http://cbfortran.sourceforge.net - -IUSE="contrib debug fortran pch" - -BDEPEND="virtual/pkgconfig" - -RDEPEND="app-arch/zip - >=dev-libs/tinyxml-2.6.2-r3 - >=dev-util/astyle-3.0.1-r1:0= - x11-libs/wxGTK:${WX_GTK_VER}[X] - contrib? ( - app-admin/gamin - app-text/hunspell - dev-libs/boost:= - )" - -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-fix-crash-on-copypaste.patch - "${FILESDIR}"/${P}-nodebug.diff - "${WORKDIR}"/patches/ - ) - -src_prepare() { - default - if has_version ">=dev-util/astyle-3.1" ; then - eapply "${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch - fi - sed -i "s:appdatadir = \$(datarootdir)/appdata:appdatadir = \$(datarootdir)/metainfo:" Makefile.am || die # bug 709450 - sed -i "s:appdatadir = \$(datarootdir)/appdata:appdatadir = \$(datarootdir)/metainfo:" src/plugins/contrib/appdata/Makefile.am || die # bug 709450 - eautoreconf -} - -src_configure() { - setup-wxwidgets - - # USE="contrib -fortran" setup: - use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject) - # USE="contrib fortran" setup: - use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all) - # USE="-contrib fortran" setup: - use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject) - - econf \ - --disable-static \ - $(use_enable debug) \ - $(use_enable pch) \ - ${CONF_WITH_LST} -} - -pkg_postinst() { - elog "The Symbols Browser is disabled due to it causing crashes." - elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"; - - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/dev-util/codeblocks/codeblocks-17.12-r304.ebuild b/dev-util/codeblocks/codeblocks-17.12-r304.ebuild deleted file mode 100644 index 88841742c92f..000000000000 --- a/dev-util/codeblocks/codeblocks-17.12-r304.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.0-gtk3" - -inherit autotools wxwidgets xdg - -DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE" -HOMEPAGE="https://codeblocks.org/"; -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz -https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz -https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz"; - -# USE="fortran" enables FortranProject plugin (v1.5) -# that is delivered with Code::Blocks 17.12 source code. -# https://sourceforge.net/projects/fortranproject -# https://cbfortran.sourceforge.io - -IUSE="contrib debug fortran pch" - -BDEPEND="virtual/pkgconfig" - -RDEPEND="app-arch/zip - >=dev-libs/tinyxml-2.6.2-r3 - >=dev-util/astyle-3.0.1-r1:0= - x11-libs/wxGTK:${WX_GTK_VER}[X] - contrib? ( - app-admin/gamin - app-text/hunspell - dev-libs/boost:= - )" - -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-fix-crash-on-copypaste.patch - "${FILESDIR}"/${P}-nodebug.diff - "${FILESDIR}"/${PN}-20.03_gcc11_compatibility.patch - "${WORKDIR}"/patches/ - ) - -src_prepare() { - default - if has_version ">=dev-util/astyle-3.1" ; then - eapply "${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch - fi - sed -i "s:appdatadir = \$(datarootdir)/appdata:appdatadir = \$(datarootdir)/metainfo:" Makefile.am || die # bug 709450 - sed -i "s:appdatadir = \$(datarootdir)/appdata:appdatadir = \$(datarootdir)/metainfo:" src/plugins/contrib/appdata/Makefile.am || die # bug 709450 - eautoreconf -} - -src_configure() { - setup-wxwidgets - - # USE="contrib -fortran" setup: - use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject) - # USE="contrib fortran" setup: - use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all) - # USE="-contrib fortran" setup: - use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject) - - econf \ - --disable-static \ - $(use_enable debug) \ - $(use_enable pch) \ - ${CONF_WITH_LST} -} - -pkg_postinst() { - elog "The Symbols Browser is disabled due to it causing crashes." - elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"; - - xdg_pkg_postinst -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/dev-util/codeblocks/codeblocks-20.03-r1.ebuild b/dev-util/codeblocks/codeblocks-20.03-r1.ebuild deleted file mode 100644 index 37605d50b649..000000000000 --- a/dev-util/codeblocks/codeblocks-20.03-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.0-gtk3" - -inherit autotools wxwidgets xdg - -DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE" -HOMEPAGE="https://codeblocks.org/"; -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz -https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz -https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz"; - -# USE="fortran" enables FortranProject plugin (updated to v1.7 2020-06-07 [r298]) -# that is delivered with Code::Blocks 20.03 source code. -# https://sourceforge.net/projects/fortranproject -# http://cbfortran.sourceforge.net - -IUSE="contrib debug fortran pch" - -BDEPEND="virtual/pkgconfig" - -RDEPEND="app-arch/zip - >=dev-libs/tinyxml-2.6.2-r3 - >=dev-util/astyle-3.1-r2:0/3.1 - x11-libs/wxGTK:${WX_GTK_VER}[X] - contrib? ( - app-admin/gamin - app-text/hunspell - dev-libs/boost:= - )" - -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-env.patch - "${WORKDIR}"/patches/ - ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - setup-wxwidgets - - # USE="contrib -fortran" setup: - use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject) - # USE="contrib fortran" setup: - use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all) - # USE="-contrib fortran" setup: - use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject) - - econf \ - --disable-static \ - $(use_enable debug) \ - $(use_enable pch) \ - ${CONF_WITH_LST} -} - -pkg_postinst() { - elog "The Symbols Browser is disabled due to it causing crashes." - elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"; - - xdg_pkg_postinst -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/dev-util/codeblocks/codeblocks-20.03-r2.ebuild b/dev-util/codeblocks/codeblocks-20.03-r2.ebuild deleted file mode 100644 index 9e4061b5925f..000000000000 --- a/dev-util/codeblocks/codeblocks-20.03-r2.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.0-gtk3" - -inherit autotools wxwidgets xdg - -DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE" -HOMEPAGE="https://codeblocks.org/"; -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz -https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz -https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz"; - -# USE="fortran" enables FortranProject plugin (updated to v1.7 2020-06-07 [r298]) -# that is delivered with Code::Blocks 20.03 source code. -# https://sourceforge.net/projects/fortranproject -# https://cbfortran.sourceforge.io - -IUSE="contrib debug fortran pch" - -BDEPEND="virtual/pkgconfig" - -RDEPEND="app-arch/zip - >=dev-libs/tinyxml-2.6.2-r3 - >=dev-util/astyle-3.1-r2:0/3.1 - x11-libs/wxGTK:${WX_GTK_VER}[X] - contrib? ( - app-admin/gamin - app-text/hunspell - dev-libs/boost:= - )" - -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-env.patch - "${FILESDIR}"/${P}_gcc11_compatibility.patch - "${WORKDIR}"/patches/ - ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - setup-wxwidgets - - # USE="contrib -fortran" setup: - use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject) - # USE="contrib fortran" setup: - use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all) - # USE="-contrib fortran" setup: - use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject) - - econf \ - --disable-static \ - $(use_enable debug) \ - $(use_enable pch) \ - ${CONF_WITH_LST} -} - -pkg_postinst() { - elog "The Symbols Browser is disabled due to it causing crashes." - elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"; - - xdg_pkg_postinst -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/dev-util/codeblocks/codeblocks-20.03-r3.ebuild b/dev-util/codeblocks/codeblocks-20.03-r3.ebuild deleted file mode 100644 index cfdd776089d2..000000000000 --- a/dev-util/codeblocks/codeblocks-20.03-r3.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.0-gtk3" - -inherit autotools wxwidgets xdg - -DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE" -HOMEPAGE="https://codeblocks.org/"; -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz -https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz -https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz -https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.8.tar.xz -https://dev.gentoo.org/~leio/distfiles/${P}-codecompletion-symbolbrowser-update.tar.xz -" - -# USE="fortran" enables FortranProject plugin (updated to v1.8 2021-05-29 [r230]) -# that is delivered with Code::Blocks 20.03 source code. -# https://sourceforge.net/projects/fortranproject -# https://cbfortran.sourceforge.io - -IUSE="contrib debug fortran pch" - -BDEPEND="virtual/pkgconfig" - -RDEPEND="app-arch/zip - >=dev-libs/tinyxml-2.6.2-r3 - >=dev-util/astyle-3.1-r2:0/3.1 - x11-libs/wxGTK:${WX_GTK_VER}[X] - contrib? ( - app-admin/gamin - app-text/hunspell - dev-libs/boost:= - )" - -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-env.patch - "${WORKDIR}"/patches/ - ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - setup-wxwidgets - - # USE="contrib -fortran" setup: - use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject) - # USE="contrib fortran" setup: - use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all) - # USE="-contrib fortran" setup: - use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject) - - econf \ - --disable-static \ - $(use_enable debug) \ - $(use_enable pch) \ - ${CONF_WITH_LST} -} - -pkg_postinst() { - xdg_pkg_postinst -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/dev-util/codeblocks/files/codeblocks-17.12-fix-crash-on-copypaste.patch b/dev-util/codeblocks/files/codeblocks-17.12-fix-crash-on-copypaste.patch deleted file mode 100644 index 9918c58d8e88..000000000000 --- a/dev-util/codeblocks/files/codeblocks-17.12-fix-crash-on-copypaste.patch +++ /dev/null @@ -1,20 +0,0 @@ -# Fix crashing on paste of copied text from other applications -# https://sourceforge.net/p/codeblocks/tickets/629/ -diff -Nuar a/main.cpp b/main.cpp ---- a/src/src/main.cpp 2017-11-01 02:32:38.000000000 +0300 -+++ b/src/src/main.cpp 2020-03-13 21:59:25.000000000 +0300 -@@ -4321,7 +4321,13 @@ - } - - if (Manager::Get()->GetEditorManager() && event.GetEditor() == Manager::Get()->GetEditorManager()->GetActiveEditor()) -- DoUpdateStatusBar(); -+ { -+ #if wxCHECK_VERSION(3, 0, 0) -+ CallAfter(&MainFrame::DoUpdateStatusBar); -+ #else -+ DoUpdateStatusBar(); -+ #endif // wxCHECK_VERSION(3, 0, 0) -+ } - - event.Skip(); - } diff --git a/dev-util/codeblocks/files/codeblocks-20.03_gcc11_compatibility.patch b/dev-util/codeblocks/files/codeblocks-20.03_gcc11_compatibility.patch deleted file mode 100644 index 46c8643e9c94..000000000000 --- a/dev-util/codeblocks/files/codeblocks-20.03_gcc11_compatibility.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/src/plugins/openfileslist/openfileslistplugin.h b/src/plugins/openfileslist/openfileslistplugin.h ---- a/src/plugins/openfileslist/openfileslistplugin.h 2020-10-13 20:35:57.000000000 +0300 -+++ b/src/plugins/openfileslist/openfileslistplugin.h 2020-10-13 20:37:37.000000000 +0300 -@@ -23,7 +23,7 @@ - // Functor for the std::set predicate to sort the opened editor files according to their tab order - struct compareLess - { -- bool operator()(const ProjectFile* lhs, const ProjectFile* rhs) { return lhs->editorTabPos < rhs->editorTabPos; } -+ bool operator()(const ProjectFile* lhs, const ProjectFile* rhs) const { return lhs->editorTabPos < rhs->editorTabPos; } - }; - typedef std::set<ProjectFile*, compareLess> OpenFilesSet; - ProjectFile* activeFile;
