[haiku-commits] haiku: hrev45063 - build/jam src/apps/webpositive/support src/apps/webpositive
- From: anevilyak@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 22 Dec 2012 22:24:27 +0100 (CET)
hrev45063 adds 2 changesets to branch 'master'
old head: 944235ddd4e060e16c3351946f081b658ab920d6
new head: 4fd9bbbc8dfdabc41c2a452231a492966add6fc1
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=4fd9bbb+%5E944235d
----------------------------------------------------------------------------
523a87a: 64-bit fixes for WebPositive.
4fd9bbb: Add x86-64 WebKit package. Makes Web+ available on x86-64.
[ Rene Gollent <anevilyak@xxxxxxxxx> ]
----------------------------------------------------------------------------
5 files changed, 11 insertions(+), 8 deletions(-)
build/jam/BuildFeatures | 9 ++++++---
build/jam/OptionalPackages | 2 +-
src/apps/webpositive/DownloadProgressView.cpp | 2 +-
src/apps/webpositive/SettingsWindow.cpp | 2 +-
src/apps/webpositive/support/FontSelectionView.cpp | 4 ++--
############################################################################
Commit: 523a87a5d28e0f60352380cc8dc48946a0361a74
URL: http://cgit.haiku-os.org/haiku/commit/?id=523a87a
Author: Rene Gollent <anevilyak@xxxxxxxxx>
Date: Sat Dec 22 21:22:51 2012 UTC
64-bit fixes for WebPositive.
----------------------------------------------------------------------------
diff --git a/src/apps/webpositive/DownloadProgressView.cpp
b/src/apps/webpositive/DownloadProgressView.cpp
index 8bdbd69..aef948b 100644
--- a/src/apps/webpositive/DownloadProgressView.cpp
+++ b/src/apps/webpositive/DownloadProgressView.cpp
@@ -776,7 +776,7 @@ DownloadProgressView::_UpdateStatusText()
// TODO: Localization of time string...
if (now < finishTime - secondsPerDay) {
// process is going to take more than a day!
- sprintf(timeText, "%0*d:%0*d %0*d/%0*d/%ld",
+ sprintf(timeText, "%0*d:%0*d %0*d/%0*d/%" B_PRId32,
2, time->tm_hour, 2, time->tm_min,
2, time->tm_mon + 1, 2, time->tm_mday, year);
} else {
diff --git a/src/apps/webpositive/SettingsWindow.cpp
b/src/apps/webpositive/SettingsWindow.cpp
index 39fa27a..48bedc3 100644
--- a/src/apps/webpositive/SettingsWindow.cpp
+++ b/src/apps/webpositive/SettingsWindow.cpp
@@ -499,7 +499,7 @@ SettingsWindow::_BuildSizesMenu(BMenu* menu, uint32
messageWhat)
continue;
char label[32];
- snprintf(label, sizeof(label), "%ld", size);
+ snprintf(label, sizeof(label), "%" B_PRId32, size);
BMessage* message = new BMessage(messageWhat);
message->AddInt32("size", size);
diff --git a/src/apps/webpositive/support/FontSelectionView.cpp
b/src/apps/webpositive/support/FontSelectionView.cpp
index be1adcb..859095e 100644
--- a/src/apps/webpositive/support/FontSelectionView.cpp
+++ b/src/apps/webpositive/support/FontSelectionView.cpp
@@ -453,7 +453,7 @@ void
FontSelectionView::_SelectCurrentSize(bool select)
{
char label[16];
- snprintf(label, sizeof(label), "%ld", (int32)fCurrentFont.Size());
+ snprintf(label, sizeof(label), "%" B_PRId32,
(int32)fCurrentFont.Size());
BMenuItem* item = fSizesMenu->FindItem(label);
if (item != NULL)
@@ -480,7 +480,7 @@ FontSelectionView::_BuildSizesMenu()
continue;
char label[32];
- snprintf(label, sizeof(label), "%ld", size);
+ snprintf(label, sizeof(label), "%" B_PRId32, size);
BMessage* message = new BMessage(kMsgSetSize);
message->AddInt32("size", size);
############################################################################
Revision: hrev45063
Commit: 4fd9bbbc8dfdabc41c2a452231a492966add6fc1
URL: http://cgit.haiku-os.org/haiku/commit/?id=4fd9bbb
Author: Rene Gollent <anevilyak@xxxxxxxxx>
Date: Sat Dec 22 21:23:09 2012 UTC
Add x86-64 WebKit package. Makes Web+ available on x86-64.
----------------------------------------------------------------------------
diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index 0c84142..fa806de 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -545,10 +545,13 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
HAIKU_BUILD_FEATURE_WEBKIT = 1 ;
}
-HAIKU_WEBKIT_FILE = haikuwebkit-1.1.3-x86-gcc4-2012-08-31a.zip ;
-
+if $(TARGET_ARCH) = x86 {
+ HAIKU_WEBKIT_FILE = haikuwebkit-1.1.3-x86-gcc4-2012-08-31a.zip ;
+} else if $(TARGET_ARCH) = x86_64 {
+ HAIKU_WEBKIT_FILE = haikuwebkit-1.1.3-x86_64-gcc4-2012-12-22.zip ;
+}
if $(HAIKU_BUILD_FEATURE_WEBKIT) {
- if $(TARGET_ARCH) != x86 {
+ if $(TARGET_ARCH) != x86 && $(TARGET_ARCH) != x86_64 {
Echo "WebKit support not available on $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) < 4 {
if ! $(isHybridBuild) {
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 5dcac02..ef0758e 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -2157,7 +2157,7 @@ if [ IsOptionalHaikuImagePackageAdded WebKit ] {
# WebPositive
if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
- if $(TARGET_ARCH) != x86 {
+ if $(TARGET_ARCH) != x86 && $(TARGET_ARCH) != x86_64 {
Echo "No optional package WebPositive available for
$(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) < 4 {
if ! $(isHybridBuild) {
Other related posts:
- » [haiku-commits] haiku: hrev45063 - build/jam src/apps/webpositive/support src/apps/webpositive - anevilyak
