Qtopia-interest Archive, February 2008
configure broken after the Qt update to 4.3.4
Message 1 in thread
Hey,
this is probably already fixed, the public rsync tree broke due the upgrade to
Qt4.3.4. The reason is that LICENSE.GPL was replaced with LICENSE.GPL2 and
LICENSE.GPL3. The Qtopia copy of Qt4.3.4 only has a LICENSE.GPL though (see
my previous mail on duplicated license files and copying them in a source
tree). I have just started the builld there might be more issues.
z.
PS: Making Qtopia available as GPLv3 would be nice as well.
From bb455d4b59c4b1fd6aef927b808a68ba9661e307 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@xxxxxxxxxxx)>
Date: Thu, 21 Feb 2008 19:24:17 +0100
Subject: [PATCH] Build fix: The Qtopia version of Qt only has a LICENSE.GPL
and not the other GPLv2 and GPLv3 file
---
qtopiacore/qt/configure | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/qtopiacore/qt/configure b/qtopiacore/qt/configure
index e9f169a..da825a8 100755
--- a/qtopiacore/qt/configure
+++ b/qtopiacore/qt/configure
@@ -162,7 +162,7 @@ if [ -f "$relpath"/LICENSE.Qtopia ]; then
Licensee="Qtopia"
Edition="Qtopia"
QT_EDITION="QT_EDITION_DESKTOP"
-elif
[ -f "$relpath"/LICENSE.QPL -o -f "$relpath"/LICENSE.GPL2 -o -f "$relpath"/LICENSE.GPL3 ];
then
+elif
[ -f "$relpath"/LICENSE.QPL -o -f "$relpath"/LICENSE.GPL2 -o -f "$relpath"/LICENSE.GPL3 -o -f "$relpath"/LICENSE.GPL ];
then
# Open Source edition - may only be used under the terms of the QPL or
GPL.
[ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
[ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes
--
[ signature omitted ]
Message 2 in thread
Thanks for this.
actually, the real fix is this:
==== //depot/qtopia/4.3/src/build/bin/configure#113 -
//depot/qtopia/4.3/src/build/bin/configure ====
@@ -3665,7 +3665,7 @@
if ( -f "$depotpath/LICENSE.GPL" && configopt("free") ) {
$licenseInfo{Product} .= " Open Source";
$licenseInfo{LicenseFile} = "LICENSE.GPL";
- $licenseInfo{DestLicenseFile} = "LICENSE.GPL";
+ $licenseInfo{DestLicenseFile} = "LICENSE.GPL2";
} elsif ( -f "$depotpath/LICENSE.TROLL" && configopt("depot") ) {
$licenseInfo{Product} .= " Trolltech Internal";
$licenseInfo{LicenseFile} = "LICENSE.TROLL";
and has been applied. Should be in the next snapshot or so
Holger Freyther wrote:
> Hey,
>
> this is probably already fixed, the public rsync tree broke due the upgrade to
> Qt4.3.4. The reason is that LICENSE.GPL was replaced with LICENSE.GPL2 and
> LICENSE.GPL3. The Qtopia copy of Qt4.3.4 only has a LICENSE.GPL though (see
> my previous mail on duplicated license files and copying them in a source
> tree). I have just started the builld there might be more issues.
>
> z.
>
> PS: Making Qtopia available as GPLv3 would be nice as well.
>
>
> From bb455d4b59c4b1fd6aef927b808a68ba9661e307 Mon Sep 17 00:00:00 2001
> From: Holger Freyther <zecke@xxxxxxxxxxx)>
> Date: Thu, 21 Feb 2008 19:24:17 +0100
> Subject: [PATCH] Build fix: The Qtopia version of Qt only has a LICENSE.GPL
> and not the other GPLv2 and GPLv3 file
>
> ---
> qtopiacore/qt/configure | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/qtopiacore/qt/configure b/qtopiacore/qt/configure
> index e9f169a..da825a8 100755
> --- a/qtopiacore/qt/configure
> +++ b/qtopiacore/qt/configure
> @@ -162,7 +162,7 @@ if [ -f "$relpath"/LICENSE.Qtopia ]; then
> Licensee="Qtopia"
> Edition="Qtopia"
> QT_EDITION="QT_EDITION_DESKTOP"
> -elif
> [ -f "$relpath"/LICENSE.QPL -o -f "$relpath"/LICENSE.GPL2 -o -f "$relpath"/LICENSE.GPL3 ];
> then
> +elif
> [ -f "$relpath"/LICENSE.QPL -o -f "$relpath"/LICENSE.GPL2 -o -f "$relpath"/LICENSE.GPL3 -o -f "$relpath"/LICENSE.GPL ];
> then
> # Open Source edition - may only be used under the terms of the QPL or
> GPL.
> [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
> [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes
--
[ signature omitted ]
Message 3 in thread
On Thursday 21 February 2008 19:55:28 Lorn Potter wrote:
> Thanks for this.
>
> actually, the real fix is this:
Hey Lorn,
cool. I have one related wish. It would be really cool if the buildsystem
would not manipulate the source tree at all. I don't know the reasonings but
I'm aware of the following changes:
-Copying of licenses
-Hiding qpeapplication_qws.cpp to avoid the buildsystem detecting it as
PLATFORM_QWS
-I also see some other changes in my git-diff (projects.pro)
I think the copying of the license files could be avoided by changing the
packaging, hiding files fixed by changing the Qt configure script (add a
parameter), no idea about what issue the hiding/removal of projects.pro
solves.
Again I do not know the reasoning but if I call configure from a build
directory I do not expect it to manipulate the source directory. At least
this is an assumption I have and normally holds true. Ideally I should be
able to put my source onto a read only filesystem and still build Qtopia.
z.
--
[ signature omitted ]
Message 4 in thread
Holger Freyther wrote:
> On Thursday 21 February 2008 19:55:28 Lorn Potter wrote:
>> Thanks for this.
>>
>> actually, the real fix is this:
>
>
> Hey Lorn,
>
> cool. I have one related wish. It would be really cool if the buildsystem
> would not manipulate the source tree at all. I don't know the reasonings but
> I'm aware of the following changes:
> -Copying of licenses
This is done because we have more than one type of package/license.
> -Hiding qpeapplication_qws.cpp to avoid the buildsystem detecting it as
> PLATFORM_QWS
> -I also see some other changes in my git-diff (projects.pro)
>
> I think the copying of the license files could be avoided by changing the
> packaging, hiding files fixed by changing the Qt configure script (add a
> parameter), no idea about what issue the hiding/removal of projects.pro
> solves.
>
> Again I do not know the reasoning but if I call configure from a build
> directory I do not expect it to manipulate the source directory. At least
> this is an assumption I have and normally holds true. Ideally I should be
> able to put my source onto a read only filesystem and still build Qtopia.
>
well this is not how it currently works. It needs to write Makefiles in
the source directories.
We are working on a new build thing - qbuild. This will replace qmake,
qtopiamake, and make. It is heaps faster. It will be included in 4.4.
--
[ signature omitted ]
