Skip to content

Commit

Permalink
dev-util/geany-plugins: GCC 14 compatibility
Browse files Browse the repository at this point in the history
Closes: https://bugs.gentoo.org/919446
Signed-off-by: Chris Mayo <aklhfex@gmail.com>
Closes: #34823
Signed-off-by: Sam James <sam@gentoo.org>
  • Loading branch information
cjmayo authored and thesamesam committed Jan 17, 2024
1 parent 1c1f23a commit 719ff45
Show file tree
Hide file tree
Showing 2 changed files with 138 additions and 0 deletions.
11 changes: 11 additions & 0 deletions dev-util/geany-plugins/files/geany-plugins-2.0-gcc14.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/projectorganizer/src/prjorg-sidebar.c
+++ b/projectorganizer/src/prjorg-sidebar.c
@@ -1562,7 +1562,7 @@ gchar **prjorg_sidebar_get_expanded_paths(void)
(GtkTreeViewMappingFunc)on_map_expanded, expanded_paths);
g_ptr_array_add(expanded_paths, NULL);

- return g_ptr_array_free(expanded_paths, FALSE);
+ return (gchar **) g_ptr_array_free(expanded_paths, FALSE);
}


127 changes: 127 additions & 0 deletions dev-util/geany-plugins/geany-plugins-2.0-r1.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

LUA_COMPAT=( lua5-1 )

inherit autotools lua-single

DESCRIPTION="A collection of different plugins for Geany"
HOMEPAGE="https://plugins.geany.org"
SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.bz2"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"

IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope webhelper workbench"
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"

DEPEND="
dev-libs/glib:2
>=dev-util/geany-2.0
x11-libs/gtk+:3
ctags? ( dev-util/ctags )
debugger? ( x11-libs/vte:2.91 )
enchant? ( app-text/enchant:= )
git? ( dev-libs/libgit2:= )
gpg? ( app-crypt/gpgme:= )
gtkspell? ( app-text/gtkspell:3= )
lua? ( ${LUA_DEPS} )
markdown? (
app-text/discount:=
net-libs/webkit-gtk:4.1
)
pretty-printer? ( dev-libs/libxml2:2 )
scope? ( x11-libs/vte:2.91 )
webhelper? ( net-libs/webkit-gtk:4.1 )
workbench? ( dev-libs/libgit2:= )
"
RDEPEND="${DEPEND}
scope? ( dev-debug/gdb )
"
BDEPEND="virtual/pkgconfig
nls? ( sys-devel/gettext )
"

PATCHES=(
"${FILESDIR}/${P}-gcc14.patch"
"${FILESDIR}/${P}-webkit2gtk-4.1.patch"
)

pkg_setup() {
use lua && lua-single_pkg_setup
}

src_prepare() {
default
eautoreconf
}

src_configure() {
local myeconfargs=(
--disable-cppcheck
--disable-extra-c-warnings
$(use_enable nls)
--enable-utilslib
# Plugins
--enable-addons
--enable-autoclose
--enable-automark
--enable-codenav
--enable-commander
--enable-defineformat
--enable-geanydoc
--enable-geanyextrasel
--enable-geanyinsertnum
--enable-geanymacro
--enable-geanyminiscript
--enable-geanynumberedbookmarks
--enable-geanyprj
--enable-geanyvc $(use_enable gtkspell)
--enable-keyrecord
--enable-latex
--enable-lineoperations
--enable-lipsum
--enable-overview
--enable-pairtaghighlighter
--enable-pohelper
--enable-projectorganizer
--enable-sendmail
--enable-shiftcolumn
--enable-tableconvert
--enable-treebrowser
--enable-vimode
--enable-xmlsnippets
$(use_enable debugger)
$(use_enable ctags geanyctags)
$(use_enable lua geanylua)
$(use_enable gpg geanypg)
$(use_enable git gitchangebar)
$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
$(use_enable pretty-printer)
$(use_enable scope)
$(use_enable enchant spellcheck)
$(use_enable webhelper)
$(use_enable workbench)
# GeanyGenDoc requires ctpl which isn’t yet in portage
--disable-geanygendoc
# Require libsoup-2.4 which conflicts with webkit2gtk-4.1
--disable-geniuspaste
--disable-updatechecker
)

econf "${myeconfargs[@]}"
}

src_install() {
default

find "${D}" -name '*.la' -delete || die

# make installs all translations if LINGUAS is empty
if [[ -z "${LINGUAS-x}" ]]; then
rm -r "${ED}/usr/share/locale/" || die
fi
}

0 comments on commit 719ff45

Please sign in to comment.