From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:56:41 +0100 Subject: gentoo resync : 14.07.2018 --- app-text/coolreader/Manifest | 7 - app-text/coolreader/coolreader-3.1.2.71-r4.ebuild | 91 -------- app-text/coolreader/coolreader-3.2.2.1.ebuild | 86 -------- .../coolreader/files/cr3.1.2.71-r1_qt5_wx.diff | 242 --------------------- app-text/coolreader/files/cr3ini.diff | 35 --- app-text/coolreader/metadata.xml | 17 -- 6 files changed, 478 deletions(-) delete mode 100644 app-text/coolreader/Manifest delete mode 100644 app-text/coolreader/coolreader-3.1.2.71-r4.ebuild delete mode 100644 app-text/coolreader/coolreader-3.2.2.1.ebuild delete mode 100644 app-text/coolreader/files/cr3.1.2.71-r1_qt5_wx.diff delete mode 100644 app-text/coolreader/files/cr3ini.diff delete mode 100644 app-text/coolreader/metadata.xml (limited to 'app-text/coolreader') diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest deleted file mode 100644 index 801284577731..000000000000 --- a/app-text/coolreader/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX cr3.1.2.71-r1_qt5_wx.diff 10066 BLAKE2B 8b1ecc7765735608e9651f23d1d9882186766e34c0ac5f9cac1312da68345d7a9028abaf9792f4ee85a4ddb5490fa1521d220b751eeeda84aa5ac79d92d33e88 SHA512 9f7a82964d1f5c308ad5124433dd0ed7debd715f1c0c2431bc84c9bf71d1d5dbbfb82a669b1c6ee114196c5e8ba1b745b07cc2195d4198c664ea15cf82182384 -AUX cr3ini.diff 1535 BLAKE2B 1eb5908bedf2a706d461ed84a60ed3232a4c98bee5d4b29c55e63d780d54785a1e3f77e9eb85d0675ac0efeb1652d505e9cef93b9c7dce39086c3b0a3f765c6b SHA512 efd7bfda3617168bda2bfad9e561b7bf3de89f141cf4155618bc6864fa5497d5b0e08ea583b302f4e9e3f60442472c7e5358313dd49549dce3fe078d58ee4ee5 -DIST coolreader-3.1.2.71.tar.bz2 10141514 BLAKE2B 143a69082a2dcabbb7a246df575e7ed2fddb4b11c542910faa2f6d44155f0de8ba6d7e0fd321b53fc0eda47c8d2867bfec02af3b95edbcb623f6a15fa6c4bc72 SHA512 2859eabfc8ba603d1cb09b07358887135b6968268a5f2fa7f874a1e8613d1b5ebe69d9b133f16e84321d1a460eae5088a7947433c6fb340a47bde9ceee415735 -DIST coolreader-3.2.2.1.tar.gz 12463566 BLAKE2B 208026a87b36a06cd0a2e83b60bb506174b2edec4e3f4d1663c9d630cf316afd54aa0dbd0fdf0d3e44e03277d39692bbada8b03376a22970321928e594632997 SHA512 c2e3ea139ff3969c16985a56a9605a59ae31c59f9dc962abcc4aae5d87b8c48c8d7ed716a7077dd9da93cefc0d9ba0fe8a43c50e33e3d58acbcdfc35b73b3538 -EBUILD coolreader-3.1.2.71-r4.ebuild 2366 BLAKE2B 94049adc28a85bbba7648a992ae1975307816f477d15fbd48343314a99504889ed22e1d4ebd7379620b295a1e378675c0a331f41a144045ee6cd060caeb08628 SHA512 21be4a384808ca943d2278fe592c3acbbce7ea6951000efe107cb744b937c8b68c32fe2f8824abcf32c41343e835265bed865e7c5a01bef7d0d77a83093d7f43 -EBUILD coolreader-3.2.2.1.ebuild 2020 BLAKE2B 17bc4cfc083d7bb30ea67b98a0dc700695823b8a39e0fc20ff4b4ae80178c5207c60838874a80a23cbbf99430d7b1b26e39b430b94d4e870b981eefed46ec961 SHA512 f8b5daa8dc76471bce823563f53e9e3810c9530a58dde042400996b73ba636b8a726115b72b2666b561a9f419865e5e56c227d94034292c5aa7edd557451fc27 -MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8 diff --git a/app-text/coolreader/coolreader-3.1.2.71-r4.ebuild b/app-text/coolreader/coolreader-3.1.2.71-r4.ebuild deleted file mode 100644 index 33c7a7c28be5..000000000000 --- a/app-text/coolreader/coolreader-3.1.2.71-r4.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -WX_GTK_VER="3.0" -PLOCALES="bg cs de es hu pl ru uk" -inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils - -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" ) - -for lang in ${PLOCALES}; do - IUSE="${IUSE} l10n_${lang}" -done - -src_prepare() { - cmake-utils_src_prepare - - # locales - l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts' - local lang langs - langs="" - for lang in ${PLOCALES}; do - if use l10n_${lang}; then - langs="${langs} ${lang}" - fi - done - sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES ${langs})|" \ - -i "${S}"/cr3qt/CMakeLists.txt \ - || die "sed CMakeLists.txt failed" -} - -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 -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} diff --git a/app-text/coolreader/coolreader-3.2.2.1.ebuild b/app-text/coolreader/coolreader-3.2.2.1.ebuild deleted file mode 100644 index 3d97d3b6b4e7..000000000000 --- a/app-text/coolreader/coolreader-3.2.2.1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -WX_GTK_VER="3.0" -PLOCALES="bg cs de es hu pl ru uk" -inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils eapi7-ver - -CR_PV=$(ver_rs 3 '-') - -if [ "${PV}" != 9999 ] -then - # git tag cr3.2.2-1 - SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz" -else - 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/${PN}.git" - SRC_URI="" -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 ) )" - -S="${WORKDIR}/${PN}-cr${CR_PV}" - -for lang in ${PLOCALES}; do - IUSE="${IUSE} l10n_${lang}" -done - -src_prepare() { - cmake-utils_src_prepare - - # locales - l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts' - local lang langs - langs="" - for lang in ${PLOCALES}; do - if use l10n_${lang}; then - langs="${langs} ${lang}" - fi - done - sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES ${langs})|" \ - -i "${S}"/cr3qt/CMakeLists.txt \ - || die "sed CMakeLists.txt failed" -} - -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 -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} diff --git a/app-text/coolreader/files/cr3.1.2.71-r1_qt5_wx.diff b/app-text/coolreader/files/cr3.1.2.71-r1_qt5_wx.diff deleted file mode 100644 index 434d4556da94..000000000000 --- a/app-text/coolreader/files/cr3.1.2.71-r1_qt5_wx.diff +++ /dev/null @@ -1,242 +0,0 @@ -diff -Naur old/CMakeLists.txt new/CMakeLists.txt ---- old/CMakeLists.txt 2017-08-30 18:31:28.000000000 +0300 -+++ new/CMakeLists.txt 2017-09-02 23:43:38.000000000 +0300 -@@ -29,7 +29,7 @@ - endif() - elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) - # Update if necessary -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic -std=c++11 -fPIC") - endif() - - if (NOT DEFINED GUI) -@@ -323,7 +323,7 @@ - message("Will make CR3/WX") - ADD_DEFINITIONS( ${DESKTOP_DEFS} -DCR_WX_SUPPORT=1 ) - SET(wxWidgets_USE_LIBS base core ) -- FIND_PACKAGE(wxWidgets) -+ FIND_PACKAGE(wxWidgets 2.8) - IF (wxWidgets_FOUND) - INCLUDE(${wxWidgets_USE_FILE}) - include_directories( ${wxWidgets_INCLUDE_DIRS} ) -diff -Naur old/cr3qt/CMakeLists.txt new/cr3qt/CMakeLists.txt ---- old/cr3qt/CMakeLists.txt 2017-08-30 18:31:28.000000000 +0300 -+++ new/cr3qt/CMakeLists.txt 2017-09-03 00:53:38.000000000 +0300 -@@ -173,7 +173,11 @@ - SET (EXTRA_LIBS ${QT_LIBRARIES} ${STD_LIBS} ) - #${QT_LIBRARIES} - ELSEIF (UNIX) -- SET (EXTRA_LIBS ${QT_LIBRARIES} fontconfig ${STD_LIBS} ) -+ IF( ${GUI} STREQUAL QT ) -+ SET (EXTRA_LIBS ${QT_LIBRARIES} fontconfig ${STD_LIBS} ) -+ ELSE() -+ SET (EXTRA_LIBS fontconfig ${STD_LIBS} ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES}) -+ ENDIF() - ELSE() - SET (EXTRA_LIBS ${STD_LIBS} ${QT_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES} ) - ENDIF(MAC) -diff -Naur old/cr3qt/src/aboutdlg.ui new/cr3qt/src/aboutdlg.ui ---- old/cr3qt/src/aboutdlg.ui 2017-08-30 18:31:28.000000000 +0300 -+++ new/cr3qt/src/aboutdlg.ui 2017-09-03 00:56:14.000000000 +0300 -@@ -56,7 +56,7 @@ - - - -- (c) 1998-2010 Vadim Lopatin -+ (c) 1998-2015 Vadim Lopatin - - - -diff -Naur old/cr3wx/CMakeLists.txt new/cr3wx/CMakeLists.txt ---- old/cr3wx/CMakeLists.txt 2017-08-30 18:31:28.000000000 +0300 -+++ new/cr3wx/CMakeLists.txt 2017-09-03 00:54:59.000000000 +0300 -@@ -10,7 +10,7 @@ - ) - LINK_DIRECTORIES(${wxWidgets_LIBRARY_DIRS}) - ADD_EXECUTABLE(cr3 ${CR3_SOURCES}) --SET (EXTRA_LIBS ${wxWidgets_LIBRARIES} ${STD_LIBS}) -+SET (EXTRA_LIBS ${wxWidgets_LIBRARIES} fontconfig ${STD_LIBS}) - TARGET_LINK_LIBRARIES(cr3 crengine tinydict ${EXTRA_LIBS}) - - IF (UNIX) -@@ -22,6 +22,9 @@ - INSTALL( DIRECTORY ../cr3qt/data/hyph DESTINATION share/cr3 - FILES_MATCHING PATTERN "*.pattern" ) - INSTALL( DIRECTORY ../cr3qt/data/skins DESTINATION share/cr3/skins ) -+ INSTALL( FILES ../cr3qt/src/desktop/cr3.desktop DESTINATION share/applications ) -+ INSTALL( FILES ../cr3qt/src/desktop/cr3.png DESTINATION share/pixmaps ) -+ INSTALL( FILES ../cr3qt/src/desktop/cr3.xpm DESTINATION share/pixmaps ) - ELSE() - INSTALL( TARGETS cr3 RUNTIME DESTINATION . ) - INSTALL( DIRECTORY ../cr3qt/data/ DESTINATION . -diff -Naur old/cr3wx/src/cr3.cpp new/cr3wx/src/cr3.cpp ---- old/cr3wx/src/cr3.cpp 2017-08-30 18:31:28.000000000 +0300 -+++ new/cr3wx/src/cr3.cpp 2017-09-03 02:30:35.000000000 +0300 -@@ -395,7 +395,11 @@ - - lString16 GetConfigFileName() - { -- lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() ); -+ #if wxCHECK_VERSION(3, 0, 0) -+ lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().wx_str() ); -+ #else -+ lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() ); -+ #endif - if ( !wxDirExists( cfgdir.c_str() ) ) - ::wxMkdir( wxString( cfgdir.c_str() ) ); - lChar16 slash = detectSlash( cfgdir ); -@@ -520,6 +524,7 @@ - - wxBitmap cr3Frame::getIcon16x16( const lChar16 * name ) - { -+ wxLogNull logNo; // Temporary disable warnings ( see: http://trac.wxwidgets.org/ticket/15331 ) - lString16 dir; - if ( _toolbarSize==2 ) - dir = "icons/22x22/"; -@@ -531,7 +536,7 @@ - if ( icon.IsOk() ) - return icon; - return wxNullBitmap; --} -+} // ~wxLogNull called, old log sink restored - - #if (USE_FREETYPE==1) - bool getDirectoryFonts( lString16Collection & pathList, lString16 ext, lString16Collection & fonts, bool absPath ) -@@ -622,7 +627,11 @@ - wxImage::AddHandler(new wxPNGHandler); - resources = new ResourceContainer(); - -- lString16 appname( argv[0] ); -+ #if wxCHECK_VERSION(3, 0, 0) -+ lString16 appname( argv[0].wx_str() ); -+ #else -+ lString16 appname( argv[0] ); -+ #endif - int lastSlash=-1; - lChar16 slashChar = '/'; - for ( int p=0; p<(int)appname.length(); p++ ) { -@@ -777,7 +786,11 @@ - int argc = wxGetApp().argc; - lString16 fnameToOpen; - for ( int i=1; iSetCursor( hg ); - wxSetCursor( hg ); -- _view->getDocView()->exportWolFile( dlg.GetPath(), opts.getMode()==0, opts.getLevels() ); -+ #if wxCHECK_VERSION(3, 0, 0) -+ _view->getDocView()->exportWolFile( dlg.GetPath().wx_str(), opts.getMode()==0, opts.getLevels() ); -+ #else -+ _view->getDocView()->exportWolFile( dlg.GetPath(), opts.getMode()==0, opts.getLevels() ); -+ #endif - wxSetCursor( wxNullCursor ); - this->SetCursor( wxNullCursor ); - } -@@ -1479,7 +1500,7 @@ - void - cr3Frame::OnAbout( wxCommandEvent& WXUNUSED( event ) ) - { -- wxMessageBox( wxT( "Cool Reader " wxT(CR3_VERSION) wxT("\n(c) 1998-2007 Vadim Lopatin\nwxWidgets version\n") ) -+ wxMessageBox( wxT( "Cool Reader " wxT(CR3_VERSION) wxT("\n(c) 1998-2015 Vadim Lopatin\n" wxVERSION_STRING"\n") ) - wxT("\nBased on CREngine library " wxT(CR_ENGINE_VERSION) ) - wxT("\nThird party libraries used:") - wxT("\nzlib, libpng, libjpeg, freetype2,") -diff -Naur old/cr3wx/src/optdlg.cpp new/cr3wx/src/optdlg.cpp ---- old/cr3wx/src/optdlg.cpp 2017-08-30 18:31:28.000000000 +0300 -+++ new/cr3wx/src/optdlg.cpp 2017-09-03 02:36:51.000000000 +0300 -@@ -41,7 +41,11 @@ - if ( v==_choices[i] ) - tb = i; - if ( _storeStringValues ) { -- props->setString( _option, lString16(_choices[tb]) ); -+ #if wxCHECK_VERSION(3, 0, 0) -+ props->setString( _option, lString16(_choices[tb].wx_str()) ); -+ #else -+ props->setString( _option, lString16(_choices[tb]) ); -+ #endif - } else { - props->setInt( _option, tb ); - } -@@ -50,7 +54,11 @@ - { - unsigned tb = _defvalue; - if ( _storeStringValues ) { -- lString8 s8 = UnicodeToUtf8( lString16(_choices[_defvalue]) ); -+ #if wxCHECK_VERSION(3, 0, 0) -+ lString8 s8 = UnicodeToUtf8( lString16(_choices[_defvalue].wx_str()) ); -+ #else -+ lString8 s8 = UnicodeToUtf8( lString16(_choices[_defvalue]) ); -+ #endif - 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 2017-08-30 18:31:28.000000000 +0300 -+++ new/cr3wx/src/view.cpp 2017-09-03 02:40:42.000000000 +0300 -@@ -353,7 +353,11 @@ - - lString16 cr3view::GetHistoryFileName() - { -- lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() ); -+ #if wxCHECK_VERSION(3, 0, 0) -+ lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().wx_str() ); -+ #else -+ lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() ); -+ #endif - if ( !wxDirExists( cfgdir.c_str() ) ) - ::wxMkdir( wxString( cfgdir.c_str() ) ); - lChar16 slash = detectSlash( cfgdir ); -@@ -667,13 +671,21 @@ - //=========================================== - GetParent()->Update(); - //printf(" loading... "); -- bool res = getDocView()->LoadDocument( fname.c_str() ); -+ #if wxCHECK_VERSION(3, 0, 0) -+ bool res = getDocView()->LoadDocument( fname.wx_str() ); -+ #else -+ bool res = getDocView()->LoadDocument( fname.c_str() ); -+ #endif - //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() ); -+ #if wxCHECK_VERSION(3, 0, 0) -+ getDocView()->createDefaultDocument(lString16("File open error"), lString16("Cannot open file ") + fname.wx_str() ); -+ #else -+ getDocView()->createDefaultDocument(lString16("File open error"), lString16("Cannot open file ") + fname.c_str() ); -+ #endif - lString16 title = getDocView()->getAuthors(); - if ( !title.empty() && !getDocView()->getTitle().empty() ) - title << L". "; -diff -Naur old/crengine/include/cr3version.h new/crengine/include/cr3version.h ---- old/crengine/include/cr3version.h 2017-08-30 18:31:28.000000000 +0300 -+++ new/crengine/include/cr3version.h 2017-09-03 00:55:28.000000000 +0300 -@@ -1,2 +1,2 @@ --#define CR_ENGINE_VERSION "3.1.2-52" --#define CR_ENGINE_BUILD_DATE "2014-11-19" -+#define CR_ENGINE_VERSION "3.1.2-71" -+#define CR_ENGINE_BUILD_DATE "2015-07-02" diff --git a/app-text/coolreader/files/cr3ini.diff b/app-text/coolreader/files/cr3ini.diff deleted file mode 100644 index 66562aa836a7..000000000000 --- a/app-text/coolreader/files/cr3ini.diff +++ /dev/null @@ -1,35 +0,0 @@ -# Patch to allow creating cr3.ini file in the home directory of user -# instead to trying save it in /usr/share/cr3/cr3.ini -# Bug: https://sourceforge.net/p/crengine/bugs/179/ -# Patch was proposed by "Olexandr" (see bug report) -diff --git a/cr3qt/src/mainwindow.cpp b/cr3qt/src/mainwindow.cpp -index 142242a..0401f71 100644 ---- a/cr3qt/src/mainwindow.cpp -+++ b/cr3qt/src/mainwindow.cpp -@@ -77,8 +77,8 @@ MainWindow::MainWindow(QWidget *parent) - #endif - QString cacheDir = homeDir + "cache"; - QString bookmarksDir = homeDir + "bookmarks"; -- QString histFile = exeDir + "cr3hist.bmk"; -- QString histFile2 = homeDir + "cr3hist.bmk"; -+ QString histFile2 = exeDir + "cr3hist.bmk"; -+ QString histFile = homeDir + "cr3hist.bmk"; - QString iniFile2 = exeDir + "cr3.ini"; - QString iniFile = homeDir + "cr3.ini"; - QString cssFile = homeDir + "fb2.css"; -@@ -92,9 +92,13 @@ MainWindow::MainWindow(QWidget *parent) - ldomDocCache::init( qt2cr( cacheDir ), DOC_CACHE_SIZE ); - ui->view->setPropsChangeCallback( this ); - if ( !ui->view->loadSettings( iniFile ) ) -- ui->view->loadSettings( iniFile2 ); -+ if ( !ui->view->loadSettings( iniFile2 ) ) -+ ui->view->saveSettings( iniFile ); -+ - if ( !ui->view->loadHistory( histFile ) ) -- ui->view->loadHistory( histFile2 ); -+ if ( !ui->view->loadHistory( histFile2 ) ) -+ ui->view->saveHistory( histFile ); -+ - if ( !ui->view->loadCSS( cssFile ) ) - ui->view->loadCSS( cssFile2 ); - #if ENABLE_BOOKMARKS_DIR==1 diff --git a/app-text/coolreader/metadata.xml b/app-text/coolreader/metadata.xml deleted file mode 100644 index 0bc14087cc2d..000000000000 --- a/app-text/coolreader/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - grozin@gentoo.org - - - 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 - - -- cgit v1.2.3