| 1 |
commit: 31b8c1b407969b492d514cc694edaf1d497344e9 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 1 03:14:01 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 1 03:14:08 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31b8c1b4 |
| 7 |
|
| 8 |
media-gfx/cellwriter: fix build with gcc 10 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/707182 |
| 11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
media-gfx/cellwriter/cellwriter-1.3.6.ebuild | 17 ++++++++------- |
| 15 |
.../files/cellwriter-1.3.6-fno-common.patch | 25 ++++++++++++++++++++++ |
| 16 |
2 files changed, 34 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-gfx/cellwriter/cellwriter-1.3.6.ebuild b/media-gfx/cellwriter/cellwriter-1.3.6.ebuild |
| 19 |
index 467dc084c96..d7a4e31afd0 100644 |
| 20 |
--- a/media-gfx/cellwriter/cellwriter-1.3.6.ebuild |
| 21 |
+++ b/media-gfx/cellwriter/cellwriter-1.3.6.ebuild |
| 22 |
@@ -1,8 +1,9 @@ |
| 23 |
-# Copyright 1999-2019 Gentoo Authors |
| 24 |
+# Copyright 1999-2020 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
-EAPI="7" |
| 28 |
-inherit xdg-utils |
| 29 |
+EAPI=7 |
| 30 |
+ |
| 31 |
+inherit xdg |
| 32 |
|
| 33 |
DESCRIPTION="Grid-entry natural handwriting input panel" |
| 34 |
HOMEPAGE="http://risujin.org/cellwriter/" |
| 35 |
@@ -11,22 +12,22 @@ SRC_URI="https://github.com/risujin/cellwriter/archive/${PV}.tar.gz -> ${P}.tar. |
| 36 |
LICENSE="GPL-2" |
| 37 |
SLOT="0" |
| 38 |
KEYWORDS="~amd64 ~ppc ~x86" |
| 39 |
-IUSE="" |
| 40 |
|
| 41 |
+BDEPEND="virtual/pkgconfig" |
| 42 |
RDEPEND="x11-libs/gtk+:2 |
| 43 |
x11-libs/libX11 |
| 44 |
x11-libs/libXtst" |
| 45 |
DEPEND="${RDEPEND} |
| 46 |
- virtual/pkgconfig |
| 47 |
x11-base/xorg-proto" |
| 48 |
|
| 49 |
DOCS="AUTHORS ChangeLog README TODO" # NEWS is no-op |
| 50 |
|
| 51 |
+PATCHES=( |
| 52 |
+ "${FILESDIR}/${PN}-1.3.6-fno-common.patch" |
| 53 |
+) |
| 54 |
+ |
| 55 |
src_prepare() { |
| 56 |
default |
| 57 |
|
| 58 |
sed -i -e '/Encoding/d' ${PN}.desktop || die |
| 59 |
} |
| 60 |
- |
| 61 |
-pkg_postinst() { xdg_icon_cache_update; } |
| 62 |
-pkg_postrm() { xdg_icon_cache_update; } |
| 63 |
|
| 64 |
diff --git a/media-gfx/cellwriter/files/cellwriter-1.3.6-fno-common.patch b/media-gfx/cellwriter/files/cellwriter-1.3.6-fno-common.patch |
| 65 |
new file mode 100644 |
| 66 |
index 00000000000..54f03533972 |
| 67 |
--- /dev/null |
| 68 |
+++ b/media-gfx/cellwriter/files/cellwriter-1.3.6-fno-common.patch |
| 69 |
@@ -0,0 +1,25 @@ |
| 70 |
+https://sources.debian.org/patches/cellwriter/1.3.6-2/fix_ftbfs.patch/ |
| 71 |
+https://bugs.gentoo.org/707182 |
| 72 |
+--- a/src/options.c |
| 73 |
++++ b/src/options.c |
| 74 |
+@@ -26,9 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fi |
| 75 |
+ #include <stdlib.h> |
| 76 |
+ #include <string.h> |
| 77 |
+ |
| 78 |
+-/* preprocess.c */ |
| 79 |
+-int ignore_stroke_dir, ignore_stroke_num; |
| 80 |
+- |
| 81 |
+ /* cellwidget.c */ |
| 82 |
+ extern int cell_width, cell_height, cell_cols_pref, cell_rows_pref, |
| 83 |
+ train_on_input, right_to_left, keyboard_enabled, xinput_enabled; |
| 84 |
+--- a/src/recognize.c |
| 85 |
++++ b/src/recognize.c |
| 86 |
+@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fi |
| 87 |
+ #include "recognize.h" |
| 88 |
+ |
| 89 |
+ /* preprocess.c */ |
| 90 |
+-int prep_examined; |
| 91 |
++extern int prep_examined; |
| 92 |
+ |
| 93 |
+ void engine_prep(void); |
| 94 |
+ |
Archives