From af5b36991112236eb0cecf6f3fb2de41e0a0960e Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Fri, 15 Nov 2013 21:11:53 -0700 Subject: [PATCH] Fix gcc2 support for qt-4.8.5 * Fix systray support by removing check for /boot/common/bin/qsystray. Instead we always return true when determining if Haiku supports a systray since qsystray is guaranteed to be installed * qmake will need some fine tuning. When trying to build other qt based projects it will insert the wrong link flags (i.e. -L.../lib... instead of -L.../develop/lib...) --- .../qtcore/patches/qtcore-4.8.5.git.patchset | 33 ++++++++++++++++--- dev-qt/qtcore/qtcore-4.8.5.git.recipe | 28 +++++++++++----- 2 files changed, 48 insertions(+), 13 deletions(-) diff --git a/dev-qt/qtcore/patches/qtcore-4.8.5.git.patchset b/dev-qt/qtcore/patches/qtcore-4.8.5.git.patchset index 2b92dd433..5998a69ad 100644 --- a/dev-qt/qtcore/patches/qtcore-4.8.5.git.patchset +++ b/dev-qt/qtcore/patches/qtcore-4.8.5.git.patchset @@ -1,11 +1,8 @@ -From 3c8c94f39ddd083200f92005b67b9a88844b3772 Mon Sep 17 00:00:00 2001 +From b6cf096768020b93ce227b0ecc662a2828db2560 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Thu, 14 Nov 2013 15:34:00 -0700 -Subject: [PATCH] Adjust font paths for updated Haiku fs layout +Subject: Adjust font paths for updated Haiku fs layout ---- - src/gui/text/qfontdatabase_haiku.cpp | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gui/text/qfontdatabase_haiku.cpp b/src/gui/text/qfontdatabase_haiku.cpp index c1b9526..f7b6dd7 100644 @@ -28,3 +25,29 @@ index c1b9526..f7b6dd7 100644 -- 1.8.3.4 + +From 144331a82b7ea68955f2e28a04eda4e6b6fbaa77 Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Fri, 15 Nov 2013 19:50:49 -0700 +Subject: Remove check for /boot/common/bin/qsystray + + +diff --git a/src/gui/util/qsystemtrayicon_haiku.cpp b/src/gui/util/qsystemtrayicon_haiku.cpp +index 2167476..7f1b1f4 100644 +--- a/src/gui/util/qsystemtrayicon_haiku.cpp ++++ b/src/gui/util/qsystemtrayicon_haiku.cpp +@@ -449,8 +449,9 @@ void QSystemTrayIconPrivate::updateToolTip_sys() + + bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys() + { +- QFileInfo qsystrayfile("/boot/common/bin/qsystray"); +- return qsystrayfile.exists(); ++// QFileInfo qsystrayfile("/boot/common/bin/qsystray"); ++// return qsystrayfile.exists(); ++ return true; + } + + bool QSystemTrayIconPrivate::supportsMessages_sys() +-- +1.8.3.4 + diff --git a/dev-qt/qtcore/qtcore-4.8.5.git.recipe b/dev-qt/qtcore/qtcore-4.8.5.git.recipe index 628a93f59..4ea8c3fa0 100644 --- a/dev-qt/qtcore/qtcore-4.8.5.git.recipe +++ b/dev-qt/qtcore/qtcore-4.8.5.git.recipe @@ -12,12 +12,12 @@ HOMEPAGE="http://qt-haiku.ru" SRC_URI="git://gitorious.org/+qt-haiku/qt/qt-haiku-port.git" LICENSE="GNU LGPL v2.1" COPYRIGHT="2011 Nokia Corporation and/or its subsidiary(-ies)." -REVISION="2" +REVISION="3" ARCHITECTURES="x86" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building # for a different secondary architecture. - ARCHITECTURES="$ARCHITECTURES ?x86_gcc2" + ARCHITECTURES="$ARCHITECTURES x86_gcc2" else ARCHITECTURES="$ARCHITECTURES !x86_gcc2" fi @@ -54,13 +54,17 @@ REQUIRES=" lib:libssl$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix - lib:libtiff$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix " +# haiku_x86 doesn't claim to provide lib:libtiff_x86 on gcc2 builds +if [ "$targetArchitecture" != x86_gcc2 ];then + REQUIRES="$REQUIRES lib:libtiff$secondaryArchSuffix" +fi + BUILD_REQUIRES=" - icu_devel$secondaryArchSuffix + icu${secondaryArchSuffix}_devel devel:libz$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix devel:libssl$secondaryArchSuffix @@ -77,6 +81,10 @@ BUILD_PREREQUIRES=" cmd:perl " +if [ "$targetArchitecture" = x86_gcc2 ];then + BUILD_PREREQUIRES="$BUILD_PREREQUIRES cmd:g++" +fi + PROVIDES_devel=" qtcore${secondaryArchSuffix}_devel = $portVersion compat >= 4.8 cmd:assistant$secondaryArchSuffix = $portVersion compat >= 4.8 @@ -135,8 +143,11 @@ SOURCE_DIR="qt-haiku-port" BUILD() { + ./configure \ -prefix $prefix \ + -bindir $binDir \ + -libdir $libDir \ -headerdir $includeDir \ -docdir $docDir/Qt \ -datadir $dataDir/Qt \ @@ -154,9 +165,10 @@ BUILD() make $jobArgs cd src/3rdparty/haiku-tools/qsystray - if [ "$effectiveTargetArchitecture" = x86 ];then + if [ "$targetArchitecture" = x86 ];then make -f Makefile.gcc4 else + export PATH="/bin:$PATH" make -f Makefile.gcc2 fi } @@ -166,10 +178,10 @@ INSTALL() make install cd src/3rdparty/haiku-tools/qsystray - if [ "$effectiveTargetArchitecture" = x86 ];then + if [ "$targetArchitecture" = x86 ];then cp -af qsystray $binDir else - cp -af qsystray_gcc2 $binDir + cp -af qsystray_gcc2 $binDir/qsystray fi prepareInstalledDevelLibs libphonon \ @@ -196,7 +208,7 @@ INSTALL() xmlpatternsvalidator" for i in $devCommands;do - devPackageCommands="$devPackageCommands $binDir/$i$secondaryArchSuffix" + devPackageCommands="$devPackageCommands $binDir/$i" done packageEntries devel $developDir \