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.

23 files changed, 130 insertions, 360 deletions

diff --git a/misc/bibletime/Makefile b/misc/bibletime/Makefile
index a2370918b66..11accca6da0 100644
--- a/misc/bibletime/Makefile
+++ b/misc/bibletime/Makefile
@@ -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"
diff --git a/misc/bibletime/PLIST b/misc/bibletime/PLIST
index bcbdd63cde1..974fc78646a 100644
--- a/misc/bibletime/PLIST
+++ b/misc/bibletime/PLIST
@@ -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.qm
 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.qm
 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/ss_mainterms.png
 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-rules-normal.html
 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
diff --git a/misc/bibletime/distinfo b/misc/bibletime/distinfo
index 71e15789648..9c8eeaa2c8d 100644
--- a/misc/bibletime/distinfo
+++ b/misc/bibletime/distinfo
@@ -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
diff --git a/misc/bibletime/patches/patch-cmake_BTApplication.cmake b/misc/bibletime/patches/patch-cmake_BTApplication.cmake
index d14f48cd7ca..39b048fe158 100644
--- a/misc/bibletime/patches/patch-cmake_BTApplication.cmake
+++ b/misc/bibletime/patches/patch-cmake_BTApplication.cmake
@@ -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
diff --git a/misc/bibletime/patches/patch-src_backend_bookshelfmodel_btbookshelftreemodel.cpp b/misc/bibletime/patches/patch-src_backend_bookshelfmodel_btbookshelftreemodel.cpp
deleted file mode 100644
index 4e0e6a9140c..00000000000
--- a/misc/bibletime/patches/patch-src_backend_bookshelfmodel_btbookshelftreemodel.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_backend_bookshelfmodel_btbookshelftreemodel.cpp,v 1.1 2020/12/04 12:17:58 nros Exp $
-
-* remove deprecation warning
- taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
-
---- src/backend/bookshelfmodel/btbookshelftreemodel.cpp.orig	2020-08-02 18:32:25.000000000 +0000
-+++ src/backend/bookshelfmodel/btbookshelftreemodel.cpp
-@@ -214,7 +214,7 @@ bool BtBookshelfTreeModel::setData(const
- 
- Qt::ItemFlags BtBookshelfTreeModel::flags(const QModelIndex & index) const {
-     if (!index.isValid())
--        return nullptr;
-+        return Qt::ItemFlags();
- 
-     Qt::ItemFlags f(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
- 
diff --git a/misc/bibletime/patches/patch-src_backend_managers_clanguagemgr.h b/misc/bibletime/patches/patch-src_backend_managers_clanguagemgr.h
deleted file mode 100644
index aa7643801b9..00000000000
--- a/misc/bibletime/patches/patch-src_backend_managers_clanguagemgr.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_backend_managers_clanguagemgr.h,v 1.1 2020/12/04 12:17:58 nros Exp $
-
-* remove deprecation warning
- taken from upstream https://github.com/bibletime/bibletime/commit/72adbba869a14be47967d7e5d877d0e7c49f0375
-
---- src/backend/managers/clanguagemgr.h.orig	2020-08-02 18:32:25.000000000 +0000
-+++ src/backend/managers/clanguagemgr.h
-@@ -163,7 +163,7 @@ class CLanguageMgr {
-     private:
-         void init();
-         inline const QStringList makeStringList(const QString& abbrevs) {
--            return abbrevs.split( ";", QString::KeepEmptyParts, Qt::CaseSensitive );
-+            return abbrevs.split( ";", Qt::KeepEmptyParts, Qt::CaseSensitive );
-         }
- 
-         Language m_defaultLanguage;
diff --git a/misc/bibletime/patches/patch-src_frontend_bibletime.cpp b/misc/bibletime/patches/patch-src_frontend_bibletime.cpp
deleted file mode 100644
index 09d10ef49ec..00000000000
--- a/misc/bibletime/patches/patch-src_frontend_bibletime.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_frontend_bibletime.cpp,v 1.1 2020/12/04 12:17:58 nros Exp $
-
-* remove deprecation warning
- taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
-
---- src/frontend/bibletime.cpp.orig	2020-08-02 18:32:25.000000000 +0000
-+++ src/frontend/bibletime.cpp
-@@ -92,7 +92,7 @@ BibleTime::BibleTime(QWidget *parent, Qt
-         if (!pm.load(splashImage)) {
-             qWarning("Can't load startuplogo! Check your installation.");
-         }
--        splash = new QSplashScreen(this, pm);
-+        splash = new QSplashScreen(pm);
-         splash->setAttribute(Qt::WA_DeleteOnClose);
-         splash->finish(this);
-         splash->showMessage(splashHtml.arg(tr("Initializing the SWORD engine...")),
diff --git a/misc/bibletime/patches/patch-src_frontend_bibletime.h b/misc/bibletime/patches/patch-src_frontend_bibletime.h
deleted file mode 100644
index 4adc2692d00..00000000000
--- a/misc/bibletime/patches/patch-src_frontend_bibletime.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_frontend_bibletime.h,v 1.1 2020/12/04 12:17:58 nros Exp $
-
-* remove deprecation warning
- taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
-
---- src/frontend/bibletime.h.orig	2020-08-02 18:32:25.000000000 +0000
-+++ src/frontend/bibletime.h
-@@ -138,7 +138,7 @@ class BibleTime : public QMainWindow {
- 
-     public:
- 
--        BibleTime(QWidget *parent = nullptr, Qt::WindowFlags flags = nullptr);
-+        BibleTime(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());
- 
-         ~BibleTime() override;
- 
diff --git a/misc/bibletime/patches/patch-src_frontend_bookshelfwizard_btbookshelfwizard.h b/misc/bibletime/patches/patch-src_frontend_bookshelfwizard_btbookshelfwizard.h
deleted file mode 100644
index e14e8f1b1c9..00000000000
--- a/misc/bibletime/patches/patch-src_frontend_bookshelfwizard_btbookshelfwizard.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_frontend_bookshelfwizard_btbookshelfwizard.h,v 1.1 2020/12/04 12:17:58 nros Exp $
-
-* remove deprecation warning
- taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
-
---- src/frontend/bookshelfwizard/btbookshelfwizard.h.orig	2020-08-02 18:32:25.000000000 +0000
-+++ src/frontend/bookshelfwizard/btbookshelfwizard.h
-@@ -38,7 +38,7 @@ class BtBookshelfWizard final: public QW
- 
- public: /* Methods: */
- 
--    BtBookshelfWizard(QWidget * parent = nullptr, Qt::WindowFlags flags = 0);
-+    BtBookshelfWizard(QWidget * parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());
- 
-     QStringList selectedSources() const;
-     QStringList selectedLanguages() const;
diff --git a/misc/bibletime/patches/patch-src_frontend_btaboutmoduledialog.h b/misc/bibletime/patches/patch-src_frontend_btaboutmoduledialog.h
deleted file mode 100644
index 977b25e00b0..00000000000
--- a/misc/bibletime/patches/patch-src_frontend_btaboutmoduledialog.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_frontend_btaboutmoduledialog.h,v 1.1 2020/12/04 12:17:58 nros Exp $
-
-* remove deprecation warning
- taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
-
---- src/frontend/btaboutmoduledialog.h.orig	2020-08-02 18:32:25.000000000 +0000
-+++ src/frontend/btaboutmoduledialog.h
-@@ -31,7 +31,7 @@ class BTAboutModuleDialog: public QDialo
- 
-         BTAboutModuleDialog(const CSwordModuleInfo *moduleInfo,
-                             QWidget *parent = nullptr,
--                            Qt::WindowFlags flags = nullptr);
-+                            Qt::WindowFlags flags = Qt::WindowFlags());
- 
-     protected: /* Methods: */
- 
diff --git a/misc/bibletime/patches/patch-src_frontend_btbookshelfdockwidget.h b/misc/bibletime/patches/patch-src_frontend_btbookshelfdockwidget.h
deleted file mode 100644
index f97d516cbe4..00000000000
--- a/misc/bibletime/patches/patch-src_frontend_btbookshelfdockwidget.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_frontend_btbookshelfdockwidget.h,v 1.1 2020/12/04 12:17:58 nros Exp $
-
-* remove deprecation warning
- taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
-
---- src/frontend/btbookshelfdockwidget.h.orig	2020-08-02 18:32:25.000000000 +0000
-+++ src/frontend/btbookshelfdockwidget.h
-@@ -29,7 +29,7 @@ class QStackedWidget;
- class BtBookshelfDockWidget: public QDockWidget {
-         Q_OBJECT
-     public:
--        BtBookshelfDockWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
-+        BtBookshelfDockWidget(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
- 
-         static inline BtBookshelfDockWidget *getInstance() { return m_instance; }
- 
diff --git a/misc/bibletime/patches/patch-src_frontend_btbookshelfwidget.h b/misc/bibletime/patches/patch-src_frontend_btbookshelfwidget.h
deleted file mode 100644
index ad17adc6222..00000000000
--- a/misc/bibletime/patches/patch-src_frontend_btbookshelfwidget.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_frontend_btbookshelfwidget.h,v 1.1 2020/12/04 12:17:58 nros Exp $
-
-* remove deprecation warning
- taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
-
---- src/frontend/btbookshelfwidget.h.orig	2020-08-02 18:32:25.000000000 +0000
-+++ src/frontend/btbookshelfwidget.h
-@@ -34,7 +34,7 @@ class QToolButton;
- class BtBookshelfWidget: public QWidget {
-     Q_OBJECT
-     public:
--        explicit BtBookshelfWidget(QWidget *parent = nullptr, Qt::WindowFlags flags = nullptr);
-+        explicit BtBookshelfWidget(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());
- 
-         void setSourceModel(QAbstractItemModel *model);
- 
diff --git a/misc/bibletime/patches/patch-src_frontend_btmodulechooserdialog.h b/misc/bibletime/patches/patch-src_frontend_btmodulechooserdialog.h
deleted file mode 100644
index 3799b11d9df..00000000000
--- a/misc/bibletime/patches/patch-src_frontend_btmodulechooserdialog.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_frontend_btmodulechooserdialog.h,v 1.1 2020/12/04 12:17:58 nros Exp $
-
-* remove deprecation warning
- taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
-
---- src/frontend/btmodulechooserdialog.h.orig	2020-08-02 18:32:25.000000000 +0000
-+++ src/frontend/btmodulechooserdialog.h
-@@ -26,7 +26,7 @@ class BtModuleChooserDialog : public QDi
-     Q_OBJECT
- 
-     protected:
--        explicit BtModuleChooserDialog(QWidget *parent = nullptr, Qt::WindowFlags flags = nullptr);
-+        explicit BtModuleChooserDialog(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());
- 
-         void retranslateUi();
- 
diff --git a/misc/bibletime/patches/patch-src_frontend_cmdiarea.h b/misc/bibletime/patches/patch-src_frontend_cmdiarea.h
deleted file mode 100644
index 35fa7719179..00000000000
--- a/misc/bibletime/patches/patch-src_frontend_cmdiarea.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_frontend_cmdiarea.h,v 1.1 2020/12/04 12:17:58 nros Exp $
-
-* remove deprecation warning
- taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
-
---- src/frontend/cmdiarea.h.orig	2020-08-02 18:32:25.000000000 +0000
-+++ src/frontend/cmdiarea.h
-@@ -55,7 +55,7 @@ class CMDIArea: public QMdiArea {
-           Reimplementation of QMdiArea::addSubWindow().
-         */
-         QMdiSubWindow * addSubWindow(QWidget * widget,
--                                     Qt::WindowFlags windowFlags = nullptr);
-+                                     Qt::WindowFlags windowFlags = Qt::WindowFlags());
- 
-         /**
-           Returns the BibleTime main window
diff --git a/misc/bibletime/patches/patch-src_frontend_display_modelview_btquickwidget.cpp b/misc/bibletime/patches/patch-src_frontend_display_modelview_btquickwidget.cpp
deleted file mode 100644
index bec87940d8e..00000000000
--- a/misc/bibletime/patches/patch-src_frontend_display_modelview_btquickwidget.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_frontend_display_modelview_btquickwidget.cpp,v 1.1 2020/12/04 12:17:58 nros Exp $
-
-* don't install DisplayView.qml in bin
- taken from upstream https://github.com/bibletime/bibletime/commit/7700e93a345c202cd45cd4e72b77feb64fe33b80
-
---- src/frontend/display/modelview/btquickwidget.cpp.orig	2020-08-02 18:32:25.000000000 +0000
-+++ src/frontend/display/modelview/btquickwidget.cpp
-@@ -36,7 +36,7 @@ BtQuickWidget::BtQuickWidget(BtQmlScroll
-     setAcceptDrops(true);
- 
-     namespace DU = util::directory;
--    QString qmlFile = QCoreApplication::applicationDirPath() + "/" + "DisplayView.qml";
-+    QString qmlFile = QCoreApplication::applicationDirPath() + "/../share/bibletime/qml/" + "DisplayView.qml";
-     setSource(QUrl::fromLocalFile(qmlFile));
-     setupScrollTimer();
- }
diff --git a/misc/bibletime/patches/patch-src_frontend_displaywindow_creadwindow.cpp b/misc/bibletime/patches/patch-src_frontend_displaywindow_creadwindow.cpp
deleted file mode 100644
index 9ef134c6488..00000000000
--- a/misc/bibletime/patches/patch-src_frontend_displaywindow_creadwindow.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_frontend_displaywindow_creadwindow.cpp,v 1.1 2020/12/04 12:17:58 nros Exp $
-
-* remove deprecation warning
- taken from upstream https://github.com/bibletime/bibletime/commit/72adbba869a14be47967d7e5d877d0e7c49f0375
-
---- src/frontend/displaywindow/creadwindow.cpp.orig	2020-08-02 18:32:25.000000000 +0000
-+++ src/frontend/displaywindow/creadwindow.cpp
-@@ -120,7 +120,7 @@ void CReadWindow::openSearchStrongsDialo
-     Q_FOREACH(QString const & strongNumber,
-               displayWidget()->getCurrentNodeInfo().split(
-                   '|',
--                  QString::SkipEmptyParts))
-+                  Qt::SkipEmptyParts))
-         searchText.append("strong:").append(strongNumber).append(' ');
-     Search::CSearchDialog::openDialog(modules(), searchText, nullptr);
- }
diff --git a/misc/bibletime/patches/patch-src_frontend_edittextwizard_btedittextwizard.h b/misc/bibletime/patches/patch-src_frontend_edittextwizard_btedittextwizard.h
deleted file mode 100644
index 5cb608a1232..00000000000
--- a/misc/bibletime/patches/patch-src_frontend_edittextwizard_btedittextwizard.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_frontend_edittextwizard_btedittextwizard.h,v 1.1 2020/12/04 12:17:58 nros Exp $
-
-* remove deprecation warning
- taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
-
---- src/frontend/edittextwizard/btedittextwizard.h.orig	2020-08-02 18:32:25.000000000 +0000
-+++ src/frontend/edittextwizard/btedittextwizard.h
-@@ -26,7 +26,7 @@ class BtEditTextWizard final: public QWi
- 
- public: /* Methods: */
- 
--    BtEditTextWizard(QWidget * parent = nullptr, Qt::WindowFlags flags = 0);
-+    BtEditTextWizard(QWidget * parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());
- 
-     bool htmlMode() const;
-     void setFont(const QFont& font);
diff --git a/misc/bibletime/patches/patch-src_frontend_keychooser_cbookkeychooser.cpp b/misc/bibletime/patches/patch-src_frontend_keychooser_cbookkeychooser.cpp
deleted file mode 100644
index edba6e26f4a..00000000000
--- a/misc/bibletime/patches/patch-src_frontend_keychooser_cbookkeychooser.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_frontend_keychooser_cbookkeychooser.cpp,v 1.1 2020/12/04 12:17:58 nros Exp $
-
-* remove deprecation warning
- taken from upstream https://github.com/bibletime/bibletime/commit/72adbba869a14be47967d7e5d877d0e7c49f0375
-
---- src/frontend/keychooser/cbookkeychooser.cpp.orig	2020-08-02 18:32:25.000000000 +0000
-+++ src/frontend/keychooser/cbookkeychooser.cpp
-@@ -66,7 +66,7 @@ void CBookKeyChooser::setKey(CSwordKey *
- 
-     QStringList siblings; // Split up key
-     if (m_key && !oldKey.isEmpty())
--        siblings = oldKey.split('/', QString::SkipEmptyParts);
-+        siblings = oldKey.split('/', Qt::SkipEmptyParts);
- 
-     int depth = 0;
- 
diff --git a/misc/bibletime/patches/patch-src_frontend_keychooser_ckeychooserwidget.cpp b/misc/bibletime/patches/patch-src_frontend_keychooser_ckeychooserwidget.cpp
deleted file mode 100644
index 0fedda391ef..00000000000
--- a/misc/bibletime/patches/patch-src_frontend_keychooser_ckeychooserwidget.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-src_frontend_keychooser_ckeychooserwidget.cpp,v 1.1 2020/12/04 12:17:58 nros Exp $
-
-* remove deprecation warning
- taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
-
---- src/frontend/keychooser/ckeychooserwidget.cpp.orig	2020-08-02 18:32:25.000000000 +0000
-+++ src/frontend/keychooser/ckeychooserwidget.cpp
-@@ -67,17 +67,17 @@ bool CKCComboBox::eventFilter(QObject * 
-             return false;
- 
-         if (f->reason() == Qt::ActiveWindowFocusReason) {
--            emit activated(currentText());
-+            emit textActivated(currentText());
-             return false;
-         }
- 
-         if (f->reason() == Qt::MouseFocusReason) {
--            emit activated(currentText());
-+            emit textActivated(currentText());
-             return false;
-         }
- 
-         if (o == this) {
--            emit activated(currentText());
-+            emit textActivated(currentText());
-             return false;
-         }
-     }
diff --git a/misc/bibletime/patches/patch-src_frontend_keychooser_cscrollerwidgetset.cpp b/misc/bibletime/patches/patch-src_frontend_keychooser_cscrollerwidgetset.cpp
deleted file mode 100644
index 639d0af3ae7..00000000000
--- a/misc/bibletime/patches/patch-src_frontend_keychooser_cscrollerwidgetset.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_frontend_keychooser_cscrollerwidgetset.cpp,v 1.1 2020/12/04 12:17:58 nros Exp $
-
-* remove deprecation warning
- taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
-
---- src/frontend/keychooser/cscrollerwidgetset.cpp.orig	2020-08-02 18:32:25.000000000 +0000
-+++ src/frontend/keychooser/cscrollerwidgetset.cpp
-@@ -75,7 +75,7 @@ void CScrollerWidgetSet::setToolTips(con
- 
- 
- void CScrollerWidgetSet::wheelEvent(QWheelEvent * e) {
--    int const delta = e->delta();
-+    int const delta = e->angleDelta().y();
-     if (delta == 0) {
-         e->ignore();
-     } else {
diff --git a/misc/bibletime/patches/patch-src_frontend_keychooser_versekeychooser_btdropdownchooserbutton.cpp b/misc/bibletime/patches/patch-src_frontend_keychooser_versekeychooser_btdropdownchooserbutton.cpp
deleted file mode 100644
index 722f1de44e3..00000000000
--- a/misc/bibletime/patches/patch-src_frontend_keychooser_versekeychooser_btdropdownchooserbutton.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_frontend_keychooser_versekeychooser_btdropdownchooserbutton.cpp,v 1.1 2020/12/04 12:17:59 nros Exp $
-
-* remove deprecation warning
- taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
-
---- src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp.orig	2020-08-02 18:32:25.000000000 +0000
-+++ src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp
-@@ -49,7 +49,7 @@ void BtDropdownChooserButton::mousePress
- }
- 
- void BtDropdownChooserButton::wheelEvent(QWheelEvent * e) {
--    int const delta = e->delta();
-+    int const delta = e->angleDelta().y();
-     if (delta == 0) {
-         e->ignore();
-     } else {
diff --git a/misc/bibletime/patches/patch-src_frontend_searchdialog_btsearchmodulechooserdialog.h b/misc/bibletime/patches/patch-src_frontend_searchdialog_btsearchmodulechooserdialog.h
deleted file mode 100644
index 59f7db42e35..00000000000
--- a/misc/bibletime/patches/patch-src_frontend_searchdialog_btsearchmodulechooserdialog.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_frontend_searchdialog_btsearchmodulechooserdialog.h,v 1.1 2020/12/04 12:17:59 nros Exp $
-
-* remove deprecation warning
- taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
-
---- src/frontend/searchdialog/btsearchmodulechooserdialog.h.orig	2020-11-28 18:53:24.250680326 +0000
-+++ src/frontend/searchdialog/btsearchmodulechooserdialog.h
-@@ -26,7 +26,7 @@ class BtSearchModuleChooserDialog: publi
-     Q_OBJECT
-     public:
-         BtSearchModuleChooserDialog(QWidget *parent = nullptr,
--                                    Qt::WindowFlags flags = nullptr);
-+                                    Qt::WindowFlags flags = Qt::WindowFlags());
- 
-         inline void setCheckedModules(BtConstModuleSet const & modules)
-         { bookshelfWidget()->treeModel()->setCheckedModules(modules); }
diff --git a/misc/bibletime/patches/patch-src_frontend_settingsdialogs_btconfigdialog.h b/misc/bibletime/patches/patch-src_frontend_settingsdialogs_btconfigdialog.h
deleted file mode 100644
index 3528f3208cd..00000000000
--- a/misc/bibletime/patches/patch-src_frontend_settingsdialogs_btconfigdialog.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_frontend_settingsdialogs_btconfigdialog.h,v 1.1 2020/12/04 12:17:59 nros Exp $
-
-* remove deprecation warning
- taken from upstream https://github.com/bibletime/bibletime/commit/6eb2938ed8b0244fda481c5fbfd7c00588c3d848
-
---- src/frontend/settingsdialogs/btconfigdialog.h.orig	2020-08-02 18:32:25.000000000 +0000
-+++ src/frontend/settingsdialogs/btconfigdialog.h
-@@ -72,7 +72,7 @@ public: /* Types: */
- public: /* Methods: */
- 
-     BtConfigDialog(QWidget * const parent = nullptr,
--                   Qt::WindowFlags const flags = 0);
-+                   Qt::WindowFlags const flags = Qt::WindowFlags());
- 
-     /** Adds a BtConfigPage to the paged widget stack. The new page will be the current page.*/
-     void addPage(Page * const pageWidget);