[pkgsrc/trunk]: pkgsrc/misc/bibletime bibletime: Upgrade to 2.11.2

[kamil <kamil%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9c9d8de3764c
branches:  trunk
changeset: 416592:9c9d8de3764c
user:      kamil <kamil%pkgsrc.org@localhost>
date:      Sun Oct 27 17:11:04 2019 +0000

description:
bibletime: Upgrade to 2.11.2

Switch from qt4 to qt5. Remove the qt4 option.

CHANGELOG
=========
BibleTime 2.11.2
The BibleTime team is proud to announce the immediate availability of BibleTime version 2.11.2 which is the second bugfix release in the stable 2.11 series of BibleTime.

All users of BibleTime are encouraged to upgrade, especially users still using BibleTime version 2.10 or earlier.

Notable changes since 2.11.1:

    Updated translations.
    Improved compatibility with Qt 5.11 (including bug #140)
    Fixed crash when clicking on "full syntax" (bug #134)
    Fixed Mag not always working with Hebrew / Strongs (bug #132)
    Fixed BibleTime startup on some versions of Windows (bug #119)
    Fixed Bookshelf Wizard buttons not being translated (bug #131)
    Fixed application icon directory to match the FreeDesktop standard
    Fixed bug which prevented installing of works (bug #124)

BibleTime 2.11.1
The BibleTime team is proud to announce the immediate availability of BibleTime version 2.11.1 which is the first bugfix release in the stable 2.11 series of BibleTime.

All users of BibleTime are encouraged to upgrade, especially users still using BibleTime version 2.10 or earlier.

Notable changes since 2.11.0:

    Enhanced packaging for Windows.
    Enhanced some error messages.
    Updated translations. Thanks to all translators!.
    Improved build-time detection of Qt WebEngine.
    Fixed crash with Qt 5.9 (workaround for QTBUG-61213).
    Fixed apocryphal books not being properly displayed (#12).
    Fixed paragraphs being displayed incorrectly (#37).
    Fixed some greek dictionary modules not working in mag (#52).
    Fixed windows not starting on some Windows 7 computers (#90).
    Fixed a bug which hindered changing to second tab in Tabbed view (#91)
    Fixed Qt "More Info..." tab being blank (#92)
    Fixed crash when closing module display window with Qt 5.8 (#94)
    Fixed images not being displayed (#95).
    Fixed reloading of "All Text Windows" shortcuts not working (#102).
    Fixed problem with Save - Yes/No dialog and editing a Personal commentary (#105).

BibleTime 2.11.0
Thanks to the great mercy of our Savior and Lord, king Jesus Christ, the BibleTime team is yet again pleased to announce the immediate availability of BibleTime version 2.11.0, which is the first 
full release in the the stable 2.11 series of BibleTime.

All users of BibleTime are encouraged to upgrade, including users of the BibleTime version 2.10 series.

Notable changes since the 2.10 series:

    Redesigned bookshelf manager
    Many bugfixes and optimizations

Build requirements changes:

    A C++11 compiler is now required
    Qt 5 or later is now required
    xml-po is no longer required

BibleTime 2.11 RC 2
The BibleTime team is proud to announce the immediate availability of BibleTime version 2.11 RC 2, which is the second release candidate in the stable 2.11 series of BibleTime, with a number of bugs 
fixed since RC 1.

Notable changes since the 2.10 series:

    Many bugfixes and optimizations
    Redesigned bookshelf manager

Build requirements changes:

    A C++11 compiler is now required
    Qt 5 or later is now required
    xml-po is no longer required

BibleTime 2.11 RC 1
The BibleTime team is proud to announce the immediate availability of BibleTime version 2.11_rc1,
which is the first release candidate in the stable 2.11 series of BibleTime.

Notable changes since the 2.10 series:

    Many bug fixes and optimizations
    Redesigned bookshelf manager

Build requirements changes:

    A C++11 compiler is now required
    Qt 5 or later is now required
    xml-po is no longer required

BibleTime 2.11 beta 1
The BibleTime team is proud to announce the immediate availability of BibleTime version 2.11_beta1,
which is the first (and only) beta release in the stable 2.11 series of BibleTime.

Notable changes since the 2.10 series:

    Many bug fixes and optimizations
    Redesigned bookshelf manager

Build requirements changes:

    A C++11 compiler is now required
    Qt 5 or later is now required
    xml-po is no longer required

diffstat:

 misc/bibletime/Makefile                     |   14 ++-
 misc/bibletime/PLIST                        |  117 ++++++++++++++++++++++-----
 misc/bibletime/distinfo                     |   11 +-
 misc/bibletime/options.mk                   |   16 ---
 misc/bibletime/patches/patch-CMakeLists.txt |   84 --------------------
 5 files changed, 110 insertions(+), 132 deletions(-)

diffs (truncated from 373 to 300 lines):

diff -r 26165ddb0a26 -r 9c9d8de3764c misc/bibletime/Makefile
--- a/misc/bibletime/Makefile   Sun Oct 27 17:04:20 2019 +0000
+++ b/misc/bibletime/Makefile   Sun Oct 27 17:11:04 2019 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2019/09/18 14:17:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.40 2019/10/27 17:11:04 kamil Exp $
 
-DISTNAME=              bibletime-2.10.1
-PKGREVISION=           40
+DISTNAME=              bibletime-2.11.2
 CATEGORIES=            misc
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=bibletime/}
 EXTRACT_SUFX=          .tar.xz
@@ -24,9 +23,16 @@
 
 DEPENDS+=      dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
 
-.include "options.mk"
+CONFIGURE_DIRS=                ${WRKDIR}/build
+CMAKE_ARG_PATH=                ${WRKSRC}
+
+post-extract:
+       ${MKDIR} ${WRKDIR}/build
 
 .include "../../misc/sword/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libclucene/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
+.include "../../x11/qt5-qtwebkit/buildlink3.mk"
+.include "../../x11/qt5-qtsvg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 26165ddb0a26 -r 9c9d8de3764c misc/bibletime/PLIST
--- a/misc/bibletime/PLIST      Sun Oct 27 17:04:20 2019 +0000
+++ b/misc/bibletime/PLIST      Sun Oct 27 17:11:04 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/03/12 13:54:30 nros Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/10/27 17:11:04 kamil Exp $
 bin/bibletime
 share/applications/bibletime.desktop
 share/bibletime/display-templates/Basic.tmpl
@@ -9,49 +9,35 @@
 share/bibletime/display-templates/HighContrast.css
 share/bibletime/display-templates/Simple.css
 share/bibletime/display-templates/basic_template.txt
+share/bibletime/icons/add.svg
+share/bibletime/icons/automatically.svg
 share/bibletime/icons/back.svg
 share/bibletime/icons/bible.svg
-share/bibletime/icons/bible_add.svg
-share/bibletime/icons/bible_locked.svg
-share/bibletime/icons/bible_remove.svg
 share/bibletime/icons/bibletime.png
 share/bibletime/icons/bibletime.svg
 share/bibletime/icons/book.svg
-share/bibletime/icons/book_add.svg
-share/bibletime/icons/book_locked.svg
 share/bibletime/icons/bookmark.svg
 share/bibletime/icons/books.svg
 share/bibletime/icons/calendar.svg
 share/bibletime/icons/cascade.svg
-share/bibletime/icons/cascade_auto.svg
 share/bibletime/icons/checkbox.svg
 share/bibletime/icons/commentary.svg
-share/bibletime/icons/commentary_add.svg
-share/bibletime/icons/commentary_locked.svg
 share/bibletime/icons/configure.svg
 share/bibletime/icons/contents2.svg
-share/bibletime/icons/default.svg
+share/bibletime/icons/delete.svg
 share/bibletime/icons/dictionary.svg
 share/bibletime/icons/displayconfig.svg
-share/bibletime/icons/displaytranslit.svg
 share/bibletime/icons/document_magnifier.svg
-share/bibletime/icons/edit_clear.svg
 share/bibletime/icons/edit_clear_locationbar.svg
 share/bibletime/icons/edit_copy.svg
-share/bibletime/icons/edit_delete.svg
-share/bibletime/icons/edit_undo.svg
 share/bibletime/icons/exit.svg
 share/bibletime/icons/export.svg
 share/bibletime/icons/file_save.svg
 share/bibletime/icons/fileclose.svg
-share/bibletime/icons/fileprint.svg
 share/bibletime/icons/find.svg
 share/bibletime/icons/flag.svg
-share/bibletime/icons/folder-new.svg
 share/bibletime/icons/folder-open.svg
 share/bibletime/icons/folder.svg
-share/bibletime/icons/folder_new.svg
-share/bibletime/icons/fontconfig.svg
 share/bibletime/icons/fonts.svg
 share/bibletime/icons/forward.svg
 share/bibletime/icons/import.svg
@@ -59,9 +45,9 @@
 share/bibletime/icons/key_bindings.svg
 share/bibletime/icons/layer-visible-on.svg
 share/bibletime/icons/lexicon.svg
-share/bibletime/icons/lexicon_add.svg
-share/bibletime/icons/lexicon_locked.svg
 share/bibletime/icons/light_bulb.svg
+share/bibletime/icons/lock.svg
+share/bibletime/icons/manual.svg
 share/bibletime/icons/map.svg
 share/bibletime/icons/pencil.svg
 share/bibletime/icons/plus.svg
@@ -70,6 +56,7 @@
 share/bibletime/icons/questionable.svg
 share/bibletime/icons/questionmark.svg
 share/bibletime/icons/refresh.svg
+share/bibletime/icons/remove.svg
 share/bibletime/icons/startconfig.svg
 share/bibletime/icons/stop.svg
 share/bibletime/icons/swordconfig.svg
@@ -82,7 +69,6 @@
 share/bibletime/icons/text_rightalign.svg
 share/bibletime/icons/text_under.svg
 share/bibletime/icons/tile.svg
-share/bibletime/icons/tile_auto.svg
 share/bibletime/icons/tile_horiz.svg
 share/bibletime/icons/tile_vert.svg
 share/bibletime/icons/trash.svg
@@ -95,20 +81,37 @@
 share/bibletime/javascript/bthtml.js
 share/bibletime/license/license.html
 share/bibletime/locale/bibletime_ui_ar.qm
+share/bibletime/locale/bibletime_ui_bg.qm
+share/bibletime/locale/bibletime_ui_ceb.qm
 share/bibletime/locale/bibletime_ui_cs.qm
 share/bibletime/locale/bibletime_ui_da.qm
 share/bibletime/locale/bibletime_ui_de.qm
+share/bibletime/locale/bibletime_ui_el.qm
 share/bibletime/locale/bibletime_ui_en_GB.qm
 share/bibletime/locale/bibletime_ui_es.qm
 share/bibletime/locale/bibletime_ui_et.qm
 share/bibletime/locale/bibletime_ui_fi.qm
+share/bibletime/locale/bibletime_ui_fil_PH.qm
+share/bibletime/locale/bibletime_ui_fr.qm
 share/bibletime/locale/bibletime_ui_hu.qm
+share/bibletime/locale/bibletime_ui_hy.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
+share/bibletime/locale/bibletime_ui_my.qm
+share/bibletime/locale/bibletime_ui_nl.qm
 share/bibletime/locale/bibletime_ui_pl.qm
 share/bibletime/locale/bibletime_ui_pt.qm
 share/bibletime/locale/bibletime_ui_pt_BR.qm
 share/bibletime/locale/bibletime_ui_ru.qm
 share/bibletime/locale/bibletime_ui_sk.qm
+share/bibletime/locale/bibletime_ui_sr_RS.qm
+share/bibletime/locale/bibletime_ui_th.qm
+share/bibletime/locale/bibletime_ui_ti.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
@@ -563,6 +566,56 @@
 share/doc/bibletime/handbook/it/ss_searchanal.png
 share/doc/bibletime/handbook/it/ss_searchopts.png
 share/doc/bibletime/handbook/it/ss_shortcuts.png
+share/doc/bibletime/handbook/lt/hdbk-config.html
+share/doc/bibletime/handbook/lt/hdbk-intro.html
+share/doc/bibletime/handbook/lt/hdbk-op-bookshelfmanager.html
+share/doc/bibletime/handbook/lt/hdbk-op-output.html
+share/doc/bibletime/handbook/lt/hdbk-op-parts.html
+share/doc/bibletime/handbook/lt/hdbk-op-search.html
+share/doc/bibletime/handbook/lt/hdbk-op.html
+share/doc/bibletime/handbook/lt/hdbk-reference-shortcuts.html
+share/doc/bibletime/handbook/lt/hdbk-reference-works.html
+share/doc/bibletime/handbook/lt/hdbk-reference.html
+share/doc/bibletime/handbook/lt/hdbk-start-firstrun.html
+share/doc/bibletime/handbook/lt/hdbk-term.html
+share/doc/bibletime/handbook/lt/i_back.png
+share/doc/bibletime/handbook/lt/i_bible.png
+share/doc/bibletime/handbook/lt/i_bible_add.png
+share/doc/bibletime/handbook/lt/i_bibletime.png
+share/doc/bibletime/handbook/lt/i_book.png
+share/doc/bibletime/handbook/lt/i_book_add.png
+share/doc/bibletime/handbook/lt/i_bookmark.png
+share/doc/bibletime/handbook/lt/i_books.png
+share/doc/bibletime/handbook/lt/i_cascade.png
+share/doc/bibletime/handbook/lt/i_checkbox.png
+share/doc/bibletime/handbook/lt/i_commentary.png
+share/doc/bibletime/handbook/lt/i_commentary_add.png
+share/doc/bibletime/handbook/lt/i_configure.png
+share/doc/bibletime/handbook/lt/i_configuresword.png
+share/doc/bibletime/handbook/lt/i_contents2.png
+share/doc/bibletime/handbook/lt/i_displayconfig.png
+share/doc/bibletime/handbook/lt/i_document_magnifier.png
+share/doc/bibletime/handbook/lt/i_exit.png
+share/doc/bibletime/handbook/lt/i_fileclose.png
+share/doc/bibletime/handbook/lt/i_find.png
+share/doc/bibletime/handbook/lt/i_folder_open.png
+share/doc/bibletime/handbook/lt/i_forward.png
+share/doc/bibletime/handbook/lt/i_lexicon.png
+share/doc/bibletime/handbook/lt/i_lexicon_add.png
+share/doc/bibletime/handbook/lt/i_light_bulb.png
+share/doc/bibletime/handbook/lt/i_sync.png
+share/doc/bibletime/handbook/lt/i_tile.png
+share/doc/bibletime/handbook/lt/i_tile_horiz.png
+share/doc/bibletime/handbook/lt/i_tile_vert.png
+share/doc/bibletime/handbook/lt/i_view_index.png
+share/doc/bibletime/handbook/lt/i_view_mag.png
+share/doc/bibletime/handbook/lt/i_window_fullscreen.png
+share/doc/bibletime/handbook/lt/index.html
+share/doc/bibletime/handbook/lt/ss_configfonts.png
+share/doc/bibletime/handbook/lt/ss_mainterms.png
+share/doc/bibletime/handbook/lt/ss_searchanal.png
+share/doc/bibletime/handbook/lt/ss_searchopts.png
+share/doc/bibletime/handbook/lt/ss_shortcuts.png
 share/doc/bibletime/handbook/nl/hdbk-config.html
 share/doc/bibletime/handbook/nl/hdbk-intro.html
 share/doc/bibletime/handbook/nl/hdbk-op-bookshelfmanager.html
@@ -903,6 +956,26 @@
 share/doc/bibletime/howto/ko/h2-rules-parables.html
 share/doc/bibletime/howto/ko/h2-rules.html
 share/doc/bibletime/howto/ko/index.html
+share/doc/bibletime/howto/lt/h2-basics-approaches.html
+share/doc/bibletime/howto/lt/h2-basics-expository.html
+share/doc/bibletime/howto/lt/h2-basics-interpretation.html
+share/doc/bibletime/howto/lt/h2-basics-types.html
+share/doc/bibletime/howto/lt/h2-basics-worksheet.html
+share/doc/bibletime/howto/lt/h2-basics.html
+share/doc/bibletime/howto/lt/h2-importance-breathed.html
+share/doc/bibletime/howto/lt/h2-importance-exhortations.html
+share/doc/bibletime/howto/lt/h2-importance-liberates.html
+share/doc/bibletime/howto/lt/h2-importance-once.html
+share/doc/bibletime/howto/lt/h2-importance-supplement.html
+share/doc/bibletime/howto/lt/h2-importance-wars.html
+share/doc/bibletime/howto/lt/h2-importance-works.html
+share/doc/bibletime/howto/lt/h2-importance.html
+share/doc/bibletime/howto/lt/h2-rules-context.html
+share/doc/bibletime/howto/lt/h2-rules-hcontest.html
+share/doc/bibletime/howto/lt/h2-rules-normal.html
+share/doc/bibletime/howto/lt/h2-rules-parables.html
+share/doc/bibletime/howto/lt/h2-rules.html
+share/doc/bibletime/howto/lt/index.html
 share/doc/bibletime/howto/nl/h2-basics-approaches.html
 share/doc/bibletime/howto/nl/h2-basics-expository.html
 share/doc/bibletime/howto/nl/h2-basics-interpretation.html
@@ -963,4 +1036,4 @@
 share/doc/bibletime/howto/ru/h2-rules-parables.html
 share/doc/bibletime/howto/ru/h2-rules.html
 share/doc/bibletime/howto/ru/index.html
-share/icons/bibletime.svg
+share/icons/hicolor/scalable/apps/bibletime.svg
diff -r 26165ddb0a26 -r 9c9d8de3764c misc/bibletime/distinfo
--- a/misc/bibletime/distinfo   Sun Oct 27 17:04:20 2019 +0000
+++ b/misc/bibletime/distinfo   Sun Oct 27 17:11:04 2019 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 23:49:31 agc Exp $
+$NetBSD: distinfo,v 1.3 2019/10/27 17:11:04 kamil Exp $
 
-SHA1 (bibletime-2.10.1.tar.xz) = 94f6f98f27ccfceee88c985bc393777b6a81d3f9
-RMD160 (bibletime-2.10.1.tar.xz) = a605ce0b04a33edd48fe33caf1ac41d017aca497
-SHA512 (bibletime-2.10.1.tar.xz) = 50f84eb1aefe911f1336ec7a23ea34ade1628383f35dca25330984787221214c0bc0cbc9f88f9540336949df02e76e769b7998d2eef3a15862e3038541564cc9
-Size (bibletime-2.10.1.tar.xz) = 3252680 bytes
-SHA1 (patch-CMakeLists.txt) = a6a992a57ee51edab2e8583c6805a017a252d7b2
+SHA1 (bibletime-2.11.2.tar.xz) = 75b0a3be9f392b568bbf974d8cf59db128fa7b20
+RMD160 (bibletime-2.11.2.tar.xz) = b4df2eb0bc581f4d0a9f0e3accebaeb955dba905
+SHA512 (bibletime-2.11.2.tar.xz) = 99e2500e07797549e32ac28238c90a4db1cd98f74ea20f0161db7675127f42363006f20d859504be958bfdecf80a18a96229a1bbc105d332af97644fafc92d31
+Size (bibletime-2.11.2.tar.xz) = 2533472 bytes
diff -r 26165ddb0a26 -r 9c9d8de3764c misc/bibletime/options.mk
--- a/misc/bibletime/options.mk Sun Oct 27 17:04:20 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2015/03/12 13:54:30 nros Exp $
-
-PKG_OPTIONS_VAR=               PKG_OPTIONS.bibletime
-PKG_OPTIONS_REQUIRED_GROUPS=   qt
-PKG_OPTIONS_GROUP.qt=          qt4 qt5
-PKG_SUGGESTED_OPTIONS=         qt4
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mqt5)
-.include "../../x11/qt5-qttools/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mqt4)
-.include "../../x11/qt4-tools/buildlink3.mk"
-.include "../../x11/qt4-qdbus/buildlink3.mk"
-.endif
diff -r 26165ddb0a26 -r 9c9d8de3764c misc/bibletime/patches/patch-CMakeLists.txt
--- a/misc/bibletime/patches/patch-CMakeLists.txt       Sun Oct 27 17:04:20 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2015/03/12 13:54:30 nros Exp $
-* support in-source builds.
-* fix build with Qt5 (fixed upstream)
-* remove apple specific stuff to make it behave correct on MacOSX
---- CMakeLists.txt.orig        2014-07-05 14:29:03.000000000 +0000
-+++ CMakeLists.txt
-@@ -1,9 +1,9 @@
- PROJECT(bibletime CXX C)
- CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
- 
--IF("${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")