Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=7d0855a371a2f905053e840682ba88d2557f8014
commit 7d0855a371a2f905053e840682ba88d2557f8014
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Sat May 29 01:39:14 2010 +0200
bibletime-2.7-1-i686
- version bump
- rebuild with qt4>=4.6.2-3
- add false-is-not-qstring.patch (probably gcc-4.5 issue)
diff --git a/source/kde-extra/bibletime/FrugalBuild
b/source/kde-extra/bibletime/FrugalBuild
index 4cbfb3d..1b02db6 100644
--- a/source/kde-extra/bibletime/FrugalBuild
+++ b/source/kde-extra/bibletime/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Bence Nagy <nagybe...@tipogral.hu>
pkgname=bibletime
-pkgver=2.6
+pkgver=2.7
pkgrel=1
pkgdesc="Bible study software for KDE"
groups=('kde-extra')
@@ -11,9 +11,11 @@ archs=('i686' 'x86_64')
_F_sourceforge_ext=".tar.gz"
_F_cmake_confopts="-DUSE_QT_WEBKIT=ON"
Finclude sourceforge cmake
-depends=('sword>=1.6.0' 'libqtdbus' 'libqtgui' 'libqtscript' 'libqtwebkit'
'qt4-linguist' 'libqttest' 'clucene')
+source=($source false-is-not-qstring.patch)
+depends=('sword>=1.6.0' 'libqtdbus>=4.6.2-3' 'libqtgui' 'libqtscript'
'libqtwebkit' 'qt4-linguist' 'libqttest' 'clucene')
makedepends=("${makedepen...@]}" 'boost')
url='http://www.bibletime.info'
# optimization OK
-sha1sums=('6f3ef0f01ca058868fadab4a72899f8d938c1272')
+sha1sums=('3d93046df4767f48f2d2889eb986065c368b96d1' \
+ 'b4545d97c42472396621b75955b82685ace71c65')
diff --git a/source/kde-extra/bibletime/false-is-not-qstring.patch
b/source/kde-extra/bibletime/false-is-not-qstring.patch
new file mode 100644
index 0000000..c1b0e43
--- /dev/null
+++ b/source/kde-extra/bibletime/false-is-not-qstring.patch
@@ -0,0 +1,13 @@
+diff --git a/src/backend/config/cbtconfig.cpp
b/src/backend/config/cbtconfig.cpp
+index 733a654..70f7280 100644
+--- a/src/backend/config/cbtconfig.cpp
++++ b/src/backend/config/cbtconfig.cpp
+@@ -129,7 +129,7 @@ QString getKey(const bools ID) {
+ return "showToolbarsInEachWindow";
+ }
+ Q_ASSERT(false);
+- return false;
++ return NULL;
+ }
+
+ QString getKey(const ints ID) {
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
