From: Jon Hood <squinky86@gentoo.org>
Date: Thu, 15 Jun 2006 04:52:30 +0000 (+0000)
Subject: gcc-4 patch, #136825
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ff3ae952ac329b0c4e013ee69bf5ace32ec7fed8;p=gentoo.git

gcc-4 patch, #136825
Package-Manager: portage-2.1
---

diff --git a/app-text/bibletime/ChangeLog b/app-text/bibletime/ChangeLog
index 1f1b72f8be28..057d94ca7d0c 100644
--- a/app-text/bibletime/ChangeLog
+++ b/app-text/bibletime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/bibletime
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/ChangeLog,v 1.28 2006/06/13 23:50:25 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/ChangeLog,v 1.29 2006/06/15 04:52:30 squinky86 Exp $
+
+  15 Jun 2006; Jon Hood <squinky86@gentoo.org>
+  +files/bibletime-1.6_beta2-gcc4.patch, bibletime-1.6_beta2.ebuild:
+  Add gcc-4 patch, #136825.
 
 *bibletime-1.6_beta2 (13 Jun 2006)
 
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index 9542f362b027..f14cad55f409 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,3 +1,7 @@
+AUX bibletime-1.6_beta2-gcc4.patch 729 RMD160 231210cfdeed2c3599d6120f767f82173fcb3b6b SHA1 80d3a94ae7b8588505933bfb745c6c91250ca8ea SHA256 ee41acb7269776756302abf3fe13c496c697ba8666f3a5959f187fb6e43bf9d3
+MD5 46cc1ff6abb340b1d39fa8deac97ec29 files/bibletime-1.6_beta2-gcc4.patch 729
+RMD160 231210cfdeed2c3599d6120f767f82173fcb3b6b files/bibletime-1.6_beta2-gcc4.patch 729
+SHA256 ee41acb7269776756302abf3fe13c496c697ba8666f3a5959f187fb6e43bf9d3 files/bibletime-1.6_beta2-gcc4.patch 729
 DIST bibletime-1.5.2.tar.bz2 1172884 RMD160 a6b0f5036b14aaf6074615297f5246db350ba6c1 SHA1 5ebccf35c7ed09ab18be26722df2880ed9171fc4 SHA256 ec1acca315a74f04d6b076d96eb143dcc6b317faf1fc79612f24f3abca38afbf
 DIST bibletime-1.5.3.tar.bz2 1172436 RMD160 3effb93a81bf6773deff8b11afb5eca6d0192fcb SHA1 580093c6d7968f668b04a78a477f21cb01e0a252 SHA256 95a868a18b85ffb9f52671c3e2cb386ef09a0ca9651a78e929cb88a35b0b6aa5
 DIST bibletime-1.6beta2.tar.bz2 1200407 RMD160 742a5e3f5809a06ca93672001063be276183622b SHA1 a0ed0a85107c56552204eac8b280e41cabea125d SHA256 333644309e4fd03282430137c27a2f134a5b110b7c9829356a81d7576e203867
@@ -11,14 +15,14 @@ EBUILD bibletime-1.5.3.ebuild 2129 RMD160 a9eb213fc6fe99b6199f315cac3653ac4f8bf5
 MD5 c6d51f764de2ca5e05fbc4b1ce55c6f1 bibletime-1.5.3.ebuild 2129
 RMD160 a9eb213fc6fe99b6199f315cac3653ac4f8bf560 bibletime-1.5.3.ebuild 2129
 SHA256 dd04f04bd6b8b2490f65ae9f9f442fe8e5edb4adda61f4696a98121f732eee50 bibletime-1.5.3.ebuild 2129
