haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update Qt recipe to 4.8.6.

Browse Source 
Fixes a lot of bugs in Qt itself and the Haiku port.
This commit is contained in:
Augustin Cavalier
2014-06-20 16:03:59 -04:00
parent 4ccace1919
commit 24635986f7
2 changed files with 22 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
dev-qt/qtcore/qtcore-4.8.5.git.recipe → dev-qt/libqt4/libqt4-4.8.6.1.recipe
View File

@@ -1,17 +1,16 @@
SUMMARY="A comprehensive C++ application development framework"
DESCRIPTION="
Qt is a cross-platform application and UI framework for developers using C++ \
or QML, a CSS & JavaScript like language. Qt Creator is the supporting Qt IDE.
Qt, Qt Quick and the supporting tools are developed as an open source project \
governed by an inclusive meritocratic model. Qt can be used under open source \
(LGPL v2.1) or commercial terms.
Qt is a cross-platform application framework that is widely used for developing \
software with a graphical user interface, and also used for developing non-GUI \
programs such as command-line tools and consoles for servers.
"
HOMEPAGE="http://qt-haiku.ru"
SRC_URI="git://gitorious.org/+qt-haiku/qt/qt-haiku-port.git"
HOMEPAGE="http://github.com/qt-haiku/qt4"
SRC_URI="https://github.com/qt-haiku/qt4/archive/v4.8.6-haiku-1.tar.gz"
SOURCE_DIR="qt4-4.8.6-haiku-1"
LICENSE="GNU LGPL v2.1"
COPYRIGHT="2011 Nokia Corporation and/or its subsidiary(-ies)."
REVISION="4"
ARCHITECTURES="x86"
COPYRIGHT="2014 Digia Plc and/or its subsidiary(-ies)."
REVISION="1"
ARCHITECTURES="x86 ?x86_64"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# x86_gcc2 is fine as primary target architecture as long as we're building
# for a different secondary architecture.
@@ -22,7 +21,7 @@ fi
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
qtcore$secondaryArchSuffix = $portVersion compat >= 4.8
libqt4$secondaryArchSuffix = $portVersion compat >= 4.8
cmd:qtconfig$secondaryArchSuffix = $portVersion compat >= 4.8
cmd:qsystray$secondaryArchSuffix = $portVersion compat >= 4.8
lib:libphonon$secondaryArchSuffix = $portVersion compat >= 4.8
@@ -54,13 +53,9 @@ REQUIRES="
lib:libicuuc$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libpng$secondaryArchSuffix
lib:libtiff$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${secondaryArchSuffix}_devel
devel:libz$secondaryArchSuffix
@@ -68,11 +63,12 @@ BUILD_REQUIRES="
devel:libssl$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
"
# should have devel:libtiff too but that doesn't seem to be provided
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:which
cmd:make
cmd:g++$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
@@ -86,7 +82,7 @@ if [ "$targetArchitecture" = x86_gcc2 ];then
fi
PROVIDES_devel="
qtcore${secondaryArchSuffix}_devel = $portVersion compat >= 4.8
libqt4${secondaryArchSuffix}_devel = $portVersion compat >= 4.8
cmd:assistant$secondaryArchSuffix = $portVersion compat >= 4.8
cmd:designer$secondaryArchSuffix = $portVersion compat >= 4.8
cmd:lconvert$secondaryArchSuffix = $portVersion compat >= 4.8
@@ -132,18 +128,13 @@ PROVIDES_devel="
"
REQUIRES_devel="
qtcore$secondaryArchSuffix == $portVersion
libqt4$secondaryArchSuffix == $portVersion
haiku$secondaryArchSuffix >= $haikuVersion
lib:libz$secondaryArchSuffix
"
PATCHES="qtcore-4.8.5.git.patchset"
SOURCE_DIR="qt-haiku-port"
"
BUILD()
{
./configure \
-prefix $prefix \
-bindir $binDir \
@@ -164,13 +155,18 @@ BUILD()
make $jobArgs
cd src/3rdparty/haiku-tools/qsystray
pushd src/3rdparty/haiku-tools/qsystray
if [ "$targetArchitecture" = x86 ];then
make -f Makefile.gcc4
else
export PATH="/bin:$PATH"
make -f Makefile.gcc2
fi
popd
pushd haiku
./do-res.sh
popd
}
INSTALL()

76
dev-qt/qtcore/patches/qtcore-4.8.5.git.patchset
View File

@@ -1,76 +0,0 @@
From ebc513ce5d748e963f4ffefe6adb7f45503b44c3 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Thu, 14 Nov 2013 15:34:00 -0700
Subject: Adjust font paths for updated Haiku fs layout
diff --git a/src/gui/text/qfontdatabase_haiku.cpp b/src/gui/text/qfontdatabase_haiku.cpp
index c1b9526..f7b6dd7 100644
--- a/src/gui/text/qfontdatabase_haiku.cpp
+++ b/src/gui/text/qfontdatabase_haiku.cpp
@@ -50,9 +50,10 @@ static void initializeDb()
FT_Library lib = qt_getFreetype();
directory_which FontDirs[] = {
- B_BEOS_FONTS_DIRECTORY,
- B_COMMON_FONTS_DIRECTORY,
- B_USER_FONTS_DIRECTORY
+ B_SYSTEM_FONTS_DIRECTORY,
+ B_SYSTEM_NONPACKAGED_FONTS_DIRECTORY,
+ B_USER_FONTS_DIRECTORY,
+ B_USER_NONPACKAGED_FONTS_DIRECTORY
};
--
1.8.3.4
From 5aa0dcc8cb9c37c048a771de7f36c57b0c5f16b5 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
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
From e2c3be50acfb8007501788f8cc78d1a7d5729323 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Sat, 16 Nov 2013 02:45:20 -0700
Subject: Fix notification timeout milli->micro conversion
diff --git a/src/gui/util/qsystemtrayicon_haiku.cpp b/src/gui/util/qsystemtrayicon_haiku.cpp
index 7f1b1f4..d4d5953 100644
--- a/src/gui/util/qsystemtrayicon_haiku.cpp
+++ b/src/gui/util/qsystemtrayicon_haiku.cpp
@@ -411,7 +411,7 @@ void QSystemTrayIconPrivate::showMessage_sys(const QString &title, const QStrin
notification.SetTitle(stitle);
notification.SetMessageID(smessageId);
notification.SetContent(smessage);
- notification.Send(timeOut/1000);
+ notification.Send(timeOut*1000);
}
}
--
1.8.3.4