Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to ncurses 6 as system dependency.

Browse Source 
* remove traces from libpng (as opposed to libpng16).
This commit is contained in:
Jérôme Duval 2015-10-17 23:02:56 +02:00
parent 802a3f9e61
commit 5b3c88f1da
8 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jamfile
View File

@ -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

10
build/jam/BuildFeatures
View File

@ -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)
;

3
src/data/package_infos/arm/haiku
View File

@ -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

2
src/data/package_infos/m68k/haiku
View File

@ -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

3
src/data/package_infos/ppc/haiku
View File

@ -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

3
src/data/package_infos/x86/haiku
View File

@ -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

3
src/data/package_infos/x86_64/haiku
View File

@ -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

3
src/data/package_infos/x86_gcc2/haiku
View File

@ -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