mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-15 16:20:08 +02:00
093f5eecd6
* 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
77 lines
2.3 KiB
Plaintext
77 lines
2.3 KiB
Plaintext
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
|
|
|