summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Torokhov <torokhov-s-a@yandex.ru>2020-03-31 04:59:27 +0300
committerMart Raudsepp <leio@gentoo.org>2020-04-08 09:34:59 +0300
commit8db46d60049775745930ef445cebe801d802932d (patch)
tree52458e05cf7568ba25b17e5df11a4501b465429a /dev-util/codeblocks/files
parentdev-util/codeblocks: update live ebuild (diff)
downloadgentoo-8db46d60049775745930ef445cebe801d802932d.tar.gz
gentoo-8db46d60049775745930ef445cebe801d802932d.tar.bz2
gentoo-8db46d60049775745930ef445cebe801d802932d.zip
dev-util/codeblocks: 20.03 version bump
- Update CodeBLocks to 20.03 with new patch to build Fortranroject plugin; - Now xdg eclass is used instead of xdg-utils eclass; - FortranProject plugin update from [r270] to [r277] with some additional features before FortranProject v1.7 release. Patch from [r273] fixes the build issue for compiling with USE=pch. Closes: https://github.com/gentoo/gentoo/pull/15182 Signed-off-by: Sergey Torokhov <torokhov-s-a@yandex.ru> Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'dev-util/codeblocks/files')
-rw-r--r--dev-util/codeblocks/files/codeblocks-20.03-env.patch29
1 files changed, 29 insertions, 0 deletions
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