gentoo Easter resync : 12.04.2020

8 files changed, 155 insertions, 109 deletions

diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index e5a5f75e711f..b5b49eabfca5 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,9 +1,13 @@
+AUX codeblocks-17.12-fix-crash-on-copypaste.patch 675 BLAKE2B 0c388b674e86b74cbb934be4acc00109bca252d4a6705a5811fa91d6323d7a2c861b1f36354cc17d5a0dee79d2a99543f5b28b9525fc79da2a51873e1eed08c8 SHA512 89a464fa8f86d5c2900bffaee43812d475015813c8870f21b95465b1b91a05744a779187b4e46d61242f1d8ad13cd965b7bcd614b88f2072e0c3e43a819a5c61
 AUX codeblocks-17.12-nodebug.diff 611 BLAKE2B 03de6a604b0971e7b91702fd9a1f66aee6d87538177947762ce7b112bf6e81e75349c76415f1a18ac4ee0b41fa4f1257085af1031988c3346a45402b7bfebe73 SHA512 d5332803a0d9cbcbcafa5fa18d90bea07ff43d8ff93922d577b3b2dddc6349a7b01c9100f6198905d531e31edd0f5ba0b5a88db38df981c567644f8e7e11022a
+AUX codeblocks-20.03-env.patch 1365 BLAKE2B 550b86319823c8453000d0a3a5e1c9a0845bbf08464d04b0055c98d72a055e966e0a30606e3496a00da829686129faf263f4f5edb36843dd5f1d882a4b87a2ce SHA512 c20b11f463517386b95ae1a2f1acc5fe75e15f1976ac004934d8b7a6441f40d5d58ba86292ff6713c0b71a6abe9c1d99554f8928b6aedc9c6452f0aa80ea894d
 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-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
