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

Fix some issues with the qt recipe

Browse Source 
* Fix an upstream problem with the time conversion in the native
  system notifications

* Kludge the packaging to put *.so symlinks in the runtime path too.
  Not particularly happy about it but I'm sick of dealing with this
  recipe. This makes qmake/cmake/etc... happy
This commit is contained in:
Chris Roberts
2013-11-19 18:19:52 -07:00
parent e56d3553eb
commit 093f5eecd6
2 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 <cpr420@gmail.com>
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 <cpr420@gmail.com>
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 <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

8
dev-qt/qtcore/qtcore-4.8.5.git.recipe
View File

@@ -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