From 4fe228ee9aa3b9b825d54ace549a5517e153e8bd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 9 Jun 2024 00:08:14 +0100 Subject: gentoo auto-resync : 09:06:2024 - 00:08:13 --- dev-util/codeblocks/Manifest | 6 +- dev-util/codeblocks/codeblocks-20.03_p13518.ebuild | 125 ++++++++ dev-util/codeblocks/codeblocks-9999.ebuild | 14 +- ...13518_FortranProject-r378-autotools-build.patch | 340 +++++++++++++++++++++ 4 files changed, 483 insertions(+), 2 deletions(-) create mode 100644 dev-util/codeblocks/codeblocks-20.03_p13518.ebuild create mode 100644 dev-util/codeblocks/files/codeblocks-20.03_p13518_FortranProject-r378-autotools-build.patch (limited to 'dev-util/codeblocks') diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest index 4d21eae3bfee..b89b558a979d 100644 --- a/dev-util/codeblocks/Manifest +++ b/dev-util/codeblocks/Manifest @@ -1,13 +1,17 @@ AUX codeblocks-20.03-env.patch 1365 BLAKE2B 550b86319823c8453000d0a3a5e1c9a0845bbf08464d04b0055c98d72a055e966e0a30606e3496a00da829686129faf263f4f5edb36843dd5f1d882a4b87a2ce SHA512 c20b11f463517386b95ae1a2f1acc5fe75e15f1976ac004934d8b7a6441f40d5d58ba86292ff6713c0b71a6abe9c1d99554f8928b6aedc9c6452f0aa80ea894d AUX codeblocks-20.03_Scintilla_fix_buffer_over-read_with_absolute_reference.patch 902 BLAKE2B 57dd173c91ac7d9c2a5a6c5aeb480e7f48ce7ead98333ab4bdfb51be18c65471bb5cdd8dfe5f20bf098e383bda21aaffc2b7a4a9e08b04423fa04000e1f8df69 SHA512 ef99d2adf255c76a0bde4545fefd6058964f94eb51a5459c52fefd233502b2669270b065a87e543a00e71e4c630cf58ecec33e1f190d8d9e1a2ed87cacafb473 AUX codeblocks-20.03_fix_DoxyBlocks_startup_segfault.patch 1886 BLAKE2B dcf643fcc53f18b3e7635ccad22b98f69974c081b1af6cdc22901bd7b5ce76920f02084c2b1caa386aa018a5002c42fb1947b76c329ba1acd3559d24c6d61ce8 SHA512 c3d8e30cdfc091d881d268f384e74d45c1402a0b52a1e09814e950791c0d8bb8c0a23c34241419aba039926f275117cffd9a079b126bdec1a4ad82511fb88d7d +AUX codeblocks-20.03_p13518_FortranProject-r378-autotools-build.patch 16568 BLAKE2B faa888e1a7886277e55825886cf434368707b100b3b55a3c1708c80d54f5ff4543087aa01c8978dbeb5ef89ea58e3c8de27e86efc632188d68cff8a2e98316a4 SHA512 3d65053258623c7018108e68c09e823797f1ba6e0a882140d88c5cce15a1ea6ff2138aaf038a9b454bb6d18b7fac3f47824a38a8f24c341e6ba7758cd9d399f0 AUX codeblocks-9999-nodebug.diff 539 BLAKE2B e205eb643be1e0a9103c77b632c10c36fd86a65866460583dbc8b4324fc5893f726b09b19ebdaea2cd38710148ec0815d8dd1d2055461421874256b5e8502e8f SHA512 f63c1d81b119d6278804b48240651e09d7d0595cf44fce6ae8a9bc4a4bbdddea7a9f4a7d7d000fb9c98aeec2c680d07bd9eb4694238fc10f5d38c8a807f8d9b2 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-20.03_p13518.tar.bz2 19779652 BLAKE2B cc445516ce92918dfac67b250e17a4d1f3aa0f86b58dfd701c723b1e4436bbcd7366754d64f75907680de65ce340d38b54c9bd48b31dc7078625186855d6b29a SHA512 2cdf52b04931f8ee788071579eed03b1737e05d890ec7bb9ed3458de770b86507cc276604740f9ea2b7928983a703eb4e4a8a97637e0dc267c9e8e49866f0430 +DIST fortranproject_r378.tar.bz2 603873 BLAKE2B ed1fe94c591ec8ce1e5a844b3fa789f1bbecfade19a4ac1c3d17098da704b271be2e13d680e43050116d7117d40e117fa50d75ab5cc3ddd7223f46e1c2a162cd SHA512 fb4645f81b087d22e5735a33aded806595f96ccd1c2d32123a919c48de260ce2e1d96551fae0b65663902bc198a8f4ab158233b8755693df38315ea688cbaf92 EBUILD codeblocks-20.03-r6.ebuild 2384 BLAKE2B 1b96645476dce1f0f041061b9bb2568b10694bf0495dd12baa6f33eafc8247dc63e3ad3d49ec4f99754fc42e57fc01483757ff9cb2a6cd319f7474f324f62ada SHA512 fc20a3f793f60c30ded884489b22f70bd893c02ebea6a73aa261b5d3a2f472983c9e21258f5912260cdda92f4bf0fb1f5a8a970983c0306681eca06ff41631c9 EBUILD codeblocks-20.03-r7.ebuild 2688 BLAKE2B e44af7aadb4b0e4d164a14b5ef5604adba4669299f107758d3dc0973015cfd6a3e5bf4c6f95bd44383f650dde843a907786b9d615a80848e17d59cf36919b394 SHA512 4b7cce9da51c0665b787345e5871949cf5d29667aeb71691ca9e5446bead55f1d4b9215523e4af51bf2d5a30cf16c95595f9a593503a74be8d4ce2889d32b9af -EBUILD codeblocks-9999.ebuild 1695 BLAKE2B 0b245e75366b1d38d55c74a40df4e82238c214aab59dbad28cdae6bfcbd07e1ad53af3112cd7ef349ddd9235e40c6e346b2c156237505ea49d20b45227e8a887 SHA512 68368d3b5f06a6fe02067817752f08378228cc25ab5d81dba1fd84c7c6f0f351a861f1fe240e5109fd649b53346fef88cc567d4e9f3303c9d3ee780b6461ba6f +EBUILD codeblocks-20.03_p13518.ebuild 2758 BLAKE2B 91e8a35ab77b48d647c31c8922fccec55846ef780ddfdccc52a2f0885deae3aad9ff69b72cb0cebf49591e54471f82d1fe938baef236c926e7979773ea6189be SHA512 68ebedbffcd9af7e8db7866e669a39ac2517a4aa64c4d130ef0ce0597b2c27503495da264ee8e5dcbee84ba3ae5d3cb3159a63b191bc755008a4722f8e3bff0e +EBUILD codeblocks-9999.ebuild 1860 BLAKE2B e1ded5ce257291f21032c56f468fa1236221efb9c13f8465e83fe296e3a9c3188a9ec341c7d5e3c8bd9e93f6bc62cfeca731148abb760253756c67dca1471886 SHA512 a00e0ba169d075298dd10366b3e27c1d61156f3f6437375f759c1709f37adcd2592263f81c317878169a3cd873efdfbbc0f0f57901413c2f61164adb704c7443 MISC metadata.xml 845 BLAKE2B f7b882b01dd425c6eb56c164a95e7e635ba59591ec1839a9b925496e4c40bf03497ec4134eb38b47f9eb54b765773890896ba243b5936cf7bc3b71f7e7ce41d4 SHA512 ae0650c5218f8e18422926bb11daa9cc89804221b9958963da484464668e99f6049ef099fc6a63f3a0800fa15238ecf0607da0a495c42d5029a94ed15ef4c985 diff --git a/dev-util/codeblocks/codeblocks-20.03_p13518.ebuild b/dev-util/codeblocks/codeblocks-20.03_p13518.ebuild new file mode 100644 index 000000000000..7267802cf9c9 --- /dev/null +++ b/dev-util/codeblocks/codeblocks-20.03_p13518.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.2-gtk3" + +inherit autotools flag-o-matic multiprocessing wxwidgets xdg + +REV=13518 +REV_DATE="2024-05-05 20:30:28" +FP_NAME=fortranproject +FP_REV=378 + +DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE" +HOMEPAGE="https://codeblocks.org/" + +# svn export --ignore-externals https://svn.code.sf.net/p/codeblocks/code/trunk@${REV} codeblocks-20.03_p${REV} +# tar -cjf codeblocks-20.03_p${REV}.tar.bz2 codeblocks-20.03_p${REV} +# +# svn export https://svn.code.sf.net/p/fortranproject/code/trunk@${FP_REV} fortranproject_r${FP_REV} +# tar -cjf fortranproject_r${FP_REV}.tar.bz2 fortranproject_r${FP_REV} +SRC_URI=" + https://github.com/band-a-prend/gentoo-overlay/releases/download/${PN}-20.03_p${REV}/${PN}-20.03_p${REV}.tar.bz2 + https://github.com/band-a-prend/gentoo-overlay/releases/download/${PN}-20.03_p${REV}/${FP_NAME}_r${FP_REV}.tar.bz2 +" + +LICENSE="GPL-3" +SLOT="0" + +IUSE="fortran contrib debug" + +BDEPEND="virtual/pkgconfig" + +RDEPEND=" + app-arch/zip + dev-libs/glib:2 + >=dev-libs/tinyxml-2.6.2-r3 + >=dev-util/astyle-3.1-r2:0/3.1 + x11-libs/gtk+:3 + x11-libs/wxGTK:${WX_GTK_VER}[X] + contrib? ( + app-admin/gamin + app-arch/bzip2 + app-text/hunspell:= + dev-libs/boost:= + dev-libs/libgamin + media-libs/fontconfig + sys-libs/zlib + ) +" + +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" + +PATCHES=( + "${FILESDIR}/${PN}-9999-nodebug.diff" + "${FILESDIR}/${P}_FortranProject-r378-autotools-build.patch" +) + +src_unpack() { + default + mv -T "${WORKDIR}/${FP_NAME}_r${FP_REV}" "${S}"/src/plugins/contrib/FortranProject || die +} + +src_prepare() { + default + + # Let's make the autorevision work. + echo "m4_define([SVN_REV], ${REV})" > revision.m4 + echo "m4_define([SVN_DATE], ${REV_DATE})" >> revision.m4 + + eautoreconf +} + +src_configure() { + # Bug 858338 + append-flags -fno-strict-aliasing + + 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) + + local myeconfargs=( + --disable-pch + --disable-static + $(use_with contrib boost-libdir "${ESYSROOT}/usr/$(get_libdir)") + $(use_enable debug) + ${CONF_WITH_LST} + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + if use contrib; then + if (( $(get_makeopts_jobs) > 8 )); then + emake -j8 # Bug 930819 + else + emake + fi + else + emake + fi +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die +} + +pkg_postinst() { + 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 531794a90f95..25b3ef48c800 100644 --- a/dev-util/codeblocks/codeblocks-9999.ebuild +++ b/dev-util/codeblocks/codeblocks-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 WX_GTK_VER="3.2-gtk3" -inherit autotools flag-o-matic subversion wxwidgets xdg +inherit autotools flag-o-matic multiprocessing subversion wxwidgets xdg DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE" HOMEPAGE="https://codeblocks.org/" @@ -69,6 +69,18 @@ src_configure() { econf "${myeconfargs[@]}" } +src_compile() { + if use contrib; then + if (( $(get_makeopts_jobs) > 8 )); then + emake -j8 # Bug 930819 + else + emake + fi + else + emake + fi +} + src_install() { default find "${ED}" -type f -name '*.la' -delete || die diff --git a/dev-util/codeblocks/files/codeblocks-20.03_p13518_FortranProject-r378-autotools-build.patch b/dev-util/codeblocks/files/codeblocks-20.03_p13518_FortranProject-r378-autotools-build.patch new file mode 100644 index 000000000000..3b8dd49efd7d --- /dev/null +++ b/dev-util/codeblocks/files/codeblocks-20.03_p13518_FortranProject-r378-autotools-build.patch @@ -0,0 +1,340 @@ +diff -Naur a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -506,6 +506,29 @@ + src/plugins/contrib/EditorTweaks/Makefile + src/plugins/contrib/envvars/Makefile + src/plugins/contrib/FileManager/Makefile ++ src/plugins/contrib/FortranProject/Makefile ++ src/plugins/contrib/FortranProject/images/Makefile ++ src/plugins/contrib/FortranProject/images/16x16/Makefile ++ src/plugins/contrib/FortranProject/images/20x20/Makefile ++ src/plugins/contrib/FortranProject/images/24x24/Makefile ++ src/plugins/contrib/FortranProject/images/28x28/Makefile ++ src/plugins/contrib/FortranProject/images/32x32/Makefile ++ src/plugins/contrib/FortranProject/images/40x40/Makefile ++ src/plugins/contrib/FortranProject/images/48x48/Makefile ++ src/plugins/contrib/FortranProject/images/56x56/Makefile ++ src/plugins/contrib/FortranProject/images/64x64/Makefile ++ src/plugins/contrib/FortranProject/images/svg/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/16x16/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/20x20/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/24x24/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/28x28/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/32x32/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/40x40/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/48x48/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/56x56/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/64x64/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/svg/Makefile + src/plugins/contrib/headerfixup/Makefile + src/plugins/contrib/help_plugin/Makefile + src/plugins/contrib/help_plugin/bzip2/Makefile +diff -Naur a/m4/acinclude.m4 b/m4/acinclude.m4 +--- a/m4/acinclude.m4 ++++ b/m4/acinclude.m4 +@@ -364,6 +364,7 @@ + AM_CONDITIONAL([BUILD_EDITORTWEAKS], [false]) + AM_CONDITIONAL([BUILD_ENVVARS], [false]) + AM_CONDITIONAL([BUILD_FILEMANAGER], [false]) ++ AM_CONDITIONAL([BUILD_FORTRANPROJECT], [false]) + AM_CONDITIONAL([BUILD_HEADERFIXUP], [false]) + AM_CONDITIONAL([BUILD_HELP], [false]) + AM_CONDITIONAL([BUILD_KEYBINDER], [false]) +@@ -408,6 +409,7 @@ + AM_CONDITIONAL([BUILD_EDITORTWEAKS], [true]) + AM_CONDITIONAL([BUILD_ENVVARS], [true]) + AM_CONDITIONAL([BUILD_FILEMANAGER], [true]) ++ AM_CONDITIONAL([BUILD_FORTRANPROJECT], [true]) + AM_CONDITIONAL([BUILD_HEADERFIXUP], [true]) + AM_CONDITIONAL([BUILD_HELP], [true]) + AM_CONDITIONAL([BUILD_KEYBINDER], [true]) +@@ -450,7 +452,7 @@ + [ compiles none of the contrib-plugins ] + [ Plugin names are: AutoVersioning, BrowseTracker, byogames, Cccc, CppCheck, cbkoders, codesnippets, ] + [ codestat, copystrings, Cscope, DoxyBlocks, dragscroll, EditorConfig, EditorTweaks, envvars, exporter, ] +- [ FileManager, headerfixup, help, hexeditor, incsearch, keybinder, libfinder, MouseSap, ] ++ [ FileManager, FortranProject, headerfixup, help, hexeditor, incsearch, keybinder, libfinder, MouseSap, ] + [ NassiShneiderman, ProjectOptionsManipulator, profiler, regex, ReopenEditor, rndgen, clangd_client, smartindent, spellchecker, ] + [ symtab, ThreadSearch, ToolsPlus, Valgrind, wxcontrib, wxsmith, wxsmithcontrib, wxsmithaui ], + plugins="$withval", plugins="none") +@@ -504,6 +506,9 @@ + FileManager) + AM_CONDITIONAL([BUILD_FILEMANAGER], [true]) + ;; ++ FortranProject) ++ AM_CONDITIONAL([BUILD_FORTRANPROJECT], [true]) ++ ;; + headerfixup) + AM_CONDITIONAL([BUILD_HEADERFIXUP], [true]) + ;; +@@ -627,6 +632,9 @@ + -FileManager) + AM_CONDITIONAL([BUILD_FILEMANAGER], [false]) + ;; ++ -FortranProject) ++ AM_CONDITIONAL([BUILD_FORTRANPROJECT], [false]) ++ ;; + -headerfixup) + AM_CONDITIONAL([BUILD_HEADERFIXUP], [false]) + ;; +@@ -735,6 +743,7 @@ + AC_SUBST(BUILD_EDITORTWEAKS) + AC_SUBST(BUILD_ENVVARS) + AC_SUBST(BUILD_FILEMANAGER) ++AC_SUBST(BUILD_FORTRANPROJECT) + AC_SUBST(BUILD_HEADERFIXUP) + AC_SUBST(BUILD_HELP) + AC_SUBST(BUILD_HEXEDITOR) +diff -Naur a/src/plugins/contrib/FortranProject/Makefile.am b/src/plugins/contrib/FortranProject/Makefile.am +--- a/src/plugins/contrib/FortranProject/Makefile.am ++++ b/src/plugins/contrib/FortranProject/Makefile.am +@@ -1,16 +1,18 @@ + SUBDIRS = images + +-ACLOCAL_AMFLAGS = --install -I m4 +- + AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + +-cb_plugin_lib_LTLIBRARIES = libFortranProject.la ++pluginlibdir = $(pkglibdir)/plugins ++ ++pluginlib_LTLIBRARIES = libFortranProject.la + +-libFortranProject_la_LDFLAGS = -shared -no-undefined -avoid-version ++libFortranProject_la_LDFLAGS = @MODULE_SHARED_LDFLAGS@ -version-info 0:1:0 -no-undefined -avoid-version + +-libFortranProject_la_LIBADD = $(WX_LIBS) ++libFortranProject_la_LIBADD = ../../../sdk/libcodeblocks.la \ ++ $(WX_LIBS) \ ++ $(CB_TINYXML_LIBS) + + libFortranProject_la_SOURCES = adddirparserthread.cpp \ + autoinsert.cpp \ +@@ -139,12 +141,9 @@ + images/fortranproject/64x64/*.png \ + images/fortranproject/svg/*.svg + +-cb_plugin_data_DATA = FortranProject.zip +- +-CLEANFILES = $(cb_plugin_data_DATA) ++pkgdata_DATA = FortranProject.zip + +-uninstall-hook: +- -rmdir ${cb_plugin_datadir}images/fortranproject ++CLEANFILES = $(pkgdata_DATA) + + FortranProject.zip: manifest.xml + PWD=`pwd` cd $(srcdir) && zip -j9 $(PWD)/FortranProject.zip manifest.xml resources/*.xrc > /dev/null +diff -Naur a/src/plugins/contrib/FortranProject/images/16x16/Makefile.am b/src/plugins/contrib/FortranProject/images/16x16/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/16x16/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/16x16/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/16x16 ++pkgdatadir = $(datadir)/@PACKAGE@/images/16x16 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/20x20/Makefile.am b/src/plugins/contrib/FortranProject/images/20x20/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/20x20/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/20x20/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/20x20 ++pkgdatadir = $(datadir)/@PACKAGE@/images/20x20 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/24x24/Makefile.am b/src/plugins/contrib/FortranProject/images/24x24/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/24x24/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/24x24/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/24x24 ++pkgdatadir = $(datadir)/@PACKAGE@/images/24x24 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/28x28/Makefile.am b/src/plugins/contrib/FortranProject/images/28x28/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/28x28/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/28x28/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/28x28 ++pkgdatadir = $(datadir)/@PACKAGE@/images/28x28 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/32x32/Makefile.am b/src/plugins/contrib/FortranProject/images/32x32/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/32x32/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/32x32/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/32x32 ++pkgdatadir = $(datadir)/@PACKAGE@/images/32x32 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/40x40/Makefile.am b/src/plugins/contrib/FortranProject/images/40x40/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/40x40/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/40x40/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/40x40 ++pkgdatadir = $(datadir)/@PACKAGE@/images/40x40 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/48x48/Makefile.am b/src/plugins/contrib/FortranProject/images/48x48/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/48x48/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/48x48/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/48x48 ++pkgdatadir = $(datadir)/@PACKAGE@/images/48x48 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/56x56/Makefile.am b/src/plugins/contrib/FortranProject/images/56x56/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/56x56/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/56x56/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/56x56 ++pkgdatadir = $(datadir)/@PACKAGE@/images/56x56 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/64x64/Makefile.am b/src/plugins/contrib/FortranProject/images/64x64/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/64x64/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/64x64/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/64x64 ++pkgdatadir = $(datadir)/@PACKAGE@/images/64x64 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/Makefile.am b/src/plugins/contrib/FortranProject/images/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/Makefile.am +@@ -1,4 +1,3 @@ + SUBDIRS = 16x16 20x20 24x24 28x28 32x32 40x40 48x48 56x56 64x64 fortranproject svg + +-pkgdatadir = $(cb_plugin_datadir)/images +- ++pkgdatadir = $(datadir)/@PACKAGE@/images +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/16x16/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/16x16/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/16x16/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/16x16/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/16x16 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/16x16 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/20x20/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/20x20/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/20x20/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/20x20/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/20x20 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/20x20 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/24x24/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/24x24/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/24x24/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/24x24/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/24x24 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/24x24 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/28x28/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/28x28/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/28x28/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/28x28/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/28x28 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/28x28 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/32x32/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/32x32/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/32x32/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/32x32/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/32x32 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/32x32 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/40x40/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/40x40/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/40x40/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/40x40/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/40x40 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/40x40 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/48x48/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/48x48/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/48x48/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/48x48/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/48x48 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/48x48 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/56x56/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/56x56/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/56x56/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/56x56/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/56x56 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/56x56 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/64x64/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/64x64/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/64x64/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/64x64/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/64x64 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/64x64 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/Makefile.am +@@ -1,5 +1,5 @@ + SUBDIRS = 16x16 20x20 24x24 28x28 32x32 40x40 48x48 56x56 64x64 svg + +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject + + dist_pkgdata_DATA = $(srcdir)/*.f90 $(srcdir)/*.py $(srcdir)/*.dem +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/svg/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/svg/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/svg/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/svg/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/svg ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/svg + + dist_pkgdata_DATA = $(srcdir)/*.svg +diff -Naur a/src/plugins/contrib/FortranProject/images/svg/Makefile.am b/src/plugins/contrib/FortranProject/images/svg/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/svg/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/svg/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/svg ++pkgdatadir = $(datadir)/@PACKAGE@/images/svg + + dist_pkgdata_DATA = $(srcdir)/*.svg +diff -Naur a/src/plugins/contrib/Makefile.am b/src/plugins/contrib/Makefile.am +--- a/src/plugins/contrib/Makefile.am ++++ b/src/plugins/contrib/Makefile.am +@@ -54,6 +54,10 @@ + MAYBE_FILEMANAGER=FileManager appdata + endif + ++if BUILD_FORTRANPROJECT ++MAYBE_FORTRANPROJECT=FortranProject appdata ++endif ++ + if BUILD_HELP + MAYBE_HELP=help_plugin appdata + endif +@@ -178,6 +182,7 @@ + $(MAYBE_EDITORTWEAKS) \ + $(MAYBE_ENVVARS) \ + $(MAYBE_FILEMANAGER) \ ++ $(MAYBE_FORTRANPROJECT) \ + $(MAYBE_HEADERFIXUP) \ + $(MAYBE_HELP) \ + $(MAYBE_HEXEDITOR) \ +@@ -222,6 +227,7 @@ + EditorTweaks \ + envvars \ + FileManager \ ++ FortranProject \ + headerfixup \ + help_plugin \ + HexEditor \ -- cgit v1.2.3