i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions 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-18 00:44:30 +02:00
parent 802a3f9e61
commit 5b3c88f1da
8 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamfile
+1 -1
View File
@@ -28,7 +28,7 @@ AddHaikuImagePackages [ FFilterByBuildFeatures
regular_image @{ regular_image @{
bzip2 ctags diffutils expat ffmpeg findutils gawk glu grep gutenprint bzip2 ctags diffutils expat ffmpeg findutils gawk glu grep gutenprint
gzip jasper jpeg gzip jasper jpeg
less libicns libpcap libpng libpng16 libwebp less libicns libpcap libpng16 libwebp
mesa mesa_devel mesa_swrast mesa mesa_devel mesa_swrast
netcat netcat
sed sharutils sed sharutils
build/jam/BuildFeatures
+5 -5
View File
@@ -359,7 +359,7 @@ if [ IsPackageAvailable haikuwebkit_devel ] {
# libpng # libpng
if [ IsPackageAvailable libpng_devel ] { if [ IsPackageAvailable libpng16_devel ] {
ExtractBuildFeatureArchives libpng : ExtractBuildFeatureArchives libpng :
file: base libpng16 file: base libpng16
runtime: lib runtime: lib
@@ -538,13 +538,13 @@ if [ IsPackageAvailable libwebp_devel ] {
# ncurses # ncurses
if [ IsPackageAvailable ncurses_devel ] { if [ IsPackageAvailable ncurses6_devel ] {
ExtractBuildFeatureArchives ncurses : ExtractBuildFeatureArchives ncurses :
file: base ncurses file: base ncurses6
runtime: lib runtime: lib
file: devel ncurses_devel file: devel ncurses6_devel
depends: base depends: base
library: $(developLibDir)/libncurses.so.5 library: $(developLibDir)/libncurses.so.6
headers: $(developHeadersDir) headers: $(developHeadersDir)
; ;
src/data/package_infos/arm/haiku
+2 -1
View File
@@ -71,9 +71,10 @@ requires {
lib:libicutest lib:libicutest
lib:libicutu lib:libicutu
lib:libicuuc lib:libicuuc
lib:libncurses >= 6.0
#ifdef HAIKU_REGULAR_BUILD #ifdef HAIKU_REGULAR_BUILD
lib:libjpeg lib:libjpeg
lib:libpng lib:libpng >= 16.0
#endif #endif
lib:libsolv lib:libsolv
lib:libsolvext lib:libsolvext
src/data/package_infos/m68k/haiku
+1 -1
View File
@@ -65,7 +65,7 @@ requires {
lib:libgcc_s lib:libgcc_s
#ifdef HAIKU_REGULAR_BUILD #ifdef HAIKU_REGULAR_BUILD
lib:libjpeg lib:libjpeg
lib:libpng lib:libpng >= 16.0
#endif #endif
lib:libsolv lib:libsolv
lib:libsolvext lib:libsolvext
src/data/package_infos/ppc/haiku
+2 -1
View File
@@ -71,9 +71,10 @@ requires {
lib:libicutest lib:libicutest
lib:libicutu lib:libicutu
lib:libicuuc lib:libicuuc
lib:libncurses >= 6.0
#ifdef HAIKU_REGULAR_BUILD #ifdef HAIKU_REGULAR_BUILD
lib:libjpeg lib:libjpeg
lib:libpng lib:libpng >= 16.0
#endif #endif
lib:libsolv lib:libsolv
lib:libsolvext lib:libsolvext
src/data/package_infos/x86/haiku
+2 -1
View File
@@ -72,13 +72,14 @@ requires {
lib:libicutest lib:libicutest
lib:libicutu lib:libicutu
lib:libicuuc lib:libicuuc
lib:libncurses >= 6.0
#ifdef HAIKU_REGULAR_BUILD #ifdef HAIKU_REGULAR_BUILD
lib:libexpat lib:libexpat
lib:libgutenprint lib:libgutenprint
lib:libicns lib:libicns
lib:libjasper lib:libjasper
lib:libjpeg lib:libjpeg
lib:libpng lib:libpng >= 16.0
lib:libqrencode lib:libqrencode
lib:libtiff lib:libtiff
lib:libwebp lib:libwebp
src/data/package_infos/x86_64/haiku
+2 -1
View File
@@ -71,13 +71,14 @@ requires {
lib:libicutest lib:libicutest
lib:libicutu lib:libicutu
lib:libicuuc lib:libicuuc
lib:libncurses >= 6.0
#ifdef HAIKU_REGULAR_BUILD #ifdef HAIKU_REGULAR_BUILD
lib:libexpat lib:libexpat
lib:libgutenprint lib:libgutenprint
lib:libicns lib:libicns
lib:libjasper lib:libjasper
lib:libjpeg lib:libjpeg
lib:libpng lib:libpng >= 16.0
lib:libqrencode lib:libqrencode
lib:libtiff lib:libtiff
lib:libwebp lib:libwebp
src/data/package_infos/x86_gcc2/haiku
+2 -1
View File
@@ -72,13 +72,14 @@ requires {
lib:libicutest lib:libicutest
lib:libicutu lib:libicutu
lib:libicuuc lib:libicuuc
lib:libncurses >= 6.0
#ifdef HAIKU_REGULAR_BUILD #ifdef HAIKU_REGULAR_BUILD
lib:libexpat lib:libexpat
lib:libgutenprint lib:libgutenprint
lib:libicns lib:libicns
lib:libjasper lib:libjasper
lib:libjpeg lib:libjpeg
lib:libpng lib:libpng >= 16.0
lib:libqrencode lib:libqrencode
lib:libtiff lib:libtiff
lib:libwebp lib:libwebp