hrev51484 adds 3 changesets to branch 'master'
old head: 1ef54b24ec1e349dddc51fd7ce6a6f66b9e6360c
new head: 8eda6db9a8c79887a076eb2ca594c43ece4cf2e9
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=8eda6db9a8c7+%5E1ef54b24ec1e
----------------------------------------------------------------------------
18b663756a78: Activity Monitor: Minor whitespace fix in Jamfile
f34bbb82ea88: Deskcalc: unlink media, not used
see next commit
8eda6db9a8c7: Add libmedia.so to the minimum image
libmedia.so was used by at least 2 apps included in the minimum image,
Activity Monitor and Deskcalc which subsequently failed to load on minimum.
Deskcalc wasn't actually using libmedia.so so I managed to get it to link and
run on minimum, however, Activity Monitor is using libmedia.so so needed it
to be present.
To fix this I added libmedia.so to the minimum image, I hope this does not
blow
its size budget. (adds 1.0MB)
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 5 insertions(+), 5 deletions(-)
build/jam/images/definitions/minimum | 1 +
src/apps/activitymonitor/Jamfile | 6 +++---
src/apps/deskcalc/Jamfile | 3 +--
############################################################################
Commit: 18b663756a7853013b24bbb171052ab67b11f3d6
URL: http://cgit.haiku-os.org/haiku/commit/?id=18b663756a78
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Sat Oct 21 23:42:53 2017 UTC
Activity Monitor: Minor whitespace fix in Jamfile
----------------------------------------------------------------------------
diff --git a/src/apps/activitymonitor/Jamfile b/src/apps/activitymonitor/Jamfile
index 86ef52c..ddf4f7f 100644
--- a/src/apps/activitymonitor/Jamfile
+++ b/src/apps/activitymonitor/Jamfile
@@ -13,11 +13,11 @@ Application ActivityMonitor :
: be tracker media libbnetapi.so shared [ TargetLibstdc++ ]
$(TARGET_NETWORK_LIBS) localestub
: ActivityMonitor.rdef
- ;
+;
DoCatalogs ActivityMonitor :
- x-vnd.Haiku-ActivityMonitor
- :
+ x-vnd.Haiku-ActivityMonitor
+ :
ActivityMonitor.cpp
ActivityView.cpp
ActivityWindow.cpp
############################################################################
Commit: f34bbb82ea885515ba92ebe52d1a5b12c41575ef
URL: http://cgit.haiku-os.org/haiku/commit/?id=f34bbb82ea88
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Sat Oct 21 23:43:38 2017 UTC
Deskcalc: unlink media, not used
see next commit
----------------------------------------------------------------------------
diff --git a/src/apps/deskcalc/Jamfile b/src/apps/deskcalc/Jamfile
index 851e36c..63d146b 100644
--- a/src/apps/deskcalc/Jamfile
+++ b/src/apps/deskcalc/Jamfile
@@ -12,8 +12,7 @@ Application DeskCalc :
DeskCalc.cpp
ExpressionTextView.cpp
InputTextView.cpp
- : be [ TargetLibstdc++ ] localestub media libexpression_parser.a
- libmapm.a shared
+ : be [ TargetLibstdc++ ] localestub libexpression_parser.a libmapm.a
shared
: DeskCalc.rdef
;
############################################################################
Revision: hrev51484
Commit: 8eda6db9a8c79887a076eb2ca594c43ece4cf2e9
URL: http://cgit.haiku-os.org/haiku/commit/?id=8eda6db9a8c7
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Sat Oct 21 23:47:57 2017 UTC
Add libmedia.so to the minimum image
libmedia.so was used by at least 2 apps included in the minimum image,
Activity Monitor and Deskcalc which subsequently failed to load on minimum.
Deskcalc wasn't actually using libmedia.so so I managed to get it to link and
run on minimum, however, Activity Monitor is using libmedia.so so needed it
to be present.
To fix this I added libmedia.so to the minimum image, I hope this does not blow
its size budget. (adds 1.0MB)
----------------------------------------------------------------------------
diff --git a/build/jam/images/definitions/minimum
b/build/jam/images/definitions/minimum
index 3f1e50f..46a57e5 100644
--- a/build/jam/images/definitions/minimum
+++ b/build/jam/images/definitions/minimum
@@ -91,6 +91,7 @@ rule HaikuImageGetSystemLibs
libdebugger.so@primary
libdevice.so
libgnu.so
+ libmedia.so
libnetwork.so
libpackage.so
libtextencoding.so libtracker.so libtranslation.so
