From 1db00cc6e94b90c08090bb5b8c406622946c4ae5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 31 Jan 2019 16:00:27 +0000 Subject: gentoo resync 31.01.2019 --- gnome-extra/Manifest.gz | Bin 10704 -> 10710 bytes gnome-extra/gtkhtml/Manifest | 2 ++ gnome-extra/gtkhtml/files/enchant-2.patch | 35 ++++++++++++++++++ gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild | 52 +++++++++++++++++++++++++++ 4 files changed, 89 insertions(+) create mode 100644 gnome-extra/gtkhtml/files/enchant-2.patch create mode 100644 gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild (limited to 'gnome-extra') diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz index e17714decf51..1963a8192d65 100644 Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest index a371d260479c..91c6a470881c 100644 --- a/gnome-extra/gtkhtml/Manifest +++ b/gnome-extra/gtkhtml/Manifest @@ -1,3 +1,5 @@ +AUX enchant-2.patch 1480 BLAKE2B ba37c6d8370b3cb1d8fea4a36de966a2f2ee3202f4228d4e3d2bfad580a5478ade92b510895c8662213a845ccf4a6652796ac2851493ede1c0a03dbc51f2f5dc SHA512 2517bcf65d7ab7c328e38a2d34543630877fef5f14caa64a11d514e39171417d8075180b6f3bd747d8b9b60c49973510983413c25cc3e9e52ea82c78aa4e060d DIST gtkhtml-4.10.0.tar.xz 1050628 BLAKE2B 563eab2e81fea2f0d457cd4506f9b91e9ce497f4f8ca8281b3f609fcb8ae3a666b5815133f6590334af31adf5fbeba1d401b8d328ed04439f0f88051c52d5e7c SHA512 efb159f902a910abd259cf38a86894a363dfd6b632aaad5ca88baf278780e653a2efc783ae48d9e4239f9fbfcbab15a5f343b60c910166d04e6663d4e34843e0 +EBUILD gtkhtml-4.10.0-r1.ebuild 1067 BLAKE2B 1e59a8ba2d63b5822fbf90974509c9df8866844932ed9596a39046a8b602f468a54047718f332c68222a5f15480d24da7ee05122d060e67c9404bb6fc378e43c SHA512 b2b1b61dbf4590b2405389973cd6f5ae26a8357c511e5a8f0f2b988f1302dd8277593ee3371422a866e347623e5a1232013074582f189eeea2d6dabe2a1362c8 EBUILD gtkhtml-4.10.0.ebuild 988 BLAKE2B 9c380fa816424cf6f7e238664856cd77bd16bfe964ea47c6702b526d8aecaac546d5c76f471b322703e474a95c545c3d4b237db70b598e6ec143ff6067d6972e SHA512 2e0d36666c93de5f672c8218490220e063675eb0310dec0b26f64223913f36ed904e9e09ca292cdd9f7fc519e18986c28813e2f022ea474e1c73b4c533648c75 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-extra/gtkhtml/files/enchant-2.patch b/gnome-extra/gtkhtml/files/enchant-2.patch new file mode 100644 index 000000000000..c1afe677c666 --- /dev/null +++ b/gnome-extra/gtkhtml/files/enchant-2.patch @@ -0,0 +1,35 @@ +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-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild new file mode 100644 index 000000000000..22fe176d121f --- /dev/null +++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit autotools gnome2 + +DESCRIPTION="Lightweight HTML rendering/printing/editing engine" +HOMEPAGE="https://git.gnome.org/browse/gtkhtml" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="4.0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~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.0.0 + 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_prepare() { + default + eautoreconf +} + +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 +} -- cgit v1.2.3