1 |
commit: 6db1cfeb695624be1aea007bc691c7252f74a95b |
2 |
Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 29 20:16:16 2019 +0000 |
4 |
Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 29 20:18:21 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6db1cfeb |
7 |
|
8 |
gnome-extra/gtkhtml: added revision with enchant-2 compatibility |
9 |
|
10 |
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org> |
11 |
|
12 |
gnome-extra/gtkhtml/files/enchant-2.patch | 35 +++++++++++++++++++ |
13 |
gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild | 52 ++++++++++++++++++++++++++++ |
14 |
profiles/package.mask | 4 +++ |
15 |
3 files changed, 91 insertions(+) |
16 |
|
17 |
diff --git a/gnome-extra/gtkhtml/files/enchant-2.patch b/gnome-extra/gtkhtml/files/enchant-2.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..c1afe677c66 |
20 |
--- /dev/null |
21 |
+++ b/gnome-extra/gtkhtml/files/enchant-2.patch |
22 |
@@ -0,0 +1,35 @@ |
23 |
+diff --git a/components/editor/gtkhtml-spell-checker.c b/components/editor/gtkhtml-spell-checker.c |
24 |
+index 0927f57..89e9873 100644 |
25 |
+--- a/components/editor/gtkhtml-spell-checker.c |
26 |
++++ b/components/editor/gtkhtml-spell-checker.c |
27 |
+@@ -375,7 +375,7 @@ gtkhtml_spell_checker_add_word (GtkhtmlSpellChecker *checker, |
28 |
+ if ((dict = spell_checker_request_dict (checker)) == NULL) |
29 |
+ return; |
30 |
+ |
31 |
+- enchant_dict_add_to_pwl (dict, word, length); |
32 |
++ enchant_dict_add (dict, word, length); |
33 |
+ g_signal_emit (G_OBJECT (checker), signals[ADDED], 0, word, length); |
34 |
+ } |
35 |
+ |
36 |
+diff --git a/configure.ac b/configure.ac |
37 |
+index e4946aa..e5771e3 100644 |
38 |
+--- a/configure.ac |
39 |
++++ b/configure.ac |
40 |
+@@ -10,7 +10,7 @@ PACKAGE=gtkhtml |
41 |
+ |
42 |
+ dnl Required Package Versions |
43 |
+ m4_define([gtk_minimum_version], [3.2.0]) |
44 |
+-m4_define([enchant_minimum_version], [1.1.7]) |
45 |
++m4_define([enchant_minimum_version], [2.0.0]) |
46 |
+ m4_define([cairo_minimum_version], [1.10.0]) |
47 |
+ |
48 |
+ GTKHTML_API_VERSION=4.0 |
49 |
+@@ -140,7 +140,7 @@ AC_SUBST(GAIL_MODULES) |
50 |
+ dnl ********************************** |
51 |
+ dnl GTKHTML modules |
52 |
+ dnl ********************************** |
53 |
+-GTKHTML_MODULES="gtk+-3.0 >= gtk_minimum_version enchant >= enchant_minimum_version gsettings-desktop-schemas iso-codes cairo >= cairo_minimum_version" |
54 |
++GTKHTML_MODULES="gtk+-3.0 >= gtk_minimum_version enchant-2 >= enchant_minimum_version gsettings-desktop-schemas iso-codes cairo >= cairo_minimum_version" |
55 |
+ PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES) |
56 |
+ AC_SUBST(GTKHTML_CFLAGS) |
57 |
+ AC_SUBST(GTKHTML_LIBS) |
58 |
|
59 |
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild |
60 |
new file mode 100644 |
61 |
index 00000000000..50c27673527 |
62 |
--- /dev/null |
63 |
+++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild |
64 |
@@ -0,0 +1,52 @@ |
65 |
+# Copyright 1999-2019 Gentoo Authors |
66 |
+# Distributed under the terms of the GNU General Public License v2 |
67 |
+ |
68 |
+EAPI="6" |
69 |
+ |
70 |
+inherit autotools gnome2 |
71 |
+ |
72 |
+DESCRIPTION="Lightweight HTML rendering/printing/editing engine" |
73 |
+HOMEPAGE="https://git.gnome.org/browse/gtkhtml" |
74 |
+ |
75 |
+LICENSE="GPL-2+ LGPL-2+" |
76 |
+SLOT="4.0" |
77 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
78 |
+IUSE="" |
79 |
+ |
80 |
+# orbit is referenced in configure, but is not used anywhere else |
81 |
+RDEPEND=" |
82 |
+ >=x11-libs/gtk+-3.2:3 |
83 |
+ >=x11-libs/cairo-1.10:= |
84 |
+ x11-libs/pango |
85 |
+ >=app-text/enchant-2.0.0 |
86 |
+ gnome-base/gsettings-desktop-schemas |
87 |
+ >=app-text/iso-codes-0.49 |
88 |
+ >=net-libs/libsoup-2.26.0:2.4 |
89 |
+" |
90 |
+DEPEND="${RDEPEND} |
91 |
+ x11-base/xorg-proto |
92 |
+ sys-devel/gettext |
93 |
+ dev-util/glib-utils |
94 |
+ >=dev-util/intltool-0.40.0 |
95 |
+ virtual/pkgconfig |
96 |
+" |
97 |
+ |
98 |
+PATCHES=( |
99 |
+ "${FILESDIR}"/enchant-2.patch |
100 |
+) |
101 |
+ |
102 |
+src_prepare() { |
103 |
+ default |
104 |
+ eautoreconf |
105 |
+} |
106 |
+ |
107 |
+src_configure() { |
108 |
+ gnome2_src_configure --disable-static |
109 |
+} |
110 |
+ |
111 |
+src_install() { |
112 |
+ gnome2_src_install |
113 |
+ |
114 |
+ # Don't collide with 3.14 slot |
115 |
+ mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die |
116 |
+} |
117 |
|
118 |
diff --git a/profiles/package.mask b/profiles/package.mask |
119 |
index e63e00e2ece..556e390f4e1 100644 |
120 |
--- a/profiles/package.mask |
121 |
+++ b/profiles/package.mask |
122 |
@@ -29,6 +29,10 @@ |
123 |
|
124 |
#--- END OF EXAMPLES --- |
125 |
|
126 |
+# Dennis Lamm <expeditioneer@g.o> (29 Jan 2019) |
127 |
+# Depends on >=app-text/enchant-2.0.0 which is masked |
128 |
+=gnome-extra/gtkhtml-4.10.0-r1 |
129 |
+ |
130 |
# Dennis Lamm <expeditioneer@g.o> (28 Jan 2019) |
131 |
# Depends on >=app-text/enchant-2.0.0 which is masked |
132 |
>=app-text/gtkspell-3.0.10 |