native libs: add ATK to native-library builds for all platforms

This commit is contained in:
Matthew Flatt 2018-04-14 07:59:00 -06:00
parent 70020785b2
commit ee695bc317
4 changed files with 7 additions and 6 deletions

View File

@ -37,6 +37,7 @@ Currently, we use the following external packages and versions:
poppler-0.24.5 poppler-0.24.5
mpfr-3.1.6 mpfr-3.1.6
gmp-6.1.2 gmp-6.1.2
atk-2.28.1
(Linux only:) (Linux only:)
xtrans-1.3.5 xtrans-1.3.5
@ -53,7 +54,6 @@ Currently, we use the following external packages and versions:
libXext-1.3.3 libXext-1.3.3
libXrender-0.9.8 libXrender-0.9.8
freefont[-ttf]-20100919 freefont[-ttf]-20100919
atk-2.12.0
gdk-pixbuf-2.30.8 gdk-pixbuf-2.30.8
gtk+-2.24.24 gtk+-2.24.24

View File

@ -57,11 +57,11 @@
"gmp" "gmp"
"mpfr" "mpfr"
"jpeg" "jpeg"
"atk"
"poppler") "poppler")
(cond (cond
[linux? [linux?
'("gdk-pixbuf" '("gdk-pixbuf"
"atk"
"gtk+")] "gtk+")]
[else null]))) [else null])))

View File

@ -385,8 +385,9 @@
#:env (append path-flags #:env (append path-flags
ld-library-path-flags))] ld-library-path-flags))]
[("atk") [("atk")
(linux-only) (config #:depends (if linux?
(config #:depends '("libX11") '("libX11")
'())
#:env (append path-flags #:env (append path-flags
ld-library-path-flags))] ld-library-path-flags))]
[("gtk+") [("gtk+")

View File

@ -19,6 +19,7 @@
"libpango-1.0.0" "libpango-1.0.0"
"libpangocairo-1.0.0" "libpangocairo-1.0.0"
"libpangoft2-1.0.0" "libpangoft2-1.0.0"
"libatk-1.0.0"
"libexpat.1" "libexpat.1"
"libfontconfig.1" "libfontconfig.1"
"libfreetype.6" "libfreetype.6"
@ -59,7 +60,6 @@
"libsqlite3.0") "libsqlite3.0")
'("libgtk-x11-2.0.0" '("libgtk-x11-2.0.0"
"libgdk-x11-2.0.0" "libgdk-x11-2.0.0"
"libatk-1.0.0"
"libgdk_pixbuf-2.0.0"))) "libgdk_pixbuf-2.0.0")))
(define linux-remove-libs (define linux-remove-libs
'("libintl.9")) '("libintl.9"))
@ -161,7 +161,7 @@
#t #t
#f #f
(["libgtk-x11-2.0.0" "GTK+ is released under the GNU Library General Public License (GNU LGPL)."] (["libgtk-x11-2.0.0" "GTK+ is released under the GNU Library General Public License (GNU LGPL)."]
["libatk-1.0.0" "ATK is released under the GNU Library General Public License (GNU LGPL)."] ["libatk" "ATK is released under the GNU Library General Public License (GNU LGPL)."]
"libgdk-x11-2.0.0" "libgdk-x11-2.0.0"
"libgdk_pixbuf-2.0.0")] "libgdk_pixbuf-2.0.0")]