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 7374A1381F3 for ; Sun, 31 Dec 2017 02:37:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1562E0872; Sun, 31 Dec 2017 02:37:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 8E9F0E0872 for ; Sun, 31 Dec 2017 02:37:24 +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 5AD7F335C32 for ; Sun, 31 Dec 2017 02:37:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E5CA145 for ; Sun, 31 Dec 2017 02:37:20 +0000 (UTC) From: "Andrey Grozin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrey Grozin" Message-ID: <1514687810.f8d88a85978c7a6546971c853c40da02cdcad2f8.grozin@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/coolreader/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/coolreader/coolreader-3.1.2.71-r3.ebuild app-text/coolreader/metadata.xml X-VCS-Directories: app-text/coolreader/ X-VCS-Committer: grozin X-VCS-Committer-Name: Andrey Grozin X-VCS-Revision: f8d88a85978c7a6546971c853c40da02cdcad2f8 X-VCS-Branch: master Date: Sun, 31 Dec 2017 02:37:20 +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: 169e6057-5bf9-468a-add5-f31266dcd398 X-Archives-Hash: 942a5c89f8e4a53bdce76d78c577ba40 commit: f8d88a85978c7a6546971c853c40da02cdcad2f8 Author: Andrey Grozin gentoo org> AuthorDate: Sun Dec 31 02:35:26 2017 +0000 Commit: Andrey Grozin gentoo org> CommitDate: Sun Dec 31 02:36:50 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8d88a85 app-text/coolreader: use wxwidgets.eclass See https://github.com/gentoo/gentoo/pull/6692 Closes: https://bugs.gentoo.org/642638 Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-text/coolreader/coolreader-3.1.2.71-r3.ebuild | 58 +++++++++++++++++++++++ app-text/coolreader/metadata.xml | 3 ++ 2 files changed, 61 insertions(+) diff --git a/app-text/coolreader/coolreader-3.1.2.71-r3.ebuild b/app-text/coolreader/coolreader-3.1.2.71-r3.ebuild new file mode 100644 index 00000000000..9c7e43e5f3f --- /dev/null +++ b/app-text/coolreader/coolreader-3.1.2.71-r3.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +WX_GTK_VER="3.0" + +inherit cmake-utils wxwidgets + +if [ "${PV}" == 9999 ] +then + inherit git-r3 + # github mirror has some new commits to fix page margins settings + # sourceforge mirror saved as backup + #EGIT_REPO_URI="git://git.code.sf.net/p/crengine/crengine" + EGIT_REPO_URI="https://github.com/buggins/coolreader.git" + SRC_URI="" +else + # git tag cr3.1.2-71 + SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2" +fi + +DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)" +HOMEPAGE="https://sourceforge.net/projects/crengine/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="wxwidgets" + +DEPEND="sys-libs/zlib + media-libs/libpng:0 + virtual/jpeg:0 + media-libs/freetype + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} ) + !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )" +RDEPEND="${DEPEND} + wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )" + +# 1st patch: To save cr3.ini to ~homedir. +# 2nd patch: To build QT5 and WX GUI version of coolreader3; +# setting correct vesrion number and years of cr3qt/cr3wx; +# internal switching between wxGTK 2.8 or 3.0 version; +# show wxWidgets version in "About" dialog window; +# disabling "iCCP: known incorrect sRGB profile" warning popup window for wxwidgets GUI + +PATCHES=( "${FILESDIR}/cr3ini.diff" "${FILESDIR}/cr3.1.2.71-r1_qt5_wx.diff" ) + +src_configure() { + CMAKE_USE_DIR="${S}" + CMAKE_BUILD_TYPE="Release" + if use wxwidgets; then + setup-wxwidgets + local mycmakeargs=(-D GUI=WX) + else + local mycmakeargs=(-D GUI=QT5) + fi + cmake-utils_src_configure +} diff --git a/app-text/coolreader/metadata.xml b/app-text/coolreader/metadata.xml index afd1b4bc9da..0bc14087cc2 100644 --- a/app-text/coolreader/metadata.xml +++ b/app-text/coolreader/metadata.xml @@ -8,6 +8,9 @@ A fast and small cross-platform XML/CSS based eBook reader for desktops and handheld devices. Supported formats: FB2, TXT, RTF, DOC, TCR, HTML, EPUB, CHM, PDB, MOBI. + + Use x11-libs/wxGTK instead of Qt5 + crengine