1 |
commit: 565e5bde87543e739adaefd0d1b43eca860ef018 |
2 |
Author: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 26 18:07:47 2019 +0000 |
4 |
Commit: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 26 18:50:36 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=565e5bde |
7 |
|
8 |
app-editors/gedit: 3.32.0-r1 -> 3.32.2 |
9 |
|
10 |
Package-Manager: Portage-2.3.66, Repoman-2.3.12 |
11 |
RepoMan-Options: --force |
12 |
Signed-off-by: Sobhan Mohammadpour <sobhan <AT> gentoo.org> |
13 |
|
14 |
app-editors/gedit/Manifest | 2 +- |
15 |
.../gedit/files/3.32.2-make-spell-optional.patch | 61 ++++++++++++++++++++++ |
16 |
...{gedit-3.32.0-r1.ebuild => gedit-3.32.2.ebuild} | 11 ++-- |
17 |
3 files changed, 69 insertions(+), 5 deletions(-) |
18 |
|
19 |
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest |
20 |
index 31ba866ade5..4cb53c80c57 100644 |
21 |
--- a/app-editors/gedit/Manifest |
22 |
+++ b/app-editors/gedit/Manifest |
23 |
@@ -1,2 +1,2 @@ |
24 |
DIST gedit-3.30.2.tar.xz 3155628 BLAKE2B 96736adbce987af89b37a712448f42b2a2eeed72d52aa16377d961c9e929fa4e75205eac5987bfc067cc2fecb35aec720d85483c4e2e824a6e8248cc652d2fbe SHA512 58ae7a4c27aeabad670718e39e1860df112d0be00ea622cc8adc185cb5d0e16ac4af65cb3aa45423c7b1b94c88d04d081fe05f3647b054a3e3291abc73c41f6f |
25 |
-DIST gedit-3.32.0.tar.xz 14793216 BLAKE2B b1d9af7882063a622fe27f8e5aa322e2a1724410c4419d538712fdda2cab10aa59014a82cc1a41b35966dceb1b75ce2613d9c5c98400743b31df76b0114e84e8 SHA512 f25ed05f5d3b7ab7711be32c6516479c8b515d6d5983e3bc3a00407740fb8ec42b1e9a3005473671fc144f4437b9e98355a3669210eefb5bf8288f171188f387 |
26 |
+DIST gedit-3.32.2.tar.xz 14789660 BLAKE2B 574a490e3beda9e8b4f8324409f3a1e3361b1fdd097c4bf8d05475be2a6bb66b230ab6d2047caa62c393458c29b6647c32293ce5c1428d030cb2345c19bf41c3 SHA512 a3ed4dea3d0f60fb2371d2b6bbf5f5db1f67c9a71d0d47836456e022903e86b8b127c88ece6a6d817b0c86ff82612c963a9e8ed60f9841af68474a1d129c886d |
27 |
|
28 |
diff --git a/app-editors/gedit/files/3.32.2-make-spell-optional.patch b/app-editors/gedit/files/3.32.2-make-spell-optional.patch |
29 |
new file mode 100644 |
30 |
index 00000000000..1d772590f60 |
31 |
--- /dev/null |
32 |
+++ b/app-editors/gedit/files/3.32.2-make-spell-optional.patch |
33 |
@@ -0,0 +1,61 @@ |
34 |
+From 72efa486222cde6094c217efc6085f49af1cca85 Mon Sep 17 00:00:00 2001 |
35 |
+From: Sobhan Mohammadpour <sobhan@g.o> |
36 |
+Date: Sun, 26 May 2019 14:19:17 -0400 |
37 |
+Subject: [PATCH] make spell optional |
38 |
+ |
39 |
+--- |
40 |
+ meson.build | 4 +++- |
41 |
+ meson_options.txt | 4 ++++ |
42 |
+ plugins/meson.build | 4 +++- |
43 |
+ 3 files changed, 10 insertions(+), 2 deletions(-) |
44 |
+ |
45 |
+diff --git a/meson.build b/meson.build |
46 |
+index 2f4d7e5..f67e320 100644 |
47 |
+--- a/meson.build |
48 |
++++ b/meson.build |
49 |
+@@ -86,7 +86,8 @@ libxml_dep = dependency('libxml-2.0', version: libxml_req) |
50 |
+ libgd_dep = libgd_sp.get_variable('libgd_dep') |
51 |
+ |
52 |
+ libsoup_dep = dependency('libsoup-2.4', version: libsoup_req, required: true) |
53 |
+-gspell_dep = dependency('gspell-1', version: gspell_req, required: true) |
54 |
++with_gspell = get_option('spell') |
55 |
++gspell_dep = dependency('gspell-1', version: gspell_req, required: false) |
56 |
+ x11_dep = dependency('x11', required: false) |
57 |
+ |
58 |
+ introspection_dep = dependency('gobject-introspection-1.0', version: introspection_req, required: false) |
59 |
+@@ -189,6 +190,7 @@ summary = [ |
60 |
+ ' Introspection: @0@'.format(generate_gir), |
61 |
+ ' Plugins: @0@'.format(build_plugins), |
62 |
+ ' Vala API: @0@'.format(generate_vapi), |
63 |
++ ' Spell: @0@'.format(with_gspell), |
64 |
+ ' Gvfs metadata: @0@'.format(enable_gvfs_metadata), |
65 |
+ '', |
66 |
+ 'Directories:', |
67 |
+diff --git a/meson_options.txt b/meson_options.txt |
68 |
+index 90803fa..e1f7349 100644 |
69 |
+--- a/meson_options.txt |
70 |
++++ b/meson_options.txt |
71 |
+@@ -16,3 +16,7 @@ option('documentation', |
72 |
+ option('enable-gvfs-metadata', |
73 |
+ type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto', |
74 |
+ description: 'Enable using gvfs to store metadata') |
75 |
++ |
76 |
++option('spell', |
77 |
++ type:'boolean', value: true, |
78 |
++ description: 'Build spell support') |
79 |
+diff --git a/plugins/meson.build b/plugins/meson.build |
80 |
+index af94ab7..abeeac5 100644 |
81 |
+--- a/plugins/meson.build |
82 |
++++ b/plugins/meson.build |
83 |
+@@ -21,5 +21,7 @@ subdir('quickhighlight') |
84 |
+ subdir('quickopen') |
85 |
+ subdir('snippets') |
86 |
+ subdir('sort') |
87 |
+-subdir('spell') |
88 |
++if with_gspell |
89 |
++ subdir('spell') |
90 |
++endif |
91 |
+ subdir('time') |
92 |
+-- |
93 |
+2.21.0 |
94 |
+ |
95 |
|
96 |
diff --git a/app-editors/gedit/gedit-3.32.0-r1.ebuild b/app-editors/gedit/gedit-3.32.2.ebuild |
97 |
similarity index 81% |
98 |
rename from app-editors/gedit/gedit-3.32.0-r1.ebuild |
99 |
rename to app-editors/gedit/gedit-3.32.2.ebuild |
100 |
index 02db350e368..1efe7a9a4eb 100644 |
101 |
--- a/app-editors/gedit/gedit-3.32.0-r1.ebuild |
102 |
+++ b/app-editors/gedit/gedit-3.32.2.ebuild |
103 |
@@ -15,10 +15,10 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gedit" |
104 |
LICENSE="GPL-2+ CC-BY-SA-3.0" |
105 |
SLOT="0" |
106 |
|
107 |
-IUSE="+introspection +python gtk-doc vala" |
108 |
-REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )" |
109 |
+IUSE="+introspection +python gtk-doc spell vala" |
110 |
+REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} ) spell? ( python )" |
111 |
|
112 |
-KEYWORDS="~amd64" |
113 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
114 |
|
115 |
# X libs are not needed for OSX (aqua) |
116 |
COMMON_DEPEND=" |
117 |
@@ -40,7 +40,7 @@ COMMON_DEPEND=" |
118 |
dev-python/pycairo[${PYTHON_USEDEP}] |
119 |
>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] |
120 |
dev-libs/libpeas[python,${PYTHON_USEDEP}] ) |
121 |
- >=app-text/gspell-0.2.5:0= |
122 |
+ spell? ( >=app-text/gspell-0.2.5:0= ) |
123 |
" |
124 |
RDEPEND="${COMMON_DEPEND} |
125 |
x11-themes/adwaita-icon-theme |
126 |
@@ -54,6 +54,7 @@ DEPEND="${COMMON_DEPEND} |
127 |
>=sys-devel/gettext-0.18 |
128 |
virtual/pkgconfig |
129 |
" |
130 |
+PATCHES=( "${FILESDIR}/${PV}-make-spell-optional.patch" ) |
131 |
|
132 |
pkg_setup() { |
133 |
use python && python-single-r1_pkg_setup |
134 |
@@ -69,7 +70,9 @@ src_configure() { |
135 |
$(meson_use gtk-doc documentation) |
136 |
$(meson_use introspection) |
137 |
$(meson_use python plugins) |
138 |
+ $(meson_use spell) |
139 |
$(meson_use vala vapi) |
140 |
+ -Denable-gvfs-metadata=yes |
141 |
) |
142 |
meson_src_configure |
143 |
} |