commit: da62bdfba7523d3ca6a036bf77f5feb65d381ce5 Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Mon Feb 23 12:53:57 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Feb 23 16:50:15 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da62bdfb
app-editors/bluefish: drop 2.2.17, 2.2.17-r1 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://codeberg.org/gentoo/gentoo/pulls/121 Merges: https://codeberg.org/gentoo/gentoo/pulls/121 Signed-off-by: Sam James <sam <AT> gentoo.org> app-editors/bluefish/Manifest | 1 - app-editors/bluefish/bluefish-2.2.17-r1.ebuild | 114 --------------------- app-editors/bluefish/bluefish-2.2.17.ebuild | 97 ------------------ .../bluefish/files/bluefish-2.2.17-check_svn.patch | 49 --------- .../bluefish/files/bluefish-2.2.17-fix_clang.patch | 17 --- 5 files changed, 278 deletions(-) diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest index 99946c7424c2..d292d6aa8076 100644 --- a/app-editors/bluefish/Manifest +++ b/app-editors/bluefish/Manifest @@ -1,3 +1,2 @@ -DIST bluefish-2.2.17.tar.bz2 4822187 BLAKE2B ebfc5482035d9e8613f84086420bc2a03ab19a2977cf299ef2bfd76cb8d68c2faae03a6ac86332ea56c55ce3ee5934fb86697f7429e0f8dd77e19d63d9235d25 SHA512 9815316f265c48ea37afa513e6530470f4c4af37f27ddf0873a8b27c5a3f58b3927614e7465e950b4eb05a93f3daab458ccbc70547484539568c3ca1499f6a46 DIST bluefish-2.2.19.tar.bz2 4819749 BLAKE2B 6d706223583a62e0c6f39f47b1ce4250ce4b2fa27f4f07c7ff9b9ed04035dd0dcafc598503495281fdeef6726fdab375809bcb392c37b822d5241b8f32a317bc SHA512 e66de6b0a7181b824d50a7765f045754e57d9039df08b874b0abc0a3bab43210162ff495ac778dbd8f3a707f70f16d44dbaa62c62b6d0aad3c8d110082fe36bd DIST bluefish-2.4.0.tar.bz2 5012280 BLAKE2B de52d797aba666adc29adc352c55706269e6ed5f72c3240c591b0913423c52f7f0afe2c5907ab8c162817074d346b8bddf1bd8292fa97f3ac869005443f38702 SHA512 ee2868a8dc765dfc808a42d6927eb964ba5c8cd34d2851c16d547d7dc89a1a312aabc38908de7fbbe56589989aa60183b6b6e6ba820603e237075fe9df985982 diff --git a/app-editors/bluefish/bluefish-2.2.17-r1.ebuild b/app-editors/bluefish/bluefish-2.2.17-r1.ebuild deleted file mode 100644 index f9b7ee3f90a9..000000000000 --- a/app-editors/bluefish/bluefish-2.2.17-r1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..14} ) - -inherit autotools python-single-r1 xdg - -DESCRIPTION="GTK HTML editor for the experienced web designer or programmer" -HOMEPAGE="https://bluefish.openoffice.nl/"; -SRC_URI="https://www.bennewitz.com/bluefish/stable/source/${P}.tar.bz2"; - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86" -IUSE="gucharmap nls python spell" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/libxml2:= - virtual/zlib:= - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/pango - gucharmap? ( gnome-extra/gucharmap:2.90 ) - python? ( ${PYTHON_DEPS} ) - spell? ( app-text/enchant:2 ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-libs/libxml2 - virtual/pkgconfig - x11-libs/gdk-pixbuf - nls? ( sys-devel/gettext ) -" - -# there actually is just some broken manpage checkup -> not bother -RESTRICT="test" - -PATCHES=( - # https://sourceforge.net/p/bluefish/tickets/111/ - "${FILESDIR}/${PN}-2.2.9-charmap_configure.patch" - # https://sourceforge.net/p/bluefish/tickets/112/ - "${FILESDIR}/${PN}-2.2.17-check_svn.patch" - # https://sourceforge.net/p/bluefish/tickets/114/ - "${FILESDIR}/${PN}-2.2.17-fix_clang.patch" -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - # remove infbrowser plugin (see https://sourceforge.net/p/bluefish/tickets/113/) - # mainly unmaintained and with deprecated function from libxml2 (nanohttp) - sed -e '/infbrowser/d' -i src/Makefile.am || die - - eautoreconf -} - -src_configure() { - export CONFIG_SHELL="${BASH}" - local myeconfargs=( - --disable-update-databases - --disable-xml-catalog-update - --with-freedesktop_org-appdata="${EPREFIX}"/usr/share/metainfo - --without-gtk2 - $(use_with gucharmap charmap) - $(use_enable nls) - $(use_enable spell spell-check) - $(use_enable python) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - if use python; then - python_fix_shebang "${ED}/usr/share/bluefish" - python_optimize "${ED}/usr/share/bluefish/plugins/zencoding" - fi - - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - xdg_pkg_postinst - - einfo "Adding XML catalog entries..." - "${EPREFIX}"/usr/bin/xmlcatalog --noout \ - --add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \ - --add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \ - --add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \ - "${EROOT}"/etc/xml/catalog \ - || ewarn "Failed to add XML catalog entries." -} - -pkg_postrm() { - xdg_pkg_postrm - - einfo "Removing XML catalog entries..." - "${EPREFIX}"/usr/bin/xmlcatalog --noout \ - --del 'Bluefish/DTD/Bflang' \ - --del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \ - --del 'http://bluefish.openoffice.nl/DTD' \ - "${EROOT}"/etc/xml/catalog \ - || ewarn "Failed to remove XML catalog entries." -} diff --git a/app-editors/bluefish/bluefish-2.2.17.ebuild b/app-editors/bluefish/bluefish-2.2.17.ebuild deleted file mode 100644 index 8fa4fe788aee..000000000000 --- a/app-editors/bluefish/bluefish-2.2.17.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..13} ) - -MY_P=${P/_/-} -inherit autotools python-single-r1 xdg - -DESCRIPTION="GTK HTML editor for the experienced web designer or programmer" -HOMEPAGE="https://bluefish.openoffice.nl/"; -SRC_URI="https://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"; - -S="${WORKDIR}/${MY_P}" -LICENSE="GPL-3+" -SLOT="0" - -KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86" -IUSE="gucharmap nls python spell" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="virtual/zlib:= - x11-libs/gtk+:3 - gucharmap? ( gnome-extra/gucharmap:2.90 ) - python? ( ${PYTHON_DEPS} ) - spell? ( app-text/enchant:2 )" -DEPEND="${RDEPEND} - x11-libs/pango" -BDEPEND=">=dev-libs/glib-2.24:2 - dev-libs/libxml2:2 - virtual/pkgconfig - nls? ( - dev-util/intltool - sys-devel/gettext - )" - -# there actually is just some broken manpage checkup -> not bother -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/${PN}-2.2.9-charmap_configure.patch" -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - # eautoreconf seems to no longer kill translation files. - eautoreconf - sed -i 's:gzip -n $< -c:gzip -n -c $<:' data/bflib/Makefile.* || die "Cannot fix makefile" -} - -src_configure() { - CONFIG_SHELL="${BROOT}/bin/bash" econf \ - --disable-update-databases \ - --disable-xml-catalog-update \ - --with-freedesktop_org-appdata="${EPREFIX}"/usr/share/metainfo \ - --without-gtk2 \ - $(use_with gucharmap charmap) \ - $(use_enable nls) \ - $(use_enable spell spell-check) \ - $(use_enable python) -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - xdg_pkg_postinst - - einfo "Adding XML catalog entries..." - "${EPREFIX}"/usr/bin/xmlcatalog --noout \ - --add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \ - --add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \ - --add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \ - "${EROOT}"/etc/xml/catalog \ - || ewarn "Failed to add XML catalog entries." -} - -pkg_postrm() { - xdg_pkg_postrm - - einfo "Removing XML catalog entries..." - "${EPREFIX}"/usr/bin/xmlcatalog --noout \ - --del 'Bluefish/DTD/Bflang' \ - --del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \ - --del 'http://bluefish.openoffice.nl/DTD' \ - "${EROOT}"/etc/xml/catalog \ - || ewarn "Failed to remove XML catalog entries." -} diff --git a/app-editors/bluefish/files/bluefish-2.2.17-check_svn.patch b/app-editors/bluefish/files/bluefish-2.2.17-check_svn.patch deleted file mode 100644 index b959f37fe630..000000000000 --- a/app-editors/bluefish/files/bluefish-2.2.17-check_svn.patch +++ /dev/null @@ -1,49 +0,0 @@ -https://sourceforge.net/p/bluefish/tickets/112/ -call svnversion only if a svn tree exists and svnversion is found ---- a/configure.ac -+++ b/configure.ac -@@ -151,12 +151,19 @@ AC_ARG_ENABLE( - ) - - dnl # make DEVELOPEMENT enabled when compiling from svn, and disabled when compiling from an exported source tree. --AC_MSG_CHECKING([for svn tree or exported source tree]) - BF_want_development="no" --BF_svnversion=`LANG=C svnversion -n . || echo exported` --if test "x$BF_svnversion" != "xexported" ; then -- AC_MSG_RESULT([svn]) -- BF_want_development="yes" -+AC_MSG_CHECKING([for svn tree or exported source tree]) -+AM_CONDITIONAL([SVN], [false]) -+if test -f .svn/entries; then -+ AC_CHECK_PROG([HAVE_SVN], [svnversion], [yes], [no]) -+ if test x$HAVE_SVN = "xyes"; then -+ BF_svnversion=`LANG=C svnversion -n . 2>/dev/null` -+ AM_CONDITIONAL([SVN], [true]) -+ AC_MSG_RESULT([svn]) -+ BF_want_development="yes" -+ else -+ AC_MSG_WARN([svn tree found but svnversion was not found, continue as an exported tree]) -+ fi - else - AC_MSG_RESULT([exported]) - fi ---- a/src/plugin_about/Makefile.am -+++ b/src/plugin_about/Makefile.am -@@ -29,7 +29,7 @@ about_rev.h: about_rev.h.tmp - @if test ! -e $@ || test -n "`diff $< $@`" ; then cp $< $@ ; fi - - about_rev.h.tmp: -- @SVN_REVISION=`LANG=C svnversion -n ${top_srcdir} || echo exported` ; \ -+ @SVN_TRUE@SVN_REVISION=`LANG=C svnversion -n ${top_srcdir} || echo exported` ; \ - echo "/* Automatically created by the Makefile." > $@ ; \ - echo " * http://bugzilla.gnome.org/show_bug.cgi?id=578719 */" >> $@ ; \ - echo "#ifndef __ABOUT_REV_H_" >> $@ ; \ -@@ -37,7 +37,7 @@ about_rev.h.tmp: - echo "#ifdef SVN_REVISION" >> $@ ; \ - echo "#undef SVN_REVISION" >> $@ ; \ - echo "#endif /* SVN_REVISION */" >> $@ ; \ -- if test -n $${SVN_REVISION} -a "x$${SVN_REVISION}" != "xexported" ; then \ -+ if test -n "$${SVN_REVISION}" -a "x$${SVN_REVISION}" != "xexported" ; then \ - echo "#define SVN_REVISION \"$${SVN_REVISION}\"" >> $@ ; \ - fi ; \ - echo "#endif /* __ABOUT_REV_H_ */" >> $@ diff --git a/app-editors/bluefish/files/bluefish-2.2.17-fix_clang.patch b/app-editors/bluefish/files/bluefish-2.2.17-fix_clang.patch deleted file mode 100644 index adc3e9786b17..000000000000 --- a/app-editors/bluefish/files/bluefish-2.2.17-fix_clang.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://sourceforge.net/p/bluefish/tickets/114/ -> xml_entity.c:238:11: error: initializing 'gchar *' (aka 'char *') -> with an expression of type 'const gchar *' (aka 'const char *') -> discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers] -> 238 | gchar *nxt = g_utf8_next_char(srcp); -> | ^ ~~~~~~~~~~~~~~~~~~~~~~ ---- a/src/xml_entity.c -+++ b/src/xml_entity.c -@@ -235,7 +235,7 @@ gchar *utf82xmlentities(const gchar *inbuf, gboolean iso8859_1, gboolean symbols - g_free(entity); - srcp = g_utf8_next_char(srcp); - } else { -- gchar *nxt = g_utf8_next_char(srcp); -+ const gchar *nxt = g_utf8_next_char(srcp); - outbuf = strncat(outbuf, srcp, (nxt-srcp)); - srcp = nxt; - }