-EBUILD bibletime-1.6_beta2.ebuild 2230 RMD160 3dc678e3da9632e1ee5bf19be5c9f72415310bb2 SHA1 e08d30eff63d74c724d54a8a64a761a97cc89d0b SHA256 58462970845c84eb464e8575a05187cb1c0c09f682d4d7d922700a5278820240
-MD5 7a8dfb5dbcf5d83a61bbec60debacb1c bibletime-1.6_beta2.ebuild 2230
-RMD160 3dc678e3da9632e1ee5bf19be5c9f72415310bb2 bibletime-1.6_beta2.ebuild 2230
-SHA256 58462970845c84eb464e8575a05187cb1c0c09f682d4d7d922700a5278820240 bibletime-1.6_beta2.ebuild 2230
-MISC ChangeLog 3727 RMD160 61f5b7a3c4c4fd2d1f7dda155c53d55aa06dec65 SHA1 f1a597ff1be80f11bf3d735eb64815b3b0803ea0 SHA256 6bd872a981d46b25612a7359fcf6e53ab4c82d425e522930dc042b9892b9f3bc
-MD5 3c0d5a538453c9eb25d96b440331892a ChangeLog 3727
-RMD160 61f5b7a3c4c4fd2d1f7dda155c53d55aa06dec65 ChangeLog 3727
-SHA256 6bd872a981d46b25612a7359fcf6e53ab4c82d425e522930dc042b9892b9f3bc ChangeLog 3727
+EBUILD bibletime-1.6_beta2.ebuild 2266 RMD160 20f7943e1a83ae2cbac8e9a4e06f0f0f4706490b SHA1 3462cafd82e8f8d74842a62abdbc66219eff887b SHA256 ec06add55165eb36e51633bf87730005afe0a1c1dae2567df54cf1772b143e15
+MD5 47fe29d897766ba337638d1dc3b2b6ab bibletime-1.6_beta2.ebuild 2266
+RMD160 20f7943e1a83ae2cbac8e9a4e06f0f0f4706490b bibletime-1.6_beta2.ebuild 2266
+SHA256 ec06add55165eb36e51633bf87730005afe0a1c1dae2567df54cf1772b143e15 bibletime-1.6_beta2.ebuild 2266
+MISC ChangeLog 3872 RMD160 7c1336d19199cb82b482755d81e6b4cc154f12c2 SHA1 cbbe6e5647d7eee366741b5c90c195dab36e7eae SHA256 e602312b696378edd7a5135201245f3ad15cb80949490e0ac7de15f9539a9f6b
+MD5 7b5294a8b79aee4109710c5d96ed16c5 ChangeLog 3872
+RMD160 7c1336d19199cb82b482755d81e6b4cc154f12c2 ChangeLog 3872
+SHA256 e602312b696378edd7a5135201245f3ad15cb80949490e0ac7de15f9539a9f6b ChangeLog 3872
 MISC metadata.xml 519 RMD160 1efcfc9c151e957054d9193a108999e340a6f0cb SHA1 453f32c4c05179aff7961c7833adac4df5b9240f SHA256 edcd4a5617801c972da5472badc56579ac2e3916977a065f722d5391e7c4fb1d
 MD5 ad5e3891d47792bb4c0ed616a8d2aa8e metadata.xml 519
 RMD160 1efcfc9c151e957054d9193a108999e340a6f0cb metadata.xml 519
diff --git a/app-text/bibletime/bibletime-1.6_beta2.ebuild b/app-text/bibletime/bibletime-1.6_beta2.ebuild
index 01e20df17375..6682213c57bf 100644
--- a/app-text/bibletime/bibletime-1.6_beta2.ebuild
+++ b/app-text/bibletime/bibletime-1.6_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-1.6_beta2.ebuild,v 1.1 2006/06/13 21:25:59 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-1.6_beta2.ebuild,v 1.2 2006/06/15 04:52:30 squinky86 Exp $
 
 inherit kde eutils versionator
 
@@ -45,6 +45,7 @@ pkg_setup() {
 
 src_unpack() {
 	kde_src_unpack
+	epatch ${FILESDIR}/${P}-gcc4.patch
 
 	local MAKE_LANGS MAKE_LANGS_DOC
 	for X in ${LANGS}; do
diff --git a/app-text/bibletime/files/bibletime-1.6_beta2-gcc4.patch b/app-text/bibletime/files/bibletime-1.6_beta2-gcc4.patch
new file mode 100644
index 000000000000..baa9e027ae25
--- /dev/null
+++ b/app-text/bibletime/files/bibletime-1.6_beta2-gcc4.patch
@@ -0,0 +1,12 @@
+diff -Naur bibletime-1.6beta2/bibletime/frontend/searchdialog/csearchdialogpages.h bibletime-1.6beta2.orig/bibletime/frontend/searchdialog/csearchdialogpages.h
+--- bibletime-1.6beta2/bibletime/frontend/searchdialog/csearchdialogpages.h	2006-06-14 23:39:55.000000000 -0500
++++ bibletime-1.6beta2.orig/bibletime/frontend/searchdialog/csearchdialogpages.h	2006-06-14 23:35:37.000000000 -0500
+@@ -180,7 +180,7 @@
+ 	/**
+ 	* This function breakes the queryString into clucene tokens
+ 	*/	
+-	QStringList CSearchResultPage::QueryParser(const QString& queryString);
++	QStringList QueryParser(const QString& queryString);
+ 	/**
+ 	* This function highlights the searched text in the content using the search type given by search flags
+ 	*/