[Pkg-octave-devel] Bug#565197: Patch for building with Qt 4.6
Hi,
I'm forwarding a patch from a Debian/Ubuntu bug report, needed to build
qtoctave with Qt 4.6. I haven't tested it myself, though (still using Qt
4.5).
On Wed, Jan 13, 2010 at 12:32:45PM -0800, Kamal Mostafa wrote:
> Package: qtoctave
> Version: 0.8.2+dfsg-2
> Severity: important
> Tags: patch
> Justification: fails to build from source
>
>
> This package FTBFS in Ubuntu Lucid
>
> http://launchpadlibrarian.net/37681442/buildlog_ubuntu-lucid-i386.qtoctave_0.8.2%2Bdfsg-2_FAILEDTOBUILD.txt.gz
>
> CMake Error at CMakeLists.txt:32 (MESSAGE):
> Qt version 4.5 required.
>
> Qt version installed is: 4.6
>
>
> However, it does appear to actually build fine with Qt version 4.6.
> The attached patch changes the CMakeLists.txt script to accept any
> version of Qt >= 4.5 instead of just == 4.5.
Thanks
Thomas
------------------------------------------------------------
revno: 7
committer: Kamal Mostafa <kamal@whence.com>
branch nick: qtoctave
timestamp: Wed 2010-01-13 12:21:17 -0800
message:
* CMakeLists.txt: allow build with Qt version >= 4.5 (not just == 4.5).
diff:
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2009-10-04 10:08:00 +0000
+++ CMakeLists.txt 2010-01-13 20:21:17 +0000
@@ -28,13 +28,13 @@
include(UseQt4)
-if( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} EQUAL 5 )
+if( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} GREATER 4 )
MESSAGE (FATAL_ERROR
- "Qt version 4.5 required.\n"
+ "Qt version 4.5 or greater is required.\n"
"Qt version installed is: ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}\n"
"Please install required version.\n"
)
-endif( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} EQUAL 5 )
+endif( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} GREATER 4 )
Reply to: