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

Move print add-ons to the haiku_datatranslators package.

Browse Source 
This allows us to move the Gutenprint dependency there, too.
(cherry picked from commit fefa5edf96)

Change-Id: I7cead5949e4e7a201a213cf2cd323368b6028db3
Reviewed-on: https://review.haiku-os.org/c/haiku/+/5785
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
This commit is contained in:
Augustin Cavalier 2022-11-11 15:48:23 -05:00 committed by waddlesplash
parent 6414eef107
commit 39ec2f7ae8
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/jam/packages/Haiku
View File

@ -242,9 +242,6 @@ AddFilesToPackage add-ons kernel network ppp : $(SYSTEM_NETWORK_PPP) ;
AddFilesToPackage add-ons kernel network protocols
: $(SYSTEM_NETWORK_PROTOCOLS) ;
AddFilesToPackage add-ons Print : $(SYSTEM_ADD_ONS_PRINT) ;
AddFilesToPackage add-ons Print transport
: $(SYSTEM_ADD_ONS_PRINT_TRANSPORT) ;
AddFilesToPackage add-ons Screen\ Savers : $(SYSTEM_ADD_ONS_SCREENSAVERS) ;
AddFilesToPackage add-ons disk_systems

2
build/jam/packages/HaikuDataTranslators
View File

@ -5,5 +5,7 @@ HaikuPackage $(dataTranslatorsPackage) ;
AddFilesToPackage add-ons Translators : $(SYSTEM_ADD_ONS_TRANSLATORS) ;
AddFilesToPackage add-ons media plugins : $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ;
AddFilesToPackage add-ons Print : $(SYSTEM_ADD_ONS_PRINT) ;
AddFilesToPackage add-ons Print transport : $(SYSTEM_ADD_ONS_PRINT_TRANSPORT) ;
BuildHaikuPackage $(dataTranslatorsPackage) : haiku_datatranslators ;

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

@ -123,8 +123,5 @@ requires {
#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_expat_ENABLED
lib:libexpat
#endif
#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_gutenprint_ENABLED
lib:libgutenprint >= 8
#endif
#endif
}

3
src/data/package_infos/generic/haiku_datatranslators
View File

@ -58,5 +58,8 @@ requires {
#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_libraw_ENABLED
lib:libraw
#endif
#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_gutenprint_ENABLED
lib:libgutenprint
#endif
#endif
}