[gentoo-commits] repo/gentoo:master commit in: dev-lang/qu-prolog/files/, dev-lang/qu-prolog/

[Keri Harris]

commit:     b9cec6032cb7ff0464813c46f20fc4524a0e1248
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Wed May 27 15:57:18 2020 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Wed May 27 15:57:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9cec603

dev-lang/qu-prolog: consolidate QT patches

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Keri Harris <keri <AT> gentoo.org>

 dev-lang/qu-prolog/files/qu-prolog-10.2-qt5.patch  | 35 ----------------------
 ...log-10.1-qt5.patch => qu-prolog-10.x-qt5.patch} |  0
 dev-lang/qu-prolog/qu-prolog-10.1.ebuild           |  4 +--
 dev-lang/qu-prolog/qu-prolog-10.2.ebuild           |  2 +-
 4 files changed, 3 insertions(+), 38 deletions(-)

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
deleted file mode 100644
index 4d5ec768be9..00000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-10.2-qt5.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur qp10.2.orig/src/xqp/term.cc qp10.2/src/xqp/term.cc
---- qp10.2.orig/src/xqp/term.cc        2008-07-09 07:32:37.000000000 +0200
-+++ qp10.2/src/xqp/term.cc     2020-03-21 14:08:16.842059351 +0100
-@@ -38,7 +38,7 @@
- 
- bool graphic_char(QChar c)
- {
--    switch (c.toAscii())
-+    switch (c.toLatin1())
-     {
-        case '-':
-        case '/':
-diff -ur qp10.2.orig/src/xqp/xqp.cc qp10.2/src/xqp/xqp.cc
---- qp10.2.orig/src/xqp/xqp.cc 2011-07-14 01:08:42.000000000 +0200
-+++ qp10.2/src/xqp/xqp.cc      2020-03-21 14:08:16.842059351 +0100
-@@ -167,7 +167,7 @@
- 
- void Xqp::send_cmd_to_qp(QString cmd)
- {
--   write(qp_stdin, cmd.toAscii(), cmd.length());
-+   write(qp_stdin, cmd.toLatin1(), cmd.length());
- }
- 
-   
-diff -ur qp10.2.orig/src/xqp/xqp.pro qp10.2/src/xqp/xqp.pro
---- qp10.2.orig/src/xqp/xqp.pro        2008-07-09 07:32:37.000000000 +0200
-+++ qp10.2/src/xqp/xqp.pro     2020-03-21 14:08:16.842059351 +0100
-@@ -4,6 +4,7 @@
- 
- TEMPLATE = app
- INCLUDEPATH += .
-+QT += widgets
- 
- # Input
- HEADERS += interact.h qpconfig.h qthelp.h term.h xqp.h xqpqueries.h

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
similarity index 100%
rename from dev-lang/qu-prolog/files/qu-prolog-10.1-qt5.patch
rename to dev-lang/qu-prolog/files/qu-prolog-10.x-qt5.patch

diff --git a/dev-lang/qu-prolog/qu-prolog-10.1.ebuild 
b/dev-lang/qu-prolog/qu-prolog-10.1.ebuild
index df4cb97f00b..66036b4f69a 100644
--- a/dev-lang/qu-prolog/qu-prolog-10.1.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"/${MY_P}
 
 src_prepare() {
-       epatch "${FILESDIR}"/${P}-qt5.patch
+       epatch "${FILESDIR}"/${PN}-10.x-qt5.patch
 
        eapply_user
 }

diff --git a/dev-lang/qu-prolog/qu-prolog-10.2.ebuild 
b/dev-lang/qu-prolog/qu-prolog-10.2.ebuild
index 4f85be09a08..d7dbcab7d77 100644
--- a/dev-lang/qu-prolog/qu-prolog-10.2.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-10.2.ebuild
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"/${MY_P}
 
 src_prepare() {
-       epatch "${FILESDIR}"/${P}-qt5.patch
+       epatch "${FILESDIR}"/${PN}-10.x-qt5.patch
 
        eapply_user
 }