diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-05-05 11:04:37 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-05-05 11:04:37 +0200 |
| commit | 0610a9a48d1e911c8bc444b75b22c016d33abc53 (patch) | |
| tree | b4ef51e174ab253482ff06380b535e422de763f7 /redhat | |
| parent | 64d0df37589d9b69c5990298acc528686665431c (diff) | |
| download | tde-packaging-0610a9a48d1e911c8bc444b75b22c016d33abc53.tar.gz tde-packaging-0610a9a48d1e911c8bc444b75b22c016d33abc53.zip | |
RHEL/Fedora: fix bibletime for GCC 4.7
Diffstat (limited to 'redhat')
| -rw-r--r-- | redhat/applications/bibletime/bibletime-3.5.13-fix_gcc47_compilation.patch | 13 | ||||
| -rw-r--r-- | redhat/applications/bibletime/trinity-bibletime.spec | 15 |
2 files changed, 24 insertions, 4 deletions
diff --git a/redhat/applications/bibletime/bibletime-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/bibletime/bibletime-3.5.13-fix_gcc47_compilation.patch new file mode 100644 index 000000000..aca2be126 --- /dev/null +++ b/redhat/applications/bibletime/bibletime-3.5.13-fix_gcc47_compilation.patch @@ -0,0 +1,13 @@ +--- bibletime/bibletime/frontend/cinfodisplay.cpp.ORI 2012-05-01 14:13:38.750903801 +0200 ++++ bibletime/bibletime/frontend/cinfodisplay.cpp 2012-05-01 14:14:59.998011927 +0200 +@@ -229,8 +229,8 @@ + VerseKey vk; + sword::ListKey refs = vk.ParseVerseList((const char*)data.mid((pos == -1) ? 0 : pos+1).utf8(), "Gen 1:1", true); + +- for (int i = 0; i < refs.Count(); ++i) { +- SWKey* key = refs.getElement(i); ++ for (int j = 0; j < refs.Count(); ++j) { ++ SWKey* key = refs.getElement(j); + Q_ASSERT(key); + VerseKey* vk = dynamic_cast<VerseKey*>(key); + diff --git a/redhat/applications/bibletime/trinity-bibletime.spec b/redhat/applications/bibletime/trinity-bibletime.spec index 0c6e8b0d8..0ab483844 100644 --- a/redhat/applications/bibletime/trinity-bibletime.spec +++ b/redhat/applications/bibletime/trinity-bibletime.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp bibletime %define version 1.6.6.0 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -35,6 +35,8 @@ Source0: %{kdecomp}-3.5.13.tar.gz # Fix detection of older versions of clucene in Fedora >= 16 Patch0: bibletime-3.5.13-clucene_detection.patch +# [bibletime] Fix compilation with GCC 4.7 +Patch1: bibletime-3.5.13-fix_gcc47_compilation.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel @@ -62,15 +64,16 @@ texts, write own notes, save, print etc.). %prep %setup -q -n applications/%{kdecomp} %patch0 -p0 +%patch1 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -127,5 +130,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-2 +- Fix compilation on RHEL 5 +- Fix compilation with GCC 4.7 + * Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 |