commit: 1fe0f94706264b202b97d0c311e4b6a83ee1a9d9 Author: Chris Mayo <aklhfex <AT> gmail <DOT> com> AuthorDate: Sat Jun 18 16:32:40 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jun 20 02:49:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fe0f947
dev-util/geany-plugins: drop 1.37-r101 Closes: https://bugs.gentoo.org/851870 Signed-off-by: Chris Mayo <aklhfex <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/25961 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/geany-plugins/Manifest | 1 - .../files/geany-plugins-1.37_use-stdbool.patch | 39 ------- .../geany-plugins/geany-plugins-1.37-r101.ebuild | 126 --------------------- 3 files changed, 166 deletions(-) diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest index 615554691d58..3b4606e1eaa4 100644 --- a/dev-util/geany-plugins/Manifest +++ b/dev-util/geany-plugins/Manifest @@ -1,2 +1 @@ -DIST geany-plugins-1.37.tar.gz 4711239 BLAKE2B 7f4fd121f6f0784aecf2dcc04d208c89e502b23debcbc40889f93c1421e414c33c8634376cfe01e91c370f70818d33b373b88698f5cb0ee23dff5edee9d781cf SHA512 47f8d7170593114c773067a8132c724471cbf881582a0a739da578ca42533783d8ecbccb04e039f2990ceed440bbd2d94e4be4a28e336c7f74b8e11a15ba4ce9 DIST geany-plugins-1.38.tar.gz 4783970 BLAKE2B 386a05d7136183799059ef6d73b28a0d67d738939b0dc57649ac68f1049104568fe7c8453ebf2144277f60ee0834564b19bf4e756168864f1551962ba2411c14 SHA512 82d04331e23c5d81765b11e081a960a7a17172184cabe94efd2ddb37ac94668349b036e6083f77c867ac650fa7b251ba3970ae26b562b4568d6e313652763339 diff --git a/dev-util/geany-plugins/files/geany-plugins-1.37_use-stdbool.patch b/dev-util/geany-plugins/files/geany-plugins-1.37_use-stdbool.patch deleted file mode 100644 index e4f3990c0015..000000000000 --- a/dev-util/geany-plugins/files/geany-plugins-1.37_use-stdbool.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ad50d3ed2ddfe11cd07954786b96725602fb4ddd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Alexander=20F=2E=20R=C3=B8dseth?= <[email protected]> -Date: Tue, 5 Jan 2021 12:57:27 +0100 -Subject: [PATCH] Use stdbool.h istead of redefining bool - -Redefining bool causes errors when used together with ie. GCC 10.2.0 ---- - pretty-printer/src/PrettyPrinter.h | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/pretty-printer/src/PrettyPrinter.h b/pretty-printer/src/PrettyPrinter.h -index 268986e95..4200db612 100644 ---- a/pretty-printer/src/PrettyPrinter.h -+++ b/pretty-printer/src/PrettyPrinter.h -@@ -29,6 +29,7 @@ - #include <stdlib.h> - #include <string.h> - #include <stdarg.h> -+#include <stdbool.h> - - #ifdef HAVE_GLIB - #include <glib.h> -@@ -52,15 +53,13 @@ - #define TRUE !(FALSE) - #endif - --typedef unsigned int bool; -- - /*========================================== STRUCTURES =======================================================*/ - - /** - * The PrettyPrintingOptions struct allows the programmer to tell the - * PrettyPrinter how it must format the XML output. - */ --typedef struct -+typedef struct - { - const char* newLineChars; /* char used to generate a new line (generally \r\n) */ - char indentChar; /* char used for indentation */ diff --git a/dev-util/geany-plugins/geany-plugins-1.37-r101.ebuild b/dev-util/geany-plugins/geany-plugins-1.37-r101.ebuild deleted file mode 100644 index 607708251221..000000000000 --- a/dev-util/geany-plugins/geany-plugins-1.37-r101.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-1 ) - -inherit lua-single - -DESCRIPTION="A collection of different plugins for Geany" -HOMEPAGE="https://plugins.geany.org"; -SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 ~sparc x86" - -IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench" -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -DEPEND=" - dev-libs/glib:2 - >=dev-util/geany-1.37[-gtk2(-)] - 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 - ) - pretty-printer? ( dev-libs/libxml2:2 ) - scope? ( x11-libs/vte:2.91 ) - soup? ( net-libs/libsoup:2.4 ) - workbench? ( dev-libs/libgit2:= ) -" -RDEPEND="${DEPEND} - scope? ( sys-devel/gdb ) -" -BDEPEND="virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -PATCHES=( "${FILESDIR}"/${P}_use-stdbool.patch ) - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -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-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 soup geniuspaste) - $(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) - # Having updatechecker… when you’re using a package manager? - $(use_enable soup updatechecker) - $(use_enable workbench) - # GeanyGenDoc requires ctpl which isn’t yet in portage - --disable-geanygendoc - # Require obsolete and vulnerable webkit-gtk versions - --disable-devhelp - --disable-webhelper - # GTK 2 only - --disable-geanydoc - --disable-geanypy - --disable-multiterm - ) - - 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 -}
