diff options
author | Andrey Grozin <grozin@gentoo.org> | 2017-09-07 18:46:15 +0700 |
---|---|---|
committer | Andrey Grozin <grozin@gentoo.org> | 2017-09-07 18:46:58 +0700 |
commit | a575207ef53d0027692a554eee85626d69b8e0fb (patch) | |
tree | 87089c25268008e8e29fc14c70afc4d5c4019d99 /app-text/coolreader | |
parent | net-mail/amavis-logwatch: new revision with yet another bugfix patch. (diff) | |
download | gentoo-a575207ef53d0027692a554eee85626d69b8e0fb.tar.gz gentoo-a575207ef53d0027692a554eee85626d69b8e0fb.tar.bz2 gentoo-a575207ef53d0027692a554eee85626d69b8e0fb.zip |
app-text/coolreader: cleaning old
Package-Manager: Portage-2.3.6, Repoman-2.3.3
Diffstat (limited to 'app-text/coolreader')
-rw-r--r-- | app-text/coolreader/coolreader-3.1.2.71.ebuild | 87 | ||||
-rw-r--r-- | app-text/coolreader/files/cr3.1.2.71_wxGTK3.diff | 99 |
2 files changed, 0 insertions, 186 deletions
diff --git a/app-text/coolreader/coolreader-3.1.2.71.ebuild b/app-text/coolreader/coolreader-3.1.2.71.ebuild deleted file mode 100644 index bd78feec198d..000000000000 --- a/app-text/coolreader/coolreader-3.1.2.71.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -if [ "${PV}" == 9999 ] -then - inherit git - EGIT_REPO_URI="git://crengine.git.sourceforge.net/gitroot/crengine/crengine" - 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="qt4 qt5 wxwidgets corefonts" -REQUIRED_USE="^^ ( qt4 qt5 wxwidgets ) - wxwidgets? ( corefonts )" - -DEPEND="sys-libs/zlib - media-libs/libpng:0 - virtual/jpeg:0 - media-libs/freetype - wxwidgets? ( - || ( x11-libs/wxGTK:3.0 x11-libs/wxGTK:2.8 ) ) - qt4? ( dev-qt/qtcore:4 - dev-qt/qtgui:4 ) - qt5? ( dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 )" -RDEPEND="${DEPEND} - corefonts? ( media-fonts/corefonts )" - -src_prepare() { - # setting patch to save cr3.ini to ~homedir - epatch "${FILESDIR}/cr3ini.diff" - # patch to build QT5 and WX GUI version of coolreader3 - # and setting correct vesrion number and years of cr3qt/cr3wx - epatch "${FILESDIR}/cr3.1.2.71-r1_qt5_wx.diff" - if [ $(eselect wxwidgets list | grep '*' | cut -d ' ' -f 6) == "gtk2-unicode-3.0" ]; then - # patch if wxGTK3.0 (not wxGTK2.8) is active eselect profile - epatch "${FILESDIR}/cr3.1.2.71_wxGTK3.diff" - fi - eapply_user -} - -src_configure() { - CMAKE_USE_DIR="${S}" - CMAKE_BUILD_TYPE="Release" - if use qt4; then - local mycmakeargs=(-D GUI=QT) - elif use qt5; then - local mycmakeargs=(-D GUI=QT5) - elif use wxwidgets; then - . "${ROOT}/var/lib/wxwidgets/current" - if [[ "${WXCONFIG}" -eq "none" ]]; then - die "The wxGTK profile should be selected!" - fi - local mycmakeargs=(-D GUI=WX) - fi - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - dosym ../fonts/corefonts /usr/share/crengine/fonts - elog -} - -pkg_postinst() { -if use wxwidgets; then - elog "" - elog "KNOWN ISSUE TO FIX:" - elog "With wxwidgets gui you can see a warning message \"iCCP: known incorrect sRGB profile\"" - elog "that appears if \"Toolbar size\" is setting to \"Medium buttons\" in Options." - elog "To avoid appearing of this warning popup window you can change \"Toolbar size\" or set it to \"Hide Toolbar\"." - elog "" -fi -} diff --git a/app-text/coolreader/files/cr3.1.2.71_wxGTK3.diff b/app-text/coolreader/files/cr3.1.2.71_wxGTK3.diff deleted file mode 100644 index 1a0f1659592c..000000000000 --- a/app-text/coolreader/files/cr3.1.2.71_wxGTK3.diff +++ /dev/null @@ -1,99 +0,0 @@ -# Patch to build CoolReader3 with active wxGTK-3.0 profile -# (eselect wxwidgets is set to "gtk2-unicode-3.0" instead of "gtk2-inicode-release-2.8") -diff -Naur old/cr3wx/src/cr3.cpp new/cr3wx/src/cr3.cpp ---- old/cr3wx/src/cr3.cpp 2015-07-13 11:23:37.000000000 +0300 -+++ new/cr3wx/src/cr3.cpp 2017-08-28 12:54:13.000000000 +0300 -@@ -395,7 +395,7 @@ - - lString16 GetConfigFileName() - { -- lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() ); -+ lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().wx_str() ); - if ( !wxDirExists( cfgdir.c_str() ) ) - ::wxMkdir( wxString( cfgdir.c_str() ) ); - lChar16 slash = detectSlash( cfgdir ); -@@ -622,7 +622,7 @@ - wxImage::AddHandler(new wxPNGHandler); - resources = new ResourceContainer(); - -- lString16 appname( argv[0] ); -+ lString16 appname( argv[0].wx_str() ); - int lastSlash=-1; - lChar16 slashChar = '/'; - for ( int p=0; p<(int)appname.length(); p++ ) { -@@ -777,7 +777,7 @@ - int argc = wxGetApp().argc; - lString16 fnameToOpen; - for ( int i=1; i<argc; i++ ) { -- lString16 param = lString16( wxGetApp().argv[1] ); -+ lString16 param = lString16( wxGetApp().argv[1].wx_str() ); - if ( param[0]!='-' ) - fnameToOpen = param; - } -@@ -1193,7 +1193,7 @@ - lString16 outFile; - bool convert = false; - for ( int i=1; i<argc; i++ ) { -- lString16 param = lString16( wxGetApp().argv[i] ); -+ lString16 param = lString16( wxGetApp().argv[i].wx_str() ); - if ( param[0]!='-' ) - fnameToOpen = param; - else if (param.startsWith("--convert")) -@@ -1470,7 +1470,7 @@ - wxCursor hg( wxCURSOR_WAIT ); - this->SetCursor( hg ); - wxSetCursor( hg ); -- _view->getDocView()->exportWolFile( dlg.GetPath(), opts.getMode()==0, opts.getLevels() ); -+ _view->getDocView()->exportWolFile( dlg.GetPath().wx_str(), opts.getMode()==0, opts.getLevels() ); - wxSetCursor( wxNullCursor ); - this->SetCursor( wxNullCursor ); - } -diff -Naur old/cr3wx/src/optdlg.cpp new/cr3wx/src/optdlg.cpp ---- old/cr3wx/src/optdlg.cpp 2015-07-13 11:23:37.000000000 +0300 -+++ new/cr3wx/src/optdlg.cpp 2017-08-28 11:38:06.000000000 +0300 -@@ -41,7 +41,7 @@ - if ( v==_choices[i] ) - tb = i; - if ( _storeStringValues ) { -- props->setString( _option, lString16(_choices[tb]) ); -+ props->setString( _option, lString16(_choices[tb].wx_str()) ); - } else { - props->setInt( _option, tb ); - } -@@ -50,7 +50,7 @@ - { - unsigned tb = _defvalue; - if ( _storeStringValues ) { -- lString8 s8 = UnicodeToUtf8( lString16(_choices[_defvalue]) ); -+ lString8 s8 = UnicodeToUtf8( lString16(_choices[_defvalue].wx_str()) ); - lString16 s16 = props->getStringDef( _option, s8.c_str() ); - wxString v = s16.c_str(); - for ( unsigned i=0; i<_choices.GetCount(); i++ ) -diff -Naur old/cr3wx/src/view.cpp new/cr3wx/src/view.cpp ---- old/cr3wx/src/view.cpp 2015-07-13 11:23:37.000000000 +0300 -+++ new/cr3wx/src/view.cpp 2017-08-28 12:57:55.000000000 +0300 -@@ -353,7 +353,7 @@ - - lString16 cr3view::GetHistoryFileName() - { -- lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() ); -+ lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().wx_str() ); - if ( !wxDirExists( cfgdir.c_str() ) ) - ::wxMkdir( wxString( cfgdir.c_str() ) ); - lChar16 slash = detectSlash( cfgdir ); -@@ -667,13 +667,13 @@ - //=========================================== - GetParent()->Update(); - //printf(" loading... "); -- bool res = getDocView()->LoadDocument( fname.c_str() ); -+ bool res = getDocView()->LoadDocument( fname.wx_str() ); - //printf(" done. \n"); - //DEBUG - //_docview->exportWolFile( "test.wol", true ); - //_docview->SetPos(0); - if ( !res ) -- getDocView()->createDefaultDocument(lString16("File open error"), lString16("Cannot open file ") + fname.c_str() ); -+ getDocView()->createDefaultDocument(lString16("File open error"), lString16("Cannot open file ") + fname.wx_str() ); - lString16 title = getDocView()->getAuthors(); - if ( !title.empty() && !getDocView()->getTitle().empty() ) - title << L". "; |