1 |
commit: b9cec6032cb7ff0464813c46f20fc4524a0e1248 |
2 |
Author: Keri Harris <keri <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 27 15:57:18 2020 +0000 |
4 |
Commit: Keri Harris <keri <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 27 15:57:33 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9cec603 |
7 |
|
8 |
dev-lang/qu-prolog: consolidate QT patches |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: Keri Harris <keri <AT> gentoo.org> |
12 |
|
13 |
dev-lang/qu-prolog/files/qu-prolog-10.2-qt5.patch | 35 ---------------------- |
14 |
...log-10.1-qt5.patch => qu-prolog-10.x-qt5.patch} | 0 |
15 |
dev-lang/qu-prolog/qu-prolog-10.1.ebuild | 4 +-- |
16 |
dev-lang/qu-prolog/qu-prolog-10.2.ebuild | 2 +- |
17 |
4 files changed, 3 insertions(+), 38 deletions(-) |
18 |
|
19 |
diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.2-qt5.patch b/dev-lang/qu-prolog/files/qu-prolog-10.2-qt5.patch |
20 |
deleted file mode 100644 |
21 |
index 4d5ec768be9..00000000000 |
22 |
--- a/dev-lang/qu-prolog/files/qu-prolog-10.2-qt5.patch |
23 |
+++ /dev/null |
24 |
@@ -1,35 +0,0 @@ |
25 |
-diff -ur qp10.2.orig/src/xqp/term.cc qp10.2/src/xqp/term.cc |
26 |
---- qp10.2.orig/src/xqp/term.cc 2008-07-09 07:32:37.000000000 +0200 |
27 |
-+++ qp10.2/src/xqp/term.cc 2020-03-21 14:08:16.842059351 +0100 |
28 |
-@@ -38,7 +38,7 @@ |
29 |
- |
30 |
- bool graphic_char(QChar c) |
31 |
- { |
32 |
-- switch (c.toAscii()) |
33 |
-+ switch (c.toLatin1()) |
34 |
- { |
35 |
- case '-': |
36 |
- case '/': |
37 |
-diff -ur qp10.2.orig/src/xqp/xqp.cc qp10.2/src/xqp/xqp.cc |
38 |
---- qp10.2.orig/src/xqp/xqp.cc 2011-07-14 01:08:42.000000000 +0200 |
39 |
-+++ qp10.2/src/xqp/xqp.cc 2020-03-21 14:08:16.842059351 +0100 |
40 |
-@@ -167,7 +167,7 @@ |
41 |
- |
42 |
- void Xqp::send_cmd_to_qp(QString cmd) |
43 |
- { |
44 |
-- write(qp_stdin, cmd.toAscii(), cmd.length()); |
45 |
-+ write(qp_stdin, cmd.toLatin1(), cmd.length()); |
46 |
- } |
47 |
- |
48 |
- |
49 |
-diff -ur qp10.2.orig/src/xqp/xqp.pro qp10.2/src/xqp/xqp.pro |
50 |
---- qp10.2.orig/src/xqp/xqp.pro 2008-07-09 07:32:37.000000000 +0200 |
51 |
-+++ qp10.2/src/xqp/xqp.pro 2020-03-21 14:08:16.842059351 +0100 |
52 |
-@@ -4,6 +4,7 @@ |
53 |
- |
54 |
- TEMPLATE = app |
55 |
- INCLUDEPATH += . |
56 |
-+QT += widgets |
57 |
- |
58 |
- # Input |
59 |
- HEADERS += interact.h qpconfig.h qthelp.h term.h xqp.h xqpqueries.h |
60 |
|
61 |
diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.1-qt5.patch b/dev-lang/qu-prolog/files/qu-prolog-10.x-qt5.patch |
62 |
similarity index 100% |
63 |
rename from dev-lang/qu-prolog/files/qu-prolog-10.1-qt5.patch |
64 |
rename to dev-lang/qu-prolog/files/qu-prolog-10.x-qt5.patch |
65 |
|
66 |
diff --git a/dev-lang/qu-prolog/qu-prolog-10.1.ebuild b/dev-lang/qu-prolog/qu-prolog-10.1.ebuild |
67 |
index df4cb97f00b..66036b4f69a 100644 |
68 |
--- a/dev-lang/qu-prolog/qu-prolog-10.1.ebuild |
69 |
+++ b/dev-lang/qu-prolog/qu-prolog-10.1.ebuild |
70 |
@@ -1,4 +1,4 @@ |
71 |
-# Copyright 1999-2018 Gentoo Foundation |
72 |
+# Copyright 1999-2020 Gentoo Authors |
73 |
# Distributed under the terms of the GNU General Public License v2 |
74 |
|
75 |
EAPI=6 |
76 |
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND} |
77 |
S="${WORKDIR}"/${MY_P} |
78 |
|
79 |
src_prepare() { |
80 |
- epatch "${FILESDIR}"/${P}-qt5.patch |
81 |
+ epatch "${FILESDIR}"/${PN}-10.x-qt5.patch |
82 |
|
83 |
eapply_user |
84 |
} |
85 |
|
86 |
diff --git a/dev-lang/qu-prolog/qu-prolog-10.2.ebuild b/dev-lang/qu-prolog/qu-prolog-10.2.ebuild |
87 |
index 4f85be09a08..d7dbcab7d77 100644 |
88 |
--- a/dev-lang/qu-prolog/qu-prolog-10.2.ebuild |
89 |
+++ b/dev-lang/qu-prolog/qu-prolog-10.2.ebuild |
90 |
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND} |
91 |
S="${WORKDIR}"/${MY_P} |
92 |
|
93 |
src_prepare() { |
94 |
- epatch "${FILESDIR}"/${P}-qt5.patch |
95 |
+ epatch "${FILESDIR}"/${PN}-10.x-qt5.patch |
96 |
|
97 |
eapply_user |
98 |
} |