From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D6FCB1382C5 for ; Sat, 27 Jan 2018 13:15:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CCE3EE0922; Sat, 27 Jan 2018 13:15:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9CFB1E0922 for ; Sat, 27 Jan 2018 13:14:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AA7DF335C2E for ; Sat, 27 Jan 2018 13:14:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4FE251BB for ; Sat, 27 Jan 2018 13:14:55 +0000 (UTC) From: "Keri Harris" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Keri Harris" Message-ID: <1517058876.e50021b642670b3ef723e1f086c96983c69f0841.keri@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/qu-prolog/files/, dev-lang/qu-prolog/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/qu-prolog/files/qu-prolog-10.0-qt5.patch dev-lang/qu-prolog/qu-prolog-10.0-r1.ebuild X-VCS-Directories: dev-lang/qu-prolog/ dev-lang/qu-prolog/files/ X-VCS-Committer: keri X-VCS-Committer-Name: Keri Harris X-VCS-Revision: e50021b642670b3ef723e1f086c96983c69f0841 X-VCS-Branch: master Date: Sat, 27 Jan 2018 13:14:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3eb35177-9046-4dae-9428-addee91608e8 X-Archives-Hash: 8854afbaedd9e91531dc83103e93e6b2 commit: e50021b642670b3ef723e1f086c96983c69f0841 Author: Keri Harris gentoo org> AuthorDate: Sat Jan 27 13:13:55 2018 +0000 Commit: Keri Harris gentoo org> CommitDate: Sat Jan 27 13:14:36 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50021b6 dev-lang/qu-prolog: port to QT5 Package-Manager: Portage-2.3.13, Repoman-2.3.3 dev-lang/qu-prolog/files/qu-prolog-10.0-qt5.patch | 35 ++++++++ dev-lang/qu-prolog/qu-prolog-10.0-r1.ebuild | 101 ++++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.0-qt5.patch b/dev-lang/qu-prolog/files/qu-prolog-10.0-qt5.patch new file mode 100644 index 00000000000..d82e78cada1 --- /dev/null +++ b/dev-lang/qu-prolog/files/qu-prolog-10.0-qt5.patch @@ -0,0 +1,35 @@ +diff -ur qp10.0.orig/src/xqp/term.cc qp10.0/src/xqp/term.cc +--- qp10.0.orig/src/xqp/term.cc 2008-07-09 07:32:37.000000000 +0200 ++++ qp10.0/src/xqp/term.cc 2018-01-27 14:06:54.101545854 +0100 +@@ -38,7 +38,7 @@ + + bool graphic_char(QChar c) + { +- switch (c.toAscii()) ++ switch (c.toLatin1()) + { + case '-': + case '/': +diff -ur qp10.0.orig/src/xqp/xqp.cc qp10.0/src/xqp/xqp.cc +--- qp10.0.orig/src/xqp/xqp.cc 2011-07-14 01:08:42.000000000 +0200 ++++ qp10.0/src/xqp/xqp.cc 2018-01-27 14:07:53.902543353 +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.0.orig/src/xqp/xqp.pro qp10.0/src/xqp/xqp.pro +--- qp10.0.orig/src/xqp/xqp.pro 2008-07-09 07:32:37.000000000 +0200 ++++ qp10.0/src/xqp/xqp.pro 2018-01-27 14:01:24.764559627 +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/qu-prolog-10.0-r1.ebuild b/dev-lang/qu-prolog/qu-prolog-10.0-r1.ebuild new file mode 100644 index 00000000000..bb5af2782e1 --- /dev/null +++ b/dev-lang/qu-prolog/qu-prolog-10.0-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit eutils multilib qmake-utils + +MY_P=qp${PV} + +DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions" +HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html" +SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz" + +LICENSE="Apache-2.0 GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc examples pedro qt5 readline threads" + +RDEPEND=" + !dev-util/mpatch + !dev-util/rej + !games-rpg/kqlives + qt5? ( + dev-qt/qtwidgets:5 + dev-qt/qtgui:5 + ) + pedro? ( net-misc/pedro ) + readline? ( app-misc/rlwrap )" +DEPEND="${RDEPEND} + dev-lang/perl" + +S="${WORKDIR}"/${MY_P} + +src_prepare() { + epatch "${FILESDIR}"/${P}-configure.patch + epatch "${FILESDIR}"/${P}-associated-item.patch + epatch "${FILESDIR}"/${P}-gcc6.patch + epatch "${FILESDIR}"/${P}-qt5.patch +} + +src_configure() { + econf \ + --libdir=/usr/$(get_libdir) \ + $(use_enable debug) \ + $(use_enable threads multiple-threads) + + if use qt5; then + cd "${S}"/src/xqp || die + eqmake5 xqp.pro + fi +} + +src_compile() { + emake OPTIMISATION="${CXXFLAGS}" + + if use qt5; then + cd "${S}"/src/xqp || die + emake + fi +} + +src_install() { + sed \ + -e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \ + -i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die + + dobin bin/{qc,qecat,qp,kq} + + use qt5 && dobin src/xqp/xqp + + into /usr/$(get_libdir)/${PN} + dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp} + + insinto /usr/$(get_libdir)/${PN}/bin + doins bin/rl_commands + doins bin/{qc1.qup,qecat,qg,qp}.qx + + insinto /usr/$(get_libdir)/${PN}/library + doins prolog/library/*.qo + + insinto /usr/$(get_libdir)/${PN}/compiler + doins prolog/compiler/*.qo + + doman doc/man/man1/*.1 + + dodoc README + + if use doc ; then + docinto reference-manual + dodoc doc/manual/*.html + docinto user-guide + dodoc doc/user/main.pdf + fi + + if use examples ; then + insinto /usr/share/doc/${PF}/examples + doins examples/*.ql + docinto examples + newdoc examples/README README.examples + fi +}