Hello community, here is the log from the commit of package bibletime for openSUSE:Factory checked in at 2020-09-07 21:34:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bibletime (Old) and /work/SRC/openSUSE:Factory/.bibletime.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bibletime" Mon Sep 7 21:34:56 2020 rev:16 rq:832678 version:3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/bibletime/bibletime.changes 2019-11-19 12:59:13.338137966 +0100 +++ /work/SRC/openSUSE:Factory/.bibletime.new.3399/bibletime.changes 2020-09-07 21:35:08.953375011 +0200 @@ -1,0 +2,34 @@ +Sun Aug 30 19:45:45 UTC 2020 - Cor Blom <corne...@solcon.nl> + +- Update to 3.0: + 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. +- Add displayview.patch + +------------------------------------------------------------------- Old: ---- bibletime-2.11.2.tar.xz New: ---- bibletime-3.0.tar.xz displayview.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bibletime.spec ++++++ --- /var/tmp/diff_new_pack.DMLVsr/_old 2020-09-07 21:35:12.397376607 +0200 +++ /var/tmp/diff_new_pack.DMLVsr/_new 2020-09-07 21:35:12.401376608 +0200 @@ -1,7 +1,7 @@ # # spec file for package bibletime # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2012-2014 Lars Vogdt # # All modifications and additions to the file contributed by third parties @@ -18,14 +18,16 @@ Name: bibletime -Version: 2.11.2 +Version: 3.0 Release: 0 Summary: A Bible study tool License: GPL-2.0-or-later Group: Productivity/Scientific/Other -Url: http://www.bibletime.info/ +URL: http://www.bibletime.info/ Source0: https://github.com/bibletime/bibletime/releases/download/v%{version}/bibletime-%{version}.tar.xz Source1: bibletime-rpmlintrc +# PATCH-FIX-UPSTREAM: Fix bug #260 Move DisplayView.qml to share/bibletime/qml +Patch0: displayview.patch BuildRequires: cmake BuildRequires: curl-devel BuildRequires: fdupes @@ -42,6 +44,11 @@ BuildRequires: cmake(Qt5Xml) BuildRequires: pkgconfig(libclucene-core) BuildRequires: pkgconfig(sword) >= 1.7 +# Dependencies for building documentation +BuildRequires: docbook-xsl-stylesheets +BuildRequires: fop +BuildRequires: libxslt-tools +BuildRequires: po4a Recommends: sword-bible Recommends: sword-commentary %if 0%{?suse_version} > 1325 @@ -63,29 +70,32 @@ %prep %setup -q +%patch0 -p1 %build %cmake \ - -Wno-dev + -DCMAKE_BUILD_TYPE=Release \ + -DBT_DOCBOOK_XSL_HTML_CHUNK_XSL=%{_datadir}/xml/docbook/stylesheet/nwalsh/current/html/chunk.xsl \ + -DBT_DOCBOOK_XSL_PDF_DOCBOOK_XSL=%{_datadir}/xml/docbook/stylesheet/nwalsh/current/fo/docbook.xsl %cmake_build %install %cmake_install -# move the icon to a valid place (/usr/share/icons is not valid... it has to be in a theme; hicolor as the usual falback) -# this is only a link pointing out of the icons -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps -mv %{buildroot}%{_datadir}/%{name}/icons/%{name}.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg -# then link back the icon into the app directory -ln -sf %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{buildroot}%{_datadir}/%{name}/icons/%{name}.svg + %fdupes -s %{buildroot} -sed -i "s|bibletime/handbook/index.html|bibletime/handbook/en/index.html|" %{buildroot}%{_datadir}/applications/%{name}.desktop -%suse_update_desktop_file -r %{name} Education Humanities + +%suse_update_desktop_file -r %{buildroot}%{_datadir}/applications/info.%{name}.BibleTime.desktop Education Humanities %files +%doc ChangeLog README.md +%license LICENSE %{_bindir}/bibletime %{_datadir}/icons/* -%{_datadir}/applications/bibletime.desktop +%{_datadir}/applications/info.%{name}.BibleTime.desktop %dir %{_datadir}/bibletime %{_datadir}/bibletime/* +%dir %{_datadir}/doc/bibletime +%{_datadir}/doc/bibletime/* +%{_datadir}/metainfo/info.bibletime.BibleTime.metainfo.xml %changelog ++++++ bibletime-2.11.2.tar.xz -> bibletime-3.0.tar.xz ++++++ ++++ 452750 lines of diff (skipped) ++++++ displayview.patch ++++++ >From 7700e93a345c202cd45cd4e72b77feb64fe33b80 Mon Sep 17 00:00:00 2001 From: Gary Holmlund <gary.holml...@gmail.com> Date: Tue, 4 Aug 2020 22:09:08 -0700 Subject: [PATCH] Fix bug #260 Move DisplayView.qml to share/bibletime/qml diff --git a/cmake/BTApplication.cmake b/cmake/BTApplication.cmake index 2ccfd4d01..b8cd4df4e 100644 --- a/cmake/BTApplication.cmake +++ b/cmake/BTApplication.cmake @@ -179,10 +179,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/Contents/share/bibletime/qml") ELSE() INSTALL(FILES "src/frontend/display/modelview/DisplayView.qml" - DESTINATION "${BT_BINDIR}/") + DESTINATION "${BT_DATAROOTDIR}/bibletime/qml") ENDIF() FILE(GLOB INSTALL_TMPL_LIST diff --git a/cmake/BTBinaryPackageMacOS.cmake b/cmake/BTBinaryPackageMacOS.cmake index 3d5b9b9c6..a5c920b43 100644 --- a/cmake/BTBinaryPackageMacOS.cmake +++ b/cmake/BTBinaryPackageMacOS.cmake @@ -13,7 +13,7 @@ IF(APPLE) SET(BT_MAC_APP "${CMAKE_INSTALL_PREFIX}/BibleTime.app") INSTALL(CODE " - EXECUTE_PROCESS(COMMAND ${QT_MACDEPLOYQT_EXECUTABLE} ${BT_MAC_APP} -qmldir=${BT_MAC_APP}/Contents/MacOS) + EXECUTE_PROCESS(COMMAND ${QT_MACDEPLOYQT_EXECUTABLE} ${BT_MAC_APP} -qmldir=${BT_MAC_APP}/Contents/share/bibletime/qml) ") ENDIF (CMAKE_BUILD_TYPE STREQUAL "Release") diff --git a/cmake/BTBinaryPackageWindows.cmake b/cmake/BTBinaryPackageWindows.cmake old mode 100644 new mode 100755 index 10c7e09bb..8fea71463 --- a/cmake/BTBinaryPackageWindows.cmake +++ b/cmake/BTBinaryPackageWindows.cmake @@ -27,7 +27,7 @@ IF(WIN32 AND NOT UNIX) FIND_PROGRAM(QT_WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${QT_BIN_DIR}") MESSAGE(STATUS "Running ${QT_WINDEPLOYQT_EXECUTABLE}") - INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${QT_WINDEPLOYQT_EXECUTABLE} \"\${CMAKE_INSTALL_PREFIX}/bin/bibletime.exe\") ") + INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${QT_WINDEPLOYQT_EXECUTABLE} -qmldir \"\${CMAKE_INSTALL_PREFIX}/share/bibletime/qml\" \"\${CMAKE_INSTALL_PREFIX}/bin/bibletime.exe\") ") IF(CMAKE_BUILD_TYPE STREQUAL "Debug") SET(ZLIB_LIBRARY ${ZLIB_LIBRARY_DEBUG}) diff --git a/src/frontend/display/modelview/btquickwidget.cpp b/src/frontend/display/modelview/btquickwidget.cpp index 2966e947a..1be24db5b 100644 --- a/src/frontend/display/modelview/btquickwidget.cpp +++ b/src/frontend/display/modelview/btquickwidget.cpp @@ -36,7 +36,7 @@ BtQuickWidget::BtQuickWidget(BtQmlScrollView* parent) 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(); }
