Hello community, here is the log from the commit of package bibletime for openSUSE:Factory checked in at 2013-05-13 14:42:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bibletime (Old) and /work/SRC/openSUSE:Factory/.bibletime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bibletime" Changes: -------- --- /work/SRC/openSUSE:Factory/bibletime/bibletime.changes 2013-01-17 13:18:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bibletime.new/bibletime.changes 2013-05-13 14:42:57.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 3 23:34:36 UTC 2013 - [email protected] + +- Added fix-movetoanchor-for-qt5.patch, fixes non visible text when + used with libQtWebkit 2.3 + +------------------------------------------------------------------- New: ---- fix-movetoanchor-for-qt5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bibletime.spec ++++++ --- /var/tmp/diff_new_pack.ouAfNU/_old 2013-05-13 14:42:58.000000000 +0200 +++ /var/tmp/diff_new_pack.ouAfNU/_new 2013-05-13 14:42:59.000000000 +0200 @@ -1,6 +1,7 @@ # # spec file for package bibletime # +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 Lars Vogdt # # All modifications and additions to the file contributed by third parties @@ -15,24 +16,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: bibletime Version: 2.9.1 -Release: 1 -License: GPL-2.0+ +Release: 0 Summary: An easy to use Bible study tool -Url: http://www.bibletime.info/ +License: GPL-2.0+ Group: Productivity/Scientific/Other +Url: http://www.bibletime.info/ Source0: %name-%version.tar.bz2 Source1: %{name}.xpm Source2: bibletime-rpmlintrc +# PATCH-FIX-UPSTREAM fix-movetoanchor-for-qt5.patch -- fixes no text visible in bibletime's main window when used with libQtWebkit 2.3 +Patch0: fix-movetoanchor-for-qt5.patch BuildRequires: boost-devel BuildRequires: cmake BuildRequires: curl-devel BuildRequires: libqt4-devel BuildRequires: sword-devel Provides: %{name}-i18n = %version -Obsoletes: %{name}-i18n < 1.7 Obsoletes: %{name}-devel < 1.7 +Obsoletes: %{name}-i18n < 1.7 Provides: %{name}-devel = %version Provides: sword-frontend # @@ -87,6 +91,7 @@ %prep %setup -q +%patch0 -p1 %build mkdir build ++++++ fix-movetoanchor-for-qt5.patch ++++++ >From fa3625f7b85f6ab5510914ab97e8ea231c252175 Mon Sep 17 00:00:00 2001 From: Gary Holmlund <gary@holmlundg.(none)> Date: Sun, 16 Dec 2012 18:30:14 -0800 Subject: [PATCH 091/133] Fix moveToAnchor for Qt5 --- src/frontend/display/bthtmlreaddisplay.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/frontend/display/bthtmlreaddisplay.cpp b/src/frontend/display/bthtmlreaddisplay.cpp index 5cb69fb..433cec4 100644 --- a/src/frontend/display/bthtmlreaddisplay.cpp +++ b/src/frontend/display/bthtmlreaddisplay.cpp @@ -247,7 +247,11 @@ void BtHtmlReadDisplay::selectAll() { // Scroll QWebView to the correct location as specified by the anchor void BtHtmlReadDisplay::moveToAnchor( const QString& anchor ) { +#if QT_VERSION >= 0x040700 + mainFrame()->scrollToAnchor(anchor); +#else slotGoToAnchor(anchor); +#endif } // Scroll the QWebView to the correct location specified by anchor -- 1.8.1.4 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
