pool/bibletime
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 174477 from home:sumski:branches:Education

Browse Source 
- Added fix-movetoanchor-for-qt5.patch, fixes non visible text when
  used with libQtWebkit 2.3

OBS-URL: https://build.opensuse.org/request/show/174477
OBS-URL: https://build.opensuse.org/package/show/Education/bibletime?expand=0&rev=33
This commit is contained in:
Lars Vogdt 2013-05-08 13:13:21 +00:00 committed by Git OBS Bridge
parent 5cbc9c8224
commit 99cb2b216c
3 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bibletime.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri May 3 23:34:36 UTC 2013 - hrvoje.senjan@gmail.com
- Added fix-movetoanchor-for-qt5.patch, fixes non visible text when
used with libQtWebkit 2.3
-------------------------------------------------------------------
Sat Dec 15 23:59:15 UTC 2012 - lars@linux-schulserver.de

13
bibletime.spec
View File

@ -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 @@ write own notes, save, print etc.).
%prep
%setup -q
%patch0 -p1
%build
mkdir build

28
fix-movetoanchor-for-qt5.patch Normal file
View File

@ -0,0 +1,28 @@
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