commit: fbae58face7ecaae56d72c1229d0d0b949e641ca Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Sun Jul 31 06:57:19 2022 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Sun Jul 31 06:57:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbae58fa
gnome-extra/gtkhtml: treeclean Closes: https://bugs.gentoo.org/855299 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> gnome-extra/gtkhtml/Manifest | 1 - gnome-extra/gtkhtml/files/enchant-2.patch | 35 -------------------- gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild | 48 ---------------------------- gnome-extra/gtkhtml/metadata.xml | 16 ---------- profiles/package.deprecated | 1 - profiles/package.mask | 5 --- 6 files changed, 106 deletions(-) diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest deleted file mode 100644 index 8689f7acbb8e..000000000000 --- a/gnome-extra/gtkhtml/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gtkhtml-4.10.0.tar.xz 1050628 BLAKE2B 563eab2e81fea2f0d457cd4506f9b91e9ce497f4f8ca8281b3f609fcb8ae3a666b5815133f6590334af31adf5fbeba1d401b8d328ed04439f0f88051c52d5e7c SHA512 efb159f902a910abd259cf38a86894a363dfd6b632aaad5ca88baf278780e653a2efc783ae48d9e4239f9fbfcbab15a5f343b60c910166d04e6663d4e34843e0 diff --git a/gnome-extra/gtkhtml/files/enchant-2.patch b/gnome-extra/gtkhtml/files/enchant-2.patch deleted file mode 100644 index c1afe677c666..000000000000 --- a/gnome-extra/gtkhtml/files/enchant-2.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/components/editor/gtkhtml-spell-checker.c b/components/editor/gtkhtml-spell-checker.c -index 0927f57..89e9873 100644 ---- a/components/editor/gtkhtml-spell-checker.c -+++ b/components/editor/gtkhtml-spell-checker.c -@@ -375,7 +375,7 @@ gtkhtml_spell_checker_add_word (GtkhtmlSpellChecker *checker, - if ((dict = spell_checker_request_dict (checker)) == NULL) - return; - -- enchant_dict_add_to_pwl (dict, word, length); -+ enchant_dict_add (dict, word, length); - g_signal_emit (G_OBJECT (checker), signals[ADDED], 0, word, length); - } - -diff --git a/configure.ac b/configure.ac -index e4946aa..e5771e3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -10,7 +10,7 @@ PACKAGE=gtkhtml - - dnl Required Package Versions - m4_define([gtk_minimum_version], [3.2.0]) --m4_define([enchant_minimum_version], [1.1.7]) -+m4_define([enchant_minimum_version], [2.0.0]) - m4_define([cairo_minimum_version], [1.10.0]) - - GTKHTML_API_VERSION=4.0 -@@ -140,7 +140,7 @@ AC_SUBST(GAIL_MODULES) - dnl ********************************** - dnl GTKHTML modules - dnl ********************************** --GTKHTML_MODULES="gtk+-3.0 >= gtk_minimum_version enchant >= enchant_minimum_version gsettings-desktop-schemas iso-codes cairo >= cairo_minimum_version" -+GTKHTML_MODULES="gtk+-3.0 >= gtk_minimum_version enchant-2 >= enchant_minimum_version gsettings-desktop-schemas iso-codes cairo >= cairo_minimum_version" - PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES) - AC_SUBST(GTKHTML_CFLAGS) - AC_SUBST(GTKHTML_LIBS) diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild deleted file mode 100644 index b77e196585f2..000000000000 --- a/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -GNOME2_EAUTORECONF="yes" - -inherit gnome2 - -DESCRIPTION="Lightweight HTML rendering/printing/editing engine" -HOMEPAGE="https://gitlab.gnome.org/Archive/gtkhtml"; - -LICENSE="GPL-2+ LGPL-2+" -SLOT="4.0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="" - -# orbit is referenced in configure, but is not used anywhere else -RDEPEND=" - >=x11-libs/gtk+-3.2:3 - >=x11-libs/cairo-1.10:= - x11-libs/pango - app-text/enchant:2 - gnome-base/gsettings-desktop-schemas - >=app-text/iso-codes-0.49 - >=net-libs/libsoup-2.26.0:2.4 -" -DEPEND="${RDEPEND} - x11-base/xorg-proto - sys-devel/gettext - dev-util/glib-utils - >=dev-util/intltool-0.40.0 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/enchant-2.patch -) - -src_configure() { - gnome2_src_configure --disable-static -} - -src_install() { - gnome2_src_install - - # Don't collide with 3.14 slot - mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die -} diff --git a/gnome-extra/gtkhtml/metadata.xml b/gnome-extra/gtkhtml/metadata.xml deleted file mode 100644 index 8fc8d7057ed4..000000000000 --- a/gnome-extra/gtkhtml/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="person"> - <email>[email protected]</email> - <name>Marek Szuba</name> -</maintainer> -<longdescription> - This is the old, and by now very much deprecated, Gtk+ HTML engine. It remains - available in Gentoo because as of late July 2020 <pkg>app-text/xiphos</pkg> - continues to rely on it for editor functionality (the alternative, WebKit-based - editor is not compatible with <pkg>net-libs/webkit-gtk</pkg>:4), however - it will be removed as soon as Xiphos upstream has implemented an alternative - solution. -</longdescription> -</pkgmetadata> diff --git a/profiles/package.deprecated b/profiles/package.deprecated index 80efc69643ac..29d4d6c451fb 100644 --- a/profiles/package.deprecated +++ b/profiles/package.deprecated @@ -58,7 +58,6 @@ dev-libs/libunique:1 gnome-base/gconf gnome-base/libgnomecanvas gnome-extra/gconf-editor -gnome-extra/gtkhtml x11-libs/gtk+extra x11-libs/gtksourceview:2.0 x11-libs/libwnck:1 diff --git a/profiles/package.mask b/profiles/package.mask index a97bda8db165..d19b69cd6e13 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -525,11 +525,6 @@ dev-util/rebar-bin ~app-editors/emacs-28.1.91 ~app-editors/emacs-28.1.92 -# Marek Szuba <[email protected]> (2022-06-30) -# A GNOME 2-era library with no consumers left in the tree, marked -# as deprecated since March 2022. Removal in 30 days (Bug #855299). -gnome-extra/gtkhtml - # Sam James <[email protected]> (2022-05-28) # GCC 9 and older no longer receive upstream support or fixes for # bugs. Please switch to a newer GCC version using gcc-config.
