head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.28 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.26 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.24 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.22 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.20 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.18 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.16 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.14 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.12 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.10 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.8 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.6 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.4 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.2 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.1.0.16 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.14 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.12 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.10 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.8 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.6 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.4 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.2 pkgsrc-2020Q4-base:1.1; locks; strict; comment @# @; 1.2 date 2022.10.20.15.49.12; author nros; state Exp; branches; next 1.1; commitid 7LVFhakpUPGymtYD; 1.1 date 2020.12.04.12.17.58; author nros; state Exp; branches; next ; commitid duTtnhnxp15edqyC; desc @@ 1.2 log @Update bibletime to version 3.0.3 Pkgsrc changes: All earlier patches removed. Changes from changelog: * MacOS build improvements * Fixed license.html being installed twice * Partially worked around a libsword bug which limited download durations to 10 seconds * Fixed bug which made it impossible to active toolbar buttons using keyboard * Fixed some out-of-bounds memory read * Fixed a number of input parsing and output generation errors, including invalid memory reads * Fixed search scopes not being properly translated * Fixed version information in installed metadata files Updated translations * Fixed a build-error caused by an C++11 incompatibility * Fixed copying of text disabled with Qt versions earlier than than 5.13 * Fixed some undefined behavior and out-of-bounds memory errors * Updated translations * Improved tuning of scrolling speed. * Improved handling of fonts to fix many bugs, including a switch to Qt's native font chooser widget in settings dialog, because of many serious bugs in our legacy implementation. * Improved sample text in settings dialog. * Improved behavior of the mag view to be more similar to pre-3.0 behavior. * Increased maximum column count from 4 to 10. * Removed the orphaned and broken tests for BibleTime. * Updated translations, including a new user interface translations to Japanese and Ukrainian, a new Handbook translation to Russian, and a new Howto translation to Ukrainian. * Fixed DisplayView.qml getting incorrectly installed under /usr/bin/ on some platforms. * Fixed some compatibility issues with different Qt versions. * Fixed a crash when editing personal commentary. * Fixed highlighting of selected text. * Fixed dragging of links. * Fixed modules rearranging themselves. * Fixed logic related to clicking on verse numbers. * Fixed custom font of first column being incorrectly applied to all columns. * Fixed preview in settings dialog displaying text in red. * Fixed lexicons not being displayed. * Fixed drag and drop in mag view and search dialog. * Fixed no text being displayed for some ThML modules. * Fixed undefined behavior and crashes from opening menus to select works by working around a broken QMenu interface. * Fixes to handling of languages, including a caching discrepancy which caused some settings not being properly applied before restarting BibleTime. * Fixed saving of chapters not working properly. * Fixed handling of nested tags for OSIS works. * Fixes to handling of PageUp/PageDown keys when scrolling out of bounds. Note that when BibleTime is compiled against Qt 5.9, one might still experience a trivial glitch where only part of the module is displayed. Pressing PageUp/PageDown again may help to work around this. @ text @$NetBSD$ * Treat apple like other unix-like systems --- cmake/BTApplication.cmake.orig 2022-10-20 15:46:45.872225854 +0000 +++ cmake/BTApplication.cmake @@@@ -58,7 +58,7 @@@@ ELSE() ADD_COMPILE_OPTIONS("-fPIE" "-fexceptions") SET(CMAKE_CXX_FLAGS_RELEASE "") SET(CMAKE_CXX_FLAGS_DEBUG "") - IF(APPLE) + IF(false) SET(T "/Applications/Xcode_12.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/") LIST(APPEND BibleTime_CXXFLAGS "-mmacosx-version-min=10.12" @@@@ -88,7 +88,7 @@@@ GET_SOURCE_FILE_PROPERTY(d "${CMAKE_CURRENT_SOURCE_DIR}/src/util/directory.cpp" COMPILE_DEFINITIONS) IF(DEFINED BT_RUNTIME_DOCDIR) LIST(APPEND d "BT_RUNTIME_DOCDIR=\"${BT_RUNTIME_DOCDIR}\"") -ELSEIF(APPLE OR MSVC) +ELSEIF(MSVC) LIST(APPEND d "BT_RUNTIME_DOCDIR=\"${BT_DOCDIR}\"") ELSE() LIST(APPEND d "BT_RUNTIME_DOCDIR=\"${BT_DOCDIR_ABSOLUTE}\"") @@@@ -128,7 +128,7 @@@@ FILE(GLOB_RECURSE bibletime_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/frontend/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/src/frontend/*.qrc" ) -IF(APPLE) +IF(false) ADD_EXECUTABLE("bibletime" MACOSX_BUNDLE ${bibletime_SOURCES}) SET_TARGET_PROPERTIES("bibletime" PROPERTIES OUTPUT_NAME "BibleTime") ELSEIF(MSVC) @@@@ -213,7 +213,7 @@@@ IF(MSVC) # Windows: SET(bibletime_PDB "${bibletime_BINARY_DIR}/Debug/bibletime.pdb") INSTALL(FILES "${bibletime_PDB}" DESTINATION "${BT_BINDIR}") ENDIF() -ELSEIF(APPLE) # OS X: +ELSEIF(false) # OS X: # sword locale information, needed for DMG image FILE(GLOB INSTALL_SWORD_LOCALE_LIST "${Sword_INCLUDE_DIRS}/../../share/sword/locales.d/*") INSTALL(FILES ${INSTALL_SWORD_LOCALE_LIST} @@@@ -228,7 +228,7 @@@@ ENDIF() # IF(WIN32 AND NOT UNIX) INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTBinaryPackageWindows.cmake") -ELSEIF(APPLE) +ELSEIF(false) INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTBinaryPackageMacOS.cmake") ENDIF() @ 1.1 log @Updated bibletime to version 3.0 Changes from release notes: Enhancements: * Text windows now have continuous scrolling from the beginning to end of a module. At the end of a chapter just keep scrolling to see the next chapter. * You don't have to open the Personal Commentary for writing. Edit it in a normal text window or even when it is a parallel column in a text window. * Automatic text scrolling up or down with variable speed and pause. * Copy to clipboard by choosing the beginning and ending reference. * A search filter was added in the "Install Works" page of the Bookshelf Manager. * You can select text from a single column when using parallel texts in a window. * Added a user interface to delete or create search indices. * The first time the Bookshelf Manager is used in a session, the remote libraries are updated. * Improved popup menus and icons for module chooser buttons and text window headers. * Show module unlock information in about text when available. * Improved unlocking of modules. Bugs fixed: * Locked Bible not unlocking properly. * Place not being saved in Daily Devotional. * Problems with MAG window references using hebrew modules OSHB and OSMHB. * Unable to create a search scope for deuterocanonical books. * Searching with quotes not working. * MAG windows Strongs references not working unless config settings were saved. @ text @d3 1 a3 2 * don't install DisplayView.qml in bin taken from upstream https://github.com/bibletime/bibletime/commit/7700e93a345c202cd45cd4e72b77feb64fe33b80 d5 1 a5 1 --- cmake/BTApplication.cmake.orig 2020-08-02 18:32:25.000000000 +0000 d7 16 a22 6 @@@@ -178,10 +178,10 @@@@ INSTALL(FILES "docs/license.html" # See QTBUG-55259, Affects windeployqt and macdeployqt IF(APPLE) INSTALL(FILES "src/frontend/display/modelview/DisplayView.qml" - DESTINATION "${BT_BINDIR}/BibleTime.app/Contents/MacOS") + DESTINATION "${BT_BINDIR}/BibleTime.app/share/bibletime/qml") d24 26 a49 3 INSTALL(FILES "src/frontend/display/modelview/DisplayView.qml" - DESTINATION "${BT_BINDIR}/") + DESTINATION "${BT_DATAROOTDIR}/bibletime/qml") a51 1 FILE(GLOB INSTALL_TMPL_LIST @