commit: c5366aec59af23d2d7de8b07896edee8b154b072 Author: Chris Mayo <aklhfex <AT> gmail <DOT> com> AuthorDate: Fri Oct 3 18:30:31 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Nov 12 09:48:38 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5366aec
dev-util/geany-plugins: drop 2.0-r1, 2.0-r3 Signed-off-by: Chris Mayo <aklhfex <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44027 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/geany-plugins/Manifest | 1 - .../files/geany-plugins-2.0-gcc14.patch | 11 -- .../files/geany-plugins-2.0-gcc15-r1.patch | 43 ------- .../files/geany-plugins-2.0-webkit2gtk-4.1.patch | 33 ----- dev-util/geany-plugins/geany-plugins-2.0-r1.ebuild | 127 ------------------- dev-util/geany-plugins/geany-plugins-2.0-r3.ebuild | 136 --------------------- 6 files changed, 351 deletions(-) diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest index c198a7f4b9c3..cbb439903459 100644 --- a/dev-util/geany-plugins/Manifest +++ b/dev-util/geany-plugins/Manifest @@ -1,2 +1 @@ -DIST geany-plugins-2.0.tar.bz2 3181264 BLAKE2B 6175f91a3a7effa081393e9397336e0f5f59846fdadd0e31584f237c14863016cc4ab1b17745e1e2804ad88161dc7e43aef97a2332a5c18a7f1baf10d2ea42ba SHA512 48d575459e5c9f905b8809796ea89a05f6e082a1bb1d29c9f44dd5de607a64ad65a27d18348312702d25cfbb80ea0348b9e806f8c0fe649ea558b5b4ccd84818 DIST geany-plugins-2.1.tar.bz2 3851685 BLAKE2B cd05f1046209dc8085e5bbcc5251bee2c8941d0e160ed434cad15d7b2d767f5de8b58a3feb95ca5110f6d89c49d6860fc4b56f17c97cba21e5e41e5ced131efc SHA512 aed8998c9fd7467b08c05cdf7a066c701b8ef73917e78f674d547282513be418063f37651d2fa0d345c4fdc5b8db3371837f3498263fa73c41497beb364294c6 diff --git a/dev-util/geany-plugins/files/geany-plugins-2.0-gcc14.patch b/dev-util/geany-plugins/files/geany-plugins-2.0-gcc14.patch deleted file mode 100644 index 40978cdab9fb..000000000000 --- a/dev-util/geany-plugins/files/geany-plugins-2.0-gcc14.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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); - } - - diff --git a/dev-util/geany-plugins/files/geany-plugins-2.0-gcc15-r1.patch b/dev-util/geany-plugins/files/geany-plugins-2.0-gcc15-r1.patch deleted file mode 100644 index 0f9feab30499..000000000000 --- a/dev-util/geany-plugins/files/geany-plugins-2.0-gcc15-r1.patch +++ /dev/null @@ -1,43 +0,0 @@ -# https://github.com/geany/geany-plugins/pull/1389 ---- a/git-changebar/src/gcb-plugin.c -+++ b/git-changebar/src/gcb-plugin.c -@@ -1410,9 +1410,9 @@ read_setting_boolean (GKeyFile *kf, - const gchar *key, - gpointer value) - { -- gboolean *bool = value; -+ gboolean *boolean = value; - -- *bool = utils_get_setting_boolean (kf, group, key, *bool); -+ *boolean = utils_get_setting_boolean (kf, group, key, *boolean); - } - - static void -@@ -1421,9 +1421,9 @@ write_setting_boolean (GKeyFile *kf, - const gchar *key, - gconstpointer value) - { -- const gboolean *bool = value; -+ const gboolean *boolean = value; - -- g_key_file_set_boolean (kf, group, key, *bool); -+ g_key_file_set_boolean (kf, group, key, *boolean); - } - - /* loads @filename in @kf and return %FALSE if failed, emitting a warning -# https://github.com/geany/geany-plugins/commit/109ad6e6a2cfa31deb33ebfcef838ba337ff208f ---- a/geanyprj/src/unittests.c -+++ b/geanyprj/src/unittests.c -@@ -25,12 +25,6 @@ file_teardown(void) - system("rm -rf test_list_dir"); - } - --gboolean --true(G_GNUC_UNUSED const gchar * arg) --{ -- return TRUE; --} -- - START_TEST(test_get_file_list) - { - GSList *files = get_file_list("test_list_dir", NULL, NULL, NULL); diff --git a/dev-util/geany-plugins/files/geany-plugins-2.0-webkit2gtk-4.1.patch b/dev-util/geany-plugins/files/geany-plugins-2.0-webkit2gtk-4.1.patch deleted file mode 100644 index 91015aa1a619..000000000000 --- a/dev-util/geany-plugins/files/geany-plugins-2.0-webkit2gtk-4.1.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/build/markdown.m4 b/build/markdown.m4 -index 6c1f53a6..39bea2a6 100644 ---- a/build/markdown.m4 -+++ b/build/markdown.m4 -@@ -49,13 +49,13 @@ AC_DEFUN([GP_CHECK_MARKDOWN], - GTK_VERSION=2.16 - WEBKIT_VERSION=1.1.13 - -- GP_CHECK_GTK3([webkit_package=webkit2gtk-4.0], -+ GP_CHECK_GTK3([webkit_package=webkit2gtk-4.1], - [webkit_package=webkit-1.0]) - GP_CHECK_PLUGIN_DEPS([markdown], [MARKDOWN], - [$GP_GTK_PACKAGE >= ${GTK_VERSION} - $webkit_package >= ${WEBKIT_VERSION} - gthread-2.0]) -- AM_CONDITIONAL([MARKDOWN_WEBKIT2], [test "$webkit_package" = webkit2gtk-4.0]) -+ AM_CONDITIONAL([MARKDOWN_WEBKIT2], [test "$webkit_package" = webkit2gtk-4.1]) - - GP_COMMIT_PLUGIN_STATUS([Markdown]) - -diff --git a/build/webhelper.m4 b/build/webhelper.m4 -index eacef95c..2325a65f 100644 ---- a/build/webhelper.m4 -+++ b/build/webhelper.m4 -@@ -25,7 +25,7 @@ AC_DEFUN([GP_CHECK_WEBHELPER], - glib-2.0 >= ${GLIB_VERSION} - gio-2.0 >= ${GIO_VERSION} - gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION} -- webkit2gtk-4.0 >= ${WEBKIT_VERSION} -+ webkit2gtk-4.1 >= ${WEBKIT_VERSION} - gthread-2.0]) - - diff --git a/dev-util/geany-plugins/geany-plugins-2.0-r1.ebuild b/dev-util/geany-plugins/geany-plugins-2.0-r1.ebuild deleted file mode 100644 index 9d7fdce8a567..000000000000 --- a/dev-util/geany-plugins/geany-plugins-2.0-r1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# 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 -} diff --git a/dev-util/geany-plugins/geany-plugins-2.0-r3.ebuild b/dev-util/geany-plugins/geany-plugins-2.0-r3.ebuild deleted file mode 100644 index 3496d90ecd69..000000000000 --- a/dev-util/geany-plugins/geany-plugins-2.0-r3.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2025 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 test webhelper workbench" -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -RESTRICT="!test? ( test )" - -COMMON_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:= ) -" -DEPEND="${COMMON_DEPEND} - test? ( dev-libs/check ) -" -RDEPEND="${COMMON_DEPEND} - scope? ( dev-debug/gdb ) -" -BDEPEND="virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -PATCHES=( - "${FILESDIR}/${P}-gcc14.patch" - "${FILESDIR}/${P}-gcc15-r1.patch" - "${FILESDIR}/${P}-webkit2gtk-4.1.patch" -) - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_prepare() { - default - if ! use test; then - sed -i "s:gp_have_unittests=yes:gp_have_unittests=no:" build/unittests.m4 || die - fi - 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 -}
