Updating liguros repo

3 files changed, 28 insertions, 14 deletions

diff --git a/dev-util/codeblocks/codeblocks-17.12-r302.ebuild b/dev-util/codeblocks/codeblocks-17.12-r304.ebuild
index 80c6e79729b0..88841742c92f 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r302.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r304.ebuild
@@ -5,13 +5,13 @@ EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools wxwidgets xdg-utils
+inherit autotools wxwidgets xdg
 
 DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
-HOMEPAGE="https://www.codeblocks.org/"
+HOMEPAGE="https://codeblocks.org/"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+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"
@@ -19,7 +19,7 @@ https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.x
 # 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
+# https://cbfortran.sourceforge.io
 
 IUSE="contrib debug fortran pch"
 
@@ -38,7 +38,9 @@ RDEPEND="app-arch/zip
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/codeblocks-17.12-nodebug.diff
+	"${FILESDIR}"/${P}-fix-crash-on-copypaste.patch
+	"${FILESDIR}"/${P}-nodebug.diff
+	"${FILESDIR}"/${PN}-20.03_gcc11_compatibility.patch
 	"${WORKDIR}"/patches/
 	)
 
@@ -47,6 +49,8 @@ src_prepare() {
 	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
 }
 
@@ -71,13 +75,9 @@ 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
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
+	xdg_pkg_postrm
 }
diff --git a/dev-util/codeblocks/codeblocks-20.03.ebuild b/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
index c8915abb8e27..16fbd94b7720 100644
--- a/dev-util/codeblocks/codeblocks-20.03.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
@@ -13,12 +13,13 @@ 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.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz"
 
-# USE="fortran" enables FortranProject plugin (v1.6 updated to 2020-04-06 [r277])
+# 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
+# https://cbfortran.sourceforge.io
 
 IUSE="contrib debug fortran pch"
 
@@ -38,6 +39,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-env.patch
+	"${FILESDIR}"/${P}_gcc11_compatibility.patch
 	"${WORKDIR}"/patches/
 	)
 
diff --git a/dev-util/codeblocks/files/codeblocks-20.03_gcc11_compatibility.patch b/dev-util/codeblocks/files/codeblocks-20.03_gcc11_compatibility.patch
new file mode 100644
index 000000000000..46c8643e9c94
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-20.03_gcc11_compatibility.patch
@@ -0,0 +1,12 @@
+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;