-EBUILD codeblocks-17.12-r300.ebuild 2004 BLAKE2B 6b6b47b35498949282efa068e70c235fa52611580f69d26cdcd483e8fe3c15093921152dd7c2d70a506491efedb1886b44282cbdad8594343c529e1273062029 SHA512 b10b5befad57a1bfc68a27af1eb326a2091600648bb53fb266ac271511ec04bd8005c47a097ba89f486c7f5f260e9e7d38074cb7f3ec9edbad22666ed94ba5b7
-EBUILD codeblocks-17.12-r301.ebuild 2158 BLAKE2B 88352118a259383659f4c9f2cfd820db719fc375a7615f69e5c5f1f5dd870057dde05c8c91908d0ecb2b87a60ce4e850d6bb79336ffca859d528d7c73f74526c SHA512 13336eac42465cb51e05fa81c1732408d429a758032c86909130980b1684304926fd3fd8860b17c9c9fca3c26481279350d77a9bb8c8aac0d68eb42342e36270
-EBUILD codeblocks-17.12-r302.ebuild 2075 BLAKE2B 268d201e8c4d8327c25031ca436617b15f25dd66d75b19a2b0e7e835c1cddf41944425629909d5307a68b128661cae9773e4af8835dac98fc211bb301cd5ee69 SHA512 9cb65efb26c46b96b9b8f4b48d9947c329380634d47650f6fad5b206b3574272bc720adc4a7ffb83cdc26bc2f65328b716fe9542e8cd4e5578cdc625e361f2c1
-EBUILD codeblocks-9999.ebuild 1598 BLAKE2B f2780d052fd517a2363e2d0866ed381a8eadb81d425f9337384ef4af69bf36855da1642e3628a47884c41ef35451a7f7d21ea8987b80030b73836df30384d829 SHA512 0d0b54fc9e42534c3d55a30a06b105597f1baef9613dd7df1ba23d0ace30ee4000994916b3bf2789ba10a527376e89b1184840c709f720b2a0d1033441312c24
+EBUILD codeblocks-17.12-r302.ebuild 2073 BLAKE2B a3b24b2ee38bc86119bad45038281ac8e7bdb22209841983ce0fc83be478e7292aef1e5e626e5c65b5ee1db4656e5957f992d47c1dfa71c53f786e3bd5ce9bfa SHA512 8df7ded166e72fd1d4bbabfb48c2fc3ce875d192e65f6e11fb6b8a4918cc41304ce7cab20c997ec04c98a2e722e806468f1bdda4a41e92c23b33d81f7653a917
+EBUILD codeblocks-17.12-r303.ebuild 2377 BLAKE2B 843edc779b569c87d4f65e6892f4d56a6ecedae5d6774b4d72991374ff0a7a6f17ca28ded88539016a4ac4e711b925228600407b9e7158c67b257a38059023a4 SHA512 e4d337a6febad50650902849d6b0e9efa6165dd70053f3920a59503abacd9f93edc8fa2d26144cbcf4edfa7b989136608854cf46d22e5ffaac95b2b60d4b1dfc
+EBUILD codeblocks-20.03.ebuild 1740 BLAKE2B 884f97f9a0d2e1b3557d934aa177552ba3b7b2dc5c02b5c5ea4033a46c5552483cf7f9ff690b1c74f1a0303bdc10438844c1f56f15e51f595c65d0aa670389f1 SHA512 53af7ec712e57f1a80fe3af696467a07ef18730a2a8e5ed8a24956f8fb862736e538fbe6e4775ad2118118236d90147214351a523a4d666cb07d4c451012c14c
+EBUILD codeblocks-9999.ebuild 1459 BLAKE2B 3add391f132cde04b2e936cd9b014d7ee091f0ce6105356ae1716d1a2a026bbd689c3959e5925c5add922e4d22878bd921fa44688b7aeae7e589911edee482a7 SHA512 0e00e64f4d3c7045b21015970e0c30551865d34439129ddaa3c41221d1414e45e68626d9a686b5e36fe6f46df2483bcb978aaaecb49a64d38da5853cb0c70ed5
 MISC metadata.xml 675 BLAKE2B db56c15590a97e891e387377cafcb743716d9c84f6adaaf43e3885993842e5456086ef1a59a6579fd5058d5d964cf49b34b7993d56cb5a2e78611a4e9edd0618 SHA512 459846c3e46109fb82d0f37d016fea29e3f69cbf8d03ae2ed2aa0beff443e4206082d9f2e53afc6cdac6862f76037dc652f2dc544d6b9bdf15f2de09d863c735
diff --git a/dev-util/codeblocks/codeblocks-17.12-r300.ebuild b/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
deleted file mode 100644
index 7c6e5b47787d..000000000000
--- a/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools flag-o-matic gnome2-utils wxwidgets xdg-utils
-
-DESCRIPTION="The open source, cross platform, free C++ IDE"
-HOMEPAGE="http://www.codeblocks.org/"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.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"
-
-RDEPEND="app-arch/zip
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	contrib? (
-		app-text/hunspell
-		dev-libs/boost:=
-		dev-libs/libgamin
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/codeblocks-17.12-nodebug.diff
-	"${WORKDIR}"/patches/
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	setup-wxwidgets
-
-	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-	# 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 \
-		--with-wx-config="${WX_CONFIG}" \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable pch) \
-		${CONF_WITH_LST}
-}
-
-pkg_postinst() {
-	if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
-		elog "The symbols browser is disabled due to it causing crashes."
-		elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
-	fi
-
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/codeblocks/codeblocks-17.12-r302.ebuild b/dev-util/codeblocks/codeblocks-17.12-r302.ebuild
index e7e1bf808573..47cecf4c74fc 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r302.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r302.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="http://www.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"
diff --git a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild b/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
index 93cfa9d4979d..3a4c47275908 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools gnome2-utils wxwidgets xdg-utils
+inherit autotools wxwidgets xdg-utils
 
 DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
-HOMEPAGE="http://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"
@@ -23,7 +23,11 @@ https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.x
 
 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
@@ -31,21 +35,21 @@ RDEPEND="app-arch/zip
 		dev-libs/boost:=
 	)"
 
-DEPEND="${RDEPEND}
-	>=dev-libs/tinyxml-2.6.2-r3
-	>=dev-util/astyle-3.0.1-r1:0=
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/codeblocks-17.12-nodebug.diff
+	"${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
-		epatch "${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
+		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
 }
 
@@ -67,18 +71,16 @@ src_configure() {
 }
 
 pkg_postinst() {
-	if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
-		elog "The symbols browser is disabled due to it causing crashes."
-		elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
-	fi
+	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
-	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
 }
diff --git a/dev-util/codeblocks/codeblocks-20.03.ebuild b/dev-util/codeblocks/codeblocks-20.03.ebuild
new file mode 100644
index 000000000000..c8915abb8e27
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-20.03.ebuild
@@ -0,0 +1,75 @@
+# 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"
+
+# USE="fortran" enables FortranProject plugin (v1.6 updated to 2020-04-06 [r277])
+# 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-9999.ebuild b/dev-util/codeblocks/codeblocks-9999.ebuild
index 5350bd29d7cc..580a1b03b545 100644
--- a/dev-util/codeblocks/codeblocks-9999.ebuild
+++ b/dev-util/codeblocks/codeblocks-9999.ebuild
@@ -5,10 +5,10 @@ EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools subversion wxwidgets xdg-utils
+inherit autotools subversion wxwidgets xdg
 
 DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
-HOMEPAGE="http://www.codeblocks.org/"
+HOMEPAGE="https://codeblocks.org/"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
@@ -58,13 +58,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/files/codeblocks-17.12-fix-crash-on-copypaste.patch b/dev-util/codeblocks/files/codeblocks-17.12-fix-crash-on-copypaste.patch
new file mode 100644
index 000000000000..9918c58d8e88
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-17.12-fix-crash-on-copypaste.patch
@@ -0,0 +1,20 @@
+# 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-env.patch b/dev-util/codeblocks/files/codeblocks-20.03-env.patch
new file mode 100644
index 000000000000..2a973abe2b7b
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-20.03-env.patch
@@ -0,0 +1,29 @@
+diff -Nuar a_init/Makefile.am b_env/Makefile.am
+--- a_init/Makefile.am	2020-03-28 15:36:06.000000000 +0300
++++ b_env/Makefile.am	2020-03-30 18:14:12.000000000 +0300
+@@ -46,5 +46,5 @@
+ clean-local:
+ 	rm -f $(top_srcdir)/debian/codeblocks-headers.install
+ 
+-appdatadir = $(datarootdir)/appdata
++appdatadir = $(datarootdir)/metainfo
+ dist_appdata_DATA = $(top_srcdir)/codeblocks.appdata.xml
+diff -Nuar a_init/m4/acinclude.m4 b_env/m4/acinclude.m4
+--- a_init/m4/acinclude.m4	2020-03-28 15:36:06.000000000 +0300
++++ b_env/m4/acinclude.m4	2020-03-30 18:08:13.000000000 +0300
+@@ -91,8 +91,6 @@
+ AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [turn on debugging (default is OFF)])],,
+                        enable_debug=$debug_default)
+     if test "x$enable_debug" = "xyes"; then
+-        CFLAGS="-g $CFLAGS"
+-        CXXFLAGS="-g $CXXFLAGS"
+         CPPFLAGS="-DDEBUG -DcbDEBUG $CPPFLAGS"
+         AC_MSG_RESULT(yes)
+     else
+diff -Nuar a_init/src/plugins/contrib/appdata/Makefile.am b_env/src/plugins/contrib/appdata/Makefile.am
+--- a_init/src/plugins/contrib/appdata/Makefile.am	2020-03-28 15:35:54.000000000 +0300
++++ b_env/src/plugins/contrib/appdata/Makefile.am	2020-03-30 18:14:22.000000000 +0300
+@@ -1,2 +1,2 @@
+-appdatadir = $(datarootdir)/appdata
++appdatadir = $(datarootdir)/metainfo
+ dist_appdata_DATA = $(top_srcdir)/codeblocks-contrib.metainfo.xml