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 5998a69ad..99a41cd3b 100644 --- a/dev-qt/qtcore/patches/qtcore-4.8.5.git.patchset +++ b/dev-qt/qtcore/patches/qtcore-4.8.5.git.patchset @@ -1,4 +1,4 @@ -From b6cf096768020b93ce227b0ecc662a2828db2560 Mon Sep 17 00:00:00 2001 +From ebc513ce5d748e963f4ffefe6adb7f45503b44c3 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Thu, 14 Nov 2013 15:34:00 -0700 Subject: Adjust font paths for updated Haiku fs layout @@ -26,7 +26,7 @@ index c1b9526..f7b6dd7 100644 1.8.3.4 -From 144331a82b7ea68955f2e28a04eda4e6b6fbaa77 Mon Sep 17 00:00:00 2001 +From 5aa0dcc8cb9c37c048a771de7f36c57b0c5f16b5 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 @@ -51,3 +51,26 @@ index 2167476..7f1b1f4 100644 -- 1.8.3.4 + +From e2c3be50acfb8007501788f8cc78d1a7d5729323 Mon Sep 17 00:00:00 2001 +From: Chris Roberts +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 + diff --git a/dev-qt/qtcore/qtcore-4.8.5.git.recipe b/dev-qt/qtcore/qtcore-4.8.5.git.recipe index 4ea8c3fa0..41b5fbf3e 100644 --- a/dev-qt/qtcore/qtcore-4.8.5.git.recipe +++ b/dev-qt/qtcore/qtcore-4.8.5.git.recipe @@ -12,7 +12,7 @@ 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="3" +REVISION="4" ARCHITECTURES="x86" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -198,6 +198,12 @@ INSTALL() fixPkgconfig + #UGLY HACK -- REMOVE ME WHEN QMAKE/CMAKE/ETC IS FIXED + cd $libDir + for i in lib*.so.4.*;do + ln -s $i $(echo $i | cut -f1,2 -d.) + done + devCommands="assistant designer lconvert linguist lrelease lupdate moc pixeltool qcollectiongenerator