diff --git a/racket/src/native-libs/README.txt b/racket/src/native-libs/README.txt index 81fd3ba714..c548c6666c 100644 --- a/racket/src/native-libs/README.txt +++ b/racket/src/native-libs/README.txt @@ -37,6 +37,7 @@ Currently, we use the following external packages and versions: poppler-0.24.5 mpfr-3.1.6 gmp-6.1.2 + atk-2.28.1 (Linux only:) xtrans-1.3.5 @@ -53,7 +54,6 @@ Currently, we use the following external packages and versions: libXext-1.3.3 libXrender-0.9.8 freefont[-ttf]-20100919 - atk-2.12.0 gdk-pixbuf-2.30.8 gtk+-2.24.24 diff --git a/racket/src/native-libs/build-all.rkt b/racket/src/native-libs/build-all.rkt index 153a38377c..f014666b0a 100644 --- a/racket/src/native-libs/build-all.rkt +++ b/racket/src/native-libs/build-all.rkt @@ -57,11 +57,11 @@ "gmp" "mpfr" "jpeg" + "atk" "poppler") (cond [linux? '("gdk-pixbuf" - "atk" "gtk+")] [else null]))) diff --git a/racket/src/native-libs/build.rkt b/racket/src/native-libs/build.rkt index 2bc02d471a..edff5da8de 100644 --- a/racket/src/native-libs/build.rkt +++ b/racket/src/native-libs/build.rkt @@ -385,8 +385,9 @@ #:env (append path-flags ld-library-path-flags))] [("atk") - (linux-only) - (config #:depends '("libX11") + (config #:depends (if linux? + '("libX11") + '()) #:env (append path-flags ld-library-path-flags))] [("gtk+") diff --git a/racket/src/native-libs/install.rkt b/racket/src/native-libs/install.rkt index 5d65a9d0ff..bff7dbe581 100644 --- a/racket/src/native-libs/install.rkt +++ b/racket/src/native-libs/install.rkt @@ -19,6 +19,7 @@ "libpango-1.0.0" "libpangocairo-1.0.0" "libpangoft2-1.0.0" + "libatk-1.0.0" "libexpat.1" "libfontconfig.1" "libfreetype.6" @@ -59,7 +60,6 @@ "libsqlite3.0") '("libgtk-x11-2.0.0" "libgdk-x11-2.0.0" - "libatk-1.0.0" "libgdk_pixbuf-2.0.0"))) (define linux-remove-libs '("libintl.9")) @@ -161,7 +161,7 @@ #t #f (["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_pixbuf-2.0.0")]