[bibletime] No text visible in main window when using qtwebkit-2.3 (#952390)
Rex Dieter
rdieter at fedoraproject.org
Fri Apr 19 13:02:47 UTC 2013
commit c31935162091f49f699430a2cb61164e334fad33
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Fri Apr 19 08:02:35 2013 -0500
No text visible in main window when using qtwebkit-2.3 (#952390)
0091-Fix-moveToAnchor-for-Qt5.patch | 28 ++++++++++++++++++++++++++++
bibletime.spec | 11 ++++++++++-
2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/0091-Fix-moveToAnchor-for-Qt5.patch b/0091-Fix-moveToAnchor-for-Qt5.patch
new file mode 100644
index 0000000..429fb71
--- /dev/null
+++ b/0091-Fix-moveToAnchor-for-Qt5.patch
@@ -0,0 +1,28 @@
+From fa3625f7b85f6ab5510914ab97e8ea231c252175 Mon Sep 17 00:00:00 2001
+From: Gary Holmlund <gary at 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
+
diff --git a/bibletime.spec b/bibletime.spec
index c0ac341..8ea3257 100644
--- a/bibletime.spec
+++ b/bibletime.spec
@@ -1,7 +1,7 @@
Summary: An easy to use Bible study tool
Name: bibletime
Version: 2.9.1
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2
Url: http://www.bibletime.info/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -24,6 +24,10 @@ Patch50: bibletime-2.9.1-dt_validate.patch
# smarter (with at least some pkgconfig hints)
Patch51: bibletime-2.9.1-reduce_linking.patch
+## upstream patches
+# fixes display problems using qtwebkit-2.3+
+Patch0091: 0091-Fix-moveToAnchor-for-Qt5.patch
+
%description
BibleTime is a free and easy to use cross-platform bible study tool.
@@ -37,6 +41,8 @@ BibleTime is a frontend for the SWORD Bible Framework.
%patch50 -p1 -b .dt_validate
%patch51 -p1 -b .reduce_linking
+%patch0091 -p1 -b .0091
+
%build
mkdir -p %{_target_platform}
@@ -85,6 +91,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/bibletime.desktop
%doc ChangeLog README LICENSE
%changelog
+* Fri Apr 19 2013 Rex Dieter <rdieter at fedoraproject.org> 2.9.1-6
+- No text visible in main window when using qtwebkit-2.3 (#952390)
+
* Thu Apr 18 2013 Rex Dieter <rdieter at fedoraproject.org> - 2.9.1-5
- clean .spec of deprecated tags (Group, %%clean, %%defattr)
- use %%cmake macro
More information about the scm-commits
mailing list