Received: by mail.netbsd.org (Postfix, from userid 605) id 1AE0184D95; Thu, 20 Oct 2022 15:49:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4B3EC84D50 for ; Thu, 20 Oct 2022 15:49:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id GgGgvJZhV13j for ; Thu, 20 Oct 2022 15:49:12 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 9C1A984C86 for ; Thu, 20 Oct 2022 15:49:12 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 95A6BFA90; Thu, 20 Oct 2022 15:49:12 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1666280952100960" MIME-Version: 1.0 Date: Thu, 20 Oct 2022 15:49:12 +0000 From: "Niclas Rosenvik" Subject: CVS commit: pkgsrc/misc/bibletime To: pkgsrc-changes@NetBSD.org Reply-To: nros@netbsd.org X-Mailer: log_accum Message-Id: <20221020154912.95A6BFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1666280952100960 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nros Date: Thu Oct 20 15:49:12 UTC 2022 Modified Files: pkgsrc/misc/bibletime: Makefile PLIST distinfo pkgsrc/misc/bibletime/patches: patch-cmake_BTApplication.cmake Removed Files: pkgsrc/misc/bibletime/patches: patch-src_backend_bookshelfmodel_btbookshelftreemodel.cpp patch-src_backend_managers_clanguagemgr.h patch-src_frontend_bibletime.cpp patch-src_frontend_bibletime.h patch-src_frontend_bookshelfwizard_btbookshelfwizard.h patch-src_frontend_btaboutmoduledialog.h patch-src_frontend_btbookshelfdockwidget.h patch-src_frontend_btbookshelfwidget.h patch-src_frontend_btmodulechooserdialog.h patch-src_frontend_cmdiarea.h patch-src_frontend_display_modelview_btquickwidget.cpp patch-src_frontend_displaywindow_creadwindow.cpp patch-src_frontend_edittextwizard_btedittextwizard.h patch-src_frontend_keychooser_cbookkeychooser.cpp patch-src_frontend_keychooser_ckeychooserwidget.cpp patch-src_frontend_keychooser_cscrollerwidgetset.cpp patch-src_frontend_keychooser_versekeychooser_btdropdownchooserbutton.cpp patch-src_frontend_searchdialog_btsearchmodulechooserdialog.h patch-src_frontend_settingsdialogs_btconfigdialog.h Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 pkgsrc/misc/bibletime/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/bibletime/PLIST cvs rdiff -u -r1.6 -r1.7 pkgsrc/misc/bibletime/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/misc/bibletime/patches/patch-cmake_BTApplication.cmake cvs rdiff -u -r1.1 -r0 \ pkgsrc/misc/bibletime/patches/patch-src_backend_bookshelfmodel_btbookshelftreemodel.cpp \ pkgsrc/misc/bibletime/patches/patch-src_backend_managers_clanguagemgr.h \ pkgsrc/misc/bibletime/patches/patch-src_frontend_bibletime.cpp \ pkgsrc/misc/bibletime/patches/patch-src_frontend_bibletime.h \ pkgsrc/misc/bibletime/patches/patch-src_frontend_bookshelfwizard_btbookshelfwizard.h \ pkgsrc/misc/bibletime/patches/patch-src_frontend_btaboutmoduledialog.h \ pkgsrc/misc/bibletime/patches/patch-src_frontend_btbookshelfdockwidget.h \ pkgsrc/misc/bibletime/patches/patch-src_frontend_btbookshelfwidget.h \ pkgsrc/misc/bibletime/patches/patch-src_frontend_btmodulechooserdialog.h \ pkgsrc/misc/bibletime/patches/patch-src_frontend_cmdiarea.h \ pkgsrc/misc/bibletime/patches/patch-src_frontend_display_modelview_btquickwidget.cpp \ pkgsrc/misc/bibletime/patches/patch-src_frontend_displaywindow_creadwindow.cpp \ pkgsrc/misc/bibletime/patches/patch-src_frontend_edittextwizard_btedittextwizard.h \ pkgsrc/misc/bibletime/patches/patch-src_frontend_keychooser_cbookkeychooser.cpp \ pkgsrc/misc/bibletime/patches/patch-src_frontend_keychooser_ckeychooserwidget.cpp \ pkgsrc/misc/bibletime/patches/patch-src_frontend_keychooser_cscrollerwidgetset.cpp \ pkgsrc/misc/bibletime/patches/patch-src_frontend_keychooser_versekeychooser_btdropdownchooserbutton.cpp \ pkgsrc/misc/bibletime/patches/patch-src_frontend_searchdialog_btsearchmodulechooserdialog.h \ pkgsrc/misc/bibletime/patches/patch-src_frontend_settingsdialogs_btconfigdialog.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1666280952100960 Content-Disposition: inline Content-Length: 13638 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/misc/bibletime/Makefile diff -u pkgsrc/misc/bibletime/Makefile:1.67 pkgsrc/misc/bibletime/Makefile:1.68 --- pkgsrc/misc/bibletime/Makefile:1.67 Sun Sep 11 12:51:57 2022 +++ pkgsrc/misc/bibletime/Makefile Thu Oct 20 15:49:12 2022 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.67 2022/09/11 12:51:57 wiz Exp $ +# $NetBSD: Makefile,v 1.68 2022/10/20 15:49:12 nros Exp $ -DISTNAME= bibletime-3.0 -PKGREVISION= 15 +DISTNAME= bibletime-3.0.3 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_GITHUB:=bibletime/} GITHUB_RELEASE= v${PKGVERSION_NOREV} @@ -26,6 +25,11 @@ CMAKE_ARGS+= -DBUILD_HOWTO_PDF=OFF CMAKE_ARGS+= -DBT_DOCBOOK_XSL_HTML_CHUNK_XSL:PATH="${PREFIX}/share/xsl/docbook/html/chunk.xsl" CMAKE_ARGS+= -DBT_RUNTIME_DOCDIR="${PREFIX}/share/doc/bibletime" +# macs need this to install correctly +CMAKE_ARGS+= -DBT_BINDIR:PATH=${PREFIX}/bin +CMAKE_ARGS+= -DBT_DATAROOTDIR:PATH=${PREFIX}/share +CMAKE_ARGS+= -DBT_DATADIR:PATH=${PREFIX}/share + .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../misc/sword/buildlink3.mk" .include "../../textproc/libclucene/buildlink3.mk" Index: pkgsrc/misc/bibletime/PLIST diff -u pkgsrc/misc/bibletime/PLIST:1.3 pkgsrc/misc/bibletime/PLIST:1.4 --- pkgsrc/misc/bibletime/PLIST:1.3 Fri Dec 4 12:17:58 2020 +++ pkgsrc/misc/bibletime/PLIST Thu Oct 20 15:49:12 2022 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2020/12/04 12:17:58 nros Exp $ +@comment $NetBSD: PLIST,v 1.4 2022/10/20 15:49:12 nros Exp $ bin/bibletime share/applications/info.bibletime.BibleTime.desktop share/bibletime/display-templates/Basic.tmpl @@ -97,6 +97,7 @@ share/bibletime/locale/bibletime_ui_fi.q share/bibletime/locale/bibletime_ui_fr.qm share/bibletime/locale/bibletime_ui_hu.qm share/bibletime/locale/bibletime_ui_it.qm +share/bibletime/locale/bibletime_ui_ja.qm share/bibletime/locale/bibletime_ui_ko.qm share/bibletime/locale/bibletime_ui_lt.qm share/bibletime/locale/bibletime_ui_lv.qm @@ -108,11 +109,11 @@ share/bibletime/locale/bibletime_ui_ru.q share/bibletime/locale/bibletime_ui_sk.qm share/bibletime/locale/bibletime_ui_th.qm share/bibletime/locale/bibletime_ui_tr.qm +share/bibletime/locale/bibletime_ui_uk.qm share/bibletime/locale/bibletime_ui_zh_TW.qm share/bibletime/pics/startuplogo.png share/bibletime/pics/startuplogo_christmas.png share/bibletime/pics/startuplogo_easter.jpg -share/bibletime/qml/DisplayView.qml share/doc/bibletime/handbook/html/ar/hdbk-config.html share/doc/bibletime/handbook/html/ar/hdbk-intro.html share/doc/bibletime/handbook/html/ar/hdbk-op-bookshelfmanager.html @@ -813,6 +814,56 @@ share/doc/bibletime/handbook/html/pt_BR/ share/doc/bibletime/handbook/html/pt_BR/ss_searchanal.png share/doc/bibletime/handbook/html/pt_BR/ss_searchopts.png share/doc/bibletime/handbook/html/pt_BR/ss_shortcuts.png +share/doc/bibletime/handbook/html/ru/hdbk-config.html +share/doc/bibletime/handbook/html/ru/hdbk-intro.html +share/doc/bibletime/handbook/html/ru/hdbk-op-bookshelfmanager.html +share/doc/bibletime/handbook/html/ru/hdbk-op-output.html +share/doc/bibletime/handbook/html/ru/hdbk-op-parts.html +share/doc/bibletime/handbook/html/ru/hdbk-op-search.html +share/doc/bibletime/handbook/html/ru/hdbk-op.html +share/doc/bibletime/handbook/html/ru/hdbk-reference-shortcuts.html +share/doc/bibletime/handbook/html/ru/hdbk-reference-works.html +share/doc/bibletime/handbook/html/ru/hdbk-reference.html +share/doc/bibletime/handbook/html/ru/hdbk-start-firstrun.html +share/doc/bibletime/handbook/html/ru/hdbk-term.html +share/doc/bibletime/handbook/html/ru/i_back.png +share/doc/bibletime/handbook/html/ru/i_bible.png +share/doc/bibletime/handbook/html/ru/i_bible_add.png +share/doc/bibletime/handbook/html/ru/i_bibletime.png +share/doc/bibletime/handbook/html/ru/i_book.png +share/doc/bibletime/handbook/html/ru/i_book_add.png +share/doc/bibletime/handbook/html/ru/i_bookmark.png +share/doc/bibletime/handbook/html/ru/i_books.png +share/doc/bibletime/handbook/html/ru/i_cascade.png +share/doc/bibletime/handbook/html/ru/i_checkbox.png +share/doc/bibletime/handbook/html/ru/i_commentary.png +share/doc/bibletime/handbook/html/ru/i_commentary_add.png +share/doc/bibletime/handbook/html/ru/i_configure.png +share/doc/bibletime/handbook/html/ru/i_configuresword.png +share/doc/bibletime/handbook/html/ru/i_contents2.png +share/doc/bibletime/handbook/html/ru/i_displayconfig.png +share/doc/bibletime/handbook/html/ru/i_document_magnifier.png +share/doc/bibletime/handbook/html/ru/i_exit.png +share/doc/bibletime/handbook/html/ru/i_fileclose.png +share/doc/bibletime/handbook/html/ru/i_find.png +share/doc/bibletime/handbook/html/ru/i_folder_open.png +share/doc/bibletime/handbook/html/ru/i_forward.png +share/doc/bibletime/handbook/html/ru/i_lexicon.png +share/doc/bibletime/handbook/html/ru/i_lexicon_add.png +share/doc/bibletime/handbook/html/ru/i_light_bulb.png +share/doc/bibletime/handbook/html/ru/i_sync.png +share/doc/bibletime/handbook/html/ru/i_tile.png +share/doc/bibletime/handbook/html/ru/i_tile_horiz.png +share/doc/bibletime/handbook/html/ru/i_tile_vert.png +share/doc/bibletime/handbook/html/ru/i_view_index.png +share/doc/bibletime/handbook/html/ru/i_view_mag.png +share/doc/bibletime/handbook/html/ru/i_window_fullscreen.png +share/doc/bibletime/handbook/html/ru/index.html +share/doc/bibletime/handbook/html/ru/ss_configfonts.png +share/doc/bibletime/handbook/html/ru/ss_mainterms.png +share/doc/bibletime/handbook/html/ru/ss_searchanal.png +share/doc/bibletime/handbook/html/ru/ss_searchopts.png +share/doc/bibletime/handbook/html/ru/ss_shortcuts.png share/doc/bibletime/handbook/html/th/hdbk-config.html share/doc/bibletime/handbook/html/th/hdbk-intro.html share/doc/bibletime/handbook/html/th/hdbk-op-bookshelfmanager.html @@ -1293,6 +1344,25 @@ share/doc/bibletime/howto/html/th/h2-rul share/doc/bibletime/howto/html/th/h2-rules-parables.html share/doc/bibletime/howto/html/th/h2-rules.html share/doc/bibletime/howto/html/th/index.html -share/doc/bibletime/license/license.html +share/doc/bibletime/howto/html/uk/h2-basics-approaches.html +share/doc/bibletime/howto/html/uk/h2-basics-expository.html +share/doc/bibletime/howto/html/uk/h2-basics-interpretation.html +share/doc/bibletime/howto/html/uk/h2-basics-types.html +share/doc/bibletime/howto/html/uk/h2-basics-worksheet.html +share/doc/bibletime/howto/html/uk/h2-basics.html +share/doc/bibletime/howto/html/uk/h2-importance-breathed.html +share/doc/bibletime/howto/html/uk/h2-importance-exhortations.html +share/doc/bibletime/howto/html/uk/h2-importance-liberates.html +share/doc/bibletime/howto/html/uk/h2-importance-once.html +share/doc/bibletime/howto/html/uk/h2-importance-supplement.html +share/doc/bibletime/howto/html/uk/h2-importance-wars.html +share/doc/bibletime/howto/html/uk/h2-importance-works.html +share/doc/bibletime/howto/html/uk/h2-importance.html +share/doc/bibletime/howto/html/uk/h2-rules-context.html +share/doc/bibletime/howto/html/uk/h2-rules-hcontest.html +share/doc/bibletime/howto/html/uk/h2-rules-normal.html +share/doc/bibletime/howto/html/uk/h2-rules-parables.html +share/doc/bibletime/howto/html/uk/h2-rules.html +share/doc/bibletime/howto/html/uk/index.html share/icons/hicolor/scalable/apps/info.bibletime.BibleTime.svg share/metainfo/info.bibletime.BibleTime.metainfo.xml Index: pkgsrc/misc/bibletime/distinfo diff -u pkgsrc/misc/bibletime/distinfo:1.6 pkgsrc/misc/bibletime/distinfo:1.7 --- pkgsrc/misc/bibletime/distinfo:1.6 Tue Oct 26 10:58:57 2021 +++ pkgsrc/misc/bibletime/distinfo Thu Oct 20 15:49:12 2022 @@ -1,25 +1,6 @@ -$NetBSD: distinfo,v 1.6 2021/10/26 10:58:57 nia Exp $ +$NetBSD: distinfo,v 1.7 2022/10/20 15:49:12 nros Exp $ -BLAKE2s (bibletime-3.0.tar.xz) = 538fff2499e93f2ba20c2c3f1f1b2d4805792ae2c66ed8ddc33a408819e2dca3 -SHA512 (bibletime-3.0.tar.xz) = 85afc2781807345ea8fdefea6d179955fa76085c0a9c97e47321ea37ef9ea05367678c54bacfc10cf1d6085d46ba6fbd1c7d448044ffdfe3c96007ee8d7e5c00 -Size (bibletime-3.0.tar.xz) = 1568732 bytes -SHA1 (patch-cmake_BTApplication.cmake) = 4183272811c95ca540b5eb8c807a94d02e7d685a -SHA1 (patch-src_backend_bookshelfmodel_btbookshelftreemodel.cpp) = c003c229770594e283787ec5c2f7d698a56dc2be -SHA1 (patch-src_backend_managers_clanguagemgr.h) = 41c63c71e2fcb48e2a8d56841bb60b8f00783505 -SHA1 (patch-src_frontend_bibletime.cpp) = a38d26bccc47b4bfc13129c6be1d753377e2af89 -SHA1 (patch-src_frontend_bibletime.h) = 365310bdfcb5f4771aa4f6b7e588e523d6fb63e5 -SHA1 (patch-src_frontend_bookshelfwizard_btbookshelfwizard.h) = 6463a56969d0cfd3183bd512deff678a8b1ab562 -SHA1 (patch-src_frontend_btaboutmoduledialog.h) = 7d6c1ab72192cce3e8cacbd93738c5b499a5debb -SHA1 (patch-src_frontend_btbookshelfdockwidget.h) = 6a1247696dda5631cf80c27f796add7eeaa81e9e -SHA1 (patch-src_frontend_btbookshelfwidget.h) = 9fba4f108b2c8f8d42189ed2137d29dda07a8138 -SHA1 (patch-src_frontend_btmodulechooserdialog.h) = 76f36c4d08db9f4b5b7998ac31f40c99e721f893 -SHA1 (patch-src_frontend_cmdiarea.h) = 4502ed7bdc49151ec647f773f297a67d6dabf452 -SHA1 (patch-src_frontend_display_modelview_btquickwidget.cpp) = b3d9d951c7a9faccf7c06d0bcbbe54eeffe97920 -SHA1 (patch-src_frontend_displaywindow_creadwindow.cpp) = ea94b0ab713ea26c76cb20699e9e143bbaeabeeb -SHA1 (patch-src_frontend_edittextwizard_btedittextwizard.h) = 0cf50c1fbb6f890d783fd930588b2a81bfce342d -SHA1 (patch-src_frontend_keychooser_cbookkeychooser.cpp) = b0d05e8d8ab1b7c8cf9d5c22c3ba6c05aaf7da6d -SHA1 (patch-src_frontend_keychooser_ckeychooserwidget.cpp) = 749f7af4f11173f726092a1e58d1231eacdb5687 -SHA1 (patch-src_frontend_keychooser_cscrollerwidgetset.cpp) = 9826fbf4d0b6cc1594a9aa657e48c45aec3412b9 -SHA1 (patch-src_frontend_keychooser_versekeychooser_btdropdownchooserbutton.cpp) = 171c04ade434617809970abfc1c9feabeee81bde -SHA1 (patch-src_frontend_searchdialog_btsearchmodulechooserdialog.h) = 27d86c92713cdd795093b7538b1caea06451964d -SHA1 (patch-src_frontend_settingsdialogs_btconfigdialog.h) = ab3c000becf4b4c361741013998d76982e2f48ee +BLAKE2s (bibletime-3.0.3.tar.xz) = d006e68fb09ceefbc74f4a117f61d7afdfea4c2a62ad5d1753160cff559e9758 +SHA512 (bibletime-3.0.3.tar.xz) = 553549b39bf3341dbf310908b24db246d88ba01524d424de14ece35c12160565185547fc0250fe8bb248a32d8a012b99afbc022d9a513dcc916c3e8089f72090 +Size (bibletime-3.0.3.tar.xz) = 1620012 bytes +SHA1 (patch-cmake_BTApplication.cmake) = af3c0f0ec15c0cdfef9e0f2af2ce71d8ca18a07e Index: pkgsrc/misc/bibletime/patches/patch-cmake_BTApplication.cmake diff -u pkgsrc/misc/bibletime/patches/patch-cmake_BTApplication.cmake:1.1 pkgsrc/misc/bibletime/patches/patch-cmake_BTApplication.cmake:1.2 --- pkgsrc/misc/bibletime/patches/patch-cmake_BTApplication.cmake:1.1 Fri Dec 4 12:17:58 2020 +++ pkgsrc/misc/bibletime/patches/patch-cmake_BTApplication.cmake Thu Oct 20 15:49:12 2022 @@ -1,20 +1,51 @@ -$NetBSD: patch-cmake_BTApplication.cmake,v 1.1 2020/12/04 12:17:58 nros Exp $ +$NetBSD: patch-cmake_BTApplication.cmake,v 1.2 2022/10/20 15:49:12 nros Exp $ -* don't install DisplayView.qml in bin - taken from upstream https://github.com/bibletime/bibletime/commit/7700e93a345c202cd45cd4e72b77feb64fe33b80 +* Treat apple like other unix-like systems ---- cmake/BTApplication.cmake.orig 2020-08-02 18:32:25.000000000 +0000 +--- cmake/BTApplication.cmake.orig 2022-10-20 15:46:45.872225854 +0000 +++ cmake/BTApplication.cmake -@@ -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") +@@ -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() - INSTALL(FILES "src/frontend/display/modelview/DisplayView.qml" -- DESTINATION "${BT_BINDIR}/") -+ DESTINATION "${BT_DATAROOTDIR}/bibletime/qml") + 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() - FILE(GLOB INSTALL_TMPL_LIST --_----------=_1666280952100960--