[haiku-commits] haiku: hrev43883 - build/jam src/kits/interface
- From: stefano.ceccherini@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 23 Mar 2012 21:07:50 +0100 (CET)
hrev43883 adds 8 changesets to branch 'master'
old head: aa29a30426c9ab7511c7c88e7223645264209a4c
new head: 73a1e6ebd21d354a2b7591f1b18f233eb20c7556
----------------------------------------------------------------------------
417c123: Fix indentation
9289418: Fix Indentation
5468786: Merge branch 'master' of ssh://git.haiku-os.org/haiku
131811f: Merge branch 'master' of ssh://git.haiku-os.org/haiku
aae7ed3: Merge branch 'master' of ssh://git.haiku-os.org/haiku
f367fc9: Merge branch 'master' of ssh://git.haiku-os.org/haiku
74bf282: Added correct dependency to freetype. I couldn't build a hybrid image
without this change.
73a1e6e: Merge branch 'master' of ssh://git.haiku-os.org/haiku
[ JackBurton <stefano.ceccherini@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 3 insertions(+), 3 deletions(-)
build/jam/OptionalBuildFeatures | 2 +-
src/kits/interface/Menu.cpp | 4 ++--
############################################################################
Commit: 417c123cc452b4cb2eb3cb4eb9e3f1d7637470ec
URL: http://cgit.haiku-os.org/haiku/commit/?id=417c123
Author: JackBurton <stefano.ceccherini@xxxxxxxxx>
Date: Sat Mar 3 09:06:42 2012 UTC
Fix indentation
----------------------------------------------------------------------------
diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp
index cb19570..e08e1f2 100644
--- a/src/kits/interface/Menu.cpp
+++ b/src/kits/interface/Menu.cpp
@@ -1231,7 +1231,7 @@ BMenu::Perform(perform_code code, void* _data)
BMenu::GetHeightForWidth(data->width, &data->min,
&data->max,
&data->preferred);
return B_OK;
-}
+ }
case PERFORM_CODE_SET_LAYOUT:
{
perform_data_set_layout* data =
(perform_data_set_layout*)_data;
############################################################################
Commit: 9289418325f453bc718b400c77222ee33dd7fd31
URL: http://cgit.haiku-os.org/haiku/commit/?id=9289418
Author: JackBurton <stefano.ceccherini@xxxxxxxxx>
Date: Sat Mar 3 09:24:06 2012 UTC
Fix Indentation
----------------------------------------------------------------------------
diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp
index e08e1f2..d27d4ca 100644
--- a/src/kits/interface/Menu.cpp
+++ b/src/kits/interface/Menu.cpp
@@ -1466,7 +1466,7 @@ BMenu::_InitData(BMessage* archive)
archive->FindFloat("_maxwidth", &fMaxContentWidth);
BMessage msg;
- for (int32 i = 0; archive->FindMessage("_items", i,
&msg) == B_OK; i++) {
+ for (int32 i = 0; archive->FindMessage("_items", i, &msg) ==
B_OK; i++) {
BArchivable* object = instantiate_object(&msg);
if (BMenuItem* item = dynamic_cast<BMenuItem*>(object))
{
BRect bounds;
############################################################################
Commit: 54687869efc97f36e24e029c795afd313ba62012
URL: http://cgit.haiku-os.org/haiku/commit/?id=5468786
Author: JackBurton <stefano.ceccherini@xxxxxxxxx>
Date: Sun Mar 11 09:16:35 2012 UTC
Merge branch 'master' of ssh://git.haiku-os.org/haiku
----------------------------------------------------------------------------
############################################################################
Commit: 131811f6b4fbbbd77ba0ca56d010605d65e51ddf
URL: http://cgit.haiku-os.org/haiku/commit/?id=131811f
Author: JackBurton <stefano.ceccherini@xxxxxxxxx>
Date: Fri Mar 16 20:06:38 2012 UTC
Merge branch 'master' of ssh://git.haiku-os.org/haiku
----------------------------------------------------------------------------
############################################################################
Commit: aae7ed37e0e39341a5959e2f6922f1d549f9c9f1
URL: http://cgit.haiku-os.org/haiku/commit/?id=aae7ed3
Author: JackBurton <stefano.ceccherini@xxxxxxxxx>
Date: Wed Mar 21 14:18:58 2012 UTC
Merge branch 'master' of ssh://git.haiku-os.org/haiku
----------------------------------------------------------------------------
############################################################################
Commit: f367fc9d6ad3c0fad2fdb5e58973f9f59baf3866
URL: http://cgit.haiku-os.org/haiku/commit/?id=f367fc9
Author: JackBurton <stefano.ceccherini@xxxxxxxxx>
Date: Thu Mar 22 21:43:06 2012 UTC
Merge branch 'master' of ssh://git.haiku-os.org/haiku
----------------------------------------------------------------------------
############################################################################
Commit: 74bf28240090c3d850cfa5898e254e7e3ad2fee3
URL: http://cgit.haiku-os.org/haiku/commit/?id=74bf282
Author: JackBurton <stefano.ceccherini@xxxxxxxxx>
Date: Fri Mar 23 19:51:20 2012 UTC
Added correct dependency to freetype. I couldn't build a hybrid image
without this change.
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index 40727bc..522457d 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -364,7 +364,7 @@ if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 {
common/lib/libfreetype.so.6.7.1
: $(freetypeZipFile)
: extracted-freetype ] ;
- Depends $(HAIKU_FREETYPE_LIBS) : $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
+ Depends $(HAIKU_FREETYPE_LIB) $(HAIKU_FREETYPE_CURRENT_LIB) :
$(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
HAIKU_FREETYPE_CURRENT_LINK = libfreetype.so.6 ;
############################################################################
Revision: hrev43883
Commit: 73a1e6ebd21d354a2b7591f1b18f233eb20c7556
URL: http://cgit.haiku-os.org/haiku/commit/?id=73a1e6e
Author: JackBurton <stefano.ceccherini@xxxxxxxxx>
Date: Fri Mar 23 19:57:36 2012 UTC
Merge branch 'master' of ssh://git.haiku-os.org/haiku
----------------------------------------------------------------------------
Other related posts:
