hrev49883 adds 2 changesets to branch 'master'
old head: e3c95b5aa13cdff19e7dff8583dd94ecd5c7cbbc
new head: d5449f12d4c8f90c6ec0bbc9463a311e946cd366
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=d5449f12d4c8+%5Ee3c95b5aa13c
----------------------------------------------------------------------------
2b899555e727: x86_gcc2: update openssl and libqt4 packages.
- openssl: changed compat to 1.0.0 for the package itself as well
as the library provides.
- libqt4: rebuilt against latest openssl packages; dependency on
libssl/libcrypto is now 1.0.0, as it should be.
d5449f12d4c8: app_server: add another missing dependency on freetype
[ Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 9 insertions(+), 9 deletions(-)
build/jam/repositories/HaikuPorts/x86_gcc2 | 12 ++++++------
src/servers/app/Jamfile | 6 +++---
############################################################################
Commit: 2b899555e7275dc950be80b53bb9dc449cc21b3d
URL: http://cgit.haiku-os.org/haiku/commit/?id=2b899555e727
Author: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
Date: Wed Nov 25 23:51:36 2015 UTC
x86_gcc2: update openssl and libqt4 packages.
- openssl: changed compat to 1.0.0 for the package itself as well
as the library provides.
- libqt4: rebuilt against latest openssl packages; dependency on
libssl/libcrypto is now 1.0.0, as it should be.
----------------------------------------------------------------------------
diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2
b/build/jam/repositories/HaikuPorts/x86_gcc2
index 5c23a42..b9060f0 100644
--- a/build/jam/repositories/HaikuPorts/x86_gcc2
+++ b/build/jam/repositories/HaikuPorts/x86_gcc2
@@ -381,8 +381,8 @@ RemotePackageRepository HaikuPorts
opensound-4.2_git-2
openssh-7.1p1-1
# sync openssl with secondary architecture (x86)
- openssl-1.0.2d-4
- openssl_devel-1.0.2d-4
+ openssl-1.0.2d-5
+ openssl_devel-1.0.2d-5
p7zip-9.20.1-4
paladin-git-6
paragui-1.1.8-1
@@ -744,8 +744,8 @@ RemotePackageRepository HaikuPorts
libpng_x86_devel-1.5.22-1
libpng16_x86-1.6.18-1
libpng16_x86_devel-1.6.18-1
- libqt4_x86-4.8.7-4
- libqt4_x86_devel-4.8.7-4
+ libqt4_x86-4.8.7-5
+ libqt4_x86_devel-4.8.7-5
librecad_x86-2.0.7-1
libsamplerate_x86-0.1.8-1
libsamplerate_x86_devel-0.1.8-1
@@ -826,8 +826,8 @@ RemotePackageRepository HaikuPorts
openjdk_x86_devel-1.7.u80_b32-3
openjpeg_x86-2.1.0-2
openjpeg_x86_devel-2.1.0-2
- openssl_x86-1.0.2d-4
- openssl_x86_devel-1.0.2d-4
+ openssl_x86-1.0.2d-5
+ openssl_x86_devel-1.0.2d-5
openttd_x86-1.3.3-1
pango_x86-1.37.0-1
pango_x86_devel-1.37.0-1
############################################################################
Revision: hrev49883
Commit: d5449f12d4c8f90c6ec0bbc9463a311e946cd366
URL: http://cgit.haiku-os.org/haiku/commit/?id=d5449f12d4c8
Author: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
Date: Thu Nov 26 01:44:51 2015 UTC
app_server: add another missing dependency on freetype
----------------------------------------------------------------------------
diff --git a/src/servers/app/Jamfile b/src/servers/app/Jamfile
index 89f8412..3d23fde 100644
--- a/src/servers/app/Jamfile
+++ b/src/servers/app/Jamfile
@@ -34,9 +34,9 @@ local font_src =
UseBuildFeatureHeaders freetype ;
Includes [ FGristFiles AppServer.cpp BitmapManager.cpp Canvas.cpp
ClientMemoryAllocator.cpp Desktop.cpp DesktopSettings.cpp
- DrawState.cpp DrawingEngine.cpp Layer.cpp ServerApp.cpp
- ServerBitmap.cpp ServerCursor.cpp ServerFont.cpp ServerPicture.cpp
- ServerWindow.cpp View.cpp Window.cpp WorkspacesView.cpp
+ DrawState.cpp DrawingEngine.cpp Layer.cpp PictureBoundingBoxPlayer.cpp
+ ServerApp.cpp ServerBitmap.cpp ServerCursor.cpp ServerFont.cpp
+ ServerPicture.cpp ServerWindow.cpp View.cpp Window.cpp
WorkspacesView.cpp
$(decorator_src) $(font_src) ]
: [ BuildFeatureAttribute freetype : headers ] ;
