hrev49697 adds 2 changesets to branch 'master'
old head: 0f3fcbe43710609a57479d1fbfde349542953ac8
new head: 5b3c88f1dab23aed6be4e6f89b09e95dde1c2d09
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=5b3c88f1dab2+%5E0f3fcbe43710
----------------------------------------------------------------------------
802a3f9e61b7: Updated glib2 package for x86_64.
5b3c88f1dab2: Switch to ncurses 6 as system dependency.
* remove traces from libpng (as opposed to libpng16).
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
9 files changed, 19 insertions(+), 14 deletions(-)
Jamfile | 2 +-
build/jam/BuildFeatures | 10 +++++-----
build/jam/repositories/HaikuPorts/x86_64 | 4 ++--
src/data/package_infos/arm/haiku | 3 ++-
src/data/package_infos/m68k/haiku | 2 +-
src/data/package_infos/ppc/haiku | 3 ++-
src/data/package_infos/x86/haiku | 3 ++-
src/data/package_infos/x86_64/haiku | 3 ++-
src/data/package_infos/x86_gcc2/haiku | 3 ++-
############################################################################
Commit: 802a3f9e61b7386f3e45425ad63218c8e5b8949f
URL: http://cgit.haiku-os.org/haiku/commit/?id=802a3f9e61b7
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Thu Oct 15 18:38:22 2015 UTC
Updated glib2 package for x86_64.
----------------------------------------------------------------------------
diff --git a/build/jam/repositories/HaikuPorts/x86_64
b/build/jam/repositories/HaikuPorts/x86_64
index 69c2e44..b0cb493 100644
--- a/build/jam/repositories/HaikuPorts/x86_64
+++ b/build/jam/repositories/HaikuPorts/x86_64
@@ -119,8 +119,8 @@ RemotePackageRepository HaikuPorts
glew-1.13.0-1
glew_devel-1.13.0-1
glew_util-1.13.0-1
- glib2-2.38.1-5
- glib2_devel-2.38.1-5
+ glib2-2.38.1-6
+ glib2_devel-2.38.1-6
glu-9.0.0-3
glu_devel-9.0.0-3
gmp-6.0.0-1
############################################################################
Revision: hrev49697
Commit: 5b3c88f1dab23aed6be4e6f89b09e95dde1c2d09
URL: http://cgit.haiku-os.org/haiku/commit/?id=5b3c88f1dab2
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Sat Oct 17 21:02:56 2015 UTC
Switch to ncurses 6 as system dependency.
* remove traces from libpng (as opposed to libpng16).
----------------------------------------------------------------------------
diff --git a/Jamfile b/Jamfile
index cce7bfe..67fa41b 100644
--- a/Jamfile
+++ b/Jamfile
@@ -28,7 +28,7 @@ AddHaikuImagePackages [ FFilterByBuildFeatures
regular_image @{
bzip2 ctags diffutils expat ffmpeg findutils gawk glu grep
gutenprint
gzip jasper jpeg
- less libicns libpcap libpng libpng16 libwebp
+ less libicns libpcap libpng16 libwebp
mesa mesa_devel mesa_swrast
netcat
sed sharutils
diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index 87bdc09..38a57b7 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -359,7 +359,7 @@ if [ IsPackageAvailable haikuwebkit_devel ] {
# libpng
-if [ IsPackageAvailable libpng_devel ] {
+if [ IsPackageAvailable libpng16_devel ] {
ExtractBuildFeatureArchives libpng :
file: base libpng16
runtime: lib
@@ -538,13 +538,13 @@ if [ IsPackageAvailable libwebp_devel ] {
# ncurses
-if [ IsPackageAvailable ncurses_devel ] {
+if [ IsPackageAvailable ncurses6_devel ] {
ExtractBuildFeatureArchives ncurses :
- file: base ncurses
+ file: base ncurses6
runtime: lib
- file: devel ncurses_devel
+ file: devel ncurses6_devel
depends: base
- library: $(developLibDir)/libncurses.so.5
+ library: $(developLibDir)/libncurses.so.6
headers: $(developHeadersDir)
;
diff --git a/src/data/package_infos/arm/haiku b/src/data/package_infos/arm/haiku
index 8173eda..23514de 100644
--- a/src/data/package_infos/arm/haiku
+++ b/src/data/package_infos/arm/haiku
@@ -71,9 +71,10 @@ requires {
lib:libicutest
lib:libicutu
lib:libicuuc
+ lib:libncurses >= 6.0
#ifdef HAIKU_REGULAR_BUILD
lib:libjpeg
- lib:libpng
+ lib:libpng >= 16.0
#endif
lib:libsolv
lib:libsolvext
diff --git a/src/data/package_infos/m68k/haiku
b/src/data/package_infos/m68k/haiku
index 4e840a6..b930f51 100644
--- a/src/data/package_infos/m68k/haiku
+++ b/src/data/package_infos/m68k/haiku
@@ -65,7 +65,7 @@ requires {
lib:libgcc_s
#ifdef HAIKU_REGULAR_BUILD
lib:libjpeg
- lib:libpng
+ lib:libpng >= 16.0
#endif
lib:libsolv
lib:libsolvext
diff --git a/src/data/package_infos/ppc/haiku b/src/data/package_infos/ppc/haiku
index aa7efca..8cb50c8 100644
--- a/src/data/package_infos/ppc/haiku
+++ b/src/data/package_infos/ppc/haiku
@@ -71,9 +71,10 @@ requires {
lib:libicutest
lib:libicutu
lib:libicuuc
+ lib:libncurses >= 6.0
#ifdef HAIKU_REGULAR_BUILD
lib:libjpeg
- lib:libpng
+ lib:libpng >= 16.0
#endif
lib:libsolv
lib:libsolvext
diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku
index 423e893..b15f70a 100644
--- a/src/data/package_infos/x86/haiku
+++ b/src/data/package_infos/x86/haiku
@@ -72,13 +72,14 @@ requires {
lib:libicutest
lib:libicutu
lib:libicuuc
+ lib:libncurses >= 6.0
#ifdef HAIKU_REGULAR_BUILD
lib:libexpat
lib:libgutenprint
lib:libicns
lib:libjasper
lib:libjpeg
- lib:libpng
+ lib:libpng >= 16.0
lib:libqrencode
lib:libtiff
lib:libwebp
diff --git a/src/data/package_infos/x86_64/haiku
b/src/data/package_infos/x86_64/haiku
index c4ff4fb..1579da8 100644
--- a/src/data/package_infos/x86_64/haiku
+++ b/src/data/package_infos/x86_64/haiku
@@ -71,13 +71,14 @@ requires {
lib:libicutest
lib:libicutu
lib:libicuuc
+ lib:libncurses >= 6.0
#ifdef HAIKU_REGULAR_BUILD
lib:libexpat
lib:libgutenprint
lib:libicns
lib:libjasper
lib:libjpeg
- lib:libpng
+ lib:libpng >= 16.0
lib:libqrencode
lib:libtiff
lib:libwebp
diff --git a/src/data/package_infos/x86_gcc2/haiku
b/src/data/package_infos/x86_gcc2/haiku
index 8563859..f0ca21c 100644
--- a/src/data/package_infos/x86_gcc2/haiku
+++ b/src/data/package_infos/x86_gcc2/haiku
@@ -72,13 +72,14 @@ requires {
lib:libicutest
lib:libicutu
lib:libicuuc
+ lib:libncurses >= 6.0
#ifdef HAIKU_REGULAR_BUILD
lib:libexpat
lib:libgutenprint
lib:libicns
lib:libjasper
lib:libjpeg
- lib:libpng
+ lib:libpng >= 16.0
lib:libqrencode
lib:libtiff
lib:libwebp